Changeset 2868 for trunk/sources/HeuristicLab.ExtLibs/HeuristicLab.Netron/3.0.2672.12446/Netron.Diagramming.Core-3.0.2672.12446/Tools/MoveTool.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/Tools/MoveTool.cs (modified) (8 diffs)

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

@@ -79 +79 @@
             if(e.Button == MouseButtons.Left && Enabled && !IsSuspended && !Blocked)
             {
-                if(Selection.SelectedItems.Count > 0)
+              if (this.Controller.Model.Selection.SelectedItems.Count > 0)
                 {
                     initialPoint = e.Location;
@@ -94 +94 @@
                     // does its thing when the mouse is moved.
                     //return true;
-                }
-                else if(Selection.Connector != null && Selection.Connector.Parent is IConnection)
-                {
-                    if(!typeof(IShape).IsInstanceOfType(Selection.Connector.Parent)) //note that there is a separate tool to move shape-connectors!
+              } else if (this.Controller.Model.Selection.Connector != null && this.Controller.Model.Selection.Connector.Parent is IConnection)
+                {
+                if (!typeof(IShape).IsInstanceOfType(this.Controller.Model.Selection.Connector.Parent)) //note that there is a separate tool to move shape-connectors!
                     {
                         initialPoint = e.Location;
@@ -123 +122 @@
             {
                 //can be a connector
-                if(Selection.Connector != null)
-                {
-                    Selection.Connector.MoveBy(new Point(point.X - lastPoint.X, point.Y - lastPoint.Y));
+              if (this.Controller.Model.Selection.Connector != null)
+                {
+                this.Controller.Model.Selection.Connector.MoveBy(new Point(point.X - lastPoint.X, point.Y - lastPoint.Y));
                     #region Do we hit something meaningful?
 
                     if (hoveredConnector != null)
-                        hoveredConnector.Hovered = false;                        
-                    
-                    hoveredConnector = Selection.FindConnectorAt(e.Location);
+                        hoveredConnector.Hovered = false;
+
+                    hoveredConnector = this.Controller.Model.Selection.FindConnectorAt(e.Location);
                     if(hoveredConnector!=null)
                         hoveredConnector.Hovered = true;
-                    if(hoveredConnector != null && hoveredConnector!=Selection.Connector)
+                    if (hoveredConnector != null && hoveredConnector != this.Controller.Model.Selection.Connector)
                     {
                         Controller.View.CurrentCursor = CursorPalette.Grip;
@@ -145 +144 @@
                 else //can be a selection
                 {
-                    foreach(IDiagramEntity entity in Selection.SelectedItems)
+                  foreach (IDiagramEntity entity in this.Controller.Model.Selection.SelectedItems)
                     {
                         if (entity.AllowMove)
@@ -204 +203 @@
                     #region Is the connector attached?
                     //detach only if there is a parent different than a connection; the join of a chained connection is allowed to move
-                    if( Selection.Connector.AttachedTo != null && !typeof(IConnection).IsInstanceOfType(Selection.Connector.AttachedTo))
-                    {
-                        DetachConnectorCommand detach = new DetachConnectorCommand(this.Controller, Selection.Connector.AttachedTo, Selection.Connector);
+                  if (this.Controller.Model.Selection.Connector.AttachedTo != null && !typeof(IConnection).IsInstanceOfType(this.Controller.Model.Selection.Connector.AttachedTo))
+                    {
+                    DetachConnectorCommand detach = new DetachConnectorCommand(this.Controller, this.Controller.Model.Selection.Connector.AttachedTo, this.Controller.Model.Selection.Connector);
                         detach.Redo();
                         package.Commands.Add(detach);
@@ -216 +215 @@
                     //a bundle might look like overkill here but it makes the coding model uniform
                     Bundle bundle = new Bundle(Controller.Model);
-                    bundle.Entities.Add(Selection.Connector);
+                    bundle.Entities.Add(this.Controller.Model.Selection.Connector);
                     MoveCommand move = new MoveCommand(this.Controller, bundle, new Point(lastPoint.X - initialPoint.X, lastPoint.Y - initialPoint.Y));
                     //no Redo() necessary here!
@@ -231 +230 @@
                             //whatever, except itself and any children of the moved connector
                             //since this would entail a child becoming a parent!
-                            if(conn.Hit(e.Location) && conn != Selection.Connector && !Selection.Connector.AttachedConnectors.Contains(conn)) 
+                          if (conn.Hit(e.Location) && conn != this.Controller.Model.Selection.Connector && !this.Controller.Model.Selection.Connector.AttachedConnectors.Contains(conn)) 
                                 return true;
                             return false;
                         };
                     //find it!
-                    IConnector parentConnector = Selection.FindConnector(predicate);
+                    IConnector parentConnector = this.Controller.Model.Selection.FindConnector(predicate);
 
                     if(parentConnector != null) //aha, there's an attachment
                     {                        
-                        BindConnectorsCommand binder = new BindConnectorsCommand(this.Controller, parentConnector, Selection.Connector);
+                        BindConnectorsCommand binder = new BindConnectorsCommand(this.Controller, parentConnector, this.Controller.Model.Selection.Connector);
                         package.Commands.Add(binder);
                         binder.Redo(); //this one is necessary since the redo cannot be performed on the whole compound command
@@ -253 +252 @@
                     #region We are moving entities other than a connector
                     Bundle bundle = new Bundle(Controller.Model);
-                    bundle.Entities.AddRange(Selection.SelectedItems);
+                    bundle.Entities.AddRange(this.Controller.Model.Selection.SelectedItems);
                     MoveCommand cmd = new MoveCommand(this.Controller, bundle, new Point(lastPoint.X - initialPoint.X, lastPoint.Y - initialPoint.Y));
                     package.Commands.Add(cmd);