Changeset 3530

Timestamp:

04/26/10 09:29:18 (15 years ago)

Author:

gkronber

Message:

Checked for invalid values in all series manipulating operations and changed the legend to dock at the top. #920 (Each single objective problem should provide a parameter for its best known quality)

Location:

trunk/sources/HeuristicLab.Analysis.Views/3.3

Files:

• DataTableView.Designer.cs (modified) (1 diff)
• DataTableView.cs (modified) (5 diffs)

trunk/sources/HeuristicLab.Analysis.Views/3.3/DataTableView.Designer.cs

@@ -76 +76 @@
       chartArea1.Name = "ChartArea1";
       this.chart.ChartAreas.Add(chartArea1);
+      legend1.Docking = System.Windows.Forms.DataVisualization.Charting.Docking.Top;
       legend1.Name = "Legend1";
       this.chart.Legends.Add(legend1);

trunk/sources/HeuristicLab.Analysis.Views/3.3/DataTableView.cs

@@ -120 +120 @@
       for (int i = 0; i < row.Values.Count; i++) {
         var value = row.Values[i];
-        if (double.IsNaN(value) || value < (double)decimal.MinValue || value > (double)decimal.MaxValue) {
+        if (IsInvalidValue(value)) {
           DataPoint point = new DataPoint();
           point.IsEmpty = true;
@@ -225 +225 @@
         foreach (IndexedItem<double> item in e.Items) {
           var value = item.Value;
-          if (double.IsNaN(value) || value < (double)decimal.MinValue || value > (double)decimal.MaxValue) {
+          if (IsInvalidValue(item.Value)) {
             DataPoint point = new DataPoint();
             point.IsEmpty = true;
@@ -253 +253 @@
         DataRow row = valuesRowsTable[(IObservableList<double>)sender];
         foreach (IndexedItem<double> item in e.Items) {
-          if (double.IsNaN(item.Value))
+          if (IsInvalidValue(item.Value))
             chart.Series[row.Name].Points[item.Index].IsEmpty = true;
-          else
+          else {
             chart.Series[row.Name].Points[item.Index].YValues = new double[] { item.Value };
+            chart.Series[row.Name].Points[item.Index].IsEmpty = false;
+          }
         }
       }
@@ -266 +268 @@
         DataRow row = valuesRowsTable[(IObservableList<double>)sender];
         foreach (IndexedItem<double> item in e.Items) {
-          if (double.IsNaN(item.Value))
+          if (IsInvalidValue(item.Value))
             chart.Series[row.Name].Points[item.Index].IsEmpty = true;
-          else
+          else {
             chart.Series[row.Name].Points[item.Index].YValues = new double[] { item.Value };
-        }
-      }
-    }
+            chart.Series[row.Name].Points[item.Index].IsEmpty = false;
+          }
+        }
+      }
+    }
+
     private void Values_CollectionReset(object sender, CollectionItemsChangedEventArgs<IndexedItem<double>> e) {
       if (InvokeRequired)
@@ -280 +285 @@
         chart.Series[row.Name].Points.Clear();
         foreach (IndexedItem<double> item in e.Items) {
-          if (double.IsNaN(item.Value))
+          if (IsInvalidValue(item.Value))
             chart.Series[row.Name].Points[item.Index].IsEmpty = true;
-          else
+          else {
             chart.Series[row.Name].Points[item.Index].YValues = new double[] { item.Value };
+            chart.Series[row.Name].Points[item.Index].IsEmpty = false;
+          }
         }
       }
     }
     #endregion
+
+    private bool IsInvalidValue(double x) {
+      return double.IsNaN(x) || x < (double)decimal.MinValue || x > (double)decimal.MaxValue;
+    }
   }
 }