Changeset 9904 for branches/StatisticalTesting/HeuristicLab.Analysis.Statistics/3.3

Timestamp:

08/23/13 10:33:11 (11 years ago)

Author:

ascheibe

Message:

#2031 updated chart analysis view to work with new progress handling

File:

• branches/StatisticalTesting/HeuristicLab.Analysis.Statistics/3.3/ChartAnalysisView.cs (modified) (5 diffs)

branches/StatisticalTesting/HeuristicLab.Analysis.Statistics/3.3/ChartAnalysisView.cs

@@ -48 +48 @@
 
     private List<IRun> runs;
-    private Progress progress;
-    private ProgressView progressView;
+    private IProgress progress;
     private bool valuesAdded = false;
 
     public ChartAnalysisView() {
       InitializeComponent();
-      progress = new Progress() {
-        CanBeCanceled = false,
-        ProgressState = ProgressState.Finished
-      };
-      progressView = new ProgressView(this, progress);
 
       stringConvertibleMatrixView.DataGridView.RowHeaderMouseDoubleClick += new DataGridViewCellMouseEventHandler(DataGridView_RowHeaderMouseDoubleClick);
@@ -78 +72 @@
         components.Dispose();
       }
-      if (disposing)
-        progressView.Dispose();
+
       base.Dispose(disposing);
     }
@@ -153 +146 @@
 
     private void addLineToChart_Click(object sender, EventArgs e) {
-      progress.Status = "Adding fitted lines to charts...";
-      progress.ProgressState = ProgressState.Started;
-      progress.ProgressValue = 0.0;
+      MainFormManager.GetMainForm<HeuristicLab.MainForm.WindowsForms.MainForm>().AddOperationProgressToView(this, "Adding fitted lines to charts...");
 
       var task = System.Threading.Tasks.Task.Factory.StartNew(AddLineToChart);
 
       task.ContinueWith((t) => {
-        progress.Finish();
+        MainFormManager.GetMainForm<HeuristicLab.MainForm.WindowsForms.MainForm>().RemoveOperationProgressFromView(this);
         ErrorHandling.ShowErrorDialog("An error occured while adding lines to charts. ", t.Exception);
       }, TaskContinuationOptions.OnlyOnFaulted);
 
       task.ContinueWith((t) => {
-        progress.Finish();
+        MainFormManager.GetMainForm<HeuristicLab.MainForm.WindowsForms.MainForm>().RemoveOperationProgressFromView(this);
       }, TaskContinuationOptions.OnlyOnRanToCompletion);
     }
@@ -235 +226 @@
 
     private void RebuildDataTableAsync() {
-      progress.Status = "Calculating values...";
-      progress.ProgressState = ProgressState.Started;
-      progress.ProgressValue = 0.0;
-
-      var task = System.Threading.Tasks.Task.Factory.StartNew(RebuildDataTable);
+      progress = MainFormManager.GetMainForm<HeuristicLab.MainForm.WindowsForms.MainForm>().AddOperationProgressToView(this, "Calculating values...");
+
+      var task = Task.Factory.StartNew(RebuildDataTable);
 
       task.ContinueWith((t) => {
-        progress.Finish();
+        MainFormManager.GetMainForm<HeuristicLab.MainForm.WindowsForms.MainForm>().RemoveOperationProgressFromView(this);
         ErrorHandling.ShowErrorDialog("An error occured while calculating values. ", t.Exception);
       }, TaskContinuationOptions.OnlyOnFaulted);
 
       task.ContinueWith((t) => {
-        progress.Finish();
+        MainFormManager.GetMainForm<HeuristicLab.MainForm.WindowsForms.MainForm>().RemoveOperationProgressFromView(this);
       }, TaskContinuationOptions.OnlyOnRanToCompletion);
     }
@@ -307 +296 @@
 
         i++;
+        progress.ProgressValue = runs.Count / i;
       }
       stringConvertibleMatrixView.Content = dt;