Changeset 6011 for branches/histogram/HeuristicLab.Analysis.Views/3.3/DataRowVisualPropertiesControl.cs

Timestamp:

04/15/11 14:54:43 (13 years ago)

Author:

abeham

Message:

#1465

• updated branch with changes from trunk
• fixed some bugs
• introduced secondary x-axis option

Location:

branches/histogram

Files:

• . (modified) (1 prop)
• HeuristicLab.Analysis.Views/3.3/DataRowVisualPropertiesControl.cs (modified) (4 diffs)

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

@@ -53 +53 @@
           colorButton.BackColor = SystemColors.Control;
           secondYAxisCheckBox.Checked = false;
+          secondXAxisCheckBox.Checked = false;
           startIndexZeroCheckBox.Checked = false;
           binsNumericUpDown.Value = 1;
@@ -58 +59 @@
         } else {
           chartTypeComboBox.SelectedItem = Content.ChartType;
-          colorButton.BackColor = Content.Color;
+          if (Content.Color.IsEmpty) {
+            colorButton.BackColor = SystemColors.Control;
+            colorButton.Text = "?";
+          } else colorButton.BackColor = Content.Color;
           secondYAxisCheckBox.Checked = Content.SecondYAxis;
+          secondXAxisCheckBox.Checked = Content.SecondXAxis;
           startIndexZeroCheckBox.Checked = Content.StartIndexZero;
           binsNumericUpDown.Value = Content.Bins;
@@ -85 +90 @@
         Content.Color = colorDialog.Color;
         colorButton.BackColor = Content.Color;
+        colorButton.Text = String.Empty;
       }
     }
@@ -91 +97 @@
       if (!SuppressEvents && Content != null) {
         Content.SecondYAxis = secondYAxisCheckBox.Checked;
+      }
+    }
+
+    private void secondXAxisCheckBox_CheckedChanged(object sender, EventArgs e) {
+      if (!SuppressEvents && Content != null) {
+        Content.SecondXAxis = secondXAxisCheckBox.Checked;
       }
     }