Context Navigation

-                      r5445
+                      r6046
 using System.Drawing;
 using HeuristicLab.Common;
-using Netron.Diagramming.Core;
 namespace HeuristicLab.Operators.Views.GraphVisualization {
   public interface IShapeInfo : IDeepCloneable {
-    Type ShapeType { get; }
     Point Location { get; set; }
-    IShape CreateShape();
     IEnumerable<string> Connectors { get; }
-    void UpdateShape(IShape shape);
-    void UpdateShapeInfo(IShape shape);
     event EventHandler Changed;

branches/histogram/HeuristicLab.Operators.Views.GraphVisualization/3.3/General/ShapeInfo.cs

-                      r5445
+                      r6046
 using HeuristicLab.Common;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
-using Netron.Diagramming.Core;
 namespace HeuristicLab.Operators.Views.GraphVisualization {
 …
     protected ShapeInfo(ShapeInfo original, Cloner cloner)
       : base(original, cloner) {
-      shapeType = original.shapeType;
       location = original.location;
+    }
+    protected ShapeInfo(Type shapeType) {
+      if (!typeof(IShape).IsAssignableFrom(shapeType))
+        throw new ArgumentException("The passed shape type " + shapeType + " must be derived from IShape.");
+      this.shapeType = shapeType;
+    }
+    [Storable]
+    private Type shapeType;
+    public Type ShapeType {
+      get { return this.shapeType; }
+    }
+    protected ShapeInfo() : base() { }
     [Storable]
 …
       if (handler != null) this.Changed(this, EventArgs.Empty);
+    }
-    public virtual IShape CreateShape() {
-      IShape shape = (IShape)Activator.CreateInstance(this.shapeType);
-      shape.Tag = this;
-      shape.Location = this.Location;
-      return shape;
+    }
-    public virtual void UpdateShape(IShape shape) {
-      shape.Location = this.Location;
+    }
-    public virtual void UpdateShapeInfo(IShape shape) {
-      this.Location = shape.Location;
+    }
+  }
+}

Note: See TracChangeset for help on using the changeset viewer.