Changeset 14089 for branches

Timestamp:

07/15/16 15:36:35 (8 years ago)

Author:

pfleck

Message:

#2597

• Hide density chart when zoom is active.
• Changed columns textbox to numberic up/down control (thus removed validation).

Location:

branches/HeuristicLab.RegressionSolutionGradientView/HeuristicLab.Problems.DataAnalysis.Views/3.4

Files:

• GradientChart.Designer.cs (modified) (1 diff)
• GradientChart.cs (modified) (3 diffs)
• Regression/RegressionSolutionTargetResponseGradientView.Designer.cs (modified) (8 diffs)
• Regression/RegressionSolutionTargetResponseGradientView.cs (modified) (4 diffs)

branches/HeuristicLab.RegressionSolutionGradientView/HeuristicLab.Problems.DataAnalysis.Views/3.4/GradientChart.Designer.cs

@@ -88 +88 @@
       this.chart.Size = new System.Drawing.Size(453, 308);
       this.chart.TabIndex = 0;
+      this.chart.SelectionRangeChanged += new System.EventHandler<System.Windows.Forms.DataVisualization.Charting.CursorEventArgs>(this.chart_SelectionRangeChanged);
       this.chart.AnnotationPositionChanging += new System.EventHandler<System.Windows.Forms.DataVisualization.Charting.AnnotationPositionChangingEventArgs>(this.chart_AnnotationPositionChanging);
       this.chart.DragDrop += new System.Windows.Forms.DragEventHandler(this.chart_DragDrop);

branches/HeuristicLab.RegressionSolutionGradientView/HeuristicLab.Problems.DataAnalysis.Views/3.4/GradientChart.cs

@@ -194 +194 @@
     }
 
+    public bool IsZoomed {
+      get { return chart.ChartAreas[0].AxisX.ScaleView.IsZoomed; }
+    }
+
     private VerticalLineAnnotation VerticalLineAnnotation {
       get { return (VerticalLineAnnotation)chart.Annotations.SingleOrDefault(x => x is VerticalLineAnnotation); }
@@ -585 +589 @@
     }
 
+    public event EventHandler ZoomChanged;
+    public void OnZoomChanged(object sender, EventArgs args) {
+      var changed = ZoomChanged;
+      if (changed == null) return;
+      changed(sender, args);
+    }
+
     private void sharedFixedVariables_ItemChanged(object o, EventArgs<int, int> e) {
       if (o != sharedFixedVariables) return;
@@ -652 +663 @@
       configurationDialog.ShowDialog(this);
     }
+
+    private void chart_SelectionRangeChanged(object sender, CursorEventArgs e) {
+      OnZoomChanged(this, EventArgs.Empty);
+    }
     #endregion
   }

branches/HeuristicLab.RegressionSolutionGradientView/HeuristicLab.Problems.DataAnalysis.Views/3.4/Regression/RegressionSolutionTargetResponseGradientView.Designer.cs

@@ -31 +31 @@
       this.automaticYAxisCheckBox = new System.Windows.Forms.CheckBox();
       this.densityGroupBox = new System.Windows.Forms.GroupBox();
-      this.columnsTextBox = new System.Windows.Forms.TextBox();
       this.columnsLabel = new System.Windows.Forms.Label();
       this.densityComboBox = new System.Windows.Forms.ComboBox();
@@ -39 +38 @@
       this.scrollPanel = new System.Windows.Forms.Panel();
       this.errorProvider = new System.Windows.Forms.ErrorProvider(this.components);
+      this.columnsNumericUpDown = new System.Windows.Forms.NumericUpDown();
       this.yAxisConfigGroupBox.SuspendLayout();
       this.densityGroupBox.SuspendLayout();
@@ -48 +48 @@
       this.scrollPanel.SuspendLayout();
       ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).BeginInit();
+      ((System.ComponentModel.ISupportInitialize)(this.columnsNumericUpDown)).BeginInit();
       this.SuspendLayout();
       // 
@@ -114 +115 @@
       // densityGroupBox
       // 
-      this.densityGroupBox.Controls.Add(this.columnsTextBox);
+      this.densityGroupBox.Controls.Add(this.columnsNumericUpDown);
       this.densityGroupBox.Controls.Add(this.columnsLabel);
       this.densityGroupBox.Controls.Add(this.densityComboBox);
@@ -125 +126 @@
       this.densityGroupBox.TabStop = false;
       this.densityGroupBox.Text = "Settings";
-      // 
-      // columnsTextBox
-      // 
-      this.columnsTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-      this.columnsTextBox.Location = new System.Drawing.Point(66, 46);
-      this.columnsTextBox.Name = "columnsTextBox";
-      this.columnsTextBox.Size = new System.Drawing.Size(94, 20);
-      this.columnsTextBox.TabIndex = 1;
-      this.columnsTextBox.Validating += new System.ComponentModel.CancelEventHandler(this.columnsTextBox_Validating);
-      this.columnsTextBox.Validated += new System.EventHandler(this.columnsTextBox_Validated);
       // 
       // columnsLabel
@@ -217 +207 @@
       this.errorProvider.BlinkStyle = System.Windows.Forms.ErrorBlinkStyle.NeverBlink;
       this.errorProvider.ContainerControl = this;
+      // 
+      // columnsNumericUpDown
+      // 
+      this.columnsNumericUpDown.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+      this.columnsNumericUpDown.Location = new System.Drawing.Point(66, 46);
+      this.columnsNumericUpDown.Minimum = new decimal(new int[] {
+            1,
+            0,
+            0,
+            0});
+      this.columnsNumericUpDown.Name = "columnsNumericUpDown";
+      this.columnsNumericUpDown.Size = new System.Drawing.Size(94, 20);
+      this.columnsNumericUpDown.TabIndex = 1;
+      this.columnsNumericUpDown.Value = new decimal(new int[] {
+            4,
+            0,
+            0,
+            0});
+      this.columnsNumericUpDown.ValueChanged += new System.EventHandler(this.columnsNumericUpDown_ValueChanged);
       // 
       // RegressionSolutionTargetResponseGradientView
@@ -237 +247 @@
       this.scrollPanel.PerformLayout();
       ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).EndInit();
+      ((System.ComponentModel.ISupportInitialize)(this.columnsNumericUpDown)).EndInit();
       this.ResumeLayout(false);
 
@@ -253 +264 @@
     private System.Windows.Forms.GroupBox variableGroupBox;
     private System.Windows.Forms.Panel scrollPanel;
-    private System.Windows.Forms.TextBox columnsTextBox;
     private System.Windows.Forms.Label columnsLabel;
     private System.Windows.Forms.ErrorProvider errorProvider;
     private System.Windows.Forms.Label label1;
+    private System.Windows.Forms.NumericUpDown columnsNumericUpDown;
   }
 }

branches/HeuristicLab.RegressionSolutionGradientView/HeuristicLab.Problems.DataAnalysis.Views/3.4/Regression/RegressionSolutionTargetResponseGradientView.cs

@@ -68 +68 @@
       densityComboBox.SelectedIndex = 1; // select Training
 
-      columnsTextBox.Text = "4";
-
       // Avoid additional horizontal scrollbar
       var vertScrollWidth = SystemInformation.VerticalScrollBarWidth;
@@ -132 +130 @@
         };
         densityCharts.Add(variableName, densityChart);
+
+        gradientChart.ZoomChanged += (o, e) => {
+          var gradient = (GradientChart)o;
+          var density = densityCharts[gradient.FreeVariable];
+          density.Visible = densityComboBox.SelectedIndex != 0 && !gradient.IsZoomed;
+          if (density.Visible)
+            UpdateDensityChart(density, gradient.FreeVariable);
+        };
 
         var panel = new Panel() {
@@ -331 +337 @@
           var variableName = entry.Key;
           var densityChart = entry.Value;
-          if (!VisibleVariables.Contains(variableName))
+          if (!VisibleVariables.Contains(variableName) || gradientCharts[variableName].IsZoomed)
             continue;
+
           UpdateDensityChart(densityChart, variableName, indices);
-
         }
       }
@@ -368 +374 @@
     }
 
-    private void columnsTextBox_Validating(object sender, System.ComponentModel.CancelEventArgs e) {
-      int columns;
-      if (!int.TryParse(columnsTextBox.Text, out columns)) {
-        e.Cancel = true;
-        columnsTextBox.Select();
-        var textBox = (TextBox)sender;
-        errorProvider.SetError(columnsTextBox, "Columns number must be a positive integer.");
-        errorProvider.SetIconPadding(textBox, -20);
-      }
-    }
-
-    private void columnsTextBox_Validated(object sender, EventArgs e) {
-      errorProvider.SetError(columnsTextBox, "");
-      MaxColumns = int.Parse(columnsTextBox.Text);
+    private void columnsNumericUpDown_ValueChanged(object sender, EventArgs e) {
+      MaxColumns = (int)columnsNumericUpDown.Value;
       int columns = Math.Min(VisibleVariables.Count(), MaxColumns);
       if (columns > 0) {