Changeset 14917 for branches/DataPreprocessing Enhancements/HeuristicLab.DataPreprocessing.Views/3.4/ScatterPlotMultiView.cs

Timestamp:

05/03/17 16:17:12 (7 years ago)

Author:

pfleck

Message:

#2709

• Use the new icons for PreprocessingCheckedVariablesView (linechart, histogram).
• Added a "lock aspect ratio" sizing for the multi scatter plot.
• Fixed a bug in single scatter plot when changing the regression line.

File:

• branches/DataPreprocessing Enhancements/HeuristicLab.DataPreprocessing.Views/3.4/ScatterPlotMultiView.cs (modified) (2 diffs)

branches/DataPreprocessing Enhancements/HeuristicLab.DataPreprocessing.Views/3.4/ScatterPlotMultiView.cs

@@ -43 +43 @@
     public ScatterPlotMultiView() {
       InitializeComponent();
+
+      oldWidth = (int)widthNumericUpDown.Value;
+      oldHeight = (int)heightNumericUpDown.Value;
 
       regressionTypeComboBox.DataSource = Enum.GetValues(typeof(RegressionType));
@@ -465 +468 @@
 
     #region Sizing of Charts
+    private int oldWidth;
+    private int oldHeight;
+    private float AspectRatio {
+      get {
+        if (oldWidth == 0 || oldHeight == 0) return 1;
+        return (float)oldWidth / oldHeight;
+      }
+    }
+    private bool lockChange = false;
 
     private int GetColumnWidth() { return (int)widthNumericUpDown.Value; }
     private int GetRowHeight() { return (int)heightNumericUpDown.Value; }
+
     private void widthNumericUpDown_ValueChanged(object sender, EventArgs e) {
       frameTableLayoutPanel.SuspendRepaint();
+      if (lockAspectCheckBox.Checked && !lockChange) {
+        lockChange = true;
+        heightNumericUpDown.Value = (int)((double)widthNumericUpDown.Value / AspectRatio);
+        lockChange = false;
+      }
       for (int i = 0; i < columnHeaderTableLayoutPanel.ColumnCount; i++) {
         columnHeaderTableLayoutPanel.ColumnStyles[i].Width = GetColumnWidth();
         bodyTableLayoutPanel.ColumnStyles[i].Width = GetColumnWidth();
       }
+      oldWidth = GetColumnWidth();
+      oldHeight = GetRowHeight();
       frameTableLayoutPanel.ResumeRepaint(true);
     }
     private void heightNumericUpDown_ValueChanged(object sender, EventArgs e) {
       frameTableLayoutPanel.SuspendRepaint();
+      if (lockAspectCheckBox.Checked && !lockChange) {
+        lockChange = true;
+        widthNumericUpDown.Value = (int)((double)heightNumericUpDown.Value * AspectRatio);
+        lockChange = false;
+      }
       for (int i = 0; i < rowHeaderTableLayoutPanel.RowCount; i++) {
         rowHeaderTableLayoutPanel.RowStyles[i].Height = GetRowHeight();
         bodyTableLayoutPanel.RowStyles[i].Height = GetRowHeight();
       }
+      oldWidth = GetColumnWidth();
+      oldHeight = GetRowHeight();
       frameTableLayoutPanel.ResumeRepaint(true);
     }