Changeset 7824 for branches/DataAnalysisService/HeuristicLab.ExperimentGeneration.DataAnalysis.ExperimentWizard

Timestamp:

05/15/12 14:11:56 (13 years ago)

Author:

spimming

Message:

#1807:

• added new wizard pages
• removed AssemblyInfo files and replaced them with frame file
• disable buttons when wizardbuttons set to 'none'
• introduce data analysis context class

Location:

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

Files:

• DataAnalysisExperimentWizard.cs (modified) (1 diff)
• DataAnalysisWizardContext.cs (added)
• HeuristicLab.ExperimentGeneration.DataAnalysis.ExperimentWizard.csproj (modified) (2 diffs)
• MediumAnalysisPage.Designer.cs (added)
• MediumAnalysisPage.cs (added)
• ProblemDataPage.Designer.cs (modified) (1 diff)
• ProblemDataPage.cs (modified) (2 diffs)
• ProblemDataViewPage.Designer.cs (added)
• ProblemDataViewPage.cs (added)
• Properties/AssemblyInfo.cs (deleted)
• Properties/AssemblyInfo.cs.frame (added)
• SelectAnalysisPage.Designer.cs (added)
• SelectAnalysisPage.cs (added)

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

@@ -4 +4 @@
   public class DataAnalysisExperimentWizard {
     private WizardBase wizard;
+    private DataAnalysisWizardContext context;
 
     public DataAnalysisExperimentWizard() {
+      context = new DataAnalysisWizardContext();
       wizard = new WizardBase();
-      wizard.WizardPages.Add(new ProblemDataPage());
+      wizard.Text = "Data Analysis Service";
+      wizard.AddPage(new ProblemDataPage(context));
+      wizard.AddPage(new ProblemDataViewPage(context));
+      wizard.AddPage(new SelectAnalysisPage(context));
+      wizard.AddPage(new WizardPage());
+      wizard.AddPage(new MediumAnalysisPage());
+
     }
 

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

@@ -107 +107 @@
   <ItemGroup>
     <Compile Include="DataAnalysisExperimentWizard.cs" />
+    <Compile Include="DataAnalysisWizardContext.cs" />
     <Compile Include="ExperimentWizardMenuItem.cs" />
+    <Compile Include="MediumAnalysisPage.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="MediumAnalysisPage.Designer.cs">
+      <DependentUpon>MediumAnalysisPage.cs</DependentUpon>
+    </Compile>
     <Compile Include="Plugin.cs" />
     <Compile Include="ProblemDataPage.cs">
@@ -115 +122 @@
       <DependentUpon>ProblemDataPage.cs</DependentUpon>
     </Compile>
+    <Compile Include="ProblemDataViewPage.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="ProblemDataViewPage.Designer.cs">
+      <DependentUpon>ProblemDataViewPage.cs</DependentUpon>
+    </Compile>
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="SelectAnalysisPage.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="SelectAnalysisPage.Designer.cs">
+      <DependentUpon>SelectAnalysisPage.cs</DependentUpon>
+    </Compile>
   </ItemGroup>
   <ItemGroup>
     <None Include="HeuristicLab.snk" />
     <None Include="Plugin.cs.frame" />
+    <None Include="Properties\AssemblyInfo.cs.frame" />
   </ItemGroup>
   <ItemGroup>
+    <EmbeddedResource Include="MediumAnalysisPage.resx">
+      <DependentUpon>MediumAnalysisPage.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="ProblemDataPage.resx">
       <DependentUpon>ProblemDataPage.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="ProblemDataViewPage.resx">
+      <DependentUpon>ProblemDataViewPage.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="SelectAnalysisPage.resx">
+      <DependentUpon>SelectAnalysisPage.cs</DependentUpon>
     </EmbeddedResource>
   </ItemGroup>

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

@@ -50 +50 @@
       this.Size = new System.Drawing.Size(640, 480);
       this.SetActive += new System.ComponentModel.CancelEventHandler(this.ProblemDataPage_SetActive);
+      this.WizardNext += new HeuristicLab.ExperimentGeneration.DataAnalysis.Wizard.WizardPageEventHandler(this.ProblemDataPage_WizardNext);
       this.Controls.SetChildIndex(this.wizardBanner, 0);
       this.Controls.SetChildIndex(this.dataAnalysisProblemView, 0);

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

@@ -4 +4 @@
 namespace HeuristicLab.ExperimentGeneration.DataAnalysis.ExperimentWizard {
   public partial class ProblemDataPage : HeuristicLab.ExperimentGeneration.DataAnalysis.Wizard.WizardPage {
-    public ProblemDataPage() {
+    private DataAnalysisWizardContext context;
+    public DataAnalysisWizardContext Context {
+      get { return context; }
+    }
+
+    public ProblemDataPage(DataAnalysisWizardContext context) {
       InitializeComponent();
+      this.context = context;
       dataAnalysisProblemView.Content = new RegressionProblem();
     }
@@ -12 +18 @@
       SetWizardButton(Wizard.WizardButtons.Next);
     }
+
+    private void ProblemDataPage_WizardNext(object sender, Wizard.WizardPageEventArgs e) {
+      context.Problem = dataAnalysisProblemView.Content;
+    }
   }
 }