Changeset 14166 for stable/HeuristicLab.Problems.DataAnalysis.Views/3.4/Controls

Timestamp:

07/21/16 17:24:22 (8 years ago)

Author:

mkommend

Message:

#2597: Merged r14095, r14096, r14098, r14099, r14118, r14119, r14131, r14157, r14158 into stable.

Location:

stable

Files:

• . (modified) (1 prop)
• HeuristicLab.Problems.DataAnalysis.Views (modified) (1 prop)
• HeuristicLab.Problems.DataAnalysis.Views/3.4/Controls (copied) (copied from trunk/sources/HeuristicLab.Problems.DataAnalysis.Views/3.4/Controls)
• HeuristicLab.Problems.DataAnalysis.Views/3.4/Controls/GradientChart.Designer.cs (modified) (3 diffs)
• HeuristicLab.Problems.DataAnalysis.Views/3.4/Controls/GradientChart.cs (modified) (10 diffs)
• HeuristicLab.Problems.DataAnalysis.Views/3.4/Controls/GradientChartConfigurationDialog.cs (modified) (2 diffs)

stable/HeuristicLab.Problems.DataAnalysis.Views/3.4/Controls/GradientChart.Designer.cs

@@ -31 +31 @@
       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();
+      System.Windows.Forms.DataVisualization.Charting.Title title1 = new System.Windows.Forms.DataVisualization.Charting.Title();
       this.calculationPendingLabel = new System.Windows.Forms.Label();
       this.calculationPendingTimer = new System.Windows.Forms.Timer(this.components);
@@ -74 +75 @@
       chartArea1.Name = "ChartArea";
       chartArea1.Position.Auto = false;
-      chartArea1.Position.Height = 100F;
+      chartArea1.Position.Height = 90F;
       chartArea1.Position.Width = 100F;
+      chartArea1.Position.Y = 10F;
       this.chart.ChartAreas.Add(chartArea1);
       this.chart.Dock = System.Windows.Forms.DockStyle.Fill;
@@ -88 +90 @@
       this.chart.Size = new System.Drawing.Size(453, 308);
       this.chart.TabIndex = 0;
+      title1.Alignment = System.Drawing.ContentAlignment.TopCenter;
+      title1.DockedToChartArea = "ChartArea";
+      title1.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+      title1.IsDockedInsideChartArea = false;
+      title1.Name = "Title";
+      title1.Text = "[Title]";
+      this.chart.Titles.Add(title1);
       this.chart.SelectionRangeChanged += new System.EventHandler<System.Windows.Forms.DataVisualization.Charting.CursorEventArgs>(this.chart_SelectionRangeChanged);
+      this.chart.PostPaint += new System.EventHandler<System.Windows.Forms.DataVisualization.Charting.ChartPaintEventArgs>(this.chart_PostPaint);
+      this.chart.AnnotationPositionChanged += new System.EventHandler(this.chart_AnnotationPositionChanged);
       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);
       this.chart.DragEnter += new System.Windows.Forms.DragEventHandler(this.chart_DragEnter);
       this.chart.MouseMove += new System.Windows.Forms.MouseEventHandler(this.chart_MouseMove);
+      this.chart.Resize += new System.EventHandler(this.chart_Resize);
       // 
       // configurationButton

stable/HeuristicLab.Problems.DataAnalysis.Views/3.4/Controls/GradientChart.cs

@@ -66 +66 @@
       set {
         chart.Annotations[0].Visible = value;
-        if (!value) chart.ChartAreas[0].AxisX.Title = string.Empty;
+        if (!value) chart.Titles[0].Text = string.Empty;
       }
     }
@@ -207 +207 @@
     #endregion
 
+    public event EventHandler ChartPostPaint;
+
     public GradientChart() {
       InitializeComponent();
@@ -266 +268 @@
           ciSeriesCache.Add(solution, series.Item2);
       }
-
-      ResizeAllSeriesData();
-      OrderAndColorSeries();
-    }
-
-    public async Task RecalculateAsync(bool updateOnFinish = true, bool resetYAxis = true) {
-      if (IsDisposed
-        || sharedFixedVariables == null || !solutions.Any() || string.IsNullOrEmpty(freeVariable)
-        || trainingMin.IsAlmost(trainingMax) || trainingMin > trainingMax || drawingSteps == 0)
-        return;
-
-      calculationPendingTimer.Start();
-
-      Update(); // immediately show label
-
-      // cancel previous recalculate call
-      if (cancelCurrentRecalculateSource != null)
-        cancelCurrentRecalculateSource.Cancel();
-      cancelCurrentRecalculateSource = new CancellationTokenSource();
 
       // Set cursor and x-axis
@@ -300 +283 @@
 
       if (ShowCursor)
-        chart.ChartAreas[0].AxisX.Title = FreeVariable + " : " + defaultValue.ToString("N3", CultureInfo.CurrentCulture);
+        chart.Titles[0].Text = FreeVariable + " : " + defaultValue.ToString("N3", CultureInfo.CurrentCulture);
+
+      ResizeAllSeriesData();
+      OrderAndColorSeries();
+    }
+
+    public async Task RecalculateAsync(bool updateOnFinish = true, bool resetYAxis = true) {
+      if (IsDisposed
+        || sharedFixedVariables == null || !solutions.Any() || string.IsNullOrEmpty(freeVariable)
+        || trainingMin.IsAlmost(trainingMax) || trainingMin > trainingMax || drawingSteps == 0)
+        return;
+
+      calculationPendingTimer.Start();
+
+      // cancel previous recalculate call
+      if (cancelCurrentRecalculateSource != null)
+        cancelCurrentRecalculateSource.Cancel();
+      cancelCurrentRecalculateSource = new CancellationTokenSource();
+      var cancellationToken = cancelCurrentRecalculateSource.Token;
 
       // Update series
-      var cancellationToken = cancelCurrentRecalculateSource.Token;
       try {
         var limits = await UpdateAllSeriesDataAsync(cancellationToken);
-        //cancellationToken.ThrowIfCancellationRequested();
 
         yMin = limits.Lower;
@@ -328 +327 @@
     }
 
+    public void UpdateTitlePosition() {
+      var title = chart.Titles[0];
+      var plotArea = InnerPlotPosition;
+
+      title.Visible = plotArea.Width != 0;
+
+      title.Position.X = plotArea.X + (plotArea.Width / 2);
+    }
+
     private void SetupAxis(Axis axis, double minValue, double maxValue, int ticks, double? fixedAxisMin, double? fixedAxisMax) {
-      double axisMin, axisMax, axisInterval;
-      ChartUtil.CalculateAxisInterval(minValue, maxValue, ticks, out axisMin, out axisMax, out axisInterval);
-      axis.Minimum = fixedAxisMin ?? axisMin;
-      axis.Maximum = fixedAxisMax ?? axisMax;
-      axis.Interval = (axis.Maximum - axis.Minimum) / ticks;
+      if (minValue < maxValue) {
+        double axisMin, axisMax, axisInterval;
+        ChartUtil.CalculateAxisInterval(minValue, maxValue, ticks, out axisMin, out axisMax, out axisInterval);
+        axis.Minimum = fixedAxisMin ?? axisMin;
+        axis.Maximum = fixedAxisMax ?? axisMax;
+        axis.Interval = (axis.Maximum - axis.Minimum) / ticks;
+      }
 
       try {
@@ -453 +463 @@
           if (yvalues[i] > max) max = yvalues[i];
         }
+        chart.Invalidate();
+
+        cancellationToken.ThrowIfCancellationRequested();
 
         var confidenceBoundSolution = solution as IConfidenceRegressionSolution;
         if (confidenceBoundSolution != null) {
           var confidenceIntervalSeries = ciSeriesCache[solution];
-
-          cancellationToken.ThrowIfCancellationRequested();
-          var variances =
-            confidenceBoundSolution.Model.GetEstimatedVariances(internalDataset,
-              Enumerable.Range(0, internalDataset.Rows)).ToList();
+          var variances = confidenceBoundSolution.Model.GetEstimatedVariances(internalDataset, Enumerable.Range(0, internalDataset.Rows)).ToList();
           for (int i = 0; i < xvalues.Count; i++) {
             var lower = yvalues[i] - 1.96 * Math.Sqrt(variances[i]);
@@ -469 +478 @@
             if (upper > max) max = upper;
           }
+          chart.Invalidate();
         }
 
@@ -619 +629 @@
 
       e.NewLocationX = newLocation;
-      var annotation = VerticalLineAnnotation;
-      var x = annotation.X;
+
+      UpdateCursor();
+    }
+    private void chart_AnnotationPositionChanged(object sender, EventArgs e) {
+      UpdateCursor();
+    }
+    void UpdateCursor() {
+      var x = VerticalLineAnnotation.X;
       sharedFixedVariables.SetVariableValue(x, FreeVariable, 0);
 
       if (ShowCursor) {
-        chart.ChartAreas[0].AxisX.Title = FreeVariable + " : " + x.ToString("N3", CultureInfo.CurrentCulture);
+        chart.Titles[0].Text = FreeVariable + " : " + x.ToString("N3", CultureInfo.CurrentCulture);
         chart.Update();
       }
@@ -636 +652 @@
     }
 
-    private void chart_DragDrop(object sender, DragEventArgs e) {
+    private async void chart_DragDrop(object sender, DragEventArgs e) {
       var data = e.Data.GetData(HeuristicLab.Common.Constants.DragDropDataFormat);
       if (data != null) {
         var solution = data as IRegressionSolution;
         if (!solutions.Contains(solution))
-          AddSolutionAsync(solution);
+          await AddSolutionAsync(solution);
       }
     }
@@ -667 +683 @@
       OnZoomChanged(this, EventArgs.Empty);
     }
+
+    private void chart_Resize(object sender, EventArgs e) {
+      UpdateTitlePosition();
+    }
+
+    private void chart_PostPaint(object sender, ChartPaintEventArgs e) {
+      if (ChartPostPaint != null)
+        ChartPostPaint(this, EventArgs.Empty);
+    }
     #endregion
   }
 }
+

stable/HeuristicLab.Problems.DataAnalysis.Views/3.4/Controls/GradientChartConfigurationDialog.cs

@@ -51 +51 @@
     private async void okButton_Click(object sender, System.EventArgs e) {
       try {
+        Enabled = false;
         chart.SuspendRepaint();
         if (xAutomaticCheckBox.Checked) {
@@ -82 +83 @@
       }
       finally {
+        Enabled = true;
         chart.ResumeRepaint(true);
       }