Changeset 7808

Timestamp:

05/14/12 16:01:00 (13 years ago)

Author:

spimming

Message:

#1807:

• experiment wizard initial commit
• plugin file frames added
• wizard renamed

Location:

branches/DataAnalysisService

Files:

• DataAnalysisService.sln (modified) (2 diffs)
• HeuristicLab.ExperimentGeneration.DataAnalysis.ExperimentWizard (added)
• HeuristicLab.ExperimentGeneration.DataAnalysis.ExperimentWizard/3.3 (added)
• HeuristicLab.ExperimentGeneration.DataAnalysis.ExperimentWizard/3.3/DataAnalysisExperimentWizard.cs (added)
• HeuristicLab.ExperimentGeneration.DataAnalysis.ExperimentWizard/3.3/ExperimentWizardMenuItem.cs (added)
• HeuristicLab.ExperimentGeneration.DataAnalysis.ExperimentWizard/3.3/HeuristicLab.ExperimentGeneration.DataAnalysis.ExperimentWizard.csproj (added)
• HeuristicLab.ExperimentGeneration.DataAnalysis.ExperimentWizard/3.3/Plugin.cs.frame (added)
• HeuristicLab.ExperimentGeneration.DataAnalysis.ExperimentWizard/3.3/ProblemDataPage.Designer.cs (added)
• HeuristicLab.ExperimentGeneration.DataAnalysis.ExperimentWizard/3.3/ProblemDataPage.cs (added)
• HeuristicLab.ExperimentGeneration.DataAnalysis.ExperimentWizard/3.3/Properties (added)
• HeuristicLab.ExperimentGeneration.DataAnalysis.ExperimentWizard/3.3/Properties/AssemblyInfo.cs (added)
• HeuristicLab.ExperimentGeneration.DataAnalysis.Wizard/3.3/Controls/WizardBanner.Designer.cs (modified) (2 diffs)
• HeuristicLab.ExperimentGeneration.DataAnalysis.Wizard/3.3/HeuristicLab.ExperimentGeneration.DataAnalysis.Wizard.csproj (modified) (3 diffs)
• HeuristicLab.ExperimentGeneration.DataAnalysis.Wizard/3.3/Plugin.cs.frame (added)
• HeuristicLab.ExperimentGeneration.DataAnalysis.Wizard/3.3/Wizard.Designer.cs (deleted)
• HeuristicLab.ExperimentGeneration.DataAnalysis.Wizard/3.3/Wizard.cs (deleted)
• HeuristicLab.ExperimentGeneration.DataAnalysis.Wizard/3.3/WizardBase.Designer.cs (added)
• HeuristicLab.ExperimentGeneration.DataAnalysis.Wizard/3.3/WizardBase.cs (added)
• HeuristicLab.ExperimentGeneration.DataAnalysis.Wizard/3.3/WizardPage.cs (modified) (1 diff)

branches/DataAnalysisService/DataAnalysisService.sln

@@ -3 +3 @@
 # Visual Studio 2010
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.ExperimentGeneration.DataAnalysis.Wizard", "HeuristicLab.ExperimentGeneration.DataAnalysis.Wizard\3.3\HeuristicLab.ExperimentGeneration.DataAnalysis.Wizard.csproj", "{77169FE1-C48A-49AE-A0DD-67921D7835AB}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.ExperimentGeneration.DataAnalysis.ExperimentWizard", "HeuristicLab.ExperimentGeneration.DataAnalysis.ExperimentWizard\3.3\HeuristicLab.ExperimentGeneration.DataAnalysis.ExperimentWizard.csproj", "{2DCCE95D-3266-4256-966A-64054BEA34F1}"
 EndProject
 Global
@@ -14 +16 @@
     {77169FE1-C48A-49AE-A0DD-67921D7835AB}.Release|Any CPU.ActiveCfg = Release|Any CPU
     {77169FE1-C48A-49AE-A0DD-67921D7835AB}.Release|Any CPU.Build.0 = Release|Any CPU
+    {2DCCE95D-3266-4256-966A-64054BEA34F1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {2DCCE95D-3266-4256-966A-64054BEA34F1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {2DCCE95D-3266-4256-966A-64054BEA34F1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {2DCCE95D-3266-4256-966A-64054BEA34F1}.Release|Any CPU.Build.0 = Release|Any CPU
   EndGlobalSection
   GlobalSection(SolutionProperties) = preSolution

branches/DataAnalysisService/HeuristicLab.ExperimentGeneration.DataAnalysis.Wizard/3.3/Controls/WizardBanner.Designer.cs

@@ -35 +35 @@
       this.etchedLine1.Edge = HeuristicLab.ExperimentGeneration.DataAnalysis.Wizard.Controls.EtchEdge.Bottom;
       this.etchedLine1.LightColor = System.Drawing.SystemColors.ControlLight;
-      this.etchedLine1.Location = new System.Drawing.Point(0, 71);
+      this.etchedLine1.Location = new System.Drawing.Point(0, 61);
       this.etchedLine1.Name = "etchedLine1";
       this.etchedLine1.Size = new System.Drawing.Size(541, 20);
@@ -70 +70 @@
       this.Controls.Add(this.etchedLine1);
       this.Name = "WizardBanner";
-      this.Size = new System.Drawing.Size(541, 91);
+      this.Size = new System.Drawing.Size(541, 81);
       this.ResumeLayout(false);
 

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

@@ -10 +10 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>HeuristicLab.ExperimentGeneration.DataAnalysis.Wizard</RootNamespace>
-    <AssemblyName>HeuristicLab.ExperimentGeneration.DataAnalysis.Wizard</AssemblyName>
+    <AssemblyName>HeuristicLab.ExperimentGeneration.DataAnalysis.Wizard-3.3</AssemblyName>
     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
@@ -62 +62 @@
     </Compile>
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Wizard.cs">
+    <Compile Include="WizardBase.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="Wizard.Designer.cs">
-      <DependentUpon>Wizard.cs</DependentUpon>
+    <Compile Include="WizardBase.Designer.cs">
+      <DependentUpon>WizardBase.cs</DependentUpon>
     </Compile>
     <Compile Include="WizardPage.cs">
@@ -83 +83 @@
       <DependentUpon>WizardBanner.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="Wizard.resx">
-      <DependentUpon>Wizard.cs</DependentUpon>
+    <EmbeddedResource Include="WizardBase.resx">
+      <DependentUpon>WizardBase.cs</DependentUpon>
     </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
     <None Include="HeuristicLab.snk" />
+    <None Include="Plugin.cs.frame" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

branches/DataAnalysisService/HeuristicLab.ExperimentGeneration.DataAnalysis.Wizard/3.3/WizardPage.cs

@@ -8 +8 @@
     }
 
-    public Wizard ParentWizard {
-      get { return (Wizard)ParentForm; }
+    public WizardBase ParentWizard {
+      get { return (WizardBase)ParentForm; }
     }