Changeset 2898

Timestamp:

03/01/10 15:16:17 (14 years ago)

Author:

mkommend

Message:

added details view for parameters (ticket #867)

Location:

trunk/sources

Files:

• HeuristicLab.ExtLibs/HeuristicLab.Netron/3.0.2672.12446/Netron.Diagramming.Core-3.0.2672.12446/Utils/Selection.cs (modified) (3 diffs)
• HeuristicLab.Operators.Views.GraphVisualization/3.3/GraphVisualizationInfoView.resx (deleted)
• HeuristicLab.Operators.Views.GraphVisualization/3.3/HeuristicLab.Operators.Views.GraphVisualization-3.3.csproj (modified) (1 diff)
• HeuristicLab.Operators.Views.GraphVisualization/3.3/OperatorGraphView.Designer.cs (modified) (4 diffs)
• HeuristicLab.Operators.Views.GraphVisualization/3.3/OperatorGraphView.cs (modified) (3 diffs)

trunk/sources/HeuristicLab.ExtLibs/HeuristicLab.Netron/3.0.2672.12446/Netron.Diagramming.Core-3.0.2672.12446/Utils/Selection.cs

@@ -267 +267 @@
             connector = con.From;
             connector.IsSelected = true;
+            this.RaiseOnNewSelection();
             Invalidate();
             return;
@@ -273 +274 @@
             connector = con.To;
             connector.IsSelected = true;
+            this.RaiseOnNewSelection();
             Invalidate();
             return;
@@ -285 +287 @@
               connector = cn;
               connector.IsSelected = true;
+              this.RaiseOnNewSelection();
               Invalidate();//this will invalidate only the selected connector
               return; //we hit a connector and quit the selection. If the user intended to select the entity it had to be away from the connector!

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

@@ -173 +173 @@
     </ProjectReference>
   </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="GraphVisualizationInfoView.resx">
-      <DependentUpon>GraphVisualizationInfoView.cs</DependentUpon>
-    </EmbeddedResource>
-  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 

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

@@ -31 +31 @@
       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.detailsGroupBox = new System.Windows.Forms.GroupBox();
+      this.detailsViewHost = new HeuristicLab.Core.Views.ViewHost();
+      this.connectorToolTip = new System.Windows.Forms.ToolTip(this.components);
       this.shapeContextMenu.SuspendLayout();
       this.splitContainer.Panel1.SuspendLayout();
       this.splitContainer.Panel2.SuspendLayout();
       this.splitContainer.SuspendLayout();
-      this.propertyGroupBox.SuspendLayout();
+      this.detailsGroupBox.SuspendLayout();
       this.SuspendLayout();
       // 
@@ -94 +95 @@
       // splitContainer.Panel2
       // 
-      this.splitContainer.Panel2.Controls.Add(this.propertyGroupBox);
+      this.splitContainer.Panel2.Controls.Add(this.detailsGroupBox);
       this.splitContainer.Size = new System.Drawing.Size(665, 444);
       this.splitContainer.SplitterDistance = 279;
       this.splitContainer.TabIndex = 1;
       // 
-      // propertyGroupBox
+      // detailsGroupBox
       // 
-      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";
+      this.detailsGroupBox.Controls.Add(this.detailsViewHost);
+      this.detailsGroupBox.Dock = System.Windows.Forms.DockStyle.Fill;
+      this.detailsGroupBox.Location = new System.Drawing.Point(0, 0);
+      this.detailsGroupBox.Name = "detailsGroupBox";
+      this.detailsGroupBox.Size = new System.Drawing.Size(665, 161);
+      this.detailsGroupBox.TabIndex = 0;
+      this.detailsGroupBox.TabStop = false;
+      this.detailsGroupBox.Text = "Details";
       // 
-      // propertyViewHost
+      // detailsViewHost
       // 
-      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;
+      this.detailsViewHost.Content = null;
+      this.detailsViewHost.Dock = System.Windows.Forms.DockStyle.Fill;
+      this.detailsViewHost.Location = new System.Drawing.Point(3, 16);
+      this.detailsViewHost.Name = "detailsViewHost";
+      this.detailsViewHost.Size = new System.Drawing.Size(659, 142);
+      this.detailsViewHost.TabIndex = 0;
+      this.detailsViewHost.ViewType = null;
+      // 
+      // connectorToolTip
+      // 
+      this.connectorToolTip.IsBalloon = true;
       // 
       // OperatorGraphView
@@ -134 +139 @@
       this.splitContainer.Panel2.ResumeLayout(false);
       this.splitContainer.ResumeLayout(false);
-      this.propertyGroupBox.ResumeLayout(false);
+      this.detailsGroupBox.ResumeLayout(false);
       this.ResumeLayout(false);
 
@@ -146 +151 @@
     private System.Windows.Forms.ToolStripMenuItem breakPointToolStripMenuItem;
     private System.Windows.Forms.SplitContainer splitContainer;
-    private System.Windows.Forms.GroupBox propertyGroupBox;
-    private HeuristicLab.Core.Views.ViewHost propertyViewHost;
+    private System.Windows.Forms.GroupBox detailsGroupBox;
+    private HeuristicLab.Core.Views.ViewHost detailsViewHost;
+    private System.Windows.Forms.ToolTip connectorToolTip;
   }
 }

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);
+      this.graphVisualizationInfoView.Controller.Model.Selection.OnNewSelection += new EventHandler(Controller_SelectionChanged);
     }
 
@@ -59 +59 @@
 
     protected override void OnContentChanged() {
-      if (this.VisualizationInfo == null)
+      bool createdVisualizationInfo = false;
+      if (this.VisualizationInfo == null) {
         this.VisualizationInfo = new GraphVisualizationInfo(this.Content);
+        createdVisualizationInfo = true;
+      }
       this.graphVisualizationInfoView.Content = this.VisualizationInfo;
+      if (createdVisualizationInfo)
+        this.graphVisualizationInfoView.RelayoutOperatorGraph();
     }
 
@@ -69 +74 @@
     }
 
-    private void Controller_OnShowSelectionProperties(object sender, EventArgs e) {
+
+    #region connector tooltips
+
+    #endregion
+
+    private void Controller_SelectionChanged(object sender, EventArgs e) {
       CollectionBase<IDiagramEntity> selectedObjects = this.graphVisualizationInfoView.Controller.Model.Selection.SelectedItems;
-      this.propertyViewHost.ViewType = null;
+      this.detailsViewHost.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);
+          IOperator op = this.VisualizationInfo.GetOperatorForShapeInfo(shapeInfo);
+          this.detailsViewHost.Content = op;
           return;
         }
       }
-      this.propertyViewHost.ViewType = null;
-      this.propertyViewHost.Content = null;
+      IConnector connector = this.graphVisualizationInfoView.Controller.Model.Selection.Connector;
+      if (connector != null) {
+        IShape shape = connector.Parent as IShape;
+        string connectorName = connector.Name;
+        if (shape == null) {
+          shape = connector.AttachedTo.Parent as IShape; //connection connector selected
+          connectorName = connector.AttachedTo.Name;
+        }
+        if (shape != null) {
+          IShapeInfo shapeInfo = shape.Tag as ShapeInfo;
+          IOperator op = this.VisualizationInfo.GetOperatorForShapeInfo(shapeInfo);
+          if (connectorName != "Predecessor") {
+            IParameter parameter = op.Parameters.Where(p => p.Name == connectorName).First();
+            this.detailsViewHost.Content = parameter;
+            return;
+          }
+        }
+      }
+      this.detailsViewHost.ViewType = null;
+      this.detailsViewHost.Content = null;
     }