Changeset 5008 for trunk

Timestamp:

12/01/10 13:01:50 (14 years ago)

Author:

mkommend

Message:

Corrected coloring of initial operator in OperatorGraphVisualizationInfo (ticket #1291).

Location:

trunk/sources

Files:

• HeuristicLab.Core/3.3/OperatorGraph.cs (modified) (2 diffs)
• HeuristicLab.Operators.Views.GraphVisualization/3.3/OperatorGraphVisualization/OperatorGraphVisualizationInfo.cs (modified) (5 diffs)

trunk/sources/HeuristicLab.Core/3.3/OperatorGraph.cs

@@ -95 +95 @@
     }
 
-    //mkommend: IMPORTANT DO NOT REMOVE THIS PRIVATE EVENT
+    //mkommend: IMPORTANT DO NOT REMOVE THIS EVENT
     //needed to register OperatorGraph events in GraphVisualizationInfo
     public event EventHandler DeserializationFinished;
@@ -106 +106 @@
     private void AfterDeserialization() {
       Initialize();
+      OnOperatorGraphDeserializationFinished();
     }
     private void Initialize() {
       RegisterOperatorsEvents();
-      OnOperatorGraphDeserializationFinished();
     }
 

trunk/sources/HeuristicLab.Operators.Views.GraphVisualization/3.3/OperatorGraphVisualization/OperatorGraphVisualizationInfo.cs

@@ -79 +79 @@
         }
       }
-      if (original.operatorGraph.InitialOperator != null) {
-        IOperatorShapeInfo newInitialShapeInfo = original.operatorShapeInfoMapping.GetByFirst(original.operatorGraph.InitialOperator);
-        if (newInitialShapeInfo != null) {
-          oldInitialShapeColor = newInitialShapeInfo.Color;
-          newInitialShapeInfo.Color = Color.LightGreen;
-        }
-        oldInitialShape = InitialShape;
-        OnInitialShapeChanged();
-      }
     }
     public override IDeepCloneable Clone(Cloner cloner) {
@@ -108 +99 @@
     private void AfterDeserialization() {
       this.operatorGraph.DeserializationFinished += new EventHandler(operatorGraph_DeserializationFinished);
+      if (oldInitialShapeColor.IsEmpty) oldInitialShapeColor = Color.LightBlue;
 
       IOperator op;
@@ -133 +125 @@
     private void operatorGraph_DeserializationFinished(object sender, EventArgs e) {
       this.RegisterOperatorGraphEvents();
-      if (this.operatorGraph.InitialOperator != null) {
-        IOperatorShapeInfo newInitialShapeInfo = this.operatorShapeInfoMapping.GetByFirst(this.operatorGraph.InitialOperator);
-        if (newInitialShapeInfo != null) {
-          oldInitialShapeColor = newInitialShapeInfo.Color;
-          newInitialShapeInfo.Color = Color.LightGreen;
-        }
-        oldInitialShape = this.InitialShape;
-        this.OnInitialShapeChanged();
-      }
       this.operatorGraph.DeserializationFinished -= new EventHandler(operatorGraph_DeserializationFinished);
     }
@@ -169 +152 @@
 
     private IShapeInfo oldInitialShape;
+    [Storable]
     private Color oldInitialShapeColor;
     public override IShapeInfo InitialShape {
       get {
         IOperator op = this.operatorGraph.InitialOperator;
-        if (op == null)
-          return null;
+        if (op == null) return null;
         return this.operatorShapeInfoMapping.GetByFirst(op);
       }
@@ -181 +164 @@
           this.OperatorGraph.InitialOperator = null;
         else {
+          this.oldInitialShape = InitialShape;
           IOperatorShapeInfo shapeInfo = (IOperatorShapeInfo)value;
           this.OperatorGraph.InitialOperator = this.operatorShapeInfoMapping.GetBySecond(shapeInfo);