Changeset 15400 for trunk/sources/HeuristicLab.MainForm.WindowsForms

Timestamp:

10/04/17 13:55:43 (7 years ago)

Author:

pfleck

Message:

#1666:

• Reverted r15371 for HeuristicLab.MainForm and HeuristicLab.MainForm.WindowsForms (all changes concerning the progress)
• Changed the signature of OptimizeConstants in the simplifiers to "tree in - tree out" (thanks to bburlacu)

Location:

trunk/sources/HeuristicLab.MainForm.WindowsForms

Files:

• . (modified) (1 prop)
• 3.3/Controls/ProgressView.cs (modified) (1 diff)
• 3.3/MainForms/MainForm.cs (modified) (4 diffs)

trunk/sources/HeuristicLab.MainForm.WindowsForms/3.3/Controls/ProgressView.cs

@@ -154 +154 @@
         if (content != null) {
           double progressValue = content.ProgressValue;
-          if (progressValue < 0.0 || progressValue > 1.0) {
+          if (progressValue <= 0.0 || progressValue > 1.0) {
             progressBar.Style = ProgressBarStyle.Marquee;
           } else {

trunk/sources/HeuristicLab.MainForm.WindowsForms/3.3/MainForms/MainForm.cs

@@ -230 +230 @@
     }
 
-    public IContentView ShowContent<T>(T content, bool reuseExistingView, IEqualityComparer<T> comparer = null) where T : class, IContent {
+    public IContentView ShowContent<T>(T content, bool reuseExistingView, IEqualityComparer<T> comparer = null) where T : class,IContent {
       if (content == null) throw new ArgumentNullException("Content cannot be null.");
       if (!reuseExistingView) return ShowContent(content);
@@ -353 +353 @@
     /// Adds a <see cref="ProgressView"/> to the <see cref="ContentView"/>s showing the specified content.
     /// </summary>
-    public IProgress AddOperationProgressToContent(IContent content, string progressMessage, double progressValue = -1, bool addToObjectGraphObjects = true) {
+    public IProgress AddOperationProgressToContent(IContent content, string progressMessage, bool addToObjectGraphObjects = true) {
       if (InvokeRequired) {
-        IProgress result = (IProgress)Invoke((Func<IContent, string, double, bool, IProgress>)AddOperationProgressToContent, content, progressMessage, progressValue, addToObjectGraphObjects);
+        IProgress result = (IProgress)Invoke((Func<IContent, string, bool, IProgress>)AddOperationProgressToContent, content, progressMessage, addToObjectGraphObjects);
         return result;
       }
@@ -371 +371 @@
         contentViews = contentViews.Where(v => v.Content == content);
 
-      var progress = new Progress();
-      progress.Start(progressMessage, progressValue);
+      var progress = new Progress(progressMessage, ProgressState.Started);
       foreach (var contentView in contentViews) {
         progressViews.Add(new ProgressView(contentView, progress));
@@ -385 +384 @@
     /// </summary>
     public IProgress AddOperationProgressToView(Control control, string progressMessage) {
-      var progress = new Progress();
-      progress.Start(progressMessage);
+      var progress = new Progress(progressMessage, ProgressState.Started);
       AddOperationProgressToView(control, progress);
       return progress;