Changeset 15417 for branches/EnhancedProgress

Timestamp:

10/11/17 10:00:34 (7 years ago)

Author:

pfleck

Message:

#2845 Removed Visible property and hide on "Finished".

Location:

branches/EnhancedProgress

Files:

• HeuristicLab.MainForm.WindowsForms/3.3/Controls/ProgressView.cs (modified) (5 diffs)
• HeuristicLab.MainForm.WindowsForms/3.3/Controls/ProgressView.designer.cs (modified) (1 diff)
• HeuristicLab.MainForm/3.3/Interfaces/IProgress.cs (modified) (3 diffs)
• HeuristicLab.MainForm/3.3/Progress.cs (modified) (6 diffs)
• HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/InteractiveSymbolicDataAnalysisSolutionSimplifierView.cs (modified) (4 diffs)

branches/EnhancedProgress/HeuristicLab.MainForm.WindowsForms/3.3/Controls/ProgressView.cs

@@ -48 +48 @@
       this.content = content;
 
-      UpdateButtonsState();
-      if (content.Visible) ShowProgress();
+      if (content.ProgressState != ProgressState.Finished)
+        ShowProgress();
       RegisterContentEvents();
     }
 
-    /// <summary> 
-    /// Clean up any resources being used.
-    /// </summary>
-    /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
     protected override void Dispose(bool disposing) {
       DeregisterContentEvents();
@@ -72 +68 @@
       content.ProgressBarModeChanged += new EventHandler(Content_ProgressBarModeChanged);
       content.ProgressValueChanged += new EventHandler(Content_ProgressValueChanged);
-      content.VisibleChanged += new EventHandler(Content_VisibleChanged);
       content.CanBeStoppedChanged += new EventHandler(Content_CanBeStoppedChanged);
       content.CanBeCanceledChanged += new EventHandler(Content_CanBeCanceledChanged);
@@ -81 +76 @@
       content.ProgressBarModeChanged -= new EventHandler(Content_ProgressBarModeChanged);
       content.ProgressValueChanged -= new EventHandler(Content_ProgressValueChanged);
-      content.VisibleChanged -= new EventHandler(Content_VisibleChanged);
       content.CanBeStoppedChanged -= new EventHandler(Content_CanBeStoppedChanged);
       content.CanBeCanceledChanged -= new EventHandler(Content_CanBeCanceledChanged);
@@ -102 +96 @@
     }
 
-    private void Content_VisibleChanged(object sender, EventArgs e) {
-      if (content.Visible)
+    private void Content_CanBeStoppedChanged(object sender, EventArgs e) {
+      UpdateButtonsState();
+    }
+    private void Content_CanBeCanceledChanged(object sender, EventArgs e) {
+      UpdateButtonsState();
+    }
+
+    private void ShowProgress() {
+      if (control.InvokeRequired) {
+        control.Invoke((Action)ShowProgress);
+        return;
+      }
+      if (Parent != null) return;
+
+      int height = (content.CanBeStopped || content.CanBeCanceled) ? Height : collapsedControlHeight;
+      Left = (control.ClientRectangle.Width / 2) - (Width / 2);
+      Top = (control.ClientRectangle.Height / 2) - (height / 2);
+      Anchor = AnchorStyles.None;
+
+      UpdateProgressMessage();
+      UpdateProgressValue();
+      UpdateButtonsState();
+
+      control.Enabled = false;
+      Parent = control.Parent;
+      BringToFront();
+      Visible = true;
+    }
+
+    private void HideProgress() {
+      if (control.InvokeRequired) {
+        control.Invoke((Action)HideProgress);
+        return;
+      }
+      if (Parent == null) return;
+
+      Visible = false;
+      control.Enabled = true;
+      Parent = null;
+    }
+
+    private void UpdateProgressState() {
+      if (control.InvokeRequired) {
+        control.Invoke((Action)UpdateProgressState);
+        return;
+      }
+
+      if (content.ProgressState != ProgressState.Finished)
         ShowProgress();
       else
         HideProgress();
-    }
-
-    private void Content_CanBeStoppedChanged(object sender, EventArgs e) {
-      UpdateButtonsState();
-    }
-    private void Content_CanBeCanceledChanged(object sender, EventArgs e) {
-      UpdateButtonsState();
-    }
-
-    private void ShowProgress() {
-      if (control.InvokeRequired) {
-        control.Invoke((Action)ShowProgress);
-        return;
-      }
-
-      int height = (content.CanBeStopped || content.CanBeCanceled) ? Height : collapsedControlHeight;
-
-      Left = (control.ClientRectangle.Width / 2) - (Width / 2);
-      Top = (control.ClientRectangle.Height / 2) - (height / 2);
-      Anchor = AnchorStyles.None;
-
-      control.Enabled = false;
-      Parent = control.Parent;
-      BringToFront();
-
-      UpdateProgressValue();
-      UpdateProgressMessage();
-      UpdateButtonsState();
-      Visible = true;
-    }
-
-    private void HideProgress() {
-      if (control.InvokeRequired) {
-        control.Invoke((Action)HideProgress);
-        return;
-      }
-
-      control.Enabled = true;
-      Parent = null;
-      Visible = false;
-    }
-
-    private void UpdateProgressState() {
-      if (control.InvokeRequired) {
-        control.Invoke((Action)UpdateProgressState);
-        return;
-      }
 
       switch (content.ProgressState) {
         case ProgressState.Started:
+        case ProgressState.Finished:
           progressBar.SetState(ProgressBarState.Normal);
           break;
-        case ProgressState.Finished:
-          HideProgress();
-          progressBar.SetState(ProgressBarState.Normal);
-          break;
-        case ProgressState.Stopped:
+        case ProgressState.StopRequested:
           progressBar.SetState(ProgressBarState.Warning);
           break;
-        case ProgressState.Canceled:
+        case ProgressState.CancelRequested:
           progressBar.SetState(ProgressBarState.Error);
           break;
@@ -211 +201 @@
 
       stopButton.Visible = content.CanBeStopped;
-      stopButton.Enabled = content.ProgressState == ProgressState.Started && content.CanBeStopped;
+      stopButton.Enabled = content.CanBeStopped && content.ProgressState == ProgressState.Started;
 
       cancelButton.Visible = content.CanBeCanceled;
-      cancelButton.Enabled = content.ProgressState == ProgressState.Started && content.CanBeCanceled;
+      cancelButton.Enabled = content.CanBeCanceled && content.ProgressState == ProgressState.Started;
 
       if (content.CanBeStopped || content.CanBeCanceled) {

branches/EnhancedProgress/HeuristicLab.MainForm.WindowsForms/3.3/Controls/ProgressView.designer.cs

@@ -103 +103 @@
       // stopButton
       // 
-      this.stopButton.Dock = System.Windows.Forms.DockStyle.Left;
       this.stopButton.Location = new System.Drawing.Point(193, 3);
       this.stopButton.Name = "stopButton";

branches/EnhancedProgress/HeuristicLab.MainForm/3.3/Interfaces/IProgress.cs

@@ -24 +24 @@
 
 namespace HeuristicLab.MainForm {
-  public enum ProgressState { Started, Finished, Stopped, Canceled }
+  public enum ProgressState { Started, Finished, StopRequested, CancelRequested }
   public enum ProgressBarMode { Continuous, Marquee }
 
@@ -36 +36 @@
     /// </summary>
     double ProgressValue { get; set; }
-    bool Visible { get; set; }
     bool CanBeStopped { get; }
     bool CanBeCanceled { get; }
@@ -56 +55 @@
     event EventHandler ProgressBarModeChanged;
     event EventHandler ProgressValueChanged;
-    event EventHandler VisibleChanged;
     event EventHandler CanBeStoppedChanged;
     event EventHandler CanBeCanceledChanged;

branches/EnhancedProgress/HeuristicLab.MainForm/3.3/Progress.cs

@@ -70 +70 @@
     }
 
-    private bool visible;
-    public bool Visible {
-      get { return visible; }
-      set {
-        if (visible != value) {
-          visible = value;
-          OnVisibleChanged();
-        }
-      }
-    }
-
     private bool canBeStopped;
     public bool CanBeStopped {
@@ -115 +104 @@
       ProgressBarMode = ProgressBarMode.Marquee;
       Message = message;
-      Visible = true;
     }
     public void Start(string message, double progressValue) {
@@ -122 +110 @@
       ProgressValue = progressValue;
       Message = message;
-      Visible = true;
     }
 
@@ -129 +116 @@
         ProgressValue = 1.0;
       ProgressState = ProgressState.Finished;
-      Visible = false;
     }
 
     public void Stop() {
       if (canBeStopped) {
-        ProgressState = ProgressState.Stopped;
+        ProgressState = ProgressState.StopRequested;
         OnStopRequested();
       } else throw new NotSupportedException("This progress cannot be stopped.");
@@ -140 +126 @@
     public void Cancel() {
       if (canBeCanceled) {
-        ProgressState = ProgressState.Canceled;
+        ProgressState = ProgressState.CancelRequested;
         OnCancelRequested();
       } else throw new NotSupportedException("This progress cannot be canceled.");
@@ -170 +156 @@
     }
 
-    public event EventHandler VisibleChanged;
-    private void OnVisibleChanged() {
-      var handler = VisibleChanged;
-      if (handler != null) handler(this, EventArgs.Empty);
-    }
-
     public event EventHandler CanBeStoppedChanged;
     private void OnCanBeStoppedChanged() {

branches/EnhancedProgress/HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/InteractiveSymbolicDataAnalysisSolutionSimplifierView.cs

@@ -40 +40 @@
     private readonly ISymbolicDataAnalysisSolutionImpactValuesCalculator impactCalculator;
 
-    private readonly IProgress progress = new Progress() { CanBeCanceled = true, CanBeStopped = true };
+    private readonly Progress progress = new Progress();
 
     private enum TreeState { Valid, Invalid }
@@ -184 +184 @@
 
       progress.Start("Calculate Impact and Replacement Values ...", 0);
+      progress.CanBeStopped = true;
       var impactAndReplacementValues = await Task.Run(() => CalculateImpactAndReplacementValues(tree));
-      await Task.Delay(500); // wait for progressbar to finish animation
+      if (progress.ProgressState != ProgressState.StopRequested)
+        await Task.Delay(500); // wait for progressbar to finish animation
       var replacementValues = impactAndReplacementValues.ToDictionary(x => x.Key, x => x.Value.Item2);
       foreach (var pair in replacementValues.Where(pair => !(pair.Key is ConstantTreeNode))) {
@@ -192 +194 @@
       nodeImpacts = impactAndReplacementValues.ToDictionary(x => x.Key, x => x.Value.Item1);
       progress.Finish();
+      progress.CanBeStopped = false;
       PaintNodeImpacts();
     }
@@ -198 +201 @@
       var impactAndReplacementValues = new Dictionary<ISymbolicExpressionTreeNode, Tuple<double, double>>();
       foreach (var node in tree.Root.GetSubtree(0).GetSubtree(0).IterateNodesPrefix()) {
+        if (progress.ProgressState == ProgressState.StopRequested) continue;
         double impactValue, replacementValue, newQualityForImpactsCalculation;
         impactCalculator.CalculateImpactAndReplacementValues(Content.Model, node, Content.ProblemData, Content.ProblemData.TrainingIndices, out impactValue, out replacementValue, out newQualityForImpactsCalculation);