Changeset 569 for trunk/sources/HeuristicLab.CEDMA.Charting

Timestamp:

09/14/08 16:52:55 (16 years ago)

Author:

gkronber

Message:

fixed a bug in multiple selection #270

Location:

trunk/sources/HeuristicLab.CEDMA.Charting

Files:

• BubbleChart.cs (modified) (2 diffs)
• BubbleChartControl.cs (modified) (3 diffs)
• Record.cs (modified) (1 diff)

trunk/sources/HeuristicLab.CEDMA.Charting/BubbleChart.cs

@@ -230 +230 @@
         double maxX = Math.Max(a.X, b.X);
         double maxY = Math.Max(a.Y, b.Y);
-        HeuristicLab.Charting.Rectangle r = new HeuristicLab.Charting.Rectangle(this, minX, minY, maxX, maxY);
+        HeuristicLab.Charting.Rectangle rect = new HeuristicLab.Charting.Rectangle(this, minX, minY, maxX, maxY);
 
         List<IPrimitive> primitives = new List<IPrimitive>();
@@ -236 +236 @@
 
         foreach(FixedSizeCircle p in primitives) {
-          if(r.ContainsPoint(p.Point)) {
-            primitiveToRecordDictionary[p].ToggleSelected();
+          if(rect.ContainsPoint(p.Point)) {
+            Record r;
+            primitiveToRecordDictionary.TryGetValue(p, out r);
+            if(r != null) r.ToggleSelected();
           }
         }
+        results.FireChanged();
       } else {
         base.MouseDrag(start, end, button);
       }
     }
+
+    public override void MouseClick(Point point, MouseButtons button) {
+      if(button == MouseButtons.Left) {
+        Record r = GetRecord(point);
+        if(r != null) r.ToggleSelected();
+        results.FireChanged();
+      } else {
+        base.MouseClick(point, button);
+      }
+    }
+
+    public override void MouseDoubleClick(Point point, MouseButtons button) {
+      if(button == MouseButtons.Left) {
+        Record r = GetRecord(point);
+        if(r != null) r.OpenModel();
+      } else {
+        base.MouseDoubleClick(point, button);
+      }
+    }
   }
 }

trunk/sources/HeuristicLab.CEDMA.Charting/BubbleChartControl.cs

@@ -35 +35 @@
     private bool renderingRequired;
     private Point mousePosition;
-    private Record clickedRecord;
     private Point buttonDownPoint;
 
@@ -82 +81 @@
 
     private void pictureBox_MouseDown(object sender, MouseEventArgs e) {
-      clickedRecord = null;
       buttonDownPoint = e.Location;
-      if(e.Button == MouseButtons.Left || e.Button == MouseButtons.Right) {
-        clickedRecord = Chart.GetRecord(buttonDownPoint);
-      }
     }
     private void pictureBox_MouseUp(object sender, MouseEventArgs e) {
@@ -176 +171 @@
 
     private void pictureBox_MouseClick(object sender, MouseEventArgs e) {
-      if(clickedRecord != null) clickedRecord.ToggleSelected();
+      Chart.MouseClick(e.Location, e.Button);
     }
 
     private void pictureBox_MouseDoubleClick(object sender, MouseEventArgs e) {
-      if(clickedRecord != null) clickedRecord.OpenModel();
+      Chart.MouseDoubleClick(e.Location, e.Button);
     }
   }

trunk/sources/HeuristicLab.CEDMA.Charting/Record.cs

@@ -94 +94 @@
     public void ToggleSelected() {
       selected = !selected;
-      if(OnSelectionChanged != null) OnSelectionChanged(this, new EventArgs());
-      resultList.FireChanged();
+      if(OnSelectionChanged != null) OnSelectionChanged(this, new EventArgs());      
     }