Changeset 16447

Timestamp:

12/22/18 21:51:08 (6 years ago)

Author:

jkarder

Message:

#2845: adapted BioBoost addon

Location:

addons/HeuristicLab.Problems.BioBoost/HeuristicLab.Problems.BioBoost.Views/3.3

Files:

• BioBoostCompoundSolutionEditor.cs (modified) (2 diffs)
• MenuItems/CreateBioBoostExperimentMenuItem.cs (modified) (2 diffs)
• MenuItems/ExportSolutionMenuItem.cs (modified) (2 diffs)

addons/HeuristicLab.Problems.BioBoost/HeuristicLab.Problems.BioBoost.Views/3.3/BioBoostCompoundSolutionEditor.cs

@@ -583 +583 @@
     private void optimizeTransportsButton_Click(object sender, EventArgs e) {
       using (BackgroundWorker bg = new BackgroundWorker()) {
-        MainFormManager.GetMainForm<MainForm.WindowsForms.MainForm>().AddOperationProgressToView(this, "Optimizing Transports...");
+        Progress.Show(this, "Optimizing Transports...", ProgressMode.Indeterminate);
         bg.DoWork += (o, a) => OptimizeTransports();
-        bg.RunWorkerCompleted += (o, a) => MainFormManager.GetMainForm<MainForm.WindowsForms.MainForm>().RemoveOperationProgressFromView(this);
+        bg.RunWorkerCompleted += (o, a) => Progress.Hide(this);
         bg.RunWorkerAsync();
       }
@@ -592 +592 @@
     private void optimizeUtilizationsButton_Click(object sender, EventArgs e) {
       using (BackgroundWorker bg = new BackgroundWorker()) {
-        MainFormManager.GetMainForm<MainForm.WindowsForms.MainForm>().AddOperationProgressToView(this, "Optimizing Utilizations...");
+        Progress.Show(this, "Optimizing Utilizations...", ProgressMode.Indeterminate);
         bg.DoWork += (o, a) => OptimizeUtilizations();
-        bg.RunWorkerCompleted += (o, a) => MainFormManager.GetMainForm<MainForm.WindowsForms.MainForm>().RemoveOperationProgressFromView(this);
+        bg.RunWorkerCompleted += (o, a) => Progress.Hide(this);
         bg.RunWorkerAsync();
       }

addons/HeuristicLab.Problems.BioBoost/HeuristicLab.Problems.BioBoost.Views/3.3/MenuItems/CreateBioBoostExperimentMenuItem.cs

@@ -79 +79 @@
     public override void Execute() {
       IContentView activeView = (IContentView)MainFormManager.MainForm.ActiveView;
-      var mainForm = ((MainForm.WindowsForms.MainForm) MainFormManager.MainForm);
-      var progress = mainForm.AddOperationProgressToContent(activeView.Content, "Generating Algorithm Configurations");
+      var progress = Progress.Show(activeView.Content, "Generating Algorithm Configurations");
       int n = nValues(typeof (Pathway))*nValues(typeof (Region))*nValues(typeof (Price))* nValues(typeof (Implementation));
       int count = 0;
-      progress.Start();
       progress.ProgressValue = 1.0*count/n;
       var alg = activeView.Content as IAlgorithm;
@@ -119 +117 @@
           dialog.ShowDialog();
         }
-        mainForm.RemoveOperationProgressFromContent(activeView.Content);
+        Progress.Hide(activeView.Content);
       }, null);
 

addons/HeuristicLab.Problems.BioBoost/HeuristicLab.Problems.BioBoost.Views/3.3/MenuItems/ExportSolutionMenuItem.cs

@@ -86 +86 @@
         var folderName = folderBrowserDialog.SelectedPath;
         IContentView activeView = (IContentView)MainFormManager.MainForm.ActiveView;
-        var mainForm = (MainForm.WindowsForms.MainForm)MainFormManager.MainForm;
-        mainForm.AddOperationProgressToContent(activeView.Content, "Export solutions.");
+        Progress.Show(activeView.Content, "Export solutions.", ProgressMode.Indeterminate);
 
         Action<IContentView> action = (view) => {
@@ -119 +118 @@
             dialog.ShowDialog();
           }
-          mainForm.RemoveOperationProgressFromContent(activeView.Content);
+          Progress.Hide(activeView.Content);
         }, null);
       }