Free cookie consent management tool by TermsFeed Policy Generator

Changeset 7824 for branches


Ignore:
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
Files:
9 added
2 deleted
6 edited

Legend:

Unmodified
Added
Removed

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

    r7808 r7824  
    44  public class DataAnalysisExperimentWizard {
    55    private WizardBase wizard;
     6    private DataAnalysisWizardContext context;
    67
    78    public DataAnalysisExperimentWizard() {
     9      context = new DataAnalysisWizardContext();
    810      wizard = new WizardBase();
    9       wizard.WizardPages.Add(new ProblemDataPage());
     11      wizard.Text = "Data Analysis Service";
     12      wizard.AddPage(new ProblemDataPage(context));
     13      wizard.AddPage(new ProblemDataViewPage(context));
     14      wizard.AddPage(new SelectAnalysisPage(context));
     15      wizard.AddPage(new WizardPage());
     16      wizard.AddPage(new MediumAnalysisPage());
     17
    1018    }
    1119

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

    r7816 r7824  
    107107  <ItemGroup>
    108108    <Compile Include="DataAnalysisExperimentWizard.cs" />
     109    <Compile Include="DataAnalysisWizardContext.cs" />
    109110    <Compile Include="ExperimentWizardMenuItem.cs" />
     111    <Compile Include="MediumAnalysisPage.cs">
     112      <SubType>UserControl</SubType>
     113    </Compile>
     114    <Compile Include="MediumAnalysisPage.Designer.cs">
     115      <DependentUpon>MediumAnalysisPage.cs</DependentUpon>
     116    </Compile>
    110117    <Compile Include="Plugin.cs" />
    111118    <Compile Include="ProblemDataPage.cs">
    … …  
    115122      <DependentUpon>ProblemDataPage.cs</DependentUpon>
    116123    </Compile>
     124    <Compile Include="ProblemDataViewPage.cs">
     125      <SubType>UserControl</SubType>
     126    </Compile>
     127    <Compile Include="ProblemDataViewPage.Designer.cs">
     128      <DependentUpon>ProblemDataViewPage.cs</DependentUpon>
     129    </Compile>
    117130    <Compile Include="Properties\AssemblyInfo.cs" />
     131    <Compile Include="SelectAnalysisPage.cs">
     132      <SubType>UserControl</SubType>
     133    </Compile>
     134    <Compile Include="SelectAnalysisPage.Designer.cs">
     135      <DependentUpon>SelectAnalysisPage.cs</DependentUpon>
     136    </Compile>
    118137  </ItemGroup>
    119138  <ItemGroup>
    120139    <None Include="HeuristicLab.snk" />
    121140    <None Include="Plugin.cs.frame" />
     141    <None Include="Properties\AssemblyInfo.cs.frame" />
    122142  </ItemGroup>
    123143  <ItemGroup>
     144    <EmbeddedResource Include="MediumAnalysisPage.resx">
     145      <DependentUpon>MediumAnalysisPage.cs</DependentUpon>
     146    </EmbeddedResource>
    124147    <EmbeddedResource Include="ProblemDataPage.resx">
    125148      <DependentUpon>ProblemDataPage.cs</DependentUpon>
     149    </EmbeddedResource>
     150    <EmbeddedResource Include="ProblemDataViewPage.resx">
     151      <DependentUpon>ProblemDataViewPage.cs</DependentUpon>
     152    </EmbeddedResource>
     153    <EmbeddedResource Include="SelectAnalysisPage.resx">
     154      <DependentUpon>SelectAnalysisPage.cs</DependentUpon>
    126155    </EmbeddedResource>
    127156  </ItemGroup>

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

    r7816 r7824  
    5050      this.Size = new System.Drawing.Size(640, 480);
    5151      this.SetActive += new System.ComponentModel.CancelEventHandler(this.ProblemDataPage_SetActive);
     52      this.WizardNext += new HeuristicLab.ExperimentGeneration.DataAnalysis.Wizard.WizardPageEventHandler(this.ProblemDataPage_WizardNext);
    5253      this.Controls.SetChildIndex(this.wizardBanner, 0);
    5354      this.Controls.SetChildIndex(this.dataAnalysisProblemView, 0);

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

    r7816 r7824  
    44namespace HeuristicLab.ExperimentGeneration.DataAnalysis.ExperimentWizard {
    55  public partial class ProblemDataPage : HeuristicLab.ExperimentGeneration.DataAnalysis.Wizard.WizardPage {
    6     public ProblemDataPage() {
     6    private DataAnalysisWizardContext context;
     7    public DataAnalysisWizardContext Context {
     8      get { return context; }
     9    }
     10
     11    public ProblemDataPage(DataAnalysisWizardContext context) {
    712      InitializeComponent();
     13      this.context = context;
    814      dataAnalysisProblemView.Content = new RegressionProblem();
    915    }
    … …  
    1218      SetWizardButton(Wizard.WizardButtons.Next);
    1319    }
     20
     21    private void ProblemDataPage_WizardNext(object sender, Wizard.WizardPageEventArgs e) {
     22      context.Problem = dataAnalysisProblemView.Content;
     23    }
    1424  }
    1525}

  • branches/DataAnalysisService/HeuristicLab.ExperimentGeneration.DataAnalysis.Wizard/3.3/HeuristicLab.ExperimentGeneration.DataAnalysis.Wizard.csproj

    r7816 r7824  
    9595    <None Include="HeuristicLab.snk" />
    9696    <None Include="Plugin.cs.frame" />
     97    <None Include="Properties\AssemblyInfo.cs.frame" />
    9798  </ItemGroup>
    9899  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

  • branches/DataAnalysisService/HeuristicLab.ExperimentGeneration.DataAnalysis.Wizard/3.3/WizardBase.cs

    r7816 r7824  
    9292        btnNext.Enabled = false;
    9393        AcceptButton = btnCommit;
     94      } else if (button == WizardButtons.None) {
     95        btnCommit.Visible = false;
     96        btnCommit.Enabled = false;
     97        btnNext.Visible = true;
     98        btnNext.Enabled = false;
     99        btnBack.Enabled = false;
     100        AcceptButton = btnNext;
    94101      }
    95102    }
    … …  
    99106        btnCommit.Text = buttonText;
    100107      }
     108    }
     109
     110    public void AddPage(WizardPage page) {
     111      WizardPages.Add(page);
    101112    }
    102113
Note: See TracChangeset for help on using the changeset viewer.