Changeset 8086 for branches/ScatterSearch (trunk integration)/HeuristicLab.Analysis.Views

Timestamp:

06/22/12 11:11:38 (12 years ago)

Author:

jkarder

Message:

#1331:

• synced branch with trunk
• added custom interface (ISimilarityBasedOperator) to mark operators that conduct similarity calculation
• similarity calculators are now parameterized by the algorithm
• deleted SolutionPool2TierUpdateMethod
• deleted KnapsackMultipleGuidesPathRelinker
• moved IImprovementOperator, IPathRelinker and ISimilarityCalculator to HeuristicLab.Optimization
• added parameter descriptions
• fixed plugin references
• fixed count of EvaluatedSolutions
• fixed check for duplicate solutions
• minor code improvements

Location:

branches/ScatterSearch (trunk integration)

Files:

• . (modified) (2 props)
• HeuristicLab.Analysis.Views/3.3/AlleleFrequencyCollectionHistoryView.Designer.cs (modified) (1 diff)
• HeuristicLab.Analysis.Views/3.3/AlleleFrequencyCollectionView.Designer.cs (modified) (1 diff)
• HeuristicLab.Analysis.Views/3.3/AlleleFrequencyView.Designer.cs (modified) (1 diff)
• HeuristicLab.Analysis.Views/3.3/DataRowVisualPropertiesControl.Designer.cs (modified) (1 diff)
• HeuristicLab.Analysis.Views/3.3/DataRowVisualPropertiesControl.cs (modified) (1 diff)
• HeuristicLab.Analysis.Views/3.3/DataTableHistoryView.Designer.cs (modified) (1 diff)
• HeuristicLab.Analysis.Views/3.3/DataTableView.Designer.cs (modified) (1 diff)
• HeuristicLab.Analysis.Views/3.3/DataTableView.cs (modified) (8 diffs)
• HeuristicLab.Analysis.Views/3.3/DataTableVisualPropertiesControl.Designer.cs (modified) (45 diffs)
• HeuristicLab.Analysis.Views/3.3/DataTableVisualPropertiesDialog.Designer.cs (modified) (8 diffs)
• HeuristicLab.Analysis.Views/3.3/DataTableVisualPropertiesDialog.cs (modified) (2 diffs)
• HeuristicLab.Analysis.Views/3.3/HeatMapHistoryView.Designer.cs (modified) (1 diff)
• HeuristicLab.Analysis.Views/3.3/HeatMapView.Designer.cs (modified) (1 diff)
• HeuristicLab.Analysis.Views/3.3/HeatMapView.resx (modified) (1 prop)
• HeuristicLab.Analysis.Views/3.3/HeuristicLab.Analysis.Views-3.3.csproj (modified) (3 diffs)
• HeuristicLab.Analysis.Views/3.3/ScatterPlotView.Designer.cs (copied) (copied from trunk/sources/HeuristicLab.Analysis.Views/3.3/ScatterPlotView.Designer.cs)
• HeuristicLab.Analysis.Views/3.3/ScatterPlotView.cs (copied) (copied from trunk/sources/HeuristicLab.Analysis.Views/3.3/ScatterPlotView.cs)

branches/ScatterSearch (trunk integration)

@@ -20 +20 @@
 bin
 protoc.exe
+_ReSharper.HeuristicLab 3.3 Tests

@@ -20 +20 @@
 bin
 protoc.exe
+_ReSharper.HeuristicLab 3.3 Tests

branches/ScatterSearch (trunk integration)/HeuristicLab.Analysis.Views/3.3/AlleleFrequencyCollectionHistoryView.Designer.cs

@@ -46 +46 @@
     private void InitializeComponent() {
       components = new System.ComponentModel.Container();
-      this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+      this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit;
     }
 

branches/ScatterSearch (trunk integration)/HeuristicLab.Analysis.Views/3.3/AlleleFrequencyCollectionView.Designer.cs

@@ -92 +92 @@
       // 
       this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
-      this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+      this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit;
       this.Controls.Add(this.chart);
       this.Name = "AlleleFrequencyCollectionView";

branches/ScatterSearch (trunk integration)/HeuristicLab.Analysis.Views/3.3/AlleleFrequencyView.Designer.cs

@@ -178 +178 @@
       // 
       this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
-      this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+      this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit;
       this.Controls.Add(this.containedInBestSolutionCheckBox);
       this.Controls.Add(this.containedInBestKnownSolutionCheckBox);

branches/ScatterSearch (trunk integration)/HeuristicLab.Analysis.Views/3.3/DataRowVisualPropertiesControl.Designer.cs

@@ -429 +429 @@
       // 
       this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
-      this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+      this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit;
       this.Controls.Add(this.lineChartGroupBox);
       this.Controls.Add(this.histoGramGroupBox);

branches/ScatterSearch (trunk integration)/HeuristicLab.Analysis.Views/3.3/DataRowVisualPropertiesControl.cs

@@ -45 +45 @@
       chartTypeComboBox.DataSource = Enum.GetValues(typeof(DataRowVisualProperties.DataRowChartType));
       lineStyleComboBox.DataSource = Enum.GetValues(typeof(DataRowVisualProperties.DataRowLineStyle));
+      SetEnabledStateOfControls();
     }
 

branches/ScatterSearch (trunk integration)/HeuristicLab.Analysis.Views/3.3/DataTableHistoryView.Designer.cs

@@ -46 +46 @@
     private void InitializeComponent() {
       components = new System.ComponentModel.Container();
-      this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+      this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit;
     }
 

branches/ScatterSearch (trunk integration)/HeuristicLab.Analysis.Views/3.3/DataTableView.Designer.cs

@@ -103 +103 @@
       // 
       this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
-      this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+      this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit;
       this.Controls.Add(this.chart);
       this.Name = "DataTableView";

branches/ScatterSearch (trunk integration)/HeuristicLab.Analysis.Views/3.3/DataTableView.cs

@@ -68 +68 @@
       Content.Rows.ItemsReplaced += new CollectionItemsChangedEventHandler<DataRow>(Rows_ItemsReplaced);
       Content.Rows.CollectionReset += new CollectionItemsChangedEventHandler<DataRow>(Rows_CollectionReset);
-      foreach (DataRow row in Content.Rows)
-        RegisterDataRowEvents(row);
     }
 
@@ -104 +102 @@
       if (Content != null) {
         chart.Titles[0].Text = Content.Name;
-        foreach (DataRow row in Content.Rows)
-          AddDataRow(row);
+        AddDataRows(Content.Rows);
         ConfigureChartArea(chart.ChartAreas[0]);
         RecalculateAxesScale(chart.ChartAreas[0]);
@@ -123 +120 @@
       } else MessageBox.Show("Nothing to configure.");
     }
-
-    protected virtual void AddDataRow(DataRow row) {
-      Series series = new Series(row.Name);
-      if (row.VisualProperties.DisplayName.Trim() != String.Empty) series.LegendText = row.VisualProperties.DisplayName;
-      else series.LegendText = row.Name;
-      ConfigureSeries(series, row);
-      FillSeriesWithRowValues(series, row);
-
-      chart.Series.Add(series);
+    protected virtual void AddDataRows(IEnumerable<DataRow> rows) {
+      foreach (var row in rows) {
+        RegisterDataRowEvents(row);
+        Series series = new Series(row.Name);
+        if (row.VisualProperties.DisplayName.Trim() != String.Empty) series.LegendText = row.VisualProperties.DisplayName;
+        else series.LegendText = row.Name;
+        ConfigureSeries(series, row);
+        FillSeriesWithRowValues(series, row);
+        chart.Series.Add(series);
+      }
       ConfigureChartArea(chart.ChartAreas[0]);
       RecalculateAxesScale(chart.ChartAreas[0]);
       UpdateYCursorInterval();
+    }
+
+    protected virtual void RemoveDataRows(IEnumerable<DataRow> rows) {
+      foreach (var row in rows) {
+        DeregisterDataRowEvents(row);
+        Series series = chart.Series[row.Name];
+        chart.Series.Remove(series);
+        if (invisibleSeries.Contains(series))
+          invisibleSeries.Remove(series);
+      }
+      RecalculateAxesScale(chart.ChartAreas[0]);
     }
 
@@ -265 +274 @@
     }
 
-
-    protected virtual void RemoveDataRow(DataRow row) {
-      Series series = chart.Series[row.Name];
-      chart.Series.Remove(series);
-      if (invisibleSeries.Contains(series))
-        invisibleSeries.Remove(series);
-      RecalculateAxesScale(chart.ChartAreas[0]);
-    }
-
     #region Event Handlers
     #region Content Event Handlers
@@ -298 +298 @@
         Invoke(new CollectionItemsChangedEventHandler<DataRow>(Rows_ItemsAdded), sender, e);
       else {
-        foreach (DataRow row in e.Items) {
-          AddDataRow(row);
-          RegisterDataRowEvents(row);
-        }
+        AddDataRows(e.Items);
       }
     }
@@ -308 +305 @@
         Invoke(new CollectionItemsChangedEventHandler<DataRow>(Rows_ItemsRemoved), sender, e);
       else {
-        foreach (DataRow row in e.Items) {
-          DeregisterDataRowEvents(row);
-          RemoveDataRow(row);
-        }
+        RemoveDataRows(e.Items);
       }
     }
@@ -318 +312 @@
         Invoke(new CollectionItemsChangedEventHandler<DataRow>(Rows_ItemsReplaced), sender, e);
       else {
-        foreach (DataRow row in e.OldItems) {
-          DeregisterDataRowEvents(row);
-          RemoveDataRow(row);
-        }
-        foreach (DataRow row in e.Items) {
-          AddDataRow(row);
-          RegisterDataRowEvents(row);
-        }
+        RemoveDataRows(e.OldItems);
+        AddDataRows(e.Items);
       }
     }
@@ -332 +320 @@
         Invoke(new CollectionItemsChangedEventHandler<DataRow>(Rows_CollectionReset), sender, e);
       else {
-        foreach (DataRow row in e.OldItems) {
-          DeregisterDataRowEvents(row);
-          RemoveDataRow(row);
-        }
-        foreach (DataRow row in e.Items) {
-          AddDataRow(row);
-          RegisterDataRowEvents(row);
-        }
+        RemoveDataRows(e.OldItems);
+        AddDataRows(e.Items);
       }
     }

branches/ScatterSearch (trunk integration)/HeuristicLab.Analysis.Views/3.3/DataTableVisualPropertiesControl.Designer.cs

@@ -141 +141 @@
       // yAxisPrimaryTitleTextBox
       // 
-      this.yAxisPrimaryTitleTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
+      this.yAxisPrimaryTitleTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+                  | System.Windows.Forms.AnchorStyles.Right)));
       this.yAxisPrimaryTitleTextBox.Location = new System.Drawing.Point(66, 19);
       this.yAxisPrimaryTitleTextBox.Name = "yAxisPrimaryTitleTextBox";
@@ -151 +151 @@
       // yAxisSecondaryTitleTextBox
       // 
-      this.yAxisSecondaryTitleTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
+      this.yAxisSecondaryTitleTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+                  | System.Windows.Forms.AnchorStyles.Right)));
       this.yAxisSecondaryTitleTextBox.Location = new System.Drawing.Point(66, 19);
       this.yAxisSecondaryTitleTextBox.Name = "yAxisSecondaryTitleTextBox";
@@ -170 +170 @@
       // xAxisPrimaryGroupBox
       // 
-      this.xAxisPrimaryGroupBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
+      this.xAxisPrimaryGroupBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+                  | System.Windows.Forms.AnchorStyles.Right)));
       this.xAxisPrimaryGroupBox.Controls.Add(this.panel2);
       this.xAxisPrimaryGroupBox.Controls.Add(this.panel1);
@@ -194 +194 @@
       this.panel2.Name = "panel2";
       this.panel2.Size = new System.Drawing.Size(106, 20);
-      this.panel2.TabIndex = 9;
+      this.panel2.TabIndex = 6;
       // 
       // xAxisPrimaryMaximumFixedRadioButton
@@ -202 +202 @@
       this.xAxisPrimaryMaximumFixedRadioButton.Name = "xAxisPrimaryMaximumFixedRadioButton";
       this.xAxisPrimaryMaximumFixedRadioButton.Size = new System.Drawing.Size(53, 17);
-      this.xAxisPrimaryMaximumFixedRadioButton.TabIndex = 8;
+      this.xAxisPrimaryMaximumFixedRadioButton.TabIndex = 1;
       this.xAxisPrimaryMaximumFixedRadioButton.TabStop = true;
       this.xAxisPrimaryMaximumFixedRadioButton.Text = "&Fixed:";
@@ -214 +214 @@
       this.xAxisPrimaryMaximumAutoRadioButton.Name = "xAxisPrimaryMaximumAutoRadioButton";
       this.xAxisPrimaryMaximumAutoRadioButton.Size = new System.Drawing.Size(47, 17);
-      this.xAxisPrimaryMaximumAutoRadioButton.TabIndex = 7;
+      this.xAxisPrimaryMaximumAutoRadioButton.TabIndex = 0;
       this.xAxisPrimaryMaximumAutoRadioButton.TabStop = true;
       this.xAxisPrimaryMaximumAutoRadioButton.Text = "&Auto";
@@ -227 +227 @@
       this.panel1.Name = "panel1";
       this.panel1.Size = new System.Drawing.Size(106, 20);
-      this.panel1.TabIndex = 9;
+      this.panel1.TabIndex = 3;
       // 
       // xAxisPrimaryMinimumFixedRadioButton
@@ -235 +235 @@
       this.xAxisPrimaryMinimumFixedRadioButton.Name = "xAxisPrimaryMinimumFixedRadioButton";
       this.xAxisPrimaryMinimumFixedRadioButton.Size = new System.Drawing.Size(53, 17);
-      this.xAxisPrimaryMinimumFixedRadioButton.TabIndex = 4;
+      this.xAxisPrimaryMinimumFixedRadioButton.TabIndex = 1;
       this.xAxisPrimaryMinimumFixedRadioButton.TabStop = true;
       this.xAxisPrimaryMinimumFixedRadioButton.Text = "&Fixed:";
@@ -247 +247 @@
       this.xAxisPrimaryMinimumAutoRadioButton.Name = "xAxisPrimaryMinimumAutoRadioButton";
       this.xAxisPrimaryMinimumAutoRadioButton.Size = new System.Drawing.Size(47, 17);
-      this.xAxisPrimaryMinimumAutoRadioButton.TabIndex = 3;
+      this.xAxisPrimaryMinimumAutoRadioButton.TabIndex = 0;
       this.xAxisPrimaryMinimumAutoRadioButton.TabStop = true;
       this.xAxisPrimaryMinimumAutoRadioButton.Text = "&Auto";
@@ -255 +255 @@
       // xAxisPrimaryMinimumFixedTextBox
       // 
-      this.xAxisPrimaryMinimumFixedTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
+      this.xAxisPrimaryMinimumFixedTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+                  | System.Windows.Forms.AnchorStyles.Right)));
       this.xAxisPrimaryMinimumFixedTextBox.Location = new System.Drawing.Point(191, 45);
       this.xAxisPrimaryMinimumFixedTextBox.Name = "xAxisPrimaryMinimumFixedTextBox";
       this.xAxisPrimaryMinimumFixedTextBox.Size = new System.Drawing.Size(244, 20);
-      this.xAxisPrimaryMinimumFixedTextBox.TabIndex = 5;
+      this.xAxisPrimaryMinimumFixedTextBox.TabIndex = 4;
       this.xAxisPrimaryMinimumFixedTextBox.Validating += new System.ComponentModel.CancelEventHandler(this.xAxisPrimaryMinimumFixedTextBox_Validating);
       // 
       // xAxisPrimaryMaximumFixedTextBox
       // 
-      this.xAxisPrimaryMaximumFixedTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
+      this.xAxisPrimaryMaximumFixedTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+                  | System.Windows.Forms.AnchorStyles.Right)));
       this.xAxisPrimaryMaximumFixedTextBox.Location = new System.Drawing.Point(191, 71);
       this.xAxisPrimaryMaximumFixedTextBox.Name = "xAxisPrimaryMaximumFixedTextBox";
       this.xAxisPrimaryMaximumFixedTextBox.Size = new System.Drawing.Size(244, 20);
-      this.xAxisPrimaryMaximumFixedTextBox.TabIndex = 9;
+      this.xAxisPrimaryMaximumFixedTextBox.TabIndex = 7;
       this.xAxisPrimaryMaximumFixedTextBox.Validating += new System.ComponentModel.CancelEventHandler(this.xAxisPrimaryMaximumFixedTextBox_Validating);
       // 
@@ -279 +279 @@
       this.label12.Name = "label12";
       this.label12.Size = new System.Drawing.Size(54, 13);
-      this.label12.TabIndex = 6;
+      this.label12.TabIndex = 5;
       this.label12.Text = "&Maximum:";
       // 
@@ -293 +293 @@
       // xAxisPrimaryTitleTextBox
       // 
-      this.xAxisPrimaryTitleTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
+      this.xAxisPrimaryTitleTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+                  | System.Windows.Forms.AnchorStyles.Right)));
       this.xAxisPrimaryTitleTextBox.Location = new System.Drawing.Point(66, 19);
       this.xAxisPrimaryTitleTextBox.Name = "xAxisPrimaryTitleTextBox";
@@ -312 +312 @@
       // xAxisSecondaryGroupBox
       // 
-      this.xAxisSecondaryGroupBox.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
-            | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
+      this.xAxisSecondaryGroupBox.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+                  | System.Windows.Forms.AnchorStyles.Left)
+                  | System.Windows.Forms.AnchorStyles.Right)));
       this.xAxisSecondaryGroupBox.Controls.Add(this.panel4);
       this.xAxisSecondaryGroupBox.Controls.Add(this.panel3);
@@ -337 +337 @@
       this.panel4.Name = "panel4";
       this.panel4.Size = new System.Drawing.Size(106, 20);
-      this.panel4.TabIndex = 9;
+      this.panel4.TabIndex = 6;
       // 
       // xAxisSecondaryMaximumFixedRadioButton
@@ -345 +345 @@
       this.xAxisSecondaryMaximumFixedRadioButton.Name = "xAxisSecondaryMaximumFixedRadioButton";
       this.xAxisSecondaryMaximumFixedRadioButton.Size = new System.Drawing.Size(53, 17);
-      this.xAxisSecondaryMaximumFixedRadioButton.TabIndex = 8;
+      this.xAxisSecondaryMaximumFixedRadioButton.TabIndex = 1;
       this.xAxisSecondaryMaximumFixedRadioButton.TabStop = true;
       this.xAxisSecondaryMaximumFixedRadioButton.Text = "&Fixed:";
@@ -357 +357 @@
       this.xAxisSecondaryMaximumAutoRadioButton.Name = "xAxisSecondaryMaximumAutoRadioButton";
       this.xAxisSecondaryMaximumAutoRadioButton.Size = new System.Drawing.Size(47, 17);
-      this.xAxisSecondaryMaximumAutoRadioButton.TabIndex = 7;
+      this.xAxisSecondaryMaximumAutoRadioButton.TabIndex = 0;
       this.xAxisSecondaryMaximumAutoRadioButton.TabStop = true;
       this.xAxisSecondaryMaximumAutoRadioButton.Text = "&Auto";
@@ -370 +370 @@
       this.panel3.Name = "panel3";
       this.panel3.Size = new System.Drawing.Size(106, 20);
-      this.panel3.TabIndex = 9;
+      this.panel3.TabIndex = 3;
       // 
       // xAxisSecondaryMinimumFixedRadioButton
@@ -378 +378 @@
       this.xAxisSecondaryMinimumFixedRadioButton.Name = "xAxisSecondaryMinimumFixedRadioButton";
       this.xAxisSecondaryMinimumFixedRadioButton.Size = new System.Drawing.Size(53, 17);
-      this.xAxisSecondaryMinimumFixedRadioButton.TabIndex = 4;
+      this.xAxisSecondaryMinimumFixedRadioButton.TabIndex = 1;
       this.xAxisSecondaryMinimumFixedRadioButton.TabStop = true;
       this.xAxisSecondaryMinimumFixedRadioButton.Text = "&Fixed:";
@@ -390 +390 @@
       this.xAxisSecondaryMinimumAutoRadioButton.Name = "xAxisSecondaryMinimumAutoRadioButton";
       this.xAxisSecondaryMinimumAutoRadioButton.Size = new System.Drawing.Size(47, 17);
-      this.xAxisSecondaryMinimumAutoRadioButton.TabIndex = 3;
+      this.xAxisSecondaryMinimumAutoRadioButton.TabIndex = 0;
       this.xAxisSecondaryMinimumAutoRadioButton.TabStop = true;
       this.xAxisSecondaryMinimumAutoRadioButton.Text = "&Auto";
@@ -398 +398 @@
       // xAxisSecondaryMinimumFixedTextBox
       // 
-      this.xAxisSecondaryMinimumFixedTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
+      this.xAxisSecondaryMinimumFixedTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+                  | System.Windows.Forms.AnchorStyles.Right)));
       this.xAxisSecondaryMinimumFixedTextBox.Location = new System.Drawing.Point(191, 45);
       this.xAxisSecondaryMinimumFixedTextBox.Name = "xAxisSecondaryMinimumFixedTextBox";
       this.xAxisSecondaryMinimumFixedTextBox.Size = new System.Drawing.Size(244, 20);
-      this.xAxisSecondaryMinimumFixedTextBox.TabIndex = 5;
+      this.xAxisSecondaryMinimumFixedTextBox.TabIndex = 4;
       this.xAxisSecondaryMinimumFixedTextBox.Validating += new System.ComponentModel.CancelEventHandler(this.xAxisSecondaryMinimumFixedTextBox_Validating);
       // 
       // xAxisSecondaryMaximumFixedTextBox
       // 
-      this.xAxisSecondaryMaximumFixedTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
+      this.xAxisSecondaryMaximumFixedTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+                  | System.Windows.Forms.AnchorStyles.Right)));
       this.xAxisSecondaryMaximumFixedTextBox.Location = new System.Drawing.Point(191, 71);
       this.xAxisSecondaryMaximumFixedTextBox.Name = "xAxisSecondaryMaximumFixedTextBox";
       this.xAxisSecondaryMaximumFixedTextBox.Size = new System.Drawing.Size(244, 20);
-      this.xAxisSecondaryMaximumFixedTextBox.TabIndex = 9;
+      this.xAxisSecondaryMaximumFixedTextBox.TabIndex = 7;
       this.xAxisSecondaryMaximumFixedTextBox.Validating += new System.ComponentModel.CancelEventHandler(this.xAxisSecondaryMaximumFixedTextBox_Validating);
       // 
@@ -427 +427 @@
       // xAxisSecondaryTitleTextBox
       // 
-      this.xAxisSecondaryTitleTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
+      this.xAxisSecondaryTitleTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+                  | System.Windows.Forms.AnchorStyles.Right)));
       this.xAxisSecondaryTitleTextBox.Location = new System.Drawing.Point(66, 19);
       this.xAxisSecondaryTitleTextBox.Name = "xAxisSecondaryTitleTextBox";
@@ -441 +441 @@
       this.label5.Name = "label5";
       this.label5.Size = new System.Drawing.Size(54, 13);
-      this.label5.TabIndex = 6;
+      this.label5.TabIndex = 5;
       this.label5.Text = "&Maximum:";
       // 
@@ -455 +455 @@
       // axisTabControl
       // 
-      this.axisTabControl.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
+      this.axisTabControl.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+                  | System.Windows.Forms.AnchorStyles.Right)));
       this.axisTabControl.Controls.Add(this.xAxisTabPage);
       this.axisTabControl.Controls.Add(this.yAxisTabPage);
@@ -491 +491 @@
       // yAxisSecondaryGroupBox
       // 
-      this.yAxisSecondaryGroupBox.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
-            | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
+      this.yAxisSecondaryGroupBox.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+                  | System.Windows.Forms.AnchorStyles.Left)
+                  | System.Windows.Forms.AnchorStyles.Right)));
       this.yAxisSecondaryGroupBox.Controls.Add(this.panel8);
       this.yAxisSecondaryGroupBox.Controls.Add(this.panel7);
@@ -516 +516 @@
       this.panel8.Name = "panel8";
       this.panel8.Size = new System.Drawing.Size(106, 20);
-      this.panel8.TabIndex = 10;
+      this.panel8.TabIndex = 6;
       // 
       // yAxisSecondaryMaximumFixedRadioButton
@@ -524 +524 @@
       this.yAxisSecondaryMaximumFixedRadioButton.Name = "yAxisSecondaryMaximumFixedRadioButton";
       this.yAxisSecondaryMaximumFixedRadioButton.Size = new System.Drawing.Size(53, 17);
-      this.yAxisSecondaryMaximumFixedRadioButton.TabIndex = 8;
+      this.yAxisSecondaryMaximumFixedRadioButton.TabIndex = 1;
       this.yAxisSecondaryMaximumFixedRadioButton.TabStop = true;
       this.yAxisSecondaryMaximumFixedRadioButton.Text = "&Fixed:";
@@ -536 +536 @@
       this.yAxisSecondaryMaximumAutoRadioButton.Name = "yAxisSecondaryMaximumAutoRadioButton";
       this.yAxisSecondaryMaximumAutoRadioButton.Size = new System.Drawing.Size(47, 17);
-      this.yAxisSecondaryMaximumAutoRadioButton.TabIndex = 7;
+      this.yAxisSecondaryMaximumAutoRadioButton.TabIndex = 0;
       this.yAxisSecondaryMaximumAutoRadioButton.TabStop = true;
       this.yAxisSecondaryMaximumAutoRadioButton.Text = "&Auto";
@@ -549 +549 @@
       this.panel7.Name = "panel7";
       this.panel7.Size = new System.Drawing.Size(106, 20);
-      this.panel7.TabIndex = 10;
+      this.panel7.TabIndex = 3;
       // 
       // yAxisSecondaryMinimumFixedRadioButton
@@ -557 +557 @@
       this.yAxisSecondaryMinimumFixedRadioButton.Name = "yAxisSecondaryMinimumFixedRadioButton";
       this.yAxisSecondaryMinimumFixedRadioButton.Size = new System.Drawing.Size(53, 17);
-      this.yAxisSecondaryMinimumFixedRadioButton.TabIndex = 4;
+      this.yAxisSecondaryMinimumFixedRadioButton.TabIndex = 1;
       this.yAxisSecondaryMinimumFixedRadioButton.TabStop = true;
       this.yAxisSecondaryMinimumFixedRadioButton.Text = "&Fixed:";
@@ -569 +569 @@
       this.yAxisSecondaryMinimumAutoRadioButton.Name = "yAxisSecondaryMinimumAutoRadioButton";
       this.yAxisSecondaryMinimumAutoRadioButton.Size = new System.Drawing.Size(47, 17);
-      this.yAxisSecondaryMinimumAutoRadioButton.TabIndex = 3;
+      this.yAxisSecondaryMinimumAutoRadioButton.TabIndex = 0;
       this.yAxisSecondaryMinimumAutoRadioButton.TabStop = true;
       this.yAxisSecondaryMinimumAutoRadioButton.Text = "&Auto";
@@ -577 +577 @@
       // yAxisSecondaryMinimumFixedTextBox
       // 
-      this.yAxisSecondaryMinimumFixedTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
+      this.yAxisSecondaryMinimumFixedTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+                  | System.Windows.Forms.AnchorStyles.Right)));
       this.yAxisSecondaryMinimumFixedTextBox.Location = new System.Drawing.Point(191, 45);
       this.yAxisSecondaryMinimumFixedTextBox.Name = "yAxisSecondaryMinimumFixedTextBox";
       this.yAxisSecondaryMinimumFixedTextBox.Size = new System.Drawing.Size(244, 20);
-      this.yAxisSecondaryMinimumFixedTextBox.TabIndex = 5;
+      this.yAxisSecondaryMinimumFixedTextBox.TabIndex = 4;
       this.yAxisSecondaryMinimumFixedTextBox.Validating += new System.ComponentModel.CancelEventHandler(this.yAxisSecondaryMinimumFixedTextBox_Validating);
       // 
       // yAxisSecondaryMaximumFixedTextBox
       // 
-      this.yAxisSecondaryMaximumFixedTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
+      this.yAxisSecondaryMaximumFixedTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+                  | System.Windows.Forms.AnchorStyles.Right)));
       this.yAxisSecondaryMaximumFixedTextBox.Location = new System.Drawing.Point(191, 71);
       this.yAxisSecondaryMaximumFixedTextBox.Name = "yAxisSecondaryMaximumFixedTextBox";
       this.yAxisSecondaryMaximumFixedTextBox.Size = new System.Drawing.Size(244, 20);
-      this.yAxisSecondaryMaximumFixedTextBox.TabIndex = 9;
+      this.yAxisSecondaryMaximumFixedTextBox.TabIndex = 7;
       this.yAxisSecondaryMaximumFixedTextBox.Validating += new System.ComponentModel.CancelEventHandler(this.yAxisSecondaryMaximumFixedTextBox_Validating);
       // 
@@ -601 +601 @@
       this.label13.Name = "label13";
       this.label13.Size = new System.Drawing.Size(54, 13);
-      this.label13.TabIndex = 6;
+      this.label13.TabIndex = 5;
       this.label13.Text = "&Maximum:";
       // 
@@ -615 +615 @@
       // yAxisPrimaryGroupBox
       // 
-      this.yAxisPrimaryGroupBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
+      this.yAxisPrimaryGroupBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+                  | System.Windows.Forms.AnchorStyles.Right)));
       this.yAxisPrimaryGroupBox.Controls.Add(this.panel6);
       this.yAxisPrimaryGroupBox.Controls.Add(this.panel5);
@@ -639 +639 @@
       this.panel6.Name = "panel6";
       this.panel6.Size = new System.Drawing.Size(106, 20);
-      this.panel6.TabIndex = 10;
+      this.panel6.TabIndex = 6;
       // 
       // yAxisPrimaryMaximumFixedRadioButton
@@ -647 +647 @@
       this.yAxisPrimaryMaximumFixedRadioButton.Name = "yAxisPrimaryMaximumFixedRadioButton";
       this.yAxisPrimaryMaximumFixedRadioButton.Size = new System.Drawing.Size(53, 17);
-      this.yAxisPrimaryMaximumFixedRadioButton.TabIndex = 8;
+      this.yAxisPrimaryMaximumFixedRadioButton.TabIndex = 1;
       this.yAxisPrimaryMaximumFixedRadioButton.TabStop = true;
       this.yAxisPrimaryMaximumFixedRadioButton.Text = "&Fixed:";
@@ -659 +659 @@
       this.yAxisPrimaryMaximumAutoRadioButton.Name = "yAxisPrimaryMaximumAutoRadioButton";
       this.yAxisPrimaryMaximumAutoRadioButton.Size = new System.Drawing.Size(47, 17);
-      this.yAxisPrimaryMaximumAutoRadioButton.TabIndex = 7;
+      this.yAxisPrimaryMaximumAutoRadioButton.TabIndex = 0;
       this.yAxisPrimaryMaximumAutoRadioButton.TabStop = true;
       this.yAxisPrimaryMaximumAutoRadioButton.Text = "&Auto";
@@ -672 +672 @@
       this.panel5.Name = "panel5";
       this.panel5.Size = new System.Drawing.Size(106, 20);
-      this.panel5.TabIndex = 10;
+      this.panel5.TabIndex = 3;
       // 
       // yAxisPrimaryMinimumAutoRadioButton
@@ -680 +680 @@
       this.yAxisPrimaryMinimumAutoRadioButton.Name = "yAxisPrimaryMinimumAutoRadioButton";
       this.yAxisPrimaryMinimumAutoRadioButton.Size = new System.Drawing.Size(47, 17);
-      this.yAxisPrimaryMinimumAutoRadioButton.TabIndex = 3;
+      this.yAxisPrimaryMinimumAutoRadioButton.TabIndex = 0;
       this.yAxisPrimaryMinimumAutoRadioButton.TabStop = true;
       this.yAxisPrimaryMinimumAutoRadioButton.Text = "&Auto";
@@ -692 +692 @@
       this.yAxisPrimaryMinimumFixedRadioButton.Name = "yAxisPrimaryMinimumFixedRadioButton";
       this.yAxisPrimaryMinimumFixedRadioButton.Size = new System.Drawing.Size(53, 17);
-      this.yAxisPrimaryMinimumFixedRadioButton.TabIndex = 4;
+      this.yAxisPrimaryMinimumFixedRadioButton.TabIndex = 1;
       this.yAxisPrimaryMinimumFixedRadioButton.TabStop = true;
       this.yAxisPrimaryMinimumFixedRadioButton.Text = "&Fixed:";
@@ -700 +700 @@
       // yAxisPrimaryMinimumFixedTextBox
       // 
-      this.yAxisPrimaryMinimumFixedTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
+      this.yAxisPrimaryMinimumFixedTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+                  | System.Windows.Forms.AnchorStyles.Right)));
       this.yAxisPrimaryMinimumFixedTextBox.Location = new System.Drawing.Point(191, 45);
       this.yAxisPrimaryMinimumFixedTextBox.Name = "yAxisPrimaryMinimumFixedTextBox";
       this.yAxisPrimaryMinimumFixedTextBox.Size = new System.Drawing.Size(244, 20);
-      this.yAxisPrimaryMinimumFixedTextBox.TabIndex = 5;
+      this.yAxisPrimaryMinimumFixedTextBox.TabIndex = 4;
       this.yAxisPrimaryMinimumFixedTextBox.Validating += new System.ComponentModel.CancelEventHandler(this.yAxisPrimaryMinimumFixedTextBox_Validating);
       // 
       // yAxisPrimaryMaximumFixedTextBox
       // 
-      this.yAxisPrimaryMaximumFixedTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
+      this.yAxisPrimaryMaximumFixedTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+                  | System.Windows.Forms.AnchorStyles.Right)));
       this.yAxisPrimaryMaximumFixedTextBox.Location = new System.Drawing.Point(191, 71);
       this.yAxisPrimaryMaximumFixedTextBox.Name = "yAxisPrimaryMaximumFixedTextBox";
       this.yAxisPrimaryMaximumFixedTextBox.Size = new System.Drawing.Size(244, 20);
-      this.yAxisPrimaryMaximumFixedTextBox.TabIndex = 9;
+      this.yAxisPrimaryMaximumFixedTextBox.TabIndex = 7;
       this.yAxisPrimaryMaximumFixedTextBox.Validating += new System.ComponentModel.CancelEventHandler(this.yAxisPrimaryMaximumFixedTextBox_Validating);
       // 
@@ -724 +724 @@
       this.label7.Name = "label7";
       this.label7.Size = new System.Drawing.Size(54, 13);
-      this.label7.TabIndex = 6;
+      this.label7.TabIndex = 5;
       this.label7.Text = "&Maximum:";
       // 
@@ -738 +738 @@
       // titleTextBox
       // 
-      this.titleTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
+      this.titleTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+                  | System.Windows.Forms.AnchorStyles.Right)));
       this.titleTextBox.Location = new System.Drawing.Point(66, 0);
       this.titleTextBox.Name = "titleTextBox";
@@ -757 +757 @@
       // axisFontLabel
       // 
-      this.axisFontLabel.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
+      this.axisFontLabel.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+                  | System.Windows.Forms.AnchorStyles.Right)));
       this.axisFontLabel.AutoSize = true;
       this.axisFontLabel.Location = new System.Drawing.Point(98, 60);
@@ -768 +768 @@
       // titleFontLabel
       // 
-      this.titleFontLabel.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
+      this.titleFontLabel.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+                  | System.Windows.Forms.AnchorStyles.Right)));
       this.titleFontLabel.AutoSize = true;
       this.titleFontLabel.Location = new System.Drawing.Point(98, 31);
@@ -827 +827 @@
       // DataTableVisualPropertiesControl
       // 
-      this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
-      this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+      this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit;
       this.Controls.Add(this.axisFontLabel);
       this.Controls.Add(this.label15);

branches/ScatterSearch (trunk integration)/HeuristicLab.Analysis.Views/3.3/DataTableVisualPropertiesDialog.Designer.cs

@@ -91 +91 @@
       // tabControl
       // 
-      this.tabControl.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
-            | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
+      this.tabControl.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+                  | System.Windows.Forms.AnchorStyles.Left)
+                  | System.Windows.Forms.AnchorStyles.Right)));
       this.tabControl.Controls.Add(this.seriesTabPage);
       this.tabControl.Controls.Add(this.chartTabPage);
@@ -115 +115 @@
       // splitContainer
       // 
-      this.splitContainer.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
-            | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
+      this.splitContainer.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+                  | System.Windows.Forms.AnchorStyles.Left)
+                  | System.Windows.Forms.AnchorStyles.Right)));
       this.splitContainer.FixedPanel = System.Windows.Forms.FixedPanel.Panel1;
       this.splitContainer.Location = new System.Drawing.Point(0, 0);
@@ -139 +139 @@
       // downButton
       // 
+      this.downButton.Enabled = false;
       this.downButton.Location = new System.Drawing.Point(35, 3);
       this.downButton.Name = "downButton";
@@ -149 +150 @@
       // upButton
       // 
+      this.upButton.Enabled = false;
       this.upButton.Location = new System.Drawing.Point(3, 3);
       this.upButton.Name = "upButton";
@@ -159 +161 @@
       // seriesListView
       // 
-      this.seriesListView.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
-            | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
+      this.seriesListView.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+                  | System.Windows.Forms.AnchorStyles.Left)
+                  | System.Windows.Forms.AnchorStyles.Right)));
       this.seriesListView.HideSelection = false;
       this.seriesListView.Location = new System.Drawing.Point(3, 32);
@@ -175 +177 @@
       // dataRowVisualPropertiesControl
       // 
-      this.dataRowVisualPropertiesControl.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
-            | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
+      this.dataRowVisualPropertiesControl.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+                  | System.Windows.Forms.AnchorStyles.Left)
+                  | System.Windows.Forms.AnchorStyles.Right)));
       this.dataRowVisualPropertiesControl.Content = null;
       this.dataRowVisualPropertiesControl.Location = new System.Drawing.Point(3, 26);
@@ -197 +199 @@
       // dataTableVisualPropertiesControl
       // 
-      this.dataTableVisualPropertiesControl.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
-            | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
+      this.dataTableVisualPropertiesControl.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+                  | System.Windows.Forms.AnchorStyles.Left)
+                  | System.Windows.Forms.AnchorStyles.Right)));
       this.dataTableVisualPropertiesControl.Content = null;
       this.dataTableVisualPropertiesControl.Location = new System.Drawing.Point(3, 6);
@@ -209 +211 @@
       // 
       this.AcceptButton = this.okButton;
-      this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
-      this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+      this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit;
       this.CancelButton = this.cancelButton;
       this.ClientSize = new System.Drawing.Size(493, 435);

branches/ScatterSearch (trunk integration)/HeuristicLab.Analysis.Views/3.3/DataTableVisualPropertiesDialog.cs

@@ -92 +92 @@
         if (seriesListView.SelectedItems.Count != 1) {
           dataRowVisualPropertiesControl.Content = null;
+          upButton.Enabled = downButton.Enabled = false;
         } else {
           string rowName = seriesListView.SelectedItems[0].Text;
           dataRowVisualPropertiesControl.Content = Content.Rows[rowName].VisualProperties;
+          upButton.Enabled = seriesListView.SelectedIndices[0] > 0;
+          downButton.Enabled = seriesListView.SelectedIndices[0] < seriesListView.Items.Count - 1;
         }
       }
@@ -160 +163 @@
         seriesListView.Items.Add(new ListViewItem(row.Name, 0));
       }
-      seriesListView.SelectedIndices.Add(0);
+      if (seriesListView.Items.Count > 0)
+        seriesListView.SelectedIndices.Add(0);
     }
 

branches/ScatterSearch (trunk integration)/HeuristicLab.Analysis.Views/3.3/HeatMapHistoryView.Designer.cs

@@ -46 +46 @@
     private void InitializeComponent() {
       components = new System.ComponentModel.Container();
-      this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+      this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit;
     }
 

branches/ScatterSearch (trunk integration)/HeuristicLab.Analysis.Views/3.3/HeatMapView.Designer.cs

@@ -150 +150 @@
       // 
       this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
-      this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+      this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit;
       this.Controls.Add(this.grayscaleCheckBox);
       this.Controls.Add(this.minimumLabel);

branches/ScatterSearch (trunk integration)/HeuristicLab.Analysis.Views/3.3/HeuristicLab.Analysis.Views-3.3.csproj

@@ -116 +116 @@
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="ScatterPlotView.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="ScatterPlotView.Designer.cs">
+      <DependentUpon>ScatterPlotView.cs</DependentUpon>
+    </Compile>
     <None Include="Plugin.cs.frame" />
     <Compile Include="AlleleFrequencyCollectionView.cs">
@@ -215 +221 @@
       <Private>False</Private>
     </ProjectReference>
-    <ProjectReference Include="..\..\HeuristicLab.Data.Views\3.3\HeuristicLab.Data.Views-3.3.csproj">
-      <Project>{72104A0B-90E7-42F3-9ABE-9BBBADD4B943}</Project>
-      <Name>HeuristicLab.Data.Views-3.3</Name>
-      <Private>False</Private>
-    </ProjectReference>
     <ProjectReference Include="..\..\HeuristicLab.Data\3.3\HeuristicLab.Data-3.3.csproj">
       <Project>{BBAB9DF5-5EF3-4BA8-ADE9-B36E82114937}</Project>
@@ -233 +234 @@
       <Project>{3BD61258-31DA-4B09-89C0-4F71FEF5F05A}</Project>
       <Name>HeuristicLab.MainForm-3.3</Name>
-      <Private>False</Private>
-    </ProjectReference>
-    <ProjectReference Include="..\..\HeuristicLab.Optimization.Views\3.3\HeuristicLab.Optimization.Views-3.3.csproj">
-      <Project>{662B4B15-8F4D-4AE5-B3EB-D91C215F5AF2}</Project>
-      <Name>HeuristicLab.Optimization.Views-3.3</Name>
-      <Private>False</Private>
-    </ProjectReference>
-    <ProjectReference Include="..\..\HeuristicLab.Optimization\3.3\HeuristicLab.Optimization-3.3.csproj">
-      <Project>{14AB8D24-25BC-400C-A846-4627AA945192}</Project>
-      <Name>HeuristicLab.Optimization-3.3</Name>
       <Private>False</Private>
     </ProjectReference>

@@ -20 +20 @@
 bin
 protoc.exe
+_ReSharper.HeuristicLab 3.3 Tests