Changeset 13846 for branches/HeuristicLab.RegressionSolutionGradientView/HeuristicLab.Problems.DataAnalysis.Views/3.4

Timestamp:

05/12/16 15:11:30 (9 years ago)

Author:

pfleck

Message:

#2597

• Added a manual y-axis control.
• Fixed bug with dragging the cursor in the GradientChart out of the chart.

Location:

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

Files:

• DensityTrackbar.Designer.cs (modified) (2 diffs)
• DensityTrackbar.cs (modified) (2 diffs)
• GradientChart.cs (modified) (2 diffs)
• RegressionSolutionGradientView.cs (modified) (3 diffs)
• RegressionSolutionTargetResponseGradientView.Designer.cs (modified) (5 diffs)
• RegressionSolutionTargetResponseGradientView.cs (modified) (7 diffs)

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

@@ -91 +91 @@
             | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
-      this.chart.BorderlineColor = System.Drawing.Color.Transparent;
       chartArea1.AxisX.Enabled = System.Windows.Forms.DataVisualization.Charting.AxisEnabled.False;
       chartArea1.AxisX.IsMarginVisible = false;
@@ -98 +97 @@
       chartArea1.AxisY.MajorTickMark.Enabled = false;
       chartArea1.AxisY.Minimum = 0D;
-      chartArea1.BackColor = System.Drawing.Color.Transparent;
-      chartArea1.BorderColor = System.Drawing.Color.Transparent;
+      chartArea1.BackColor = System.Drawing.Color.White;
+      chartArea1.BorderColor = System.Drawing.Color.White;
       chartArea1.Name = "ChartArea1";
       chartArea1.Position.Auto = false;

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

@@ -141 +141 @@
         LimitsChanged(this, EventArgs.Empty);
     }
-
     #region Hepers
 
@@ -166 +165 @@
 
     #endregion
-
-
   }
 }

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

@@ -526 +526 @@
     private double oldCurserPosition = double.NaN;
     private void chart_AnnotationPositionChanging(object sender, AnnotationPositionChangingEventArgs e) {
-      if (oldCurserPosition.IsAlmost(e.NewLocationX))
-        return;
-      oldCurserPosition = e.NewLocationX;
-
       var step = (trainingMax - trainingMin) / drawingSteps;
-      e.NewLocationX = step * (long)Math.Round(e.NewLocationX / step);
+      double newLocation = step * (long)Math.Round(e.NewLocationX / step);
       var axisX = chart.ChartAreas[0].AxisX;
-      if (e.NewLocationX > axisX.Maximum)
-        e.NewLocationX = axisX.Maximum;
-      if (e.NewLocationX < axisX.Minimum)
-        e.NewLocationX = axisX.Minimum;
+      if (newLocation > axisX.Maximum)
+        newLocation = axisX.Maximum;
+      if (newLocation < axisX.Minimum)
+        newLocation = axisX.Minimum;
+
+      e.NewLocationX = newLocation;
 
       var annotation = VerticalLineAnnotation;
@@ -545 +543 @@
       chart.Update();
 
-      OnVariableValueChanged(this, EventArgs.Empty);
+      if (!oldCurserPosition.IsAlmost(e.NewLocationX))
+        OnVariableValueChanged(this, EventArgs.Empty);
+      oldCurserPosition = e.NewLocationX;
     }
 

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

@@ -26 +26 @@
 using HeuristicLab.Collections;
 using HeuristicLab.MainForm;
+using HeuristicLab.MainForm.WindowsForms;
 using HeuristicLab.Problems.DataAnalysis;
 using HeuristicLab.Problems.DataAnalysis.Views;
@@ -76 +77 @@
       trackbars.Clear();
 
+      tableLayoutPanel.SuspendRepaint();
+      tableLayoutPanel.SuspendLayout();
+
       tableLayoutPanel.RowCount = 0;
       tableLayoutPanel.Controls.Clear();
 
-      if (Content == null) return;
+      if (Content == null) {
+        tableLayoutPanel.ResumeLayout(false);
+        tableLayoutPanel.ResumeRepaint(false);
+        return;
+      }
 
       variableNames.AddRange(Content.ProblemData.AllowedInputVariables);
@@ -99 +107 @@
       }
 
+      tableLayoutPanel.ResumeLayout(true);
+      tableLayoutPanel.ResumeRepaint(true);
+
       trackbars.First().Checked = true;
     }

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

@@ -27 +27 @@
       this.panel1 = new System.Windows.Forms.Panel();
       this.gradientChartTableLayout = new System.Windows.Forms.TableLayoutPanel();
+      this.yAxisConfigGroupBox = new System.Windows.Forms.GroupBox();
+      this.limitView = new HeuristicLab.Problems.DataAnalysis.Views.DoubleLimitView();
+      this.automaticYAxisCheckBox = new System.Windows.Forms.CheckBox();
       this.panel1.SuspendLayout();
+      this.yAxisConfigGroupBox.SuspendLayout();
       this.SuspendLayout();
       // 
@@ -69 +73 @@
       this.gradientChartTableLayout.RowCount = 1;
       this.gradientChartTableLayout.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 693F));
-      this.gradientChartTableLayout.Size = new System.Drawing.Size(848, 693);
+      this.gradientChartTableLayout.Size = new System.Drawing.Size(828, 693);
       this.gradientChartTableLayout.TabIndex = 2;
+      // 
+      // yAxisConfigGroupBox
+      // 
+      this.yAxisConfigGroupBox.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+      this.yAxisConfigGroupBox.Controls.Add(this.limitView);
+      this.yAxisConfigGroupBox.Controls.Add(this.automaticYAxisCheckBox);
+      this.yAxisConfigGroupBox.Location = new System.Drawing.Point(4, 342);
+      this.yAxisConfigGroupBox.Name = "yAxisConfigGroupBox";
+      this.yAxisConfigGroupBox.Size = new System.Drawing.Size(152, 98);
+      this.yAxisConfigGroupBox.TabIndex = 2;
+      this.yAxisConfigGroupBox.TabStop = false;
+      this.yAxisConfigGroupBox.Text = "Y-Axis";
+      // 
+      // limitView
+      // 
+      this.limitView.Caption = "DoubleLimit View";
+      this.limitView.Content = null;
+      this.limitView.Location = new System.Drawing.Point(6, 20);
+      this.limitView.Name = "limitView";
+      this.limitView.ReadOnly = false;
+      this.limitView.Size = new System.Drawing.Size(140, 47);
+      this.limitView.TabIndex = 1;
+      // 
+      // automaticYAxisCheckBox
+      // 
+      this.automaticYAxisCheckBox.AutoSize = true;
+      this.automaticYAxisCheckBox.Location = new System.Drawing.Point(6, 72);
+      this.automaticYAxisCheckBox.Name = "automaticYAxisCheckBox";
+      this.automaticYAxisCheckBox.Size = new System.Drawing.Size(73, 17);
+      this.automaticYAxisCheckBox.TabIndex = 0;
+      this.automaticYAxisCheckBox.Text = "Automatic";
+      this.automaticYAxisCheckBox.UseVisualStyleBackColor = true;
       // 
       // RegressionSolutionTargetResponseGradientView
@@ -76 +112 @@
       this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
       this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+      this.Controls.Add(this.yAxisConfigGroupBox);
       this.Controls.Add(this.panel1);
       this.Controls.Add(this.variableListView);
@@ -82 +119 @@
       this.panel1.ResumeLayout(false);
       this.panel1.PerformLayout();
+      this.yAxisConfigGroupBox.ResumeLayout(false);
+      this.yAxisConfigGroupBox.PerformLayout();
       this.ResumeLayout(false);
 
@@ -91 +130 @@
     private System.Windows.Forms.Panel panel1;
     private System.Windows.Forms.TableLayoutPanel gradientChartTableLayout;
+    private System.Windows.Forms.GroupBox yAxisConfigGroupBox;
+    private System.Windows.Forms.CheckBox automaticYAxisCheckBox;
+    private DoubleLimitView limitView;
   }
 }

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

@@ -43 +43 @@
       InitializeComponent();
       charts = new Dictionary<string, GradientChart>();
+
+      limitView.Content = new DoubleLimit(0, 1);
     }
 
@@ -53 +55 @@
       base.RegisterContentEvents();
       variableListView.ItemChecked += variableListView_ItemChecked;
+      limitView.Content.ValueChanged += limit_ValueChanged;
+      automaticYAxisCheckBox.CheckedChanged += automaticYAxisCheckBox_CheckedChanged;
     }
 
     protected override void DeregisterContentEvents() {
       variableListView.ItemChecked -= variableListView_ItemChecked;
+      limitView.Content.ValueChanged -= limit_ValueChanged;
+      automaticYAxisCheckBox.CheckedChanged -= automaticYAxisCheckBox_CheckedChanged;
       base.DeregisterContentEvents();
     }
@@ -64 +70 @@
       if (Content == null) return;
       var problemData = Content.ProblemData;
+
+      // Init Y-axis range
+      double min = double.MaxValue, max = double.MinValue;
+      var trainingTarget = problemData.Dataset.GetDoubleValues(problemData.TargetVariable, problemData.TrainingIndices);
+      foreach (var t in trainingTarget) {
+        if (t < min) min = t;
+        if (t > max) max = t;
+      }
+      double range = max - min;
+      const double scale = 1.0 / 3.0;
+      double axisMin, axisMax, axisInterval;
+      ChartUtil.CalculateAxisInterval(min - scale * range, max + scale * range, 5, out axisMin, out axisMax, out axisInterval);
+      automaticYAxisCheckBox.Checked = false;
+      limitView.ReadOnly = false;
+      limitView.Content.Lower = axisMin;
+      limitView.Content.Upper = axisMax;
+
       // create dataset
       var allowedInputVariables = Content.ProblemData.AllowedInputVariables;
@@ -87 +110 @@
 
           if (recalculations.All(t => t.IsCompleted))
-            SyncYAxis();
+            SetupYAxis();
         };
         gradientChart.Configure(new[] { Content }, sharedFixedVariables, variableName, Points);
@@ -101 +124 @@
     }
 
-    private void SyncYAxis() {
-      double min = double.MaxValue, max = double.MinValue;
-      foreach (var chart in VisibleCharts) {
-        if (chart.YMin < min) min = chart.YMin;
-        if (chart.YMax > max) max = chart.YMax;
-      }
-      double axisMin, axisMax, axisInterval;
-      ChartUtil.CalculateAxisInterval(min, max, 5, out axisMin, out axisMax, out axisInterval);
+    private void SetupYAxis() {
+      double axisMin, axisMax;
+      if (automaticYAxisCheckBox.Checked) {
+        double min = double.MaxValue, max = double.MinValue;
+        foreach (var chart in VisibleCharts) {
+          if (chart.YMin < min) min = chart.YMin;
+          if (chart.YMax > max) max = chart.YMax;
+        }
+
+        double axisInterval;
+        ChartUtil.CalculateAxisInterval(min, max, 5, out axisMin, out axisMax, out axisInterval);
+      } else {
+        axisMin = limitView.Content.Lower;
+        axisMax = limitView.Content.Upper;
+      }
 
       foreach (var chart in VisibleCharts) {
@@ -146 +176 @@
         tl.Controls.Remove(chart);
       }
-      SyncYAxis();
+      SetupYAxis();
 
       var count = tl.Controls.Count;
@@ -163 +193 @@
       tl.ResumeLayout();
     }
+
+    private void automaticYAxisCheckBox_CheckedChanged(object sender, EventArgs e) {
+      limitView.ReadOnly = automaticYAxisCheckBox.Checked;
+      SetupYAxis();
+    }
+
+    private void limit_ValueChanged(object sender, EventArgs e) {
+      if (automaticYAxisCheckBox.Checked)
+        return;
+      SetupYAxis();
+    }
   }
 }