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

Timestamp:

02/17/10 11:17:15 (15 years ago)

Author:

mkommend

Message:

new version of graph visualization with menuitems (ticket #867)

Location:

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

Files:

• HeuristicLab.Operators.Views.GraphVisualization-3.3.csproj (modified) (3 diffs)
• OperatorGraphVisualizationView.Designer.cs (modified) (2 diffs)
• OperatorGraphVisualizationView.cs (modified) (10 diffs)
• ToolBarItems (added)
• ToolBarItems/OperatorGraphVisualizationToolBarItemSeparator.cs (added)
• ToolBarItems/PanToolBarItem.cs (added)
• ToolBarItems/RelayoutToolBarItem.cs (added)
• ToolBarItems/SelectToolBarItem.cs (added)
• ToolBarItems/ZoomInToolBarItem.cs (added)
• ToolBarItems/ZoomOutToolBarItem.cs (added)
• ToolBarItems/ZoomToolBarItem.cs (added)

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

@@ -95 +95 @@
     <None Include="HeuristicLabOperatorsViewsGraphVisualizationPlugin.cs.frame" />
     <None Include="Properties\AssemblyInfo.frame" />
+    <Compile Include="ToolBarItems\SelectToolBarItem.cs" />
+    <Compile Include="ToolBarItems\PanToolBarItem.cs" />
+    <Compile Include="ToolBarItems\ZoomOutToolBarItem.cs" />
+    <Compile Include="ToolBarItems\ZoomInToolBarItem.cs" />
+    <Compile Include="ToolBarItems\ZoomToolBarItem.cs" />
+    <Compile Include="ToolBarItems\OperatorGraphVisualizationToolBarItemSeparator.cs" />
+    <Compile Include="ToolBarItems\RelayoutToolBarItem.cs" />
   </ItemGroup>
   <ItemGroup>
@@ -100 +107 @@
       <Project>{958B43BC-CC5C-4FA2-8628-2B3B01D890B6}</Project>
       <Name>HeuristicLab.Collections-3.3</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\HeuristicLab.Common.Resources\3.2\HeuristicLab.Common.Resources-3.2.csproj">
+      <Project>{0E27A536-1C4A-4624-A65E-DC4F4F23E3E1}</Project>
+      <Name>HeuristicLab.Common.Resources-3.2</Name>
     </ProjectReference>
     <ProjectReference Include="..\..\HeuristicLab.Core.Views\3.3\HeuristicLab.Core.Views-3.3.csproj">
@@ -129 +140 @@
       <Name>HeuristicLab.Operators-3.3</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\HeuristicLab.Optimizer\3.3\HeuristicLab.Optimizer-3.3.csproj">
+      <Project>{C664305E-497C-4533-A140-967DEDB05C19}</Project>
+      <Name>HeuristicLab.Optimizer-3.3</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\HeuristicLab.Parameters\3.3\HeuristicLab.Parameters-3.3.csproj">
+      <Project>{56F9106A-079F-4C61-92F6-86A84C2D84B7}</Project>
+      <Name>HeuristicLab.Parameters-3.3</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\HeuristicLab.PluginInfrastructure\HeuristicLab.PluginInfrastructure.csproj">
       <Project>{94186A6A-5176-4402-AE83-886557B53CCA}</Project>

trunk/sources/HeuristicLab.Operators.Views.GraphVisualization/3.3/OperatorGraphVisualizationView.Designer.cs

@@ -35 +35 @@
       this.graphVisualization.BackColor = System.Drawing.Color.DarkGray;
       this.graphVisualization.BackgroundType = global::Netron.Diagramming.Core.CanvasBackgroundTypes.FlatColor;
-      this.graphVisualization.Dock = System.Windows.Forms.DockStyle.Fill;
-      this.graphVisualization.Document = ((global::Netron.Diagramming.Core.Document)(resources.GetObject("netronVisualization1.Document")));
+      this.graphVisualization.Dock = System.Windows.Forms.DockStyle.Fill;      
       this.graphVisualization.EnableAddConnection = true;
       this.graphVisualization.FileName = "";
@@ -43 +42 @@
       this.graphVisualization.Name = "graphVisualization";
       this.graphVisualization.Origin = new System.Drawing.Point(0, 0);
-      this.graphVisualization.PageSettings = ((System.Drawing.Printing.PageSettings)(resources.GetObject("netronVisualization1.PageSettings")));
       this.graphVisualization.ShowConnectors = true;
       this.graphVisualization.ShowRulers = false;

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

@@ -32 +32 @@
 using HeuristicLab.Core.Views;
 using Netron.Diagramming.Core;
+using HeuristicLab.Parameters;
 
 namespace HeuristicLab.Operators.Views.GraphVisualization {
@@ -37 +38 @@
   public partial class OperatorGraphVisualizationView : ItemView {
     private Dictionary<IOperator, IShape> operatorShapeMapping;
-    private Dictionary<KeyValuePair<IOperator, IOperator>, IConnection> connectionMapping;
+    private Dictionary<KeyValuePair<IOperator, IValueParameter<IOperator>>, IConnection> connectionMapping;
+    private HashSet<IValueParameter<IOperator>> parameters;
     /// <summary>
     /// Initializes a new instance of <see cref="OperatorGraphVisualizationView"/> with caption "Operator Graph".
@@ -45 +47 @@
       Caption = "Operator Graph";
       this.operatorShapeMapping = new Dictionary<IOperator, IShape>();
-      this.connectionMapping = new Dictionary<KeyValuePair<IOperator, IOperator>, IConnection>();
+      this.connectionMapping = new Dictionary<KeyValuePair<IOperator, IValueParameter<IOperator>>, IConnection>();
+      this.parameters = new HashSet<IValueParameter<IOperator>>();
+
+      this.graphVisualization.Controller.Model.OnEntityRemoved += new EventHandler<EntityEventArgs>(Model_OnEntityRemoved);
     }
 
@@ -59 +64 @@
     }
 
-
     /// <summary>
     /// Gets or sets the operator graph to represent visually.
@@ -74 +78 @@
     }
 
+
     protected override void OnContentChanged() {
       base.OnContentChanged();
-      this.GraphModel.Shapes.Clear();
-      this.operatorShapeMapping.Clear();
-      this.connectionMapping.Clear();
-
-      this.CreateGraph(null, this.Content);
+      this.ClearGraph();
+
+      this.CreateGraph(null, new OperatorParameter(string.Empty, this.Content));
       foreach (IShape shape in this.operatorShapeMapping.Values)
         this.GraphModel.AddShape(shape);
@@ -87 +90 @@
         this.GraphModel.AddConnection(connection);
 
-      this.graphVisualization.Controller.View.Invalidate();
-      this.graphVisualization.Controller.Model.LayoutRoot = this.operatorShapeMapping[this.Content];
-      this.graphVisualization.Controller.RunActivity("Standard TreeLayout");
+      if (this.Content == null)
+        this.graphVisualization.Controller.Model.LayoutRoot = null;
+      else
+        this.graphVisualization.Controller.Model.LayoutRoot = this.operatorShapeMapping[this.Content];
+      this.RelayoutOperatorGraph();
     }
 
@@ -96 +101 @@
         Invoke(new EventHandler(opParam_ValueChanged), sender, e);
       else {
-        //IValueParameter<IOperator> opParam = (IValueParameter<IOperator>)sender;
-        //foreach (TreeNode node in opParamNodeTable[opParam].ToArray())
-        //  //remove nodes
-        //foreach (TreeNode node in opParamNodeTable[opParam]) {
-        //  //add nodes
-        //}
-      }
-    } 
-
-    private void CreateGraph(IOperator parent, IOperator op) {
-      if (op == null)
+        this.OnContentChanged();
+      }
+    }
+
+    private void ClearGraph() {
+      this.GraphModel.Clear();
+      foreach (IValueParameter<IOperator> opParam in this.parameters)
+        opParam.ValueChanged -= opParam_ValueChanged;
+
+      this.operatorShapeMapping.Clear();
+      this.parameters.Clear();
+      this.connectionMapping.Clear();
+    }
+
+
+
+    private void CreateGraph(IOperator parent, IValueParameter<IOperator> op) {
+      if (op == null || op.Value == null)
         return;
 
       IShape shape;
-      if (!this.operatorShapeMapping.ContainsKey(op)) {
-        shape = CreateOperatorShape(op);
-        this.operatorShapeMapping[op] = shape;
-
-        foreach (IParameter param in op.Parameters) {
+      if (!this.operatorShapeMapping.ContainsKey(op.Value)) {
+        shape = CreateOperatorShape(op.Value);
+        this.operatorShapeMapping[op.Value] = shape;
+
+        foreach (IParameter param in op.Value.Parameters) {
           IValueParameter<IOperator> opParam = param as IValueParameter<IOperator>;
           if (opParam != null) {
-            opParam.ValueChanged += new EventHandler(opParam_ValueChanged);
-            this.CreateGraph(op, opParam.Value);
+            HandleOperatorParameter(opParam);
+            this.CreateGraph(op.Value, opParam);
           }
         }
@@ -127 +139 @@
     }
 
-    private void RemoveGraph(IOperator op) {
-      if(op == null)
+    private void HandleOperatorParameter(IValueParameter<IOperator> opParam) {
+      if (opParam == null)
         return;
-      IShape shape = this.operatorShapeMapping[op];
-      this.GraphModel.RemoveShape(shape);
-    }
-
-    private IConnection ConnectShapes(IOperator parent, IOperator op) {
-      IShape operatorShape = this.operatorShapeMapping[op];
+      opParam.ValueChanged += new EventHandler(opParam_ValueChanged);
+      parameters.Add(opParam);
+    }
+
+    private IConnection ConnectShapes(IOperator parent, IValueParameter<IOperator> opParam) {
+      IShape operatorShape = this.operatorShapeMapping[opParam.Value];
       IShape parentShape = this.operatorShapeMapping[parent];
       IConnector operatorConnector = parentShape.Connectors.Where(c => c.Name == "Bottom connector").First();
@@ -144 +156 @@
       operatorConnector.AttachConnector(connection.To);
 
-      this.connectionMapping[new KeyValuePair<IOperator, IOperator>(parent, op)] = connection;
+      this.connectionMapping[new KeyValuePair<IOperator, IValueParameter<IOperator>>(parent, opParam)] = connection;
       return connection;
     }
@@ -157 +169 @@
       return shape;
     }
+
+    private void Model_OnEntityRemoved(object sender, EntityEventArgs e) {
+      IShape shape = e.Entity as IShape;
+      if (shape != null) {
+        IOperator op = operatorShapeMapping.Where(os => os.Value == shape).First().Key;
+        if (op == this.Content)
+          this.Content = null;
+        else {
+          //clear all connections to the removed operator
+          IEnumerable<IValueParameter<IOperator>> parentOperator = this.connectionMapping.Where(cs => cs.Key.Value.Value == op).Select(x => x.Key.Value);
+          foreach(IValueParameter<IOperator> opParam in parentOperator.ToArray())
+            opParam.Value = null;
+
+          //remove connections from graph view
+          IEnumerable<IConnection> connections = this.connectionMapping.Where(cs => cs.Key.Value.Value == op).Select(x => x.Value);
+          foreach (IConnection connection in connections)
+            this.GraphModel.Remove(connection);
+
+          this.graphVisualization.Invalidate();
+        }
+
+
+      }
+    }
+
+    #region methods for toolbar items
+
+    internal void RelayoutOperatorGraph() {
+      if (this.operatorShapeMapping.Count > 0 && this.connectionMapping.Count > 0) { //otherwise the layout does not work
+        this.graphVisualization.Invalidate();
+        this.graphVisualization.Controller.RunActivity("Standard TreeLayout");
+      }
+    }
+
+    internal void ActivateZoomAreaTool() {
+      this.graphVisualization.Controller.ActivateTool(ControllerBase.ZoomAreaToolName);
+    }
+
+    internal void ActivateZoomInTool() {
+      this.graphVisualization.Controller.ActivateTool(ControllerBase.ZoomInToolName);
+    }
+
+    internal void ActivateZoomOutTool() {
+      this.graphVisualization.Controller.ActivateTool(ControllerBase.ZoomOutToolName);
+    }
+
+    internal void ActivatePanTool() {
+      this.graphVisualization.Controller.ActivateTool(ControllerBase.PanToolName);
+    }
+
+    internal void ActivateSelectTool() {
+      this.graphVisualization.Controller.ActivateTool(ControllerBase.SelectionToolName);
+    }
+
+    #endregion
   }
 }