Changeset 7816 for branches/DataAnalysisService/HeuristicLab.ExperimentGeneration.DataAnalysis.ExperimentWizard/3.3

Timestamp:

05/14/12 17:58:58 (12 years ago)

Author:

spimming

Message:

#1807:

• moved banner to wizardpage
• set dock style when setting active page
• set content in problem view

Location:

branches/DataAnalysisService/HeuristicLab.ExperimentGeneration.DataAnalysis.ExperimentWizard/3.3

Files:

• HeuristicLab.ExperimentGeneration.DataAnalysis.ExperimentWizard.csproj (modified) (2 diffs)
• ProblemDataPage.Designer.cs (modified) (4 diffs)
• ProblemDataPage.cs (modified) (2 diffs)

branches/DataAnalysisService/HeuristicLab.ExperimentGeneration.DataAnalysis.ExperimentWizard/3.3/HeuristicLab.ExperimentGeneration.DataAnalysis.ExperimentWizard.csproj

@@ -108 +108 @@
     <Compile Include="DataAnalysisExperimentWizard.cs" />
     <Compile Include="ExperimentWizardMenuItem.cs" />
+    <Compile Include="Plugin.cs" />
     <Compile Include="ProblemDataPage.cs">
       <SubType>UserControl</SubType>
@@ -121 +122 @@
   </ItemGroup>
   <ItemGroup>
+    <EmbeddedResource Include="ProblemDataPage.resx">
+      <DependentUpon>ProblemDataPage.cs</DependentUpon>
+    </EmbeddedResource>
+  </ItemGroup>
+  <ItemGroup>
     <ProjectReference Include="..\..\HeuristicLab.ExperimentGeneration.DataAnalysis.Wizard\3.3\HeuristicLab.ExperimentGeneration.DataAnalysis.Wizard.csproj">
       <Project>{77169FE1-C48A-49AE-A0DD-67921D7835AB}</Project>
       <Name>HeuristicLab.ExperimentGeneration.DataAnalysis.Wizard</Name>
     </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="ProblemDataPage.resx">
-      <DependentUpon>ProblemDataPage.cs</DependentUpon>
-    </EmbeddedResource>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

branches/DataAnalysisService/HeuristicLab.ExperimentGeneration.DataAnalysis.ExperimentWizard/3.3/ProblemDataPage.Designer.cs

@@ -24 +24 @@
     /// </summary>
     private void InitializeComponent() {
-      this.wizardBanner1 = new HeuristicLab.ExperimentGeneration.DataAnalysis.Wizard.Controls.WizardBanner();
       this.dataAnalysisProblemView = new HeuristicLab.Problems.DataAnalysis.Views.DataAnalysisProblemView();
       this.SuspendLayout();
       // 
-      // wizardBanner1
+      // wizardBanner
       // 
-      this.wizardBanner1.BackColor = System.Drawing.SystemColors.Window;
-      this.wizardBanner1.Dock = System.Windows.Forms.DockStyle.Top;
-      this.wizardBanner1.Location = new System.Drawing.Point(0, 0);
-      this.wizardBanner1.Name = "wizardBanner1";
-      this.wizardBanner1.Size = new System.Drawing.Size(713, 81);
-      this.wizardBanner1.Subtitle = "Please select file ...";
-      this.wizardBanner1.TabIndex = 0;
-      this.wizardBanner1.Title = "Problem Data";
+      this.wizardBanner.Size = new System.Drawing.Size(640, 81);
       // 
       // dataAnalysisProblemView
@@ -47 +39 @@
       this.dataAnalysisProblemView.Name = "dataAnalysisProblemView";
       this.dataAnalysisProblemView.ReadOnly = false;
-      this.dataAnalysisProblemView.Size = new System.Drawing.Size(713, 371);
+      this.dataAnalysisProblemView.Size = new System.Drawing.Size(640, 399);
       this.dataAnalysisProblemView.TabIndex = 1;
       // 
@@ -53 +45 @@
       // 
       this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+      this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
       this.Controls.Add(this.dataAnalysisProblemView);
-      this.Controls.Add(this.wizardBanner1);
       this.Name = "ProblemDataPage";
-      this.Size = new System.Drawing.Size(713, 452);
+      this.Size = new System.Drawing.Size(640, 480);
       this.SetActive += new System.ComponentModel.CancelEventHandler(this.ProblemDataPage_SetActive);
+      this.Controls.SetChildIndex(this.wizardBanner, 0);
+      this.Controls.SetChildIndex(this.dataAnalysisProblemView, 0);
       this.ResumeLayout(false);
 
@@ -64 +58 @@
     #endregion
 
-    private Wizard.Controls.WizardBanner wizardBanner1;
     private Problems.DataAnalysis.Views.DataAnalysisProblemView dataAnalysisProblemView;
 

branches/DataAnalysisService/HeuristicLab.ExperimentGeneration.DataAnalysis.ExperimentWizard/3.3/ProblemDataPage.cs

@@ -1 +1 @@
 using System.ComponentModel;
+using HeuristicLab.Problems.DataAnalysis;
 
 namespace HeuristicLab.ExperimentGeneration.DataAnalysis.ExperimentWizard {
@@ -5 +6 @@
     public ProblemDataPage() {
       InitializeComponent();
+      dataAnalysisProblemView.Content = new RegressionProblem();
     }