Changeset 1108 for branches/CEDMA-Refactoring-Ticket419/HeuristicLab.CEDMA.Charting

Timestamp:

01/11/09 19:30:54 (16 years ago)

Author:

gkronber

Message:

worked on CEDMA presentation layer (bubble chart, and collection of results) (#419)

Location:

branches/CEDMA-Refactoring-Ticket419/HeuristicLab.CEDMA.Charting

Files:

• BubbleChart.cs (modified) (13 diffs)
• BubbleChartView.cs (modified) (3 diffs)
• HeuristicLab.CEDMA.Charting.csproj (modified) (3 diffs)

branches/CEDMA-Refactoring-Ticket419/HeuristicLab.CEDMA.Charting/BubbleChart.cs

@@ -31 +31 @@
 namespace HeuristicLab.CEDMA.Charting {
   public class BubbleChart : Chart {
+    private const string X_JITTER = "__X_JITTER";
+    private const string Y_JITTER = "__Y_JITTER";
     private const double maxXJitterPercent = 0.05;
     private const double maxYJitterPercent = 0.05;
@@ -50 +52 @@
     private double maxX = double.NegativeInfinity;
     private double maxY = double.NegativeInfinity;
-    private List<Record> records;
+    private List<ResultsEntry> records;
     private Results results;
-    private Dictionary<IPrimitive, Record> primitiveToRecordDictionary;
-    private Dictionary<Record, IPrimitive> recordToPrimitiveDictionary;
+    private Dictionary<IPrimitive, ResultsEntry> primitiveToEntryDictionary;
+    private Dictionary<ResultsEntry, IPrimitive> entryToPrimitiveDictionary;
     private Random random = new Random();
     private Group points;
@@ -59 +61 @@
     public BubbleChart(Results results, PointD lowerLeft, PointD upperRight)
       : base(lowerLeft, upperRight) {
-      records = new List<Record>();
-      primitiveToRecordDictionary = new Dictionary<IPrimitive, Record>();
-      recordToPrimitiveDictionary = new Dictionary<Record, IPrimitive>();
+      records = new List<ResultsEntry>();
+      primitiveToEntryDictionary = new Dictionary<IPrimitive, ResultsEntry>();
+      entryToPrimitiveDictionary = new Dictionary<ResultsEntry, IPrimitive>();
       this.results = results;
-      foreach(Record r in results.Records) {
-        records.Add(r);
-     }
-      results.OnRecordAdded += new EventHandler<RecordAddedEventArgs>(results_OnRecordAdded);
-      results.Changed += new EventHandler(results_Changed);
     }
 
@@ -75 +72 @@
     }
 
-    public BubbleChart(ResultList results, double x1, double y1, double x2, double y2)
+    public BubbleChart(Results results, double x1, double y1, double x2, double y2)
       : this(results, new PointD(x1, y1), new PointD(x2, y2)) {
     }
 
-    void results_OnRecordAdded(object sender, RecordAddedEventArgs e) {
-      lock(records) {
-        records.Add(e.Record);
-      }
-    }
+    //void results_OnRecordAdded(object sender, RecordAddedEventArgs e) {
+    //  lock(records) {
+    //    records.Add(e.Record);
+    //  }
+    //}
 
     public void SetBubbleSizeDimension(string dimension, bool inverted) {
@@ -93 +90 @@
 
     public void ShowXvsY(string xDimension, string yDimension) {
-      if(this.xDimension != xDimension || this.yDimension != yDimension) {
+      if (this.xDimension != xDimension || this.yDimension != yDimension) {
         this.xDimension = xDimension;
         this.yDimension = yDimension;
+
+        foreach (var resultsEntry in results.SelectRows()) {
+          resultsEntry.Set(X_JITTER, random.NextDouble() * 2.0 - 1.0);
+          resultsEntry.Set(Y_JITTER, random.NextDouble() * 2.0 - 1.0);
+          records.Add(resultsEntry);
+        }
         ResetViewSize();
         Repaint();
@@ -110 +113 @@
 
     private void Repaint() {
-      if(xDimension == null || yDimension == null) return;
-      lock(records) {
-        double maxSize = 1;
-        double minSize = 1;
-        if(sizeDimension != null) {
-          var sizes = records.Select(r => r.Get(sizeDimension)).Where(x => !double.IsInfinity(x) && x != double.MaxValue && x != double.MinValue).OrderBy(x=>x);
+      if (xDimension == null || yDimension == null) return;
+      double maxSize = 1;
+      double minSize = 1;
+      try {
+        if (sizeDimension != null && Results.OrdinalVariables.Contains(sizeDimension)) {
+          var sizes = records
+            .Select(x => Convert.ToDouble(x.Get(sizeDimension)))
+            .Where(size => !double.IsInfinity(size) && size != double.MaxValue && size != double.MinValue)
+            .OrderBy(r => r);
           minSize = sizes.ElementAt((int)(sizes.Count() * 0.1));
           maxSize = sizes.ElementAt((int)(sizes.Count() * 0.9));
         }
-        UpdateEnabled = false;
-        Group.Clear();
-        primitiveToRecordDictionary.Clear();
-        recordToPrimitiveDictionary.Clear();
-        points = new Group(this);
-        Group.Add(new Axis(this, 0, 0, AxisType.Both));
-        UpdateViewSize(0, 0, 5);
-        foreach(Record r in records) {
-          double x = r.Get(xDimension) + r.Get(Record.X_JITTER) * xJitterFactor;
-          double y = r.Get(yDimension) + r.Get(Record.Y_JITTER) * yJitterFactor;
-          int size = CalculateSize(r.Get(sizeDimension), minSize, maxSize);
-
-          if(double.IsInfinity(x) || x == double.MaxValue || x == double.MinValue) x = double.NaN;
-          if(double.IsInfinity(y) || y == double.MaxValue || y == double.MinValue) y = double.NaN;
-          if(!double.IsNaN(x) && !double.IsNaN(y)) {
-            UpdateViewSize(x, y, size);
-            int alpha = CalculateAlpha(size);
-            Pen pen = new Pen(Color.FromArgb(alpha, r.Selected ? selectionColor : defaultColor));
-            Brush brush = pen.Brush;
-            FixedSizeCircle c = new FixedSizeCircle(this, x, y, size, pen, brush);
-            c.ToolTipText = r.GetToolTipText();
-            points.Add(c);
-            if(!r.Selected) c.IntoBackground();
-            primitiveToRecordDictionary[c] = r;
-            recordToPrimitiveDictionary[r] = c;
-          }
-        }
-        Group.Add(points);
-        UpdateEnabled = true;
-      }
+      }
+      catch (InvalidCastException) {
+        minSize = 1;
+        maxSize = 1;
+      }
+      UpdateEnabled = false;
+      Group.Clear();
+      primitiveToEntryDictionary.Clear();
+      entryToPrimitiveDictionary.Clear();
+      points = new Group(this);
+      Group.Add(new Axis(this, 0, 0, AxisType.Both));
+      UpdateViewSize(0, 0, 5);
+      foreach (ResultsEntry r in records) {
+        double x, y;
+        int size;
+        try {
+          x = Convert.ToDouble(r.Get(xDimension)) + (double)r.Get(X_JITTER) * xJitterFactor;
+          y = Convert.ToDouble(r.Get(yDimension)) + (double)r.Get(Y_JITTER) * yJitterFactor;
+          size = CalculateSize(Convert.ToDouble(r.Get(sizeDimension)), minSize, maxSize);
+        }
+        catch (InvalidCastException) {
+          x = double.NaN;
+          y = double.NaN;
+          size = minBubbleSize;
+        }
+        if (double.IsInfinity(x) || x == double.MaxValue || x == double.MinValue) x = double.NaN;
+        if (double.IsInfinity(y) || y == double.MaxValue || y == double.MinValue) y = double.NaN;
+        if (!double.IsNaN(x) && !double.IsNaN(y)) {
+          UpdateViewSize(x, y, size);
+          int alpha = CalculateAlpha(size);
+          Pen pen = new Pen(Color.FromArgb(alpha, r.Selected ? selectionColor : defaultColor));
+          Brush brush = pen.Brush;
+          FixedSizeCircle c = new FixedSizeCircle(this, x, y, size, pen, brush);
+          c.ToolTipText = r.GetToolTipText();
+          points.Add(c);
+          if (!r.Selected) c.IntoBackground();
+          primitiveToEntryDictionary[c] = r;
+          entryToPrimitiveDictionary[r] = c;
+        }
+      }
+      Group.Add(points);
+      UpdateEnabled = true;
     }
 
     private int CalculateSize(double size, double minSize, double maxSize) {
-      if(double.IsNaN(size) || double.IsInfinity(size) || size == double.MaxValue || size == double.MinValue) return minBubbleSize;
-      if(size > maxSize) size = maxSize;
-      if(size < minSize) size = minSize;
+      if (double.IsNaN(size) || double.IsInfinity(size) || size == double.MaxValue || size == double.MinValue) return minBubbleSize;
+      if (size > maxSize) size = maxSize;
+      if (size < minSize) size = minSize;
+      if (Math.Abs(maxSize - minSize) < 1.0E-10) return minBubbleSize;
       double sizeDifference = ((size - minSize) / (maxSize - minSize) * (maxBubbleSize - minBubbleSize));
-      if(invertSize) return maxBubbleSize - (int)sizeDifference;
+      if (invertSize) return maxBubbleSize - (int)sizeDifference;
       else return minBubbleSize + (int)sizeDifference;
     }
@@ -165 +184 @@
 
     private void ZoomToViewSize() {
-      if(minX < maxX && minY < maxY) {
+      if (minX < maxX && minY < maxY) {
         // enlarge view by 5% on each side
         double width = maxX - minX;
@@ -178 +197 @@
 
     private void UpdateViewSize(double x, double y, double size) {
-      if(x - size < minX) minX = x - size;
-      if(x + size > maxX) maxX = x + size;
-      if(y - size < minY) minY = y + size;
-      if(y + size > maxY) maxY = y + size;
+      if (x - size < minX) minX = x - size;
+      if (x + size > maxX) maxX = x + size;
+      if (y - size < minY) minY = y + size;
+      if (y + size > maxY) maxY = y + size;
     }
 
@@ -191 +210 @@
     }
 
-    internal Record GetRecord(Point point) {
-      Record r = null;
+    internal ResultsEntry GetResultsEntry(Point point) {
+      ResultsEntry r = null;
       IPrimitive p = points.GetPrimitive(TransformPixelToWorld(point));
-      if(p != null) {
-        primitiveToRecordDictionary.TryGetValue(p, out r);
+      if (p != null) {
+        primitiveToEntryDictionary.TryGetValue(p, out r);
       }
       return r;
@@ -202 +221 @@
 
     public override void MouseDrag(Point start, Point end, MouseButtons button) {
-      if(button == MouseButtons.Left && Mode == ChartMode.Select) {
+      if (button == MouseButtons.Left && Mode == ChartMode.Select) {
         PointD a = TransformPixelToWorld(start);
         PointD b = TransformPixelToWorld(end);
@@ -214 +233 @@
         primitives.AddRange(points.Primitives);
 
-        foreach(FixedSizeCircle p in primitives) {
-          if(rect.ContainsPoint(p.Point)) {
-            Record r;
-            primitiveToRecordDictionary.TryGetValue(p, out r);
-            if(r != null) r.ToggleSelected();
+        foreach (FixedSizeCircle p in primitives) {
+          if (rect.ContainsPoint(p.Point)) {
+            ResultsEntry r;
+            primitiveToEntryDictionary.TryGetValue(p, out r);
+            if (r != null) r.ToggleSelected();
           }
         }
-        results.FireChanged();
+        // results.FireChanged();
       } else {
         base.MouseDrag(start, end, button);
@@ -228 +247 @@
 
     public override void MouseClick(Point point, MouseButtons button) {
-      if(button == MouseButtons.Left) {
-        Record r = GetRecord(point);
-        if(r != null) r.ToggleSelected();
-        results.FireChanged();
+      if (button == MouseButtons.Left) {
+        ResultsEntry r = GetResultsEntry(point);
+        if (r != null) r.ToggleSelected();
+        //        results.FireChanged();
       } else {
         base.MouseClick(point, button);
@@ -237 +256 @@
     }
 
-    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);
-      }
-    }
+    //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);
+    //  }
+    //}
   }
 }

branches/CEDMA-Refactoring-Ticket419/HeuristicLab.CEDMA.Charting/BubbleChartView.cs

@@ -12 +12 @@
 
 namespace HeuristicLab.CEDMA.Charting {
-  public partial class BubbleChartView : ViewBase {
+  public partial class BubbleChartView : ViewBase, IResultsView {
     private Results results;
     private const string CONSTANT_SIZE = "<constant>";
     private Label pleaseSelectAxisLabel = new Label();
 
-    public BubbleChartView(Results results) {
-      this.results = results;
+    public BubbleChartView() {
       InitializeComponent();
-      bubbleChartControl.Chart = new BubbleChart(results, 0, 0, 100, 100);
-      xAxisComboBox.Items.AddRange(results.OrdinalVariableNames);
-      yAxisComboBox.Items.AddRange(results.OrdinalVariableNames);
-      sizeComboBox.Items.Add(CONSTANT_SIZE);
-      sizeComboBox.Items.AddRange(results.VariableNames);
-      sizeComboBox.SelectedItem = sizeComboBox.Items[0];
-      sizeComboBox.Enabled = false;
-      invertCheckbox.Enabled = false;
-      sizeLabel.Enabled = false;
-      yAxisComboBox.SelectedItem = yAxisComboBox.Items[0];
-      xAxisComboBox.SelectedItem = xAxisComboBox.Items[0];
     }
 
@@ -39 +27 @@
     private void UpdateChart() {
       if (xAxisComboBox.SelectedItem == null || yAxisComboBox.SelectedItem == null) return;
-      xJitterlabel.Enabled = true;
-      xTrackBar.Enabled = true;
-      yJitterLabel.Enabled = true;
-      yTrackBar.Enabled = true;
-      sizeComboBox.Enabled = true;
-      invertCheckbox.Enabled = true;
-      sizeLabel.Enabled = true;
       bubbleChartControl.Chart.ShowXvsY((string)xAxisComboBox.SelectedItem, (string)yAxisComboBox.SelectedItem);
     }
@@ -64 +45 @@
       }
     }
+
+    #region IResultsView Members
+
+    public Control Control {
+      get { return this; }
+    }
+
+    string IResultsView.Name {
+      get { return "Bubble chart"; }
+    }
+
+    public void ShowResults(Results results) {
+      this.results = results;
+      bubbleChartControl.Chart = new BubbleChart(results, 0, 0, 100, 100);
+      xAxisComboBox.Items.AddRange(Results.OrdinalVariables);
+      xAxisComboBox.Items.AddRange(Results.CategoricalVariables);
+      yAxisComboBox.Items.AddRange(Results.OrdinalVariables);
+      yAxisComboBox.Items.AddRange(Results.CategoricalVariables);
+      sizeComboBox.Items.Add(CONSTANT_SIZE);
+      sizeComboBox.Items.AddRange(Results.OrdinalVariables);
+      sizeComboBox.SelectedItem = sizeComboBox.Items[0];
+      yAxisComboBox.SelectedItem = yAxisComboBox.Items[0];
+      xAxisComboBox.SelectedItem = xAxisComboBox.Items[0];
+    }
+
+    #endregion
   }
 }

branches/CEDMA-Refactoring-Ticket419/HeuristicLab.CEDMA.Charting/HeuristicLab.CEDMA.Charting.csproj

@@ -66 +66 @@
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="BubbleChart.cs" />
+    <Compile Include="BubbleChartControl.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="BubbleChartControl.Designer.cs">
+      <DependentUpon>BubbleChartControl.cs</DependentUpon>
+    </Compile>
+    <Compile Include="BubbleChartView.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="BubbleChartView.Designer.cs">
+      <DependentUpon>BubbleChartView.cs</DependentUpon>
+    </Compile>
     <Compile Include="HeuristicLabCedmaChartingPlugin.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
@@ -98 +111 @@
       <Name>HeuristicLab.Data</Name>
     </ProjectReference>
-    <ProjectReference Include="..\HeuristicLab.GP.StructureIdentification\HeuristicLab.GP.StructureIdentification.csproj">
-      <Project>{74223A32-C726-4978-BE78-37113A18373C}</Project>
-      <Name>HeuristicLab.GP.StructureIdentification</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\HeuristicLab.GP\HeuristicLab.GP.csproj">
-      <Project>{1F1CF3ED-374C-4288-995B-93F6B872F571}</Project>
-      <Name>HeuristicLab.GP</Name>
-    </ProjectReference>
     <ProjectReference Include="..\HeuristicLab.Logging\HeuristicLab.Logging.csproj">
       <Project>{4095C92C-5A4C-44BC-9963-5F384CF5CC3F}</Project>
@@ -118 +123 @@
     <None Include="HeuristicLab.snk" />
     <None Include="Properties\AssemblyInfo.frame" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="BubbleChartControl.resx">
+      <DependentUpon>BubbleChartControl.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="BubbleChartView.resx">
+      <DependentUpon>BubbleChartView.cs</DependentUpon>
+    </EmbeddedResource>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />