Changeset 13077 for branches/OptimizationNetworks/HeuristicLab.Networks/3.3/Core

Timestamp:

10/29/15 10:08:31 (9 years ago)

Author:

jkarder

Message:

#2205: worked on optimization networks

• added first version of network visualization
• updated frame files

Location:

branches/OptimizationNetworks/HeuristicLab.Networks/3.3/Core

Files:

• INetworkItem.cs (modified) (2 diffs)
• INodeVisualProperties.cs (added)
• IPort.cs (modified) (1 diff)
• IPortVisualProperties.cs (added)
• IVisualProperties.cs (added)
• IVisualizableNode.cs (added)
• IVisualizablePort.cs (added)
• NetworkItem.cs (modified) (1 diff)
• Node.cs (modified) (2 diffs)
• NodeVisualProperties.cs (added)
• Port.cs (modified) (2 diffs)
• PortVisualProperties.cs (added)
• VisualProperties.cs (added)

branches/OptimizationNetworks/HeuristicLab.Networks/3.3/Core/INetworkItem.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.
@@ -20 +20 @@
 #endregion
 
-using System;
 using System.Collections.Generic;
 

branches/OptimizationNetworks/HeuristicLab.Networks/3.3/Core/IPort.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/OptimizationNetworks/HeuristicLab.Networks/3.3/Core/NetworkItem.cs

@@ -20 +20 @@
 #endregion
 
-using HeuristicLab.Common;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
-using System;
 using System.Collections.Generic;
 using System.Drawing;
 using System.Linq;
+using HeuristicLab.Common;
+using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
 namespace HeuristicLab.Core.Networks {

branches/OptimizationNetworks/HeuristicLab.Networks/3.3/Core/Node.cs

@@ -20 +20 @@
 #endregion
 
-using HeuristicLab.Common;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 using System.Collections.Generic;
 using System.Drawing;
 using System.Linq;
+using HeuristicLab.Common;
+using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
 namespace HeuristicLab.Core.Networks {
   [Item("Node", "Abstract base class for nodes of a network.")]
   [StorableClass]
-  public abstract class Node : NetworkItem, INode {
+  public abstract class Node : NetworkItem, IVisualizableNode {
     public static new Image StaticItemImage {
       get { return HeuristicLab.Common.Resources.VSImageLibrary.RadialChart; }
@@ -55 +55 @@
         if (readOnlyPorts == null) readOnlyPorts = ports.AsReadOnly();
         return readOnlyPorts;
+      }
+    }
+
+    public string VisualName { get { return Name; } }
+
+    [Storable]
+    private INodeVisualProperties visualProperties;
+    public INodeVisualProperties VisualProperties {
+      get {
+        if (visualProperties == null)
+          visualProperties = new NodeVisualProperties();
+        return visualProperties;
       }
     }

branches/OptimizationNetworks/HeuristicLab.Networks/3.3/Core/Port.cs

@@ -20 +20 @@
 #endregion
 
+using System.Drawing;
 using HeuristicLab.Common;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
-using System.Drawing;
 
 namespace HeuristicLab.Core.Networks {
   [Item("Port", "Abstract base class for ports of network nodes.")]
   [StorableClass]
-  public abstract class Port : NetworkItem, IPort {
+  public abstract class Port : NetworkItem, IVisualizablePort {
     public static new Image StaticItemImage {
       get { return HeuristicLab.Common.Resources.VSImageLibrary.Interface; }
@@ -40 +40 @@
     }
 
+    [Storable]
+    private IPortVisualProperties visualProperties;
+    public IPortVisualProperties VisualProperties {
+      get {
+        if (visualProperties == null)
+          visualProperties = new PortVisualProperties();
+        return visualProperties;
+      }
+    }
+
     [StorableConstructor]
     protected Port(bool deserializing) : base(deserializing) { }