Changeset 15607 for trunk

Timestamp:

01/12/18 18:12:58 (7 years ago)

Author:

mkommend

Message:

#2876: Added menu item to open the bubble chart from the boxplot view.

Location:

trunk/sources/HeuristicLab.Optimization.Views/3.3/RunCollectionViews

Files:

• RunCollectionBoxPlotView.Designer.cs (modified) (5 diffs)
• RunCollectionBoxPlotView.cs (modified) (4 diffs)
• RunCollectionBubbleChartView.Designer.cs (modified) (2 diffs)

trunk/sources/HeuristicLab.Optimization.Views/3.3/RunCollectionViews/RunCollectionBoxPlotView.Designer.cs

@@ -54 +54 @@
       this.yAxisComboBox = new System.Windows.Forms.ComboBox();
       this.chart = new HeuristicLab.Visualization.ChartControlsExtensions.EnhancedChart();
+      this.openBubbleChartViewToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
       this.noRunsLabel = new System.Windows.Forms.Label();
       this.splitContainer = new System.Windows.Forms.SplitContainer();
@@ -112 +113 @@
       // chart
       // 
-      this.chart.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
-            | System.Windows.Forms.AnchorStyles.Left) 
+      this.chart.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+            | System.Windows.Forms.AnchorStyles.Left)
             | System.Windows.Forms.AnchorStyles.Right)));
       chartArea1.Name = "ChartArea1";
@@ -132 +133 @@
       this.chart.MouseMove += new System.Windows.Forms.MouseEventHandler(this.chart_MouseMove);
       // 
+      // openBubbleChartViewToolStripMenuItem
+      // 
+      this.openBubbleChartViewToolStripMenuItem.Name = "openBubbleChartViewToolStripMenuItem";
+      this.openBubbleChartViewToolStripMenuItem.Size = new System.Drawing.Size(256, 22);
+      this.openBubbleChartViewToolStripMenuItem.Text = "Open BubbleChart View";
+      this.openBubbleChartViewToolStripMenuItem.Click += new System.EventHandler(this.openBubbleChartViewToolStripMenuItem_Click);
+      // 
       // noRunsLabel
       // 
@@ -183 +191 @@
       // statisticsGroupBox
       // 
-      this.statisticsGroupBox.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
-            | System.Windows.Forms.AnchorStyles.Left) 
+      this.statisticsGroupBox.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+            | System.Windows.Forms.AnchorStyles.Left)
             | System.Windows.Forms.AnchorStyles.Right)));
       this.statisticsGroupBox.Controls.Add(this.statisticsMatrixView);
@@ -239 +247 @@
     private System.Windows.Forms.ToolTip tooltip;
     protected System.Windows.Forms.CheckBox showStatisticsCheckBox;
+    private System.Windows.Forms.ToolStripMenuItem openBubbleChartViewToolStripMenuItem;
   }
 }

trunk/sources/HeuristicLab.Optimization.Views/3.3/RunCollectionViews/RunCollectionBoxPlotView.cs

@@ -48 +48 @@
     public RunCollectionBoxPlotView() {
       InitializeComponent();
+      chart.ContextMenuStrip.Items.Insert(0, openBubbleChartViewToolStripMenuItem);
+
       categoricalMapping = new Dictionary<int, Dictionary<object, double>>();
       seriesCache = new SortedDictionary<double, Series>();
@@ -224 +226 @@
             AxisDimension axisDimension = (AxisDimension)Enum.Parse(typeof(AxisDimension), selectedAxis);
             switch (axisDimension) {
-              case AxisDimension.Color: value = new StringValue(run.Color.ToString());
+              case AxisDimension.Color:
+                value = new StringValue(run.Color.ToString());
                 break;
             }
@@ -445 +448 @@
     }
 
+    private void openBubbleChartViewToolStripMenuItem_Click(object sender, EventArgs e) {
+      RunCollectionBubbleChartView bubbleChartView = new RunCollectionBubbleChartView();
+      bubbleChartView.Content = this.Content;
+      bubbleChartView.xAxisComboBox.SelectedItem = xAxisComboBox.SelectedItem;
+      bubbleChartView.yAxisComboBox.SelectedItem = yAxisComboBox.SelectedItem;
+      bubbleChartView.Show();
+    }
+
     private void chart_MouseMove(object sender, MouseEventArgs e) {
       string newTooltipText = string.Empty;
@@ -463 +474 @@
     }
 
-  public bool StatisticsVisible {
-    get { return splitContainer.Panel2Collapsed; }
-    set { splitContainer.Panel2Collapsed = value; }
-  }
-  
+    public bool StatisticsVisible {
+      get { return splitContainer.Panel2Collapsed; }
+      set { splitContainer.Panel2Collapsed = value; }
+    }
+
     public void SetXAxis(string axisName) {
       xAxisComboBox.SelectedItem = axisName;

trunk/sources/HeuristicLab.Optimization.Views/3.3/RunCollectionViews/RunCollectionBubbleChartView.Designer.cs

@@ -201 +201 @@
       // chart
       // 
-      this.chart.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
-            | System.Windows.Forms.AnchorStyles.Left) 
+      this.chart.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+            | System.Windows.Forms.AnchorStyles.Left)
             | System.Windows.Forms.AnchorStyles.Right)));
       chartArea1.Name = "ChartArea1";
@@ -455 +455 @@
 
     private System.Windows.Forms.Label xAxisLabel;
-    private System.Windows.Forms.ComboBox xAxisComboBox;
+    internal System.Windows.Forms.ComboBox xAxisComboBox;
     private System.Windows.Forms.Label yAxisLabel;
-    private System.Windows.Forms.ComboBox yAxisComboBox;
+    internal System.Windows.Forms.ComboBox yAxisComboBox;
     private System.Windows.Forms.TrackBar yTrackBar;
     private System.Windows.Forms.TrackBar xTrackBar;