Changeset 573

Timestamp:

09/14/08 22:31:37 (16 years ago)

Author:

gkronber

Message:

minor code improvements

Location:

trunk/sources/HeuristicLab.CEDMA.Charting

Files:

• BubbleChart.cs (modified) (3 diffs)
• Histogram.cs (modified) (2 diffs)
• Record.cs (modified) (2 diffs)

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

@@ -64 +64 @@
       foreach(Record r in results.Records) {
         records.Add(r);
-        r.OnSelectionChanged += new EventHandler(Record_OnSelectionChanged);
-      }
+     }
       results.OnRecordAdded += new EventHandler<RecordAddedEventArgs>(results_OnRecordAdded);
       results.Changed += new EventHandler(results_Changed);
@@ -81 +80 @@
     void results_OnRecordAdded(object sender, RecordAddedEventArgs e) {
       lock(records) {
-        e.Record.OnSelectionChanged += new EventHandler(Record_OnSelectionChanged);
         records.Add(e.Record);
-      }
-    }
-
-    void Record_OnSelectionChanged(object sender, EventArgs e) {
-      Record r = (Record)sender;
-      IPrimitive primitive;
-      recordToPrimitiveDictionary.TryGetValue(r, out primitive);
-      if(primitive != null) {
-        ((FixedSizeCircle)primitive).UpdateEnabled = false;
-        points.UpdateEnabled = false;
-        if(r.Selected) {
-          int alpha = primitive.Pen.Color.A;
-          primitive.Pen.Color = Color.FromArgb(alpha, selectionColor);
-          primitive.Brush = primitive.Pen.Brush;
-          primitive.IntoForeground();
-        } else {
-          int alpha = primitive.Pen.Color.A;
-          primitive.Pen.Color = Color.FromArgb(alpha, defaultColor);
-          primitive.Brush = primitive.Pen.Brush;
-          primitive.IntoBackground();
-        }
-        ((FixedSizeCircle)primitive).UpdateEnabled = true;
-        points.UpdateEnabled = true;
       }
     }
@@ -165 +140 @@
             c.ToolTipText = r.GetToolTipText();
             points.Add(c);
+            if(!r.Selected) c.IntoBackground();
             primitiveToRecordDictionary[c] = r;
             recordToPrimitiveDictionary[r] = c;

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

@@ -87 +87 @@
 
     private void Repaint() {
-      if(dimension == null) return;
-      UpdateEnabled = false;
-      Group.Clear();
-      primitiveToRecordsDictionary.Clear();
-      recordToPrimitiveDictionary.Clear();
-      bars = new Group(this);
-      Group.Add(new Axis(this, 0, 0, AxisType.Both));
-      UpdateViewSize(0, 0);
-      Pen defaultPen = new Pen(defaultColor);
-      Brush defaultBrush = defaultPen.Brush;
-      PaintHistogram(records, defaultPen, defaultBrush);
-      Pen selectionPen = new Pen(selectionColor);
-      Brush selectionBrush = selectionPen.Brush;
-      PaintHistogram(records.Where(r => r.Selected), selectionPen, selectionBrush);
-      Group.Add(bars);
-      UpdateEnabled = true;
+      lock(records) {
+        if(dimension == null) return;
+        UpdateEnabled = false;
+        Group.Clear();
+        primitiveToRecordsDictionary.Clear();
+        recordToPrimitiveDictionary.Clear();
+        bars = new Group(this);
+        Group.Add(new Axis(this, 0, 0, AxisType.Both));
+        UpdateViewSize(0, 0);
+        Pen defaultPen = new Pen(defaultColor);
+        Brush defaultBrush = defaultPen.Brush;
+        PaintHistogram(records, defaultPen, defaultBrush);
+        Pen selectionPen = new Pen(selectionColor);
+        Brush selectionBrush = selectionPen.Brush;
+        PaintHistogram(records.Where(r => r.Selected), selectionPen, selectionBrush);
+        Group.Add(bars);
+        UpdateEnabled = true;
+      }
     }
 
@@ -168 +170 @@
     public override void MouseClick(Point point, MouseButtons button) {
       if(button == MouseButtons.Left) {
-        List<Record> rs = GetRecords(point);
-        UpdateEnabled = false;
-        if(rs != null) rs.ForEach(r => r.ToggleSelected());
-        UpdateEnabled = true;
+        lock(records) {
+          List<Record> rs = GetRecords(point);
+          UpdateEnabled = false;
+          if(rs != null) rs.ForEach(r => r.ToggleSelected());
+          UpdateEnabled = true;
+        }
         results.FireChanged();
       } else {

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

@@ -68 +68 @@
     public const string Y_JITTER = "__Y_JITTER";
 
-    public event EventHandler OnSelectionChanged;
-
     private Dictionary<string, double> values = new Dictionary<string, double>();
     private ResultList resultList;
@@ -94 +92 @@
     public void ToggleSelected() {
       selected = !selected;
-      if(OnSelectionChanged != null) OnSelectionChanged(this, new EventArgs());      
     }