Changeset 17062 for stable/HeuristicLab.Problems.DataAnalysis.Views
- Timestamp:
- 07/04/19 14:45:47 (5 years ago)
- Location:
- stable
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
stable
- Property svn:mergeinfo changed
-
stable/HeuristicLab.Problems.DataAnalysis.Views
- Property svn:mergeinfo changed
/trunk/HeuristicLab.Problems.DataAnalysis.Views merged: 16356,16389,16430 /trunk/sources/HeuristicLab.Problems.DataAnalysis.Views merged: 15581,15583,15589
- Property svn:mergeinfo changed
-
stable/HeuristicLab.Problems.DataAnalysis.Views/3.4/Classification/ClassificationSolutionVariableImpactsView.cs
r16438 r17062 120 120 121 121 //Prepare arguments 122 var mainForm = (MainForm.WindowsForms.MainForm)MainFormManager.MainForm;123 122 var replMethod = (ClassificationSolutionVariableImpactsCalculator.ReplacementMethodEnum)replacementComboBox.Items[replacementComboBox.SelectedIndex]; 124 123 var factorReplMethod = (ClassificationSolutionVariableImpactsCalculator.FactorReplacementMethodEnum)factorVarReplComboBox.Items[factorVarReplComboBox.SelectedIndex]; … … 126 125 127 126 variableImpactsArrayView.Caption = Content.Name + " Variable Impacts"; 128 progress = mainForm.AddOperationProgressToView(this, "Calculating variable impacts for " + Content.Name); 129 progress.ProgressValue = 0; 130 127 progress = Progress.Show(this, "Calculating variable impacts for " + Content.Name); 131 128 cancellationToken = new CancellationTokenSource(); 132 129 … … 146 143 rawVariableImpacts.AddRange(impacts); 147 144 UpdateOrdering(); 148 } 149 finally { 150 ((MainForm.WindowsForms.MainForm)MainFormManager.MainForm).RemoveOperationProgressFromView(this); 145 } finally { 146 Progress.Hide(this); 151 147 } 152 148 } … … 175 171 if (cancellationToken.Token.IsCancellationRequested) { return null; } 176 172 progress.ProgressValue = (double)++i / count; 177 progress. Status= string.Format("Calculating impact for variable {0} ({1} of {2})", variableName, i, count);173 progress.Message = string.Format("Calculating impact for variable {0} ({1} of {2})", variableName, i, count); 178 174 179 175 double impact = 0; -
stable/HeuristicLab.Problems.DataAnalysis.Views/3.4/MenuItems/ShrinkDataAnalysisRunsMenuItem.cs
r15584 r17062 72 72 public override void Execute() { 73 73 IContentView activeView = (IContentView)MainFormManager.MainForm.ActiveView; 74 var mainForm = (MainForm.WindowsForms.MainForm)MainFormManager.MainForm;75 mainForm.AddOperationProgressToContent(activeView.Content, "Removing duplicate datasets.");74 var content = activeView.Content; 75 Progress.Show(content, "Removing duplicate datasets.", ProgressMode.Indeterminate); 76 76 77 77 Action<IContentView> action = (view) => DatasetUtil.RemoveDuplicateDatasets(view.Content); … … 79 79 action.BeginInvoke(activeView, delegate (IAsyncResult result) { 80 80 action.EndInvoke(result); 81 mainForm.RemoveOperationProgressFromContent(activeView.Content);81 Progress.Hide(content); 82 82 }, null); 83 83 } -
stable/HeuristicLab.Problems.DataAnalysis.Views/3.4/Regression/RegressionSolutionVariableImpactsView.cs
r16438 r17062 111 111 112 112 private async void UpdateVariableImpact() { 113 IProgress progress;114 115 113 //Check if the selection is valid 116 114 if (Content == null) { return; } … … 120 118 121 119 //Prepare arguments 122 var mainForm = (MainForm.WindowsForms.MainForm)MainFormManager.MainForm;123 120 var replMethod = (RegressionSolutionVariableImpactsCalculator.ReplacementMethodEnum)replacementComboBox.Items[replacementComboBox.SelectedIndex]; 124 121 var factorReplMethod = (RegressionSolutionVariableImpactsCalculator.FactorReplacementMethodEnum)factorVarReplComboBox.Items[factorVarReplComboBox.SelectedIndex]; … … 126 123 127 124 variableImpactsArrayView.Caption = Content.Name + " Variable Impacts"; 128 progress = mainForm.AddOperationProgressToView(this, "Calculating variable impacts for " + Content.Name); 129 progress.ProgressValue = 0; 130 125 var progress = Progress.Show(this, "Calculating variable impacts for " + Content.Name); 131 126 cancellationToken = new CancellationTokenSource(); 132 127 … … 148 143 } 149 144 finally { 150 ((MainForm.WindowsForms.MainForm)MainFormManager.MainForm).RemoveOperationProgressFromView(this);145 Progress.Hide(this); 151 146 } 152 147 } … … 175 170 if (cancellationToken.Token.IsCancellationRequested) { return null; } 176 171 progress.ProgressValue = (double)++i / count; 177 progress. Status= string.Format("Calculating impact for variable {0} ({1} of {2})", variableName, i, count);172 progress.Message = string.Format("Calculating impact for variable {0} ({1} of {2})", variableName, i, count); 178 173 179 174 double impact = 0;
Note: See TracChangeset
for help on using the changeset viewer.