Changeset 13122

Timestamp:

11/05/15 13:07:08 (9 years ago)

Author:

jkarder

Message:

#1265: worked on visualization

• added default chart mode
• updated SelectChartMode

Location:

branches/HeuristicLab.Visualization/HeuristicLab.Visualization/3.3

Files:

• ChartControl.cs (modified) (2 diffs)
• ChartMode.cs (modified) (2 diffs)
• ChartModes/SelectChartMode.cs (modified) (1 diff)

branches/HeuristicLab.Visualization/HeuristicLab.Visualization/3.3/ChartControl.cs

@@ -55 +55 @@
 
     private ChartMode mode;
+    private ChartMode defaultMode;
     public ChartMode Mode {
       get { return mode; }
@@ -60 +61 @@
         if (mode == value) return;
         mode = value;
+        if (defaultMode == null) defaultMode = mode;
+        if (mode == null) mode = defaultMode;
         SetModeButtonCheckedState();
         SetModeMenuItemCheckedState();

branches/HeuristicLab.Visualization/HeuristicLab.Visualization/3.3/ChartMode.cs

@@ -45 +45 @@
     }
 
-    public virtual void HandleOnKeyDown(object sender, KeyEventArgs e) { }
+    public void Select() { chartControl.Mode = this; }
+    public void Deselect() { chartControl.Mode = null; }
+
+    public virtual void HandleOnKeyDown(object sender, KeyEventArgs e) {
+      switch (e.KeyCode) {
+        case Keys.Escape:
+          Deselect();
+          break;
+      }
+    }
+
     public virtual void HandleOnKeyUp(object sender, KeyEventArgs e) { }
     public virtual void HandleOnMouseClick(object sender, MouseEventArgs e) { }
     public virtual void HandleOnMouseDoubleClick(object sender, MouseEventArgs e) { }
-    public virtual void HandleOnMouseWheel(object sender, MouseEventArgs e) { }
 
     public virtual void HandleOnMouseDown(object sender, MouseEventArgs e) {
@@ -62 +71 @@
     }
 
+    public virtual void HandleOnMouseWheel(object sender, MouseEventArgs e) { }
     public virtual void HandleOnMouseEnter(object sender, EventArgs e) { }
     public virtual void HandleOnMouseLeave(object sender, EventArgs e) { }

branches/HeuristicLab.Visualization/HeuristicLab.Visualization/3.3/ChartModes/SelectChartMode.cs

@@ -37 +37 @@
         switch (e.KeyCode) {
           case Keys.Delete:
-            if (e.KeyCode == Keys.Delete) {
-              try {
-                chartControl.SuspendRendering();
-                foreach (var primitive in chartControl.Chart.Group.SelectedPrimitives)
-                  chartControl.Chart.Group.Remove(primitive);
-              } finally { chartControl.ResumeRendering(); }
-            }
+            try {
+              chartControl.SuspendRendering();
+              foreach (var primitive in chartControl.Chart.Group.SelectedPrimitives)
+                chartControl.Chart.Group.Remove(primitive);
+            } finally { chartControl.ResumeRendering(); }
+
             break;
         }