Changeset 13853

Timestamp:

05/19/16 15:31:30 (8 years ago)

Author:

pfleck

Message:

#2597

• Added GradientChartConfigurationDialog to allow setup x/y axis and drawing steps.
• Added "calculating pending"-icon only after 100ms to avoid flickering.
• Fixed some small issues.

Location:

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

Files:

• DensityTrackbar.cs (modified) (2 diffs)
• GradientChart.Designer.cs (modified) (4 diffs)
• GradientChart.cs (modified) (12 diffs)
• GradientChartConfigurationDialog.Designer.cs (added)
• GradientChartConfigurationDialog.cs (added)
• HeuristicLab.Problems.DataAnalysis.Views-3.4.csproj (modified) (1 diff)
• Regression/RegressionSolutionGradientView.Designer.cs (modified) (1 diff)
• Regression/RegressionSolutionGradientView.cs (modified) (1 diff)
• Regression/RegressionSolutionTargetResponseGradientView.Designer.cs (modified) (5 diffs)
• Regression/RegressionSolutionTargetResponseGradientView.cs (modified) (1 diff)

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

@@ -22 +22 @@
 using System;
 using System.Collections.Generic;
+using System.Drawing;
 using System.Globalization;
 using System.Windows.Forms;
@@ -91 +92 @@
       trackBar.Enabled = !Checked;
       textBox.Text = Checked ? "Plotted" : Value.ToString(CultureInfo.InvariantCulture);
+      radioButton.BackColor = Checked ? SystemColors.ActiveCaption : SystemColors.Control;
       OnCheckedChanged();
     }

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

@@ -30 +30 @@
       System.Windows.Forms.DataVisualization.Charting.StripLine stripLine2 = new System.Windows.Forms.DataVisualization.Charting.StripLine();
       System.Windows.Forms.DataVisualization.Charting.Legend legend1 = new System.Windows.Forms.DataVisualization.Charting.Legend();
+      this.calculationPendingLabel = new System.Windows.Forms.Label();
+      this.calculationPendingTimer = new System.Windows.Forms.Timer(this.components);
       this.chart = new HeuristicLab.Visualization.ChartControlsExtensions.EnhancedChart();
-      this.statusLabel = new System.Windows.Forms.Label();
       ((System.ComponentModel.ISupportInitialize)(this.chart)).BeginInit();
       this.SuspendLayout();
+      // 
+      // calculationPendingLabel
+      // 
+      this.calculationPendingLabel.BackColor = System.Drawing.Color.White;
+      this.calculationPendingLabel.Image = HeuristicLab.Common.Resources.VSImageLibrary.Timer;
+      this.calculationPendingLabel.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
+      this.calculationPendingLabel.Location = new System.Drawing.Point(3, 3);
+      this.calculationPendingLabel.Margin = new System.Windows.Forms.Padding(0);
+      this.calculationPendingLabel.Name = "calculationPendingLabel";
+      this.calculationPendingLabel.Size = new System.Drawing.Size(17, 17);
+      this.calculationPendingLabel.TabIndex = 1;
+      this.calculationPendingLabel.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
+      this.calculationPendingLabel.Visible = false;
+      // 
+      // calculationPendingTimer
+      // 
+      this.calculationPendingTimer.Tick += new System.EventHandler(this.calculationPendingTimer_Tick);
       // 
       // chart
@@ -68 +86 @@
       this.chart.TabIndex = 0;
       this.chart.AnnotationPositionChanging += new System.EventHandler<System.Windows.Forms.DataVisualization.Charting.AnnotationPositionChangingEventArgs>(this.chart_AnnotationPositionChanging);
-      this.chart.FormatNumber += new System.EventHandler<System.Windows.Forms.DataVisualization.Charting.FormatNumberEventArgs>(this.chart_FormatNumber);
       this.chart.DragDrop += new System.Windows.Forms.DragEventHandler(this.chart_DragDrop);
       this.chart.DragEnter += new System.Windows.Forms.DragEventHandler(this.chart_DragEnter);
       this.chart.MouseMove += new System.Windows.Forms.MouseEventHandler(this.chart_MouseMove);
-      // 
-      // statusLabel
-      // 
-      this.statusLabel.BackColor = System.Drawing.Color.White;
-      this.statusLabel.Image = HeuristicLab.Common.Resources.VSImageLibrary.Timer;
-      this.statusLabel.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
-      this.statusLabel.Location = new System.Drawing.Point(3, 3);
-      this.statusLabel.Margin = new System.Windows.Forms.Padding(0);
-      this.statusLabel.Name = "statusLabel";
-      this.statusLabel.Size = new System.Drawing.Size(17, 17);
-      this.statusLabel.TabIndex = 1;
-      this.statusLabel.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
-      this.statusLabel.Visible = false;
       // 
       // GradientChart
@@ -90 +94 @@
       this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
       this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-      this.Controls.Add(this.statusLabel);
+      this.Controls.Add(this.calculationPendingLabel);
       this.Controls.Add(this.chart);
       this.Name = "GradientChart";
@@ -102 +106 @@
 
     private HeuristicLab.Visualization.ChartControlsExtensions.EnhancedChart chart;
-    private System.Windows.Forms.Label statusLabel;
+    private System.Windows.Forms.Label calculationPendingLabel;
+    private System.Windows.Forms.Timer calculationPendingTimer;
   }
 }

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

@@ -44 +44 @@
     private readonly Dictionary<IRegressionSolution, Series> ciSeriesCache;
 
+    private readonly ToolStripMenuItem configToolStripMenuItem;
+    private readonly GradientChartConfigurationDialog configurationDialog;
+
     #region Properties
     public bool ShowLegend {
@@ -49 +52 @@
       set { chart.Legends[0].Enabled = value; }
     }
-    public bool ShowXAxisLabel {
-      get { return chart.ChartAreas[0].AxisX.Enabled == AxisEnabled.True; }
-      set { chart.ChartAreas[0].AxisX.Enabled = value ? AxisEnabled.True : AxisEnabled.False; }
-    }
-    public bool ShowYAxisLabel {
-      get { return chart.ChartAreas[0].AxisY.Enabled == AxisEnabled.True; }
-      set { chart.ChartAreas[0].AxisY.Enabled = value ? AxisEnabled.True : AxisEnabled.False; }
-    }
     public bool ShowCursor {
       get { return chart.Annotations[0].Visible; }
-      set { chart.Annotations[0].Visible = value; }
+      set {
+        chart.Annotations[0].Visible = value;
+        if (!value) chart.ChartAreas[0].AxisX.Title = string.Empty;
+      }
     }
 
@@ -191 +189 @@
       chart.ChartAreas[0].CursorY.Interval = 0;
 
+      configToolStripMenuItem = new ToolStripMenuItem("Configuration");
+      configToolStripMenuItem.Click += configToolStripMenuItem_Click;
+      chart.ContextMenuStrip.Items.Add(new ToolStripSeparator());
+      chart.ContextMenuStrip.Items.Add(configToolStripMenuItem);
+
+      configurationDialog = new GradientChartConfigurationDialog(this);
+
       Disposed += GradientChart_Disposed;
     }
+
     private void GradientChart_Disposed(object sender, EventArgs e) {
       if (cancelCurrentRecalculateSource != null)
@@ -237 +243 @@
         return;
 
-      statusLabel.Visible = true;
+      calculationPendingTimer.Start();
+
       Update(); // immediately show label
 
@@ -248 +255 @@
       var defaultValue = sharedFixedVariables.GetDoubleValue(freeVariable, 0);
       VerticalLineAnnotation.X = defaultValue;
-      chart.ChartAreas[0].AxisX.Title = FreeVariable + " : " + defaultValue.ToString("N3", CultureInfo.CurrentCulture);
+      if (ShowCursor)
+        chart.ChartAreas[0].AxisX.Title = FreeVariable + " : " + defaultValue.ToString("N3", CultureInfo.CurrentCulture);
 
       // Update series
@@ -264 +272 @@
         UpdateOutOfTrainingRangeStripLines();
 
-        statusLabel.Visible = false;
+        calculationPendingTimer.Stop();
+        calculationPendingLabel.Visible = false;
         if (updateOnFinish)
           Update();
@@ -437 +446 @@
       var series = seriesCache[solution];
       series.Points.SuspendUpdates();
+      series.Points.Clear();
       for (int i = 0; i < xvalues.Count; i++)
         series.Points.Add(new DataPoint(xvalues[i], 0.0));
@@ -444 +454 @@
       if (ciSeriesCache.TryGetValue(solution, out confidenceIntervalSeries)) {
         confidenceIntervalSeries.Points.SuspendUpdates();
+        confidenceIntervalSeries.Points.Clear();
         for (int i = 0; i < xvalues.Count; i++)
           confidenceIntervalSeries.Points.Add(new DataPoint(xvalues[i], new[] { -1.0, 1.0 }));
@@ -538 +549 @@
         newLocation = axisX.Minimum;
 
+      if (oldCurserPosition.IsAlmost(newLocation))
+        return;
+
       e.NewLocationX = newLocation;
+      oldCurserPosition = e.NewLocationX;
 
       var annotation = VerticalLineAnnotation;
@@ -544 +559 @@
       sharedFixedVariables.SetVariableValue(x, FreeVariable, 0);
 
-      chart.ChartAreas[0].AxisX.Title = FreeVariable + " : " + x.ToString("N3", CultureInfo.CurrentCulture);
-      chart.Update();
-
-      if (!oldCurserPosition.IsAlmost(e.NewLocationX))
-        OnVariableValueChanged(this, EventArgs.Empty);
-      oldCurserPosition = e.NewLocationX;
+      if (ShowCursor) {
+        chart.ChartAreas[0].AxisX.Title = FreeVariable + " : " + x.ToString("N3", CultureInfo.CurrentCulture);
+        chart.Update();
+      }
+
+      OnVariableValueChanged(this, EventArgs.Empty);
     }
 
@@ -555 +570 @@
       bool hitCursor = chart.HitTest(e.X, e.Y).ChartElementType == ChartElementType.Annotation;
       chart.Cursor = hitCursor ? Cursors.VSplit : Cursors.Default;
-    }
-
-    private void chart_FormatNumber(object sender, FormatNumberEventArgs e) {
-      if (e.ElementType == ChartElementType.AxisLabels) {
-        switch (e.Format) {
-          case "CustomAxisXFormat":
-            break;
-          case "CustomAxisYFormat":
-            var v = e.Value;
-            e.LocalizedValue = string.Format("{0,5}", v);
-            break;
-          default:
-            break;
-        }
-      }
     }
 
@@ -590 +590 @@
       }
     }
+
+    private void calculationPendingTimer_Tick(object sender, EventArgs e) {
+      calculationPendingLabel.Visible = true;
+      Update();
+    }
+
+    private void configToolStripMenuItem_Click(object sender, EventArgs e) {
+      configurationDialog.ShowDialog(this);
+    }
     #endregion
   }

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

@@ -282 +282 @@
     <Compile Include="GradientChart.Designer.cs">
       <DependentUpon>GradientChart.cs</DependentUpon>
+    </Compile>
+    <Compile Include="GradientChartConfigurationDialog.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="GradientChartConfigurationDialog.Designer.cs">
+      <DependentUpon>GradientChartConfigurationDialog.cs</DependentUpon>
     </Compile>
     <Compile Include="Regression\RegressionSolutionGradientView.cs">

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

@@ -81 +81 @@
       this.gradientChart.Name = "gradientChart";
       this.gradientChart.ShowCursor = false;
-      this.gradientChart.ShowLegend = true;
-      this.gradientChart.ShowXAxisLabel = false;
-      this.gradientChart.ShowYAxisLabel = true;
+      this.gradientChart.ShowLegend = false;
       this.gradientChart.Size = new System.Drawing.Size(715, 376);
       this.gradientChart.TabIndex = 0;

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

@@ -110 +110 @@
       tableLayoutPanel.ResumeRepaint(true);
 
+      // Init Y-axis range
+      var problemData = Content.ProblemData;
+      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);
+      gradientChart.FixedYAxisMin = axisMin;
+      gradientChart.FixedYAxisMax = axisMax;
+
       trackbars.First().Checked = true;
     }

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

@@ -50 +50 @@
       this.variableListView.Location = new System.Drawing.Point(3, 16);
       this.variableListView.Name = "variableListView";
-      this.variableListView.Size = new System.Drawing.Size(163, 482);
+      this.variableListView.Size = new System.Drawing.Size(163, 503);
       this.variableListView.TabIndex = 0;
       this.variableListView.UseCompatibleStateImageBehavior = false;
@@ -77 +77 @@
       this.yAxisConfigGroupBox.Location = new System.Drawing.Point(0, 0);
       this.yAxisConfigGroupBox.Name = "yAxisConfigGroupBox";
-      this.yAxisConfigGroupBox.Size = new System.Drawing.Size(169, 98);
+      this.yAxisConfigGroupBox.Size = new System.Drawing.Size(169, 77);
       this.yAxisConfigGroupBox.TabIndex = 2;
       this.yAxisConfigGroupBox.TabStop = false;
@@ -97 +97 @@
       // 
       this.automaticYAxisCheckBox.AutoSize = true;
-      this.automaticYAxisCheckBox.Location = new System.Drawing.Point(6, 72);
+      this.automaticYAxisCheckBox.Location = new System.Drawing.Point(49, -1);
       this.automaticYAxisCheckBox.Name = "automaticYAxisCheckBox";
       this.automaticYAxisCheckBox.Size = new System.Drawing.Size(73, 17);
@@ -108 +108 @@
       this.densityGroupBox.Controls.Add(this.densityComboBox);
       this.densityGroupBox.Dock = System.Windows.Forms.DockStyle.Top;
-      this.densityGroupBox.Location = new System.Drawing.Point(0, 98);
+      this.densityGroupBox.Location = new System.Drawing.Point(0, 77);
       this.densityGroupBox.Name = "densityGroupBox";
       this.densityGroupBox.Size = new System.Drawing.Size(169, 49);
@@ -156 +156 @@
       this.variableGroupBox.Controls.Add(this.variableListView);
       this.variableGroupBox.Dock = System.Windows.Forms.DockStyle.Fill;
-      this.variableGroupBox.Location = new System.Drawing.Point(0, 147);
+      this.variableGroupBox.Location = new System.Drawing.Point(0, 126);
       this.variableGroupBox.Name = "variableGroupBox";
-      this.variableGroupBox.Size = new System.Drawing.Size(169, 501);
+      this.variableGroupBox.Size = new System.Drawing.Size(169, 522);
       this.variableGroupBox.TabIndex = 1;
       this.variableGroupBox.TabStop = false;

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

@@ -160 +160 @@
         ShowLegend = false,
         ShowCursor = true,
-        ShowXAxisLabel = true,
-        ShowYAxisLabel = true,
         YAxisTicks = 5,
       };