Changeset 1287 for trunk/sources/HeuristicLab.CEDMA.Charting/BubbleChartView.cs

Timestamp:

03/08/09 12:48:18 (15 years ago)

Author:

gkronber

Message:

Merged change sets from CEDMA branch to trunk:

• r957:r990 r992 r1003 r1041:1044 (#419)
• r1051:1053 r1060 (#419, #224)
• r1072:1075 r1104:1106 r1108:1109 r1115:1116 r1129:1130 r1151 r1156 (#419)
• r1201:1202 (#224)
• r1208 (#487)
• r1214:1217 r1230:1231 (#419)
• r1235:1236 r1238:1239 r1245 (#224)
• r1246 (#505)
• r1251:1254 r1262:1263 (#224)
• r1265:1266, r1275:1277 (#419)

File:

• trunk/sources/HeuristicLab.CEDMA.Charting/BubbleChartView.cs (copied) (copied from branches/CEDMA-Refactoring-Ticket419/HeuristicLab.CEDMA.Charting/BubbleChartView.cs) (2 diffs)

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

@@ -10 +10 @@
 using HeuristicLab.CEDMA.Charting;
 using HeuristicLab.CEDMA.Core;
+using HeuristicLab.PluginInfrastructure;
 
 namespace HeuristicLab.CEDMA.Charting {
+  public class BubbleChartViewFactory : IResultsViewFactory {
+    #region IResultsViewFactory Members
+
+    public string Name {
+      get { return "Bubble chart"; }
+    }
+
+    public IControl CreateView(Results results) {
+      return new BubbleChartView(results);
+    }
+
+    #endregion
+  }
+
   public partial class BubbleChartView : ViewBase {
-    private Results results;
+    private Results Results {
+      get { return (Results)Item; }
+      set { Item = value; }
+    }
     private const string CONSTANT_SIZE = "<constant>";
     private Label pleaseSelectAxisLabel = new Label();
-
     public BubbleChartView(Results results) {
-      this.results = results;
       InitializeComponent();
-      bubbleChartControl.Chart = new BubbleChart(results, 0, 0, 100, 100);
-      xAxisComboBox.Items.AddRange(results.OrdinalVariableNames);
-      yAxisComboBox.Items.AddRange(results.OrdinalVariableNames);
+      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.VariableNames);
+      sizeComboBox.Items.AddRange(Results.OrdinalVariables);
       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 +55 @@
     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);
     }
 
     private void jitterTrackBar_ValueChanged(object sender, EventArgs e) {
-      if (bubbleChartControl.Chart != null) {
-        double xJitterFactor = xTrackBar.Value / 100.0;
-        double yJitterFactor = yTrackBar.Value / 100.0;
-        bubbleChartControl.Chart.SetJitter(xJitterFactor, yJitterFactor);
-      }
+      double xJitterFactor = xTrackBar.Value / 100.0;
+      double yJitterFactor = yTrackBar.Value / 100.0;
+      bubbleChartControl.Chart.SetJitter(xJitterFactor, yJitterFactor);
       UpdateChart();
     }
 
     private void sizeComboBox_SelectedIndexChanged(object sender, EventArgs e) {
-      if (bubbleChartControl.Chart != null) {
-        bubbleChartControl.Chart.SetBubbleSizeDimension((string)sizeComboBox.SelectedItem, invertCheckbox.Checked);
-        UpdateChart();
-      }
+      bubbleChartControl.Chart.SetBubbleSizeDimension((string)sizeComboBox.SelectedItem, invertCheckbox.Checked);
+      UpdateChart();
     }
   }