Changeset 6558 for trunk/sources

Timestamp:

07/09/11 12:49:20 (13 years ago)

Author:

swagner

Message:

Adapted colorize button for x-axis in RunCollectionBubbleChartView and changed names of experiments and batch runs which are created using the CreateExperimentDialog (#1529)

Location:

trunk/sources

Files:

• HeuristicLab.Common.Resources/3.3/HeuristicLab.Common.Resources-3.3.csproj (modified) (1 diff)
• HeuristicLab.Common.Resources/3.3/Resources/VS2008ImageLibrary/VS2008ImageLibrary_Actions_DisplayInColor_Vertical.png (added)
• HeuristicLab.Common.Resources/3.3/VSImageLibrary.Designer.cs (modified) (1 diff)
• HeuristicLab.Common.Resources/3.3/VSImageLibrary.resx (modified) (1 diff)
• HeuristicLab.Optimization.Views/3.3/RunCollectionBubbleChartView.Designer.cs (modified) (1 diff)
• HeuristicLab.Optimizer/3.3/CreateExperimentDialog.cs (modified) (1 diff)

trunk/sources/HeuristicLab.Common.Resources/3.3/HeuristicLab.Common.Resources-3.3.csproj

@@ -431 +431 @@
     <Content Include="Resources\VS2008ImageLibrary\VS2008ImageLibrary_Actions_Checkout.png" />
     <Content Include="Resources\VS2008ImageLibrary\VS2008ImageLibrary_Actions_Clone.png" />
+    <None Include="Resources\VS2008ImageLibrary\VS2008ImageLibrary_Actions_DisplayInColor_Vertical.png" />
     <Content Include="Resources\VS2008ImageLibrary\VS2008ImageLibrary_Objects_BatchRun_Paused.png" />
     <Content Include="Resources\VS2008ImageLibrary\VS2008ImageLibrary_Objects_BatchRun_Prepared.png" />

trunk/sources/HeuristicLab.Common.Resources/3.3/VSImageLibrary.Designer.cs

@@ -271 +271 @@
         }
         
+        public static System.Drawing.Bitmap DisplayInColorVertical {
+            get {
+                object obj = ResourceManager.GetObject("DisplayInColorVertical", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
         public static System.Drawing.Bitmap Document {
             get {

trunk/sources/HeuristicLab.Common.Resources/3.3/VSImageLibrary.resx

@@ -506 +506 @@
     <value>Resources\VS2008ImageLibrary\VS2008ImageLibrary_CommonElements_Objects_Zoom_Out.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="DisplayInColorVertical" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>Resources\VS2008ImageLibrary\VS2008ImageLibrary_Actions_DisplayInColor_Vertical.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
 </root>

trunk/sources/HeuristicLab.Optimization.Views/3.3/RunCollectionBubbleChartView.Designer.cs

@@ -274 +274 @@
       this.colorXAxisButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
       this.colorXAxisButton.Enabled = false;
-      this.colorXAxisButton.Image = HeuristicLab.Common.Resources.VSImageLibrary.DisplayInColor;
+      this.colorXAxisButton.Image = HeuristicLab.Common.Resources.VSImageLibrary.DisplayInColorVertical;
       this.colorXAxisButton.Location = new System.Drawing.Point(719, 469);
       this.colorXAxisButton.Name = "colorXAxisButton";

trunk/sources/HeuristicLab.Optimizer/3.3/CreateExperimentDialog.cs

@@ -59 +59 @@
     }
     private void okButton_Click(object sender, EventArgs e) {
-      experiment = new Experiment(Optimizer.Name);
+      experiment = new Experiment();
       if (createBatchRunCheckBox.Checked) {
-        BatchRun batchRun = new BatchRun(Optimizer.Name);
+        BatchRun batchRun = new BatchRun();
         batchRun.Repetitions = (int)repetitionsNumericUpDown.Value;
         batchRun.Optimizer = (IOptimizer)Optimizer.Clone();