Changeset 13799 for branches/OptimizationNetworks/HeuristicLab.Networks.Views.NetworkVisualization.Views/3.3/ChartModes

Timestamp:

04/26/16 15:05:28 (9 years ago)

Author:

jkarder

Message:

#2205: worked on optimization networks

• improved network visualization

Location:

branches/OptimizationNetworks/HeuristicLab.Networks.Views.NetworkVisualization.Views/3.3/ChartModes

Files:

• AddNodesChartMode.cs (modified) (1 diff)
• SelectChartMode.cs (modified) (4 diffs)

branches/OptimizationNetworks/HeuristicLab.Networks.Views.NetworkVisualization.Views/3.3/ChartModes/AddNodesChartMode.cs

@@ -79 +79 @@
             var lowerLeft = center - new Offset(size);
             var upperRight = center + new Offset(size);
-            node.VisualProperties = new NodeVisualProperties(new Point2D<double>(lowerLeft.X, lowerLeft.Y),
-                                                             new Point2D<double>(upperRight.X, upperRight.Y));
+            node.VisualProperties = new NodeVisualProperties {
+              LowerLeft = new Point2D<double>(lowerLeft.X, lowerLeft.Y),
+              UpperRight = new Point2D<double>(upperRight.X, upperRight.Y)
+            };
             network.Nodes.Add(node);
             break;

branches/OptimizationNetworks/HeuristicLab.Networks.Views.NetworkVisualization.Views/3.3/ChartModes/SelectChartMode.cs

@@ -49 +49 @@
     }
 
-    public override void HandleOnKeyDown(object sender, KeyEventArgs e) {
-      try {
-        if (!(chartControl.Tag is IUserDefinedNetwork)) return;
-
-        switch (e.KeyCode) {
-          case Keys.Delete:
-            chartControl.SuspendRendering();
-
-            var connectionLines = chartControl.Chart.Group.Primitives.OfType<ConnectionLine>().ToList();
-            var nodeRectangles = chartControl.Chart.Group.Primitives.OfType<NodeRectangle>().ToList();
-            var portRectangles = nodeRectangles.SelectMany(x => x.NetworkItem.Ports.Select(x.GetPortPrimitive)).OfType<PortRectangle>().ToList();
-
-            var deletedNodes = new HashSet<INode>();
-            var deletedPorts = new HashSet<IMessagePort>();
-
-            foreach (var nodeRectangle in nodeRectangles) {
-              if (nodeRectangle.Selected) {
-                var node = nodeRectangle.NetworkItem;
-                if (node == null) continue;
-                deletedNodes.Add(node);
-                foreach (var port in node.Ports.OfType<IMessagePort>())
-                  deletedPorts.Add(port);
-              }
-            }
-
-            foreach (var portRectangle in portRectangles) {
-              if (portRectangle.Selected) {
-                var port = portRectangle.NetworkItem as IMessagePort;
-                if (port == null) continue;
-                port.Parent.Ports.Remove(port);
-                deletedPorts.Add(port);
-              }
-            }
-
-            selectedPortRectangle = null;
-
-            foreach (var connectionLine in connectionLines) {
-              var startPortRectangle = connectionLine.StartPortRectangle;
-              var endPortRectangle = connectionLine.EndPortRectangle;
-              if (startPortRectangle == null || endPortRectangle == null) continue;
-
-              var startPort = startPortRectangle.NetworkItem as IMessagePort;
-              var endPort = endPortRectangle.NetworkItem as IMessagePort;
-              if (startPort == null || endPort == null) continue;
-
-              if (connectionLine.Selected || deletedPorts.Contains(startPort) || deletedPorts.Contains(endPort))
-                startPort.ConnectedPort = null;
-            }
-
-            foreach (var node in deletedNodes)
-              node.Parent.Nodes.Remove(node);
-            break;
-        }
-      } finally {
-        chartControl.ResumeRendering();
-      }
-    }
-
     public override void HandleOnMouseDown(object sender, MouseEventArgs e) {
       try {
@@ -129 +71 @@
                   selectedPortRectangle = portRectangle;
                   constrainingNodeRectangle = nodeRectangle;
+                  break;
                 }
               }
@@ -134 +77 @@
 
             if (selectedPortRectangle != null)
-              foreach (var sp in chartControl.Chart.Group.SelectedPrimitives)
+              foreach (var sp in chartControl.Chart.Group.SelectedPrimitives) {
                 sp.Selected = false;
-            else
-              base.HandleOnMouseDown(sender, e);
+                OnSelectedPrimitivesChanged();
+              } else base.HandleOnMouseDown(sender, e);
             break;
         }
@@ -196 +139 @@
       }
     }
+
+    protected override void DeleteSelectedPrimitives() {
+      if (!(chartControl.Tag is IUserDefinedNetwork)) return;
+
+      try {
+        chartControl.SuspendRendering();
+
+        var connectionLines = chartControl.Chart.Group.Primitives.OfType<ConnectionLine>().ToList();
+        var nodeRectangles = chartControl.Chart.Group.Primitives.OfType<NodeRectangle>().ToList();
+        var portRectangles = nodeRectangles.SelectMany(x => x.NetworkItem.Ports.Select(x.GetPortPrimitive)).OfType<PortRectangle>().ToList();
+
+        var deletedNodes = new HashSet<INode>();
+        var deletedPorts = new HashSet<IMessagePort>();
+
+        foreach (var nodeRectangle in nodeRectangles) {
+          if (nodeRectangle.Selected) {
+            var node = nodeRectangle.NetworkItem;
+            if (node == null) continue;
+            deletedNodes.Add(node);
+            foreach (var port in node.Ports.OfType<IMessagePort>())
+              deletedPorts.Add(port);
+          }
+        }
+
+        foreach (var portRectangle in portRectangles) {
+          if (portRectangle.Selected) {
+            var port = portRectangle.NetworkItem as IMessagePort;
+            if (port == null) continue;
+            port.Parent.Ports.Remove(port);
+            deletedPorts.Add(port);
+          }
+        }
+
+        selectedPortRectangle = null;
+
+        foreach (var connectionLine in connectionLines) {
+          var startPortRectangle = connectionLine.StartPortRectangle;
+          var endPortRectangle = connectionLine.EndPortRectangle;
+          if (startPortRectangle == null || endPortRectangle == null) continue;
+
+          var startPort = startPortRectangle.NetworkItem as IMessagePort;
+          var endPort = endPortRectangle.NetworkItem as IMessagePort;
+          if (startPort == null || endPort == null) continue;
+
+          if (connectionLine.Selected || deletedPorts.Contains(startPort) || deletedPorts.Contains(endPort))
+            startPort.ConnectedPort = null;
+        }
+
+        foreach (var node in deletedNodes)
+          node.Parent.Nodes.Remove(node);
+      } finally { chartControl.ResumeRendering(); }
+    }
   }
 }