Changeset 2895 for trunk

Timestamp:

03/01/10 13:01:03 (15 years ago)

Author:

mkommend

Message:

added properties view in graph visualization (ticket #867)

Location:

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

Files:

• HeuristicLab.Operators.Views.GraphVisualization-3.3.csproj (modified) (1 diff)
• OperatorGraphView.Designer.cs (modified) (7 diffs)
• OperatorGraphView.cs (modified) (2 diffs)
• OperatorGraphView.resx (deleted)

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

@@ -177 +177 @@
       <DependentUpon>GraphVisualizationInfoView.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="OperatorGraphView.resx">
-      <DependentUpon>OperatorGraphView.cs</DependentUpon>
-    </EmbeddedResource>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

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

@@ -24 +24 @@
     /// </summary>
     private void InitializeComponent() {
+      this.components = new System.ComponentModel.Container();
       this.graphVisualizationInfoView = new HeuristicLab.Operators.Views.GraphVisualization.GraphVisualizationInfoView();
-      this.shapeContextMenu = new System.Windows.Forms.ContextMenuStrip();
+      this.shapeContextMenu = new System.Windows.Forms.ContextMenuStrip(this.components);
       this.openViewToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
       this.initialToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
       this.breakPointToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+      this.splitContainer = new System.Windows.Forms.SplitContainer();
+      this.propertyGroupBox = new System.Windows.Forms.GroupBox();
+      this.propertyViewHost = new HeuristicLab.Core.Views.ViewHost();
+      this.shapeContextMenu.SuspendLayout();
+      this.splitContainer.Panel1.SuspendLayout();
+      this.splitContainer.Panel2.SuspendLayout();
+      this.splitContainer.SuspendLayout();
+      this.propertyGroupBox.SuspendLayout();
       this.SuspendLayout();
-      this.shapeContextMenu.SuspendLayout();
       // 
       // graphVisualizationInfoView
       // 
-      this.graphVisualizationInfoView.AllowDrop = false;
-      this.graphVisualizationInfoView.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
-                  | System.Windows.Forms.AnchorStyles.Left)
-                  | System.Windows.Forms.AnchorStyles.Right)));
       this.graphVisualizationInfoView.Caption = null;
       this.graphVisualizationInfoView.Content = null;
-      this.graphVisualizationInfoView.Location = new System.Drawing.Point(3, 3);
+      this.graphVisualizationInfoView.Dock = System.Windows.Forms.DockStyle.Fill;
+      this.graphVisualizationInfoView.Location = new System.Drawing.Point(0, 0);
       this.graphVisualizationInfoView.Name = "graphVisualizationInfoView";
-      this.graphVisualizationInfoView.Size = new System.Drawing.Size(659, 336);
+      this.graphVisualizationInfoView.Size = new System.Drawing.Size(665, 279);
       this.graphVisualizationInfoView.TabIndex = 0;
       // 
@@ -53 +58 @@
       this.shapeContextMenu.Name = "shapeContextMenu";
       this.shapeContextMenu.Size = new System.Drawing.Size(154, 70);
-      this.shapeContextMenu.Opening += new System.ComponentModel.CancelEventHandler(shapeContextMenu_Opening);
+      this.shapeContextMenu.Opening += new System.ComponentModel.CancelEventHandler(this.shapeContextMenu_Opening);
       // 
       // openViewToolStripMenuItem
@@ -69 +74 @@
       this.initialToolStripMenuItem.Click += new System.EventHandler(this.initialOperatorToolStripMenuItem_Click);
       // 
-      // BreakPointToolStripMenuItem
+      // breakPointToolStripMenuItem
       // 
       this.breakPointToolStripMenuItem.Name = "breakPointToolStripMenuItem";
@@ -76 +81 @@
       this.breakPointToolStripMenuItem.Click += new System.EventHandler(this.breakPointToolStripMenuItem_Click);
       // 
+      // splitContainer
+      // 
+      this.splitContainer.Dock = System.Windows.Forms.DockStyle.Fill;
+      this.splitContainer.Location = new System.Drawing.Point(0, 0);
+      this.splitContainer.Name = "splitContainer";
+      this.splitContainer.Orientation = System.Windows.Forms.Orientation.Horizontal;
+      // 
+      // splitContainer.Panel1
+      // 
+      this.splitContainer.Panel1.Controls.Add(this.graphVisualizationInfoView);
+      // 
+      // splitContainer.Panel2
+      // 
+      this.splitContainer.Panel2.Controls.Add(this.propertyGroupBox);
+      this.splitContainer.Size = new System.Drawing.Size(665, 444);
+      this.splitContainer.SplitterDistance = 279;
+      this.splitContainer.TabIndex = 1;
+      // 
+      // propertyGroupBox
+      // 
+      this.propertyGroupBox.Controls.Add(this.propertyViewHost);
+      this.propertyGroupBox.Dock = System.Windows.Forms.DockStyle.Fill;
+      this.propertyGroupBox.Location = new System.Drawing.Point(0, 0);
+      this.propertyGroupBox.Name = "propertyGroupBox";
+      this.propertyGroupBox.Size = new System.Drawing.Size(665, 161);
+      this.propertyGroupBox.TabIndex = 0;
+      this.propertyGroupBox.TabStop = false;
+      this.propertyGroupBox.Text = "Properties";
+      // 
+      // propertyViewHost
+      // 
+      this.propertyViewHost.Content = null;
+      this.propertyViewHost.Dock = System.Windows.Forms.DockStyle.Fill;
+      this.propertyViewHost.Location = new System.Drawing.Point(3, 16);
+      this.propertyViewHost.Name = "propertyViewHost";
+      this.propertyViewHost.Size = new System.Drawing.Size(659, 142);
+      this.propertyViewHost.TabIndex = 0;
+      this.propertyViewHost.ViewType = null;
+      // 
       // OperatorGraphView
       // 
@@ -81 +125 @@
       this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
       this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-      this.Controls.Add(this.graphVisualizationInfoView);
+      this.Controls.Add(this.splitContainer);
       this.Name = "OperatorGraphView";
       this.Size = new System.Drawing.Size(665, 444);
@@ -87 +131 @@
       this.DragEnter += new System.Windows.Forms.DragEventHandler(this.OperatorGraphView_DragEnter);
       this.shapeContextMenu.ResumeLayout(false);
+      this.splitContainer.Panel1.ResumeLayout(false);
+      this.splitContainer.Panel2.ResumeLayout(false);
+      this.splitContainer.ResumeLayout(false);
+      this.propertyGroupBox.ResumeLayout(false);
       this.ResumeLayout(false);
+
     }
     #endregion
@@ -96 +145 @@
     private System.Windows.Forms.ToolStripMenuItem initialToolStripMenuItem;
     private System.Windows.Forms.ToolStripMenuItem breakPointToolStripMenuItem;
+    private System.Windows.Forms.SplitContainer splitContainer;
+    private System.Windows.Forms.GroupBox propertyGroupBox;
+    private HeuristicLab.Core.Views.ViewHost propertyViewHost;
   }
 }

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

@@ -45 +45 @@
 
       this.graphVisualizationInfoView.Controller.OnShowContextMenu += new EventHandler<EntityMenuEventArgs>(Controller_OnShowContextMenu);
+      this.graphVisualizationInfoView.Controller.Model.Selection.OnNewSelection += new EventHandler(Controller_OnShowSelectionProperties);
     }
 
@@ -66 +67 @@
       get { return Content.VisualizationInfo as GraphVisualizationInfo; }
       set { this.Content.VisualizationInfo = value; }
+    }
+
+    private void Controller_OnShowSelectionProperties(object sender, EventArgs e) {
+      CollectionBase<IDiagramEntity> selectedObjects = this.graphVisualizationInfoView.Controller.Model.Selection.SelectedItems;
+      this.propertyViewHost.ViewType = null;
+      if (selectedObjects.Count == 1) {
+        IShape shape = selectedObjects[0] as IShape;
+        if (shape != null) {
+          IShapeInfo shapeInfo = shape.Tag as ShapeInfo;
+          this.propertyViewHost.Content = this.VisualizationInfo.GetOperatorForShapeInfo(shapeInfo);
+          return;
+        }
+      }
+      this.propertyViewHost.ViewType = null;
+      this.propertyViewHost.Content = null;
     }