Changeset 8000 for trunk/sources/HeuristicLab.Operators.Views.GraphVisualization.Views/3.3

Timestamp:

06/13/12 19:08:05 (12 years ago)

Author:

jkarder

Message:

#1747:

• added support to pan with the middle mouse button
• removed pan button

Location:

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

Files:

• OperatorGraphView.Designer.cs (modified) (9 diffs)
• OperatorGraphView.cs (modified) (8 diffs)

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

@@ -59 +59 @@
       this.relayoutButton = new System.Windows.Forms.Button();
       this.connectButton = new System.Windows.Forms.Button();
-      this.panButton = new System.Windows.Forms.Button();
       this.selectButton = new System.Windows.Forms.Button();
       this.detailsGroupBox = new System.Windows.Forms.GroupBox();
@@ -130 +129 @@
       this.splitContainer.Panel1.Controls.Add(this.relayoutButton);
       this.splitContainer.Panel1.Controls.Add(this.connectButton);
-      this.splitContainer.Panel1.Controls.Add(this.panButton);
       this.splitContainer.Panel1.Controls.Add(this.selectButton);
       this.splitContainer.Panel1.Controls.Add(this.graphVisualizationInfoView);
@@ -144 +142 @@
       // 
       this.screenshotButton.Image = HeuristicLab.Common.Resources.VSImageLibrary.Image;
-      this.screenshotButton.Location = new System.Drawing.Point(243, 3);
+      this.screenshotButton.Location = new System.Drawing.Point(213, 3);
       this.screenshotButton.Name = "screenshotButton";
       this.screenshotButton.Size = new System.Drawing.Size(24, 24);
-      this.screenshotButton.TabIndex = 8;
+      this.screenshotButton.TabIndex = 7;
       this.buttonToolTip.SetToolTip(this.screenshotButton, "Screenshot");
       this.screenshotButton.UseVisualStyleBackColor = true;
@@ -155 +153 @@
       // 
       this.zoomOutButton.Image = HeuristicLab.Common.Resources.VSImageLibrary.ZoomOut;
-      this.zoomOutButton.Location = new System.Drawing.Point(213, 3);
+      this.zoomOutButton.Location = new System.Drawing.Point(183, 3);
       this.zoomOutButton.Name = "zoomOutButton";
       this.zoomOutButton.Size = new System.Drawing.Size(24, 24);
-      this.zoomOutButton.TabIndex = 7;
+      this.zoomOutButton.TabIndex = 6;
       this.buttonToolTip.SetToolTip(this.zoomOutButton, "Zoom Out");
       this.zoomOutButton.UseVisualStyleBackColor = true;
@@ -166 +164 @@
       // 
       this.zoomInButton.Image = HeuristicLab.Common.Resources.VSImageLibrary.ZoomIn;
-      this.zoomInButton.Location = new System.Drawing.Point(183, 3);
+      this.zoomInButton.Location = new System.Drawing.Point(153, 3);
       this.zoomInButton.Name = "zoomInButton";
       this.zoomInButton.Size = new System.Drawing.Size(24, 24);
-      this.zoomInButton.TabIndex = 6;
+      this.zoomInButton.TabIndex = 5;
       this.buttonToolTip.SetToolTip(this.zoomInButton, "Zoom In");
       this.zoomInButton.UseVisualStyleBackColor = true;
@@ -177 +175 @@
       // 
       this.zoomToFitButton.Image = HeuristicLab.Common.Resources.VSImageLibrary.ActualSize;
-      this.zoomToFitButton.Location = new System.Drawing.Point(153, 3);
+      this.zoomToFitButton.Location = new System.Drawing.Point(123, 3);
       this.zoomToFitButton.Name = "zoomAreaButton";
       this.zoomToFitButton.Size = new System.Drawing.Size(24, 24);
-      this.zoomToFitButton.TabIndex = 5;
+      this.zoomToFitButton.TabIndex = 4;
       this.buttonToolTip.SetToolTip(this.zoomToFitButton, "Zoom to Fit");
       this.zoomToFitButton.UseVisualStyleBackColor = true;
@@ -188 +186 @@
       // 
       this.relayoutButton.Image = HeuristicLab.Common.Resources.VSImageLibrary.RefreshDocument;
-      this.relayoutButton.Location = new System.Drawing.Point(123, 3);
+      this.relayoutButton.Location = new System.Drawing.Point(93, 3);
       this.relayoutButton.Name = "relayoutButton";
       this.relayoutButton.Size = new System.Drawing.Size(24, 24);
-      this.relayoutButton.TabIndex = 4;
+      this.relayoutButton.TabIndex = 3;
       this.buttonToolTip.SetToolTip(this.relayoutButton, "Relayout Graph");
       this.relayoutButton.UseVisualStyleBackColor = true;
@@ -199 +197 @@
       // 
       this.connectButton.Image = HeuristicLab.Common.Resources.VSImageLibrary.Interface;
-      this.connectButton.Location = new System.Drawing.Point(63, 3);
+      this.connectButton.Location = new System.Drawing.Point(33, 3);
       this.connectButton.Name = "connectButton";
       this.connectButton.Size = new System.Drawing.Size(24, 24);
-      this.connectButton.TabIndex = 3;
+      this.connectButton.TabIndex = 2;
       this.buttonToolTip.SetToolTip(this.connectButton, "Connection Tool");
       this.connectButton.UseVisualStyleBackColor = true;
       this.connectButton.Click += new System.EventHandler(this.connectButton_Click);
-      // 
-      // panButton
-      // 
-      this.panButton.Image = HeuristicLab.Common.Resources.VSImageLibrary.Breakpoint;
-      this.panButton.Location = new System.Drawing.Point(33, 3);
-      this.panButton.Name = "panButton";
-      this.panButton.Size = new System.Drawing.Size(24, 24);
-      this.panButton.TabIndex = 2;
-      this.buttonToolTip.SetToolTip(this.panButton, "Pan Tool");
-      this.panButton.UseVisualStyleBackColor = true;
-      this.panButton.Click += new System.EventHandler(this.panButton_Click);
       // 
       // selectButton
@@ -290 +277 @@
     private System.Windows.Forms.Button relayoutButton;
     private System.Windows.Forms.Button connectButton;
-    private System.Windows.Forms.Button panButton;
     private System.Windows.Forms.Button screenshotButton;
     private System.Windows.Forms.ToolTip buttonToolTip;

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

@@ -27 +27 @@
 using HeuristicLab.MainForm;
 using HeuristicLab.MainForm.WindowsForms;
+using HeuristicLab.Netron.CustomTools;
 using Netron.Diagramming.Core;
 
@@ -33 +34 @@
   [Content(typeof(OperatorGraph), true)]
   public partial class OperatorGraphView : AsynchronousContentView {
+    private ITool lastActiveTool;
+
     public OperatorGraphView() {
       InitializeComponent();
@@ -39 +42 @@
       this.graphVisualizationInfoView.Controller.Model.Selection.OnNewSelection += new EventHandler(Controller_SelectionChanged);
       this.graphVisualizationInfoView.Controller.OnMouseDown += new EventHandler<MouseEventArgs>(Controller_OnMouseDown);
+      this.graphVisualizationInfoView.Controller.ParentControl.MouseDown += new MouseEventHandler(ParentControl_MouseDown);
+      this.graphVisualizationInfoView.Controller.ParentControl.MouseUp += new MouseEventHandler(ParentControl_MouseUp);
       foreach (ITool tool in this.graphVisualizationInfoView.Controller.Tools) {
         tool.OnToolActivate += new EventHandler<ToolEventArgs>(tool_OnToolActivate);
@@ -69 +74 @@
       if (Content == null) {
         selectButton.Enabled = false;
-        panButton.Enabled = false;
         relayoutButton.Enabled = false;
         zoomToFitButton.Enabled = false;
@@ -79 +83 @@
       } else {
         selectButton.Enabled = true;
-        panButton.Enabled = true;
         relayoutButton.Enabled = true;
         zoomToFitButton.Enabled = true;
@@ -150 +153 @@
     }
 
+    void ParentControl_MouseDown(object sender, MouseEventArgs e) {
+      lastActiveTool = this.graphVisualizationInfoView.Controller.ActiveTool;
+      if (e.Button == MouseButtons.Middle) {
+        if (!(lastActiveTool is CustomPanTool)) this.graphVisualizationInfoView.Controller.ActivateTool(CustomPanTool.ToolName);
+      }
+    }
+
+    void ParentControl_MouseUp(object sender, MouseEventArgs e) {
+      if (e.Button == MouseButtons.Middle) {
+        if (lastActiveTool != null) this.graphVisualizationInfoView.Controller.ActivateTool(lastActiveTool.Name);
+        else this.graphVisualizationInfoView.Controller.DeactivateAllTools();
+      }
+    }
+
     #region context menu
     private void Controller_OnShowContextMenu(object sender, EntityMenuEventArgs e) {
@@ -252 +269 @@
           button = this.selectButton;
           break;
-        case ControllerBase.PanToolName:
-          button = this.panButton;
-          break;
         case ControllerBase.ConnectionToolName:
           button = this.connectButton;
@@ -268 +282 @@
       ITool tool = this.graphVisualizationInfoView.Controller.Tools.Where(t => t.Name == ControllerBase.SelectionToolName).First();
       this.graphVisualizationInfoView.Controller.DeactivateAllTools();
-    }
-
-    private void panButton_Click(object sender, EventArgs e) {
-      this.graphVisualizationInfoView.Controller.ActivateTool(ControllerBase.PanToolName);
     }