Changeset 14021

Timestamp:

07/07/16 19:31:49 (8 years ago)

Author:

bburlacu

Message:

#2597: Fixed some additional issues with the density charts (which are now turned on by default).

Location:

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

Files:

• GradientChart.cs (modified) (2 diffs)
• Regression/RegressionSolutionTargetResponseGradientView.Designer.cs (modified) (2 diffs)
• Regression/RegressionSolutionTargetResponseGradientView.cs (modified) (12 diffs)

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

@@ -142 +142 @@
         if ((value.HasValue && fixedYAxisMin.HasValue && !value.Value.IsAlmost(fixedYAxisMin.Value)) || (value.HasValue != fixedYAxisMin.HasValue)) {
           fixedYAxisMin = value;
-          // the check below prevents an exception when yMin >= yMax
-          if (yMin < yMax)
-            SetupAxis(chart.ChartAreas[0].AxisY, yMin, yMax, YAxisTicks, FixedYAxisMin, FixedYAxisMax);
+          SetupAxis(chart.ChartAreas[0].AxisY, yMin, yMax, YAxisTicks, FixedYAxisMin, FixedYAxisMax);
         }
       }
@@ -154 +152 @@
         if ((value.HasValue && fixedYAxisMax.HasValue && !value.Value.IsAlmost(fixedYAxisMax.Value)) || (value.HasValue != fixedYAxisMax.HasValue)) {
           fixedYAxisMax = value;
-          // the check below prevents an exception when yMin >= yMax
-          if (yMin < yMax)
-            SetupAxis(chart.ChartAreas[0].AxisY, yMin, yMax, YAxisTicks, FixedYAxisMin, FixedYAxisMax);
+          SetupAxis(chart.ChartAreas[0].AxisY, yMin, yMax, YAxisTicks, FixedYAxisMin, FixedYAxisMax);
         }
       }

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

@@ -60 +60 @@
       this.variableListView.UseCompatibleStateImageBehavior = false;
       this.variableListView.View = System.Windows.Forms.View.List;
+      this.variableListView.ItemChecked += new System.Windows.Forms.ItemCheckedEventHandler(this.variableListView_ItemChecked);
       // 
       // gradientChartTableLayout
@@ -109 +110 @@
       this.automaticYAxisCheckBox.Text = "Automatic";
       this.automaticYAxisCheckBox.UseVisualStyleBackColor = true;
+      this.automaticYAxisCheckBox.CheckedChanged += new System.EventHandler(this.automaticYAxisCheckBox_CheckedChanged);
       // 
       // densityGroupBox

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

@@ -64 +64 @@
 
       limitView.Content = new DoubleLimit(0, 1);
-      densityComboBox.SelectedIndex = 0; // select None
+      limitView.Content.ValueChanged += limit_ValueChanged;
+
+      densityComboBox.SelectedIndex = 1; // select Training
 
       columnsTextBox.Text = "4";
@@ -81 +83 @@
     protected override void RegisterContentEvents() {
       base.RegisterContentEvents();
-      variableListView.ItemChecked += variableListView_ItemChecked;
-      limitView.Content.ValueChanged += limit_ValueChanged;
-      automaticYAxisCheckBox.CheckedChanged += automaticYAxisCheckBox_CheckedChanged;
       Content.ModelChanged += solution_ModelChanged;
     }
 
     protected override void DeregisterContentEvents() {
-      variableListView.ItemChecked -= variableListView_ItemChecked;
-      limitView.Content.ValueChanged -= limit_ValueChanged;
-      automaticYAxisCheckBox.CheckedChanged -= automaticYAxisCheckBox_CheckedChanged;
       Content.ModelChanged -= solution_ModelChanged;
       base.DeregisterContentEvents();
@@ -149 +145 @@
 
       // update variable list
+      variableListView.ItemChecked -= variableListView_ItemChecked;
       variableListView.Items.Clear();
       foreach (var variable in allowedInputVariables)
@@ -155 +152 @@
       foreach (var variable in Content.Model.VariablesUsedForPrediction)
         variableListView.Items[variable].Checked = true;
+      variableListView.ItemChecked += variableListView_ItemChecked;
+
+      RecalculateAndRelayoutCharts();
+    }
+
+    private async void RecalculateAndRelayoutCharts() {
+      foreach (var variable in VisibleVariables) {
+        var gradientChart = gradientCharts[variable];
+        await gradientChart.RecalculateAsync();
+      }
+      gradientChartTableLayout.SuspendLayout();
+      SetupYAxis();
+      ReOrderControls();
+      SetStyles();
+      gradientChartTableLayout.ResumeLayout();
+      gradientChartTableLayout.Refresh();
+      foreach (var variable in VisibleVariables) {
+        var densityChart = densityCharts[variable];
+        UpdateDensityChart(densityChart, variable);
+      }
     }
     private GradientChart CreateGradientChart(string variableName, ModifiableDataset sharedFixedVariables) {
@@ -199 +216 @@
         chart.FixedYAxisMin = axisMin;
         chart.FixedYAxisMax = axisMax;
-        //chart.Update();
       }
     }
@@ -213 +229 @@
         tl.Controls.Add(chartsPanel, column, row);
 
-        if (column == 0) {
-          var chart = gradientCharts[v];
-          chart.YAxisTitle = Content.ProblemData.TargetVariable;
-        }
-
+        var chart = gradientCharts[v];
+        chart.YAxisTitle = column == 0 ? Content.ProblemData.TargetVariable : string.Empty;
         column++;
 
@@ -268 +281 @@
       var variable = item.Text;
       var gradientChart = gradientCharts[variable];
-      var densityChart = densityCharts[variable];
       var chartsPanel = groupingPanels[variable];
       var tl = gradientChartTableLayout;
@@ -276 +288 @@
         tl.Controls.Add(chartsPanel);
         await gradientChart.RecalculateAsync();
-        UpdateDensityChart(densityChart, variable);
       } else {
         tl.Controls.Remove(chartsPanel);
@@ -287 +298 @@
       }
       tl.ResumeLayout();
+      tl.Refresh();
+      densityComboBox_SelectedIndexChanged(this, EventArgs.Empty);
     }
 
@@ -292 +305 @@
       limitView.ReadOnly = automaticYAxisCheckBox.Checked;
       SetupYAxis();
+      gradientChartTableLayout.Refresh();
+      densityComboBox_SelectedIndexChanged(this, EventArgs.Empty); // necessary to realign the density plots
     }
 
@@ -298 +313 @@
         return;
       SetupYAxis();
+      gradientChartTableLayout.Refresh();
+      densityComboBox_SelectedIndexChanged(this, EventArgs.Empty); // necessary to realign the density plots
     }
 
     private void densityComboBox_SelectedIndexChanged(object sender, EventArgs e) {
+      if (Content == null)
+        return;
+
       int si = densityComboBox.SelectedIndex;
       if (si == 0) {
@@ -369 +389 @@
         ReOrderControls();
         SetStyles();
-        tl.ResumeLayout(true);
-      }
-    }
-
-    private void solution_ModelChanged(object sender, EventArgs e) {
-      foreach (var chart in gradientCharts.Values) {
-        chart.RecalculateAsync();
+        tl.ResumeLayout();
+        tl.Refresh();
+        densityComboBox_SelectedIndexChanged(this, EventArgs.Empty);
+      }
+    }
+
+    private async void solution_ModelChanged(object sender, EventArgs e) {
+      foreach (var variable in VisibleVariables) {
+        var gradientChart = gradientCharts[variable];
+        var densityChart = densityCharts[variable];
+        // recalculate and refresh
+        await gradientChart.RecalculateAsync();
+        gradientChart.Refresh();
+        UpdateDensityChart(densityChart, variable);
       }
     }