Changeset 2875 for trunk/sources/HeuristicLab.Operators.Views.GraphVisualization

Timestamp:

02/26/10 16:31:47 (15 years ago)

Author:

mkommend

Message:

corrected layouting issues in netron (ticket #867)

Location:

trunk/sources/HeuristicLab.Operators.Views.GraphVisualization/3.3

Files:

• Model/OperatorGraphVisualizationInfo.cs (modified) (1 diff)
• Model/ShapeInfoFactory.cs (modified) (1 diff)
• OperatorGraphView.cs (modified) (3 diffs)

trunk/sources/HeuristicLab.Operators.Views.GraphVisualization/3.3/Model/OperatorGraphVisualizationInfo.cs ¶

@@ -48 +48 @@
       this.operatorGraph = operatorGraph;
       this.operatorGraph.InitialOperatorChanged += new EventHandler(operatorGraph_InitialOperatorChanged);
+      operatorGraph.Operators.ItemsAdded += new HeuristicLab.Collections.CollectionItemsChangedEventHandler<IOperator>(Operators_ItemsAdded);
+      operatorGraph.Operators.ItemsRemoved += new HeuristicLab.Collections.CollectionItemsChangedEventHandler<IOperator>(Operators_ItemsRemoved);
+      operatorGraph.Operators.CollectionReset += new HeuristicLab.Collections.CollectionItemsChangedEventHandler<IOperator>(Operators_CollectionReset);
+
       foreach (IOperator op in operatorGraph.Operators)
         if (!this.shapeInfoMapping.ContainsFirst(op))
           this.AddOperator(op);
 
-      operatorGraph.Operators.ItemsAdded += new HeuristicLab.Collections.CollectionItemsChangedEventHandler<IOperator>(Operators_ItemsAdded);
-      operatorGraph.Operators.ItemsRemoved += new HeuristicLab.Collections.CollectionItemsChangedEventHandler<IOperator>(Operators_ItemsRemoved);
-      operatorGraph.Operators.CollectionReset += new HeuristicLab.Collections.CollectionItemsChangedEventHandler<IOperator>(Operators_CollectionReset);
+      this.UpdateInitialShape();
     }
 
     public event EventHandler InitialShapeChanged;
     private void operatorGraph_InitialOperatorChanged(object sender, EventArgs e) {
+      this.UpdateInitialShape();
+    }
+
+    private void UpdateInitialShape() {
+      OperatorShapeInfo old = this.oldInitialShape as OperatorShapeInfo;
+      if (old != null)
+        old.HeadColor = oldInitialShapeColor;
+
+      OperatorShapeInfo newInitialShapeInfo = this.InitialShape as OperatorShapeInfo;
+      if (newInitialShapeInfo != null) {
+        oldInitialShapeColor = newInitialShapeInfo.HeadColor;
+        newInitialShapeInfo.HeadColor = Color.LightGreen;
+      }
+
+      oldInitialShape = this.InitialShape;
       if (this.InitialShapeChanged != null)
         this.InitialShapeChanged(this, new EventArgs());
     }
 
+    private IShapeInfo oldInitialShape;
+    private Color oldInitialShapeColor;
     public IShapeInfo InitialShape {
       get {

trunk/sources/HeuristicLab.Operators.Views.GraphVisualization/3.3/Model/ShapeInfoFactory.cs ¶

@@ -43 +43 @@
       operatorShapeInfo.Title = op.Name;
       operatorShapeInfo.Text = op.GetType().ToString();
+      operatorShapeInfo.HeadColor = Color.LightBlue;
 
       return operatorShapeInfo;

trunk/sources/HeuristicLab.Operators.Views.GraphVisualization/3.3/OperatorGraphView.cs ¶

@@ -97 +97 @@
       if (shapeInfo != null)
         this.graphVisualization.Controller.Model.LayoutRoot = this.shapeInfoShapeMapping.GetByFirst(shapeInfo);
-      else
+       else
         this.graphVisualization.Controller.Model.LayoutRoot = null;
     }
@@ -281 +281 @@
       IShape shape = this.shapeInfoShapeMapping.GetByFirst(shapeInfo);
       shapeInfo.UpdateShape(shape);
+      shape.Invalidate();
     }
 
@@ -334 +335 @@
     #region methods for toolbar items
 
-    private int layoutCount = 0;
     internal void RelayoutOperatorGraph() {
-      if (this.shapeInfoShapeMapping.Count > 0 && this.connectionConnectorsMapping.Count > 0) { //otherwise the layout does not work
-
-        string layoutName = string.Empty;
-        switch (this.layoutCount % 6) {
-          case 0: { layoutName = "Random Layout"; break; }
-          case 1: { layoutName = "FruchtermanReingold Layout"; break; }
-          case 2: { layoutName = "Standard TreeLayout"; break; }
-          case 3: { layoutName = "Radial TreeLayout"; break; }
-          case 4: { layoutName = "Balloon TreeLayout"; break; }
-          case 5: { layoutName = "ForceDirected Layout"; break; }
-        }
+      if (this.shapeInfoShapeMapping.Count > 0 
+        && this.connectionConnectorsMapping.Count > 0 
+        && this.VisualizationInfo.InitialShape != null) { //otherwise the layout does not work
+        string layoutName = "Standard TreeLayout";
         this.graphVisualization.Controller.RunActivity(layoutName);
-        MessageBox.Show(layoutName);
-        this.layoutCount++;
         this.graphVisualization.Invalidate();
       }