Changeset 3228 for trunk/sources

Timestamp:

03/28/10 18:05:58 (15 years ago)

Author:

mkommend

Message:

adapted all HL3.3 views to use the AsynchronousContentView (ticket #953)

Location:

trunk/sources

Files:

• HeuristicLab.Core.Views/3.3/ItemArrayView.cs (modified) (1 diff)
• HeuristicLab.Core.Views/3.3/ItemCollectionView.cs (modified) (1 diff)
• HeuristicLab.Core.Views/3.3/ItemListView.cs (modified) (1 diff)
• HeuristicLab.Core.Views/3.3/ItemView.cs (modified) (4 diffs)
• HeuristicLab.Data.Views/3.3/StringConvertibleArrayView.cs (modified) (1 diff)
• HeuristicLab.Data.Views/3.3/StringConvertibleMatrixView.cs (modified) (1 diff)
• HeuristicLab.Data.Views/3.3/StringConvertibleValueView.cs (modified) (1 diff)

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

@@ -35 +35 @@
   [Content(typeof(ItemArray<>), true)]
   [Content(typeof(IObservableArray<>), false)]
-  public partial class ItemArrayView<T> : ContentView where T : class, IItem {
+  public partial class ItemArrayView<T> : AsynchronousContentView where T : class, IItem {
     /// <summary>
     /// Gets or sets the scope whose variables to represent visually.

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

@@ -31 +31 @@
   [Content(typeof(ItemCollection<>), true)]
   [Content(typeof(IObservableCollection<>), false)]
-  public partial class ItemCollectionView<T> : ContentView where T : class, IItem {
+  public partial class ItemCollectionView<T> : AsynchronousContentView where T : class, IItem {
     public new IObservableCollection<T> Content {
       get { return (IObservableCollection<T>)base.Content; }

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

@@ -35 +35 @@
   [Content(typeof(ItemList<>), true)]
   [Content(typeof(IObservableList<>), false)]
-  public partial class ItemListView<T> : ContentView where T : class, IItem {
+  public partial class ItemListView<T> : AsynchronousContentView where T : class, IItem {
     /// <summary>
     /// Gets or sets the scope whose variables to represent visually.

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

@@ -23 +23 @@
 using HeuristicLab.MainForm;
 using HeuristicLab.MainForm.WindowsForms;
+using System.Threading;
 
 namespace HeuristicLab.Core.Views {
@@ -31 +32 @@
   [Content(typeof(Item), false)]
   [Content(typeof(IItem), false)]
-  public partial class ItemView : ContentView {
+  public partial class ItemView : AsynchronousContentView {
     public new IItem Content {
       get { return (IItem)base.Content; }
@@ -64 +65 @@
     protected new void Invoke(Delegate method) {
       // enforce context switch to improve GUI response time
-      System.Threading.Thread.Sleep(0);
-
+      IAsyncResult res = base.BeginInvoke(method);
+      ThreadPool.RegisterWaitForSingleObject(res.AsyncWaitHandle,
+        new WaitOrTimerCallback((x, b) => { EndInvoke(res); }),
+        null, -1, true);
       // prevent blocking of worker thread in Invoke, if the control is disposed
-      IAsyncResult result = BeginInvoke(method);
-      while ((!result.AsyncWaitHandle.WaitOne(100, false)) && (!IsDisposed)) { }
-      if (!IsDisposed) EndInvoke(result);
+      //IAsyncResult result = BeginInvoke(method);
+      //while ((!result.AsyncWaitHandle.WaitOne(100, false)) && (!IsDisposed)) {
+      //  System.Threading.Thread.Sleep(0);
+      //}
+      //if (!IsDisposed) EndInvoke(result);
     }
     /// <summary>
@@ -78 +83 @@
     protected new void Invoke(Delegate method, params object[] args) {
       // enforce context switch to improve GUI response time
-      System.Threading.Thread.Sleep(0);
+      IAsyncResult res = base.BeginInvoke(method, args);
+      ThreadPool.RegisterWaitForSingleObject(res.AsyncWaitHandle,
+        new WaitOrTimerCallback((x, b) => { EndInvoke(res); }),
+        null, -1, true);
+      //base.Invoke(method, args);
+      //System.Threading.Thread.Sleep(0);
 
-      // prevent blocking of worker thread in Invoke, if the control is disposed
-      IAsyncResult result = BeginInvoke(method, args);
-      while ((!result.AsyncWaitHandle.WaitOne(100, false)) && (!IsDisposed)) { }
-      if (!IsDisposed) EndInvoke(result);
+      //// prevent blocking of worker thread in Invoke, if the control is disposed
+      //IAsyncResult result = BeginInvoke(method, args);
+      //while ((!result.AsyncWaitHandle.WaitOne(100, false)) && (!IsDisposed)) { }
+      //if (!IsDisposed) EndInvoke(result);
     }
   }

trunk/sources/HeuristicLab.Data.Views/3.3/StringConvertibleArrayView.cs

@@ -31 +31 @@
   [View("StringConvertibleArray View")]
   [Content(typeof(IStringConvertibleArray), true)]
-  public partial class StringConvertibleArrayView : ContentView {
+  public partial class StringConvertibleArrayView : AsynchronousContentView {
     public new IStringConvertibleArray Content {
       get { return (IStringConvertibleArray)base.Content; }

trunk/sources/HeuristicLab.Data.Views/3.3/StringConvertibleMatrixView.cs

@@ -31 +31 @@
   [View("StringConvertibleMatrix View")]
   [Content(typeof(IStringConvertibleMatrix), true)]
-  public partial class StringConvertibleMatrixView : ContentView {
+  public partial class StringConvertibleMatrixView : AsynchronousContentView {
     public new IStringConvertibleMatrix Content {
       get { return (IStringConvertibleMatrix)base.Content; }

trunk/sources/HeuristicLab.Data.Views/3.3/StringConvertibleValueView.cs

@@ -29 +29 @@
   [View("StringConvertibleValue View")]
   [Content(typeof(IStringConvertibleValue), true)]
-  public partial class StringConvertibleValueView : ContentView {
+  public partial class StringConvertibleValueView : AsynchronousContentView {
     public new IStringConvertibleValue Content {
       get { return (IStringConvertibleValue)base.Content; }