Changeset 13976 for stable/HeuristicLab.Problems.DataAnalysis.Views/3.4/Regression

Timestamp:

07/02/16 09:02:09 (8 years ago)

Author:

gkronber

Message:

#2590 merged r13697:13698, r13700:13702, r13704:13705, r13711, r13715 from trunk to stable

Location:

stable

Files:

• . (modified) (1 prop)
• HeuristicLab.Problems.DataAnalysis.Views (modified) (1 prop)
• HeuristicLab.Problems.DataAnalysis.Views/3.4/Regression/RegressionEnsembleSolutionModelView.cs (modified) (1 diff)
• HeuristicLab.Problems.DataAnalysis.Views/3.4/Regression/RegressionEnsembleSolutionModelWeightsView.Designer.cs (copied) (copied from trunk/sources/HeuristicLab.Problems.DataAnalysis.Views/3.4/Regression/RegressionEnsembleSolutionModelWeightsView.Designer.cs)
• HeuristicLab.Problems.DataAnalysis.Views/3.4/Regression/RegressionEnsembleSolutionModelWeightsView.cs (copied) (copied from trunk/sources/HeuristicLab.Problems.DataAnalysis.Views/3.4/Regression/RegressionEnsembleSolutionModelWeightsView.cs) (4 diffs)

stable/HeuristicLab.Problems.DataAnalysis.Views/3.4/Regression/RegressionEnsembleSolutionModelView.cs

@@ -63 +63 @@
       protected override void SetEnabledStateOfControls() {
         base.SetEnabledStateOfControls();
-        addButton.Enabled = Content != null && !Content.IsReadOnly && !Locked;
-        removeButton.Enabled = Content != null && !Content.IsReadOnly && !Locked && itemsListView.SelectedItems.Count > 0;
+        addButton.Enabled = false;
+        removeButton.Enabled = Content != null && !Content.IsReadOnly && !Locked && !ReadOnly && itemsListView.SelectedItems.Count > 0;
         itemsListView.Enabled = Content != null && !Locked;
         detailsGroupBox.Enabled = Content != null && itemsListView.SelectedItems.Count == 1;
+        sortAscendingButton.Enabled = false;
+        sortDescendingButton.Enabled = false;
       }
+
+      //forbid sorting
+      protected override void SortItemsListView(SortOrder sortOrder) { }
 
       protected override void itemsListView_DragEnter(object sender, DragEventArgs e) {

stable/HeuristicLab.Problems.DataAnalysis.Views/3.4/Regression/RegressionEnsembleSolutionModelWeightsView.cs

@@ -45 +45 @@
     }
 
+    protected override void SetEnabledStateOfControls() {
+      base.SetEnabledStateOfControls();
+      averageEstimatesCheckBox.Enabled = Content != null && !Locked && !ReadOnly;
+    }
+
     protected override void RegisterContentEvents() {
       base.RegisterContentEvents();
@@ -67 +72 @@
         var array = new DoubleArray(Content.Model.ModelWeights.ToArray());
         array.Resizable = false;
-        array.ElementNames = Content.Model.Models.Select(m => m.Name);
+        array.ElementNames = Content.RegressionSolutions.Select(s => s.Name);
 
         RegisterArrayEvents(array);
@@ -94 +99 @@
         array[i] = modelWeights[i];
 
-      array.ElementNames = Content.Model.Models.Select(m => m.Name);
+      array.ElementNames = Content.RegressionSolutions.Select(s => s.Name);
       averageEstimatesCheckBox.Checked = Content.Model.AverageModelEstimates;
     }
@@ -108 +113 @@
 
     private void averageEstimatesCheckBox_CheckedChanged(object sender, EventArgs e) {
+      if (Content == null) return;
       Content.Model.AverageModelEstimates = averageEstimatesCheckBox.Checked;
     }