Changeset 3177

Timestamp:

03/22/10 16:43:57 (14 years ago)

Author:

swagner

Message:

Moved extension methods of Control from HeuristicLab.Core.Views to HeuristicLab.MainForm.WindowsForms and suspended/resumed repainting in some controls to improve UI response times (#887).

Location:

trunk/sources

Files:

• HeuristicLab.Core.Views/3.3/HeuristicLab.Core.Views-3.3.csproj (modified) (1 diff)
• HeuristicLab.Core.Views/3.3/ViewHost.cs (modified) (2 diffs)
• HeuristicLab.MainForm.WindowsForms/3.2/ControlExtensions.cs (moved) (moved from trunk/sources/HeuristicLab.Core.Views/3.3/ControlExtensions.cs) (1 diff)
• HeuristicLab.MainForm.WindowsForms/3.2/HeuristicLab.MainForm.WindowsForms-3.2.csproj (modified) (1 diff)
• HeuristicLab.MainForm.WindowsForms/3.2/View.cs (modified) (2 diffs)
• HeuristicLab.Optimization.Views/3.3/AlgorithmView.cs (modified) (8 diffs)
• HeuristicLab.Optimization.Views/3.3/UserDefinedAlgorithmView.cs (modified) (4 diffs)
• HeuristicLab.Optimizer/3.3/FileManager.cs (modified) (2 diffs)

trunk/sources/HeuristicLab.Core.Views/3.3/HeuristicLab.Core.Views-3.3.csproj

@@ -87 +87 @@
   <ItemGroup>
     <None Include="HeuristicLabCoreViewsPlugin.cs.frame" />
-    <Compile Include="ControlExtensions.cs" />
     <Compile Include="VariableValueView.cs">
       <SubType>UserControl</SubType>

trunk/sources/HeuristicLab.Core.Views/3.3/ViewHost.cs

@@ -26 +26 @@
 using HeuristicLab.Common;
 using HeuristicLab.MainForm;
+using HeuristicLab.MainForm.WindowsForms;
 
 namespace HeuristicLab.Core.Views {
@@ -53 +54 @@
           Initialize();
         }
+      }
+    }
+
+    public new bool Enabled {
+      get { return base.Enabled; }
+      set {
+        this.SuspendRepaint();
+        base.Enabled = value;
+        this.ResumeRepaint(true);
       }
     }

trunk/sources/HeuristicLab.MainForm.WindowsForms/3.2/ControlExtensions.cs

@@ -21 +21 @@
 
 using System;
+using System.Runtime.InteropServices;
 using System.Windows.Forms;
-using System.Runtime.InteropServices;
 
-namespace HeuristicLab.Core.Views {
+namespace HeuristicLab.MainForm.WindowsForms {
   public static class ControlExtensions {
     [DllImport("user32.dll")]

trunk/sources/HeuristicLab.MainForm.WindowsForms/3.2/HeuristicLab.MainForm.WindowsForms-3.2.csproj

@@ -93 +93 @@
     </Compile>
     <None Include="HeuristicLabMainFormWindowsFormsPlugin.cs.frame" />
+    <Compile Include="ControlExtensions.cs" />
     <Compile Include="DockForm.cs">
       <SubType>Form</SubType>

trunk/sources/HeuristicLab.MainForm.WindowsForms/3.2/View.cs

@@ -21 +21 @@
 
 using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Drawing;
-using System.Data;
-using System.Text;
-using System.Xml;
 using System.Windows.Forms;
 
@@ -161 +155 @@
     protected virtual void OnInitialized(EventArgs e) {
     }
+
+    public new bool Enabled {
+      get { return base.Enabled; }
+      set {
+        SuspendRepaint();
+        base.Enabled = value;
+        ResumeRepaint(true);
+      }
+    }
+
+    public void SuspendRepaint() {
+      ((Control)this).SuspendRepaint();
+    }
+    public void ResumeRepaint(bool refresh) {
+      ((Control)this).ResumeRepaint(refresh);
+    }
   }
 }

trunk/sources/HeuristicLab.Optimization.Views/3.3/AlgorithmView.cs

@@ -146 +146 @@
         Invoke(new EventHandler(Content_Started), sender, e);
       else {
-        this.SuspendRepaint();
         SaveEnabled = false;
         parameterCollectionView.Enabled = false;
@@ -156 +155 @@
         resetButton.Enabled = false;
         UpdateExecutionTimeTextBox();
-        this.ResumeRepaint(true);
       }
     }
@@ -163 +161 @@
         Invoke(new EventHandler(Content_Stopped), sender, e);
       else {
-        this.SuspendRepaint();
         SaveEnabled = true;
         parameterCollectionView.Enabled = true;
@@ -173 +170 @@
         resetButton.Enabled = true;
         UpdateExecutionTimeTextBox();
-        this.ResumeRepaint(true);
       }
     }
@@ -207 +203 @@
         this.Cursor = Cursors.AppStarting;
         newProblemButton.Enabled = openProblemButton.Enabled = saveProblemButton.Enabled = false;
+        problemViewHost.Enabled = false;
 
         var call = new Func<string, object>(XmlParser.Deserialize);
@@ -223 +220 @@
             else
               Content.Problem = problem;
+            problemViewHost.Enabled = true;
             newProblemButton.Enabled = openProblemButton.Enabled = saveProblemButton.Enabled = true;
             this.Cursor = Cursors.Default;
@@ -234 +232 @@
         this.Cursor = Cursors.AppStarting;
         newProblemButton.Enabled = openProblemButton.Enabled = saveProblemButton.Enabled = false;
+        problemViewHost.Enabled = false;
 
         var call = new Action<IProblem, string, int>(XmlGenerator.Serialize);
@@ -246 +245 @@
           }
           Invoke(new Action(delegate() {
+            problemViewHost.Enabled = true;
             newProblemButton.Enabled = openProblemButton.Enabled = saveProblemButton.Enabled = true;
             this.Cursor = Cursors.Default;

trunk/sources/HeuristicLab.Optimization.Views/3.3/UserDefinedAlgorithmView.cs

@@ -112 +112 @@
         this.Cursor = Cursors.AppStarting;
         newOperatorGraphButton.Enabled = openOperatorGraphButton.Enabled = saveOperatorGraphButton.Enabled = false;
+        operatorGraphViewHost.Enabled = false;
 
         var call = new Func<string, object>(XmlParser.Deserialize);
@@ -127 +128 @@
             else
               Content.OperatorGraph = operatorGraph;
+            operatorGraphViewHost.Enabled = true;
             newOperatorGraphButton.Enabled = openOperatorGraphButton.Enabled = saveOperatorGraphButton.Enabled = true;
             this.Cursor = Cursors.Default;
@@ -138 +140 @@
         this.Cursor = Cursors.AppStarting;
         newOperatorGraphButton.Enabled = openOperatorGraphButton.Enabled = saveOperatorGraphButton.Enabled = false;
+        operatorGraphViewHost.Enabled = false;
 
         var call = new Action<OperatorGraph, string, int>(XmlGenerator.Serialize);
@@ -150 +153 @@
           }
           Invoke(new Action(delegate() {
+            operatorGraphViewHost.Enabled = true;
             newOperatorGraphButton.Enabled = openOperatorGraphButton.Enabled = saveOperatorGraphButton.Enabled = true;
             this.Cursor = Cursors.Default;

trunk/sources/HeuristicLab.Optimizer/3.3/FileManager.cs

@@ -28 +28 @@
 using HeuristicLab.Core.Views;
 using HeuristicLab.MainForm;
+using HeuristicLab.MainForm.WindowsForms;
 using HeuristicLab.Persistence.Default.Xml;
 
@@ -241 +242 @@
     private static void DisableView(IView view) {
       Invoke(delegate() {
-        ((UserControl)view).Enabled = false;
+        ((Control)view).SuspendRepaint();
+        ((Control)view).Enabled = false;
+        ((Control)view).ResumeRepaint(true);
       });
     }
     private static void EnableView(IView view) {
       Invoke(delegate() {
-        ((UserControl)view).Enabled = true;
+        ((Control)view).SuspendRepaint();
+        ((Control)view).Enabled = true;
+        ((Control)view).ResumeRepaint(true);
       });
     }