Changeset 2868 for trunk/sources/HeuristicLab.ExtLibs/HeuristicLab.Netron/3.0.2672.12446/Netron.Diagramming.Core-3.0.2672.12446/Core/ControllerBase.cs

Timestamp:

02/25/10 17:28:31 (14 years ago)

Author:

mkommend

Message:

finished mapping from OperatorGraph to GraphVisualizationInfo (ticket #867)

File:

• trunk/sources/HeuristicLab.ExtLibs/HeuristicLab.Netron/3.0.2672.12446/Netron.Diagramming.Core-3.0.2672.12446/Core/ControllerBase.cs (modified) (8 diffs)

trunk/sources/HeuristicLab.ExtLibs/HeuristicLab.Netron/3.0.2672.12446/Netron.Diagramming.Core-3.0.2672.12446/Core/ControllerBase.cs

@@ -310 +310 @@
            
 
-            //Make sure the static selection class knows about the model
-            Selection.Controller = this;
             //Initialize the colorscheme
             ArtPalette.Init();
@@ -527 +525 @@
             FillStyleCommand cmd = new FillStyleCommand(
                 this, 
-                Selection.SelectedItems.Copy(), 
+                this.Model.Selection.SelectedItems.Copy(), 
                 paintStyle);            
 
@@ -544 +542 @@
             PenStyleCommand cmd = new PenStyleCommand(
                 this, 
-                Selection.SelectedItems.Copy(), 
+                this.Model.Selection.SelectedItems.Copy(), 
                 penStyle);
 
@@ -1275 +1273 @@
             }
 
-            foreach (IDiagramEntity entity in Selection.SelectedItems)
+            foreach (IDiagramEntity entity in this.Model.Selection.SelectedItems)
             {
                 if (entity is IKeyboardListener)
@@ -1292 +1290 @@
             }
 
-            foreach (IDiagramEntity entity in Selection.SelectedItems)
+            foreach (IDiagramEntity entity in  this.Model.Selection.SelectedItems)
             {
                 if (entity is IKeyboardListener)
@@ -1308 +1306 @@
             }
 
-            foreach (IDiagramEntity entity in Selection.SelectedItems)
+             foreach (IDiagramEntity entity in this.Model.Selection.SelectedItems)
             {
                 if (entity is IKeyboardListener)
@@ -1378 +1376 @@
             //raise the event to give the host the opportunity to show the properties of the selected item(s)
             //Note that if the selection is empty the property grid will show 'nothing'.
-            RaiseOnShowSelectionProperties(new SelectionEventArgs(Selection.SelectedItems.ToArray()));
+            RaiseOnShowSelectionProperties(new SelectionEventArgs(this.Model.Selection.SelectedItems.ToArray()));
 
             foreach(IMouseListener listener in mouseListeners)
@@ -1483 +1481 @@
         {
             this.View.ResetTracker();
-            Selection.Clear();
-            Selection.SelectedItems = this.Model.CurrentPage.Entities;
+            this.Model.Selection.Clear();
+            this.Model.Selection.SelectedItems = this.Model.CurrentPage.Entities;
             this.View.ShowTracker();
             this.View.Invalidate();