Changeset 15719 for branches/1614_GeneralizedQAP/HeuristicLab.Optimization.Views

Timestamp:

02/04/18 21:31:38 (7 years ago)

Author:

abeham

Message:

#1614:

• branched analysis and analysis views
• merged changes from #2457 into optimization and optimization.views

Location:

branches/1614_GeneralizedQAP/HeuristicLab.Optimization.Views

Files:

• . (modified) (1 prop)
• 3.3/HeuristicLab.Optimization.Views-3.3.csproj (modified) (2 diffs)
• 3.3/RunView.cs (modified) (5 diffs)

branches/1614_GeneralizedQAP/HeuristicLab.Optimization.Views/3.3/HeuristicLab.Optimization.Views-3.3.csproj

@@ -391 +391 @@
       <Private>False</Private>
     </Reference>
-    <Reference Include="HeuristicLab.Analysis.Views-3.3, Version=3.3.0.0">
-      <HintPath>..\..\..\..\trunk\bin\HeuristicLab.Analysis.Views-3.3.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
     <Reference Include="HeuristicLab.Core.Views-3.3, Version=3.3.0.0">
       <HintPath>..\..\..\..\trunk\bin\HeuristicLab.Core.Views-3.3.dll</HintPath>
@@ -427 +423 @@
       <Private>False</Private>
     </Reference>
-    <Reference Include="HeuristicLab.Analysis-3.3, Version=3.3.0.0">
-      <HintPath>..\..\..\..\trunk\bin\HeuristicLab.Analysis-3.3.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\HeuristicLab.Analysis.Views\3.3\HeuristicLab.Analysis.Views-3.3.csproj">
+      <Project>{76945d76-ca61-4147-9dc2-0acdcddf87f9}</Project>
+      <Name>HeuristicLab.Analysis.Views-3.3</Name>
+      <Private>False</Private>
+    </ProjectReference>
+    <ProjectReference Include="..\..\HeuristicLab.Analysis\3.3\HeuristicLab.Analysis-3.3.csproj">
+      <Project>{887425b4-4348-49ed-a457-b7d2c26ddbf9}</Project>
+      <Name>HeuristicLab.Analysis-3.3</Name>
+      <Private>False</Private>
+    </ProjectReference>
     <ProjectReference Include="..\..\HeuristicLab.Optimization\3.3\HeuristicLab.Optimization-3.3.csproj">
       <Project>{14AB8D24-25BC-400C-A846-4627AA945192}</Project>

branches/1614_GeneralizedQAP/HeuristicLab.Optimization.Views/3.3/RunView.cs

@@ -97 +97 @@
 
     private void Content_PropertyChanged(object sender, PropertyChangedEventArgs e) {
+      if (InvokeRequired) {
+        Invoke((Action<object, PropertyChangedEventArgs>)Content_PropertyChanged, sender, e);
+        return;
+      }
       if (e.PropertyName == "Color") {
         if (InvokeRequired) this.Invoke((Action)UpdateColor, null);
@@ -112 +116 @@
 
     private void ParametersOnItemsChanged(object sender, CollectionItemsChangedEventArgs<KeyValuePair<string, IItem>> e) {
+      if (InvokeRequired) {
+        Invoke((Action<object, CollectionItemsChangedEventArgs<KeyValuePair<string, IItem>>>)ParametersOnItemsChanged, sender, e);
+        return;
+      }
       foreach (var item in e.OldItems) {
         listView.Items.Remove(parametersItemToListViewItem[item.Key]);
@@ -124 +132 @@
 
     private void ParametersOnItemsRemoved(object sender, CollectionItemsChangedEventArgs<KeyValuePair<string, IItem>> e) {
+      if (InvokeRequired) {
+        Invoke((Action<object, CollectionItemsChangedEventArgs<KeyValuePair<string, IItem>>>)ParametersOnItemsRemoved, sender, e);
+        return;
+      }
       foreach (var item in e.Items) {
         listView.Items.Remove(parametersItemToListViewItem[item.Key]);
@@ -131 +143 @@
 
     private void ResultsOnItemsChanged(object sender, CollectionItemsChangedEventArgs<KeyValuePair<string, IItem>> e) {
+      if (InvokeRequired) {
+        Invoke((Action<object, CollectionItemsChangedEventArgs<KeyValuePair<string, IItem>>>)ResultsOnItemsChanged, sender, e);
+        return;
+      }
       foreach (var item in e.OldItems) {
         listView.Items.Remove(resultsItemToListViewItem[item.Key]);
@@ -143 +159 @@
 
     private void ResultsOnItemsRemoved(object sender, CollectionItemsChangedEventArgs<KeyValuePair<string, IItem>> e) {
+      if (InvokeRequired) {
+        Invoke((Action<object, CollectionItemsChangedEventArgs<KeyValuePair<string, IItem>>>)ResultsOnItemsRemoved, sender, e);
+        return;
+      }
       foreach (var item in e.Items) {
         listView.Items.Remove(resultsItemToListViewItem[item.Key]);