Changeset 6032 for branches/histogram/HeuristicLab.Analysis.Views/3.3/DataTableVisualPropertiesControl.cs

Timestamp:

04/19/11 17:47:26 (13 years ago)

Author:

abeham

Message:

#1465

• updated from trunk
• fixed the bug regarding the -1 x-axis start

Location:

branches/histogram

Files:

• . (modified) (1 prop)
• HeuristicLab.Analysis.Views/3.3/DataTableVisualPropertiesControl.cs (modified) (8 diffs)

branches/histogram/HeuristicLab.Analysis.Views/3.3/DataTableVisualPropertiesControl.cs

@@ -161 +161 @@
         double val;
         if (double.TryParse(tb.Text, out val)) {
-          Content.XAxisMinimumFixedValue = val;
-          errorProvider.SetError(tb, string.Empty);
+          if (val >= Content.XAxisMaximumFixedValue) {
+            errorProvider.SetError(tb, "Number must be smaller than maximum.");
+            e.Cancel = true;
+          } else {
+            Content.XAxisMinimumFixedValue = val;
+            errorProvider.SetError(tb, string.Empty);
+          }
         } else {
           errorProvider.SetError(tb, "Not a valid number.");
@@ -175 +180 @@
         double val;
         if (double.TryParse(tb.Text, out val)) {
-          Content.XAxisMaximumFixedValue = val;
-          errorProvider.SetError(tb, string.Empty);
+          if (val <= Content.XAxisMinimumFixedValue) {
+            errorProvider.SetError(tb, "Number must be greater than minimum.");
+            e.Cancel = true;
+          } else {
+            Content.XAxisMaximumFixedValue = val;
+            errorProvider.SetError(tb, string.Empty);
+          }
         } else {
           errorProvider.SetError(tb, "Not a valid number.");
@@ -189 +199 @@
         double val;
         if (double.TryParse(tb.Text, out val)) {
-          Content.SecondXAxisMinimumFixedValue = val;
-          errorProvider.SetError(tb, string.Empty);
+          if (val >= Content.SecondXAxisMaximumFixedValue) {
+            errorProvider.SetError(tb, "Number must be smaller than maximum.");
+            e.Cancel = true;
+          } else {
+            Content.SecondXAxisMinimumFixedValue = val;
+            errorProvider.SetError(tb, string.Empty);
+          }
         } else {
           errorProvider.SetError(tb, "Not a valid number.");
@@ -203 +218 @@
         double val;
         if (double.TryParse(tb.Text, out val)) {
-          Content.SecondXAxisMaximumFixedValue = val;
-          errorProvider.SetError(tb, string.Empty);
+          if (val <= Content.SecondXAxisMinimumFixedValue) {
+            errorProvider.SetError(tb, "Number must be greater than minimum.");
+            e.Cancel = true;
+          } else {
+            Content.SecondXAxisMaximumFixedValue = val;
+            errorProvider.SetError(tb, string.Empty);
+          }
         } else {
           errorProvider.SetError(tb, "Not a valid number.");
@@ -217 +237 @@
         double val;
         if (double.TryParse(tb.Text, out val)) {
-          Content.YAxisMinimumFixedValue = val;
-          errorProvider.SetError(tb, string.Empty);
+          if (val >= Content.YAxisMaximumFixedValue) {
+            errorProvider.SetError(tb, "Number must be smaller than maximum.");
+            e.Cancel = true;
+          } else {
+            Content.YAxisMinimumFixedValue = val;
+            errorProvider.SetError(tb, string.Empty);
+          }
         } else {
           errorProvider.SetError(tb, "Not a valid number.");
@@ -231 +256 @@
         double val;
         if (double.TryParse(tb.Text, out val)) {
-          Content.YAxisMaximumFixedValue = val;
-          errorProvider.SetError(tb, string.Empty);
+          if (val <= Content.YAxisMinimumFixedValue) {
+            errorProvider.SetError(tb, "Number must be greater than minimum.");
+            e.Cancel = true;
+          } else {
+            Content.YAxisMaximumFixedValue = val;
+            errorProvider.SetError(tb, string.Empty);
+          }
         } else {
           errorProvider.SetError(tb, "Not a valid number.");
@@ -245 +275 @@
         double val;
         if (double.TryParse(tb.Text, out val)) {
-          Content.SecondYAxisMinimumFixedValue = val;
-          errorProvider.SetError(tb, string.Empty);
+          if (val >= Content.SecondYAxisMaximumFixedValue) {
+            errorProvider.SetError(tb, "Number must be smaller than maximum.");
+            e.Cancel = true;
+          } else {
+            Content.SecondYAxisMinimumFixedValue = val;
+            errorProvider.SetError(tb, string.Empty);
+          }
         } else {
           errorProvider.SetError(tb, "Not a valid number.");
@@ -259 +294 @@
         double val;
         if (double.TryParse(tb.Text, out val)) {
-          Content.SecondYAxisMaximumFixedValue = val;
-          errorProvider.SetError(tb, string.Empty);
+          if (val <= Content.SecondYAxisMinimumFixedValue) {
+            errorProvider.SetError(tb, "Number must be greater than minimum.");
+            e.Cancel = true;
+          } else {
+            Content.SecondYAxisMaximumFixedValue = val;
+            errorProvider.SetError(tb, string.Empty);
+          }
         } else {
           errorProvider.SetError(tb, "Not a valid number.");