Changeset 13976 for stable/HeuristicLab.Problems.DataAnalysis.Views/3.4
- Timestamp:
- 07/02/16 09:02:09 (8 years ago)
- Location:
- stable
- Files:
-
- 4 edited
- 2 copied
Legend:
- Unmodified
- Added
- Removed
-
stable
- Property svn:mergeinfo changed
/trunk/sources merged: 13697-13698,13700-13702,13704-13705,13711,13715
- Property svn:mergeinfo changed
-
stable/HeuristicLab.Problems.DataAnalysis.Views
- Property svn:mergeinfo changed
/trunk/sources/HeuristicLab.Problems.DataAnalysis.Views merged: 13705,13711,13715
- Property svn:mergeinfo changed
-
stable/HeuristicLab.Problems.DataAnalysis.Views/3.4/HeuristicLab.Problems.DataAnalysis.Views-3.4.csproj
r13156 r13976 195 195 <Compile Include="ProblemDataView.Designer.cs"> 196 196 <DependentUpon>ProblemDataView.cs</DependentUpon> 197 </Compile> 198 <Compile Include="Regression\RegressionEnsembleSolutionModelWeightsView.cs"> 199 <SubType>UserControl</SubType> 200 </Compile> 201 <Compile Include="Regression\RegressionEnsembleSolutionModelWeightsView.Designer.cs"> 202 <DependentUpon>RegressionEnsembleSolutionModelWeightsView.cs</DependentUpon> 197 203 </Compile> 198 204 <Compile Include="Regression\RegressionFeatureCorrelationView.cs"> -
stable/HeuristicLab.Problems.DataAnalysis.Views/3.4/Regression/RegressionEnsembleSolutionModelView.cs
r12009 r13976 63 63 protected override void SetEnabledStateOfControls() { 64 64 base.SetEnabledStateOfControls(); 65 addButton.Enabled = Content != null && !Content.IsReadOnly && !Locked;66 removeButton.Enabled = Content != null && !Content.IsReadOnly && !Locked && itemsListView.SelectedItems.Count > 0;65 addButton.Enabled = false; 66 removeButton.Enabled = Content != null && !Content.IsReadOnly && !Locked && !ReadOnly && itemsListView.SelectedItems.Count > 0; 67 67 itemsListView.Enabled = Content != null && !Locked; 68 68 detailsGroupBox.Enabled = Content != null && itemsListView.SelectedItems.Count == 1; 69 sortAscendingButton.Enabled = false; 70 sortDescendingButton.Enabled = false; 69 71 } 72 73 //forbid sorting 74 protected override void SortItemsListView(SortOrder sortOrder) { } 70 75 71 76 protected override void itemsListView_DragEnter(object sender, DragEventArgs e) { -
stable/HeuristicLab.Problems.DataAnalysis.Views/3.4/Regression/RegressionEnsembleSolutionModelWeightsView.cs
r13705 r13976 45 45 } 46 46 47 protected override void SetEnabledStateOfControls() { 48 base.SetEnabledStateOfControls(); 49 averageEstimatesCheckBox.Enabled = Content != null && !Locked && !ReadOnly; 50 } 51 47 52 protected override void RegisterContentEvents() { 48 53 base.RegisterContentEvents(); … … 67 72 var array = new DoubleArray(Content.Model.ModelWeights.ToArray()); 68 73 array.Resizable = false; 69 array.ElementNames = Content. Model.Models.Select(m => m.Name);74 array.ElementNames = Content.RegressionSolutions.Select(s => s.Name); 70 75 71 76 RegisterArrayEvents(array); … … 94 99 array[i] = modelWeights[i]; 95 100 96 array.ElementNames = Content. Model.Models.Select(m => m.Name);101 array.ElementNames = Content.RegressionSolutions.Select(s => s.Name); 97 102 averageEstimatesCheckBox.Checked = Content.Model.AverageModelEstimates; 98 103 } … … 108 113 109 114 private void averageEstimatesCheckBox_CheckedChanged(object sender, EventArgs e) { 115 if (Content == null) return; 110 116 Content.Model.AverageModelEstimates = averageEstimatesCheckBox.Checked; 111 117 }
Note: See TracChangeset
for help on using the changeset viewer.