Changeset 13132

Timestamp:

11/10/15 14:32:39 (9 years ago)

Author:

jkarder

Message:

#1265: worked on visualization

• added Selected to ChartMode
• added PrimitiveAttribute

Location:

branches/HeuristicLab.Visualization/HeuristicLab.Visualization/3.3

Files:

• ChartControl.cs (modified) (2 diffs)
• ChartMode.cs (modified) (2 diffs)
• ChartModes/RulerChartMode.cs (modified) (2 diffs)
• ChartModes/SelectChartMode.cs (modified) (4 diffs)
• HeuristicLab.Visualization-3.3.csproj (modified) (1 diff)
• PrimitiveAttribute.cs (added)

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

@@ -388 +388 @@
       };
 
-      rb.CheckedChanged += (sender, args) => { if (rb.Checked) Mode = chartMode; };
+      rb.CheckedChanged += (sender, args) => { if (rb.Checked) chartMode.Select(); };
 
       return rb;
@@ -400 +400 @@
       };
 
-      mi.CheckedChanged += (sender, args) => { if (mi.Checked) Mode = chartMode; };
+      mi.CheckedChanged += (sender, args) => { if (mi.Checked) chartMode.Select(); };
 
       return mi;

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

@@ -41 +41 @@
     }
 
+    private bool selected;
+    public bool Selected {
+      get { return selected; }
+      set {
+        if (selected == value) return;
+        selected = value;
+        if (selected) {
+          chartControl.Mode = this;
+          OnSelected();
+        } else {
+          if (chartControl.Mode == this)
+            chartControl.Mode = null;
+          OnDeselected();
+        }
+        OnSelectedChanged();
+      }
+    }
+
     protected ChartMode(ChartControl control) {
       chartControl = control;
+      chartControl.ModeChanged += (sender, args) => Selected = chartControl.Mode == this;
     }
 
-    public void Select() { chartControl.Mode = this; }
-    public void Deselect() { chartControl.Mode = null; }
+    public void Select() { Selected = true; }
+    public void Deselect() { Selected = false; }
+
+    protected virtual void OnSelected() { }
+    protected virtual void OnDeselected() { }
 
     public virtual void HandleOnKeyDown(object sender, KeyEventArgs e) {
@@ -75 +97 @@
     public virtual void HandleOnMouseLeave(object sender, EventArgs e) { }
     public virtual void HandleOnClick(object sender, EventArgs e) { }
+
+    public event EventHandler SelectedChanged;
+    protected virtual void OnSelectedChanged() {
+      var handler = SelectedChanged;
+      if (handler != null) handler(this, EventArgs.Empty);
+    }
   }
 }

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

@@ -85 +85 @@
     }
 
+    #region Helpers
     protected virtual void DrawCross(Graphics graphics, Point point) {
       using (var pen = new Pen(Color.Red)) {
@@ -112 +113 @@
       graphics.DrawRectangle(Pens.Red, location.X, location.Y, width, height);
       graphics.DrawString(text, SystemFonts.DefaultFont, Brushes.Black, location.X, location.Y + 2);
-
     }
+    #endregion
   }
 }

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

@@ -33 +33 @@
     public SelectChartMode(ChartControl control) : base(control) { }
 
+    protected override void OnDeselected() {
+      try {
+        chartControl.SuspendRendering();
+        foreach (var p in chartControl.Chart.Group.SelectedPrimitives)
+          p.Selected = false;
+      } finally {
+        chartControl.ResumeRendering();
+        base.OnDeselected();
+      }
+    }
+
     public override void HandleOnKeyDown(object sender, KeyEventArgs e) {
       try {
@@ -39 +50 @@
             try {
               chartControl.SuspendRendering();
-              foreach (var primitive in chartControl.Chart.Group.SelectedPrimitives)
-                chartControl.Chart.Group.Remove(primitive);
+              foreach (var p in chartControl.Chart.Group.SelectedPrimitives)
+                chartControl.Chart.Group.Remove(p);
             } finally { chartControl.ResumeRendering(); }
-
             break;
         }
@@ -57 +67 @@
               chartControl.SuspendRendering();
               var worldLocation = chartControl.Chart.TransformPixelToWorld(e.Location);
-              foreach (var sp in chartControl.Chart.Group.SelectedPrimitives.Where(x => !x.ContainsPoint(worldLocation)))
-                sp.Selected = false;
-              var p = chartControl.Chart.GetPrimitive(e.Location);
-              if (p != null) p.Selected = true;
+              foreach (var p in chartControl.Chart.Group.SelectedPrimitives.Where(x => !x.ContainsPoint(worldLocation)))
+                p.Selected = false;
+              var sp = chartControl.Chart.GetPrimitive(e.Location);
+              if (sp != null) sp.Selected = true;
             } finally { chartControl.ResumeRendering(); }
             break;
@@ -80 +90 @@
             try {
               chartControl.SuspendRendering();
-              foreach (var primitive in chartControl.Chart.Group.SelectedPrimitives.Where(p => p.ContainsPoint(previousWorldLocation)))
-                primitive.Move(previousWorldLocation, offset);
+              foreach (var p in chartControl.Chart.Group.SelectedPrimitives.Where(p => p.ContainsPoint(previousWorldLocation)))
+                p.Move(previousWorldLocation, offset);
             } finally { chartControl.ResumeRendering(); }
             break;

branches/HeuristicLab.Visualization/HeuristicLab.Visualization/3.3/HeuristicLab.Visualization-3.3.csproj

@@ -132 +132 @@
     <Compile Include="ChartModes\PanChartMode.cs" />
     <Compile Include="ChartModes\RulerChartMode.cs" />
+    <Compile Include="PrimitiveAttribute.cs" />
     <Compile Include="Primitives\Grid.cs" />
     <Compile Include="Properties\Resources.Designer.cs">