Changeset 8085 for branches/GP-MoveOperators/HeuristicLab.Operators.Views.GraphVisualization.Views/3.3/OperatorGraphView.cs

Timestamp:

06/21/12 18:02:33 (12 years ago)

Author:

gkronber

Message:

#1847: merged trunk changes r7800:HEAD into gp move operators branch

Location:

branches/GP-MoveOperators

Files:

• . (modified) (2 props)
• HeuristicLab.Operators.Views.GraphVisualization.Views/3.3/OperatorGraphView.cs (modified) (8 diffs)

branches/GP-MoveOperators

@@ -20 +20 @@
 bin
 protoc.exe
+_ReSharper.HeuristicLab 3.3 Tests

@@ -20 +20 @@
 bin
 protoc.exe
+_ReSharper.HeuristicLab 3.3 Tests

branches/GP-MoveOperators/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);
     }
 

@@ -20 +20 @@
 bin
 protoc.exe
+_ReSharper.HeuristicLab 3.3 Tests