Changeset 14467 for branches/DataPreprocessing Enhancements/HeuristicLab.DataPreprocessing.Views/3.4

Timestamp:

12/09/16 11:35:42 (8 years ago)

Author:

pfleck

Message:

#2709

• Removed some groupboxes in ViewShortcutListView.
• Removed unnecessary IViewChartShortcut
• Split ScatterPlot Multi and Single in to separate contents.
• Renamed Color-combo box in Scatterplot to "Group".

Location:

branches/DataPreprocessing Enhancements/HeuristicLab.DataPreprocessing.Views/3.4

Files:

• DataPreprocessingView.cs (modified) (1 diff)
• ScatterPlotMultiView.cs (modified) (2 diffs)
• ScatterPlotSingleView.Designer.cs (modified) (5 diffs)
• ScatterPlotSingleView.cs (modified) (4 diffs)
• ViewShortcutListView.Designer.cs (modified) (1 diff)
• ViewShortcutListView.cs (modified) (3 diffs)

branches/DataPreprocessing Enhancements/HeuristicLab.DataPreprocessing.Views/3.4/DataPreprocessingView.cs

@@ -61 +61 @@
           new LineChartContent(data),
           new HistogramContent(data),
-          new ScatterPlotContent(data),
+          new SingleScatterPlotContent(data),
           new MultiScatterPlotContent(data),
           new CorrelationMatrixContent(Content),

branches/DataPreprocessing Enhancements/HeuristicLab.DataPreprocessing.Views/3.4/ScatterPlotMultiView.cs

@@ -7 +7 @@
 using HeuristicLab.Analysis.Views;
 using HeuristicLab.Collections;
-using HeuristicLab.Common;
 using HeuristicLab.Data;
 using HeuristicLab.MainForm;
@@ -347 +346 @@
     private void ScatterPlotDoubleClick(object sender, EventArgs e) {
       var scatterPlotControl = (ScatterPlotControl)sender;
-      ScatterPlotContent scatterContent = new ScatterPlotContent(Content, new Cloner());  // create new content
+      var scatterContent = new SingleScatterPlotContent(Content.PreprocessingData);
       ScatterPlot scatterPlot = scatterPlotControl.Content;
 

branches/DataPreprocessing Enhancements/HeuristicLab.DataPreprocessing.Views/3.4/ScatterPlotSingleView.Designer.cs

@@ -50 +50 @@
       this.label2 = new System.Windows.Forms.Label();
       this.label1 = new System.Windows.Forms.Label();
-      this.comboBoxColor = new System.Windows.Forms.ComboBox();
+      this.comboBoxGroup = new System.Windows.Forms.ComboBox();
       this.comboBoxYVariable = new System.Windows.Forms.ComboBox();
       this.comboBoxXVariable = new System.Windows.Forms.ComboBox();
@@ -72 +72 @@
       this.groupBox1.Controls.Add(this.label2);
       this.groupBox1.Controls.Add(this.label1);
-      this.groupBox1.Controls.Add(this.comboBoxColor);
+      this.groupBox1.Controls.Add(this.comboBoxGroup);
       this.groupBox1.Controls.Add(this.comboBoxYVariable);
       this.groupBox1.Controls.Add(this.comboBoxXVariable);
@@ -87 +87 @@
       this.label3.Location = new System.Drawing.Point(17, 141);
       this.label3.Name = "label3";
-      this.label3.Size = new System.Drawing.Size(31, 13);
+      this.label3.Size = new System.Drawing.Size(36, 13);
       this.label3.TabIndex = 3;
-      this.label3.Text = "Color";
+      this.label3.Text = "Group";
       // 
       // label2
@@ -109 +109 @@
       this.label1.Text = "X Variable";
       // 
-      // comboBoxColor
+      // comboBoxGroup
       // 
-      this.comboBoxColor.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
-      this.comboBoxColor.FormattingEnabled = true;
-      this.comboBoxColor.Location = new System.Drawing.Point(20, 164);
-      this.comboBoxColor.Margin = new System.Windows.Forms.Padding(3, 10, 3, 3);
-      this.comboBoxColor.Name = "comboBoxColor";
-      this.comboBoxColor.Size = new System.Drawing.Size(121, 21);
-      this.comboBoxColor.TabIndex = 1;
-      this.comboBoxColor.SelectedIndexChanged += new System.EventHandler(this.comboBox_SelectedIndexChanged);
+      this.comboBoxGroup.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+      this.comboBoxGroup.FormattingEnabled = true;
+      this.comboBoxGroup.Location = new System.Drawing.Point(20, 164);
+      this.comboBoxGroup.Margin = new System.Windows.Forms.Padding(3, 10, 3, 3);
+      this.comboBoxGroup.Name = "comboBoxGroup";
+      this.comboBoxGroup.Size = new System.Drawing.Size(121, 21);
+      this.comboBoxGroup.TabIndex = 1;
+      this.comboBoxGroup.SelectedIndexChanged += new System.EventHandler(this.comboBox_SelectedIndexChanged);
       // 
       // comboBoxYVariable
@@ -164 +164 @@
     private System.Windows.Forms.ComboBox comboBoxYVariable;
     private System.Windows.Forms.ComboBox comboBoxXVariable;
-    private System.Windows.Forms.ComboBox comboBoxColor;
+    private System.Windows.Forms.ComboBox comboBoxGroup;
     private System.Windows.Forms.Label label3;
   }

branches/DataPreprocessing Enhancements/HeuristicLab.DataPreprocessing.Views/3.4/ScatterPlotSingleView.cs

@@ -30 +30 @@
 
   [View("Scatter Plot Single View")]
-  [Content(typeof(ScatterPlotContent), true)]
+  [Content(typeof(SingleScatterPlotContent), true)]
   public partial class ScatterPlotSingleView : ItemView {
 
-    public new ScatterPlotContent Content {
-      get { return (ScatterPlotContent)base.Content; }
+    public new SingleScatterPlotContent Content {
+      get { return (SingleScatterPlotContent)base.Content; }
       set { base.Content = value; }
     }
@@ -48 +48 @@
       comboBoxXVariable.Items.Clear();
       comboBoxYVariable.Items.Clear();
-      comboBoxColor.Items.Clear();
+      comboBoxGroup.Items.Clear();
       comboBoxXVariable.Items.AddRange(variables.ToArray());
       comboBoxYVariable.Items.AddRange(variables.ToArray());
-      comboBoxColor.Items.Add("-");
+      comboBoxGroup.Items.Add("-");
       for (int i = 0; i < Content.PreprocessingData.Columns; ++i) {
         if (Content.PreprocessingData.VariableHasType<double>(i)) {
           double distinctValueCount = Content.PreprocessingData.GetValues<double>(i).GroupBy(x => x).Count();
           if (distinctValueCount <= 20)
-            comboBoxColor.Items.Add(Content.PreprocessingData.GetVariableName(i));
+            comboBoxGroup.Items.Add(Content.PreprocessingData.GetVariableName(i));
         }
       }
 
       // use x and y variable from content
-      if (Content.SelectedXVariable != null && Content.SelectedYVariable != null && Content.SelectedColorVariable != null) {
+      if (Content.SelectedXVariable != null && Content.SelectedYVariable != null && Content.SelectedGroupVariable != null) {
         comboBoxXVariable.SelectedItem = Content.SelectedXVariable;
         comboBoxYVariable.SelectedItem = Content.SelectedYVariable;
-        comboBoxColor.SelectedItem = Content.SelectedColorVariable;
+        comboBoxGroup.SelectedItem = Content.SelectedGroupVariable;
       } else {
         if (variables.Count() >= 2) {
           comboBoxXVariable.SelectedIndex = 0;
           comboBoxYVariable.SelectedIndex = 1;
-          comboBoxColor.SelectedIndex = 0;
+          comboBoxGroup.SelectedIndex = 0;
           UpdateScatterPlot();
         }
@@ -87 +87 @@
 
     private void UpdateScatterPlot() {
-      if (comboBoxXVariable.SelectedItem != null && comboBoxYVariable.SelectedItem != null && comboBoxColor.SelectedItem != null) {
+      if (comboBoxXVariable.SelectedItem != null && comboBoxYVariable.SelectedItem != null && comboBoxGroup.SelectedItem != null) {
         var xVariable = (string)comboBoxXVariable.SelectedItem;
         var yVariable = (string)comboBoxYVariable.SelectedItem;
-        var colorVariable = (string)comboBoxColor.SelectedItem;
-        ScatterPlot scatterPlot = Content.CreateScatterPlot(xVariable, yVariable, colorVariable);
+        var groupVariable = (string)comboBoxGroup.SelectedItem;
+        ScatterPlot scatterPlot = Content.CreateScatterPlot(xVariable, yVariable, groupVariable);
         var vp = scatterPlot.VisualProperties;
         vp.Title = string.Empty;
@@ -98 +98 @@
 
         scatterPlotControl.Content = scatterPlot;
-        
+
         //save selected x and y variable in content
         this.Content.SelectedXVariable = (string)comboBoxXVariable.SelectedItem;
         this.Content.SelectedYVariable = (string)comboBoxYVariable.SelectedItem;
-        this.Content.SelectedColorVariable = (string)comboBoxColor.SelectedItem;
+        this.Content.SelectedGroupVariable = (string)comboBoxGroup.SelectedItem;
       }
     }

branches/DataPreprocessing Enhancements/HeuristicLab.DataPreprocessing.Views/3.4/ViewShortcutListView.Designer.cs

@@ -53 +53 @@
       this.SuspendLayout();
       // 
-      // splitContainer
-      // 
-      this.splitContainer.Size = new System.Drawing.Size(526, 364);
-      // 
-      // itemsGroupBox
-      // 
-      this.itemsGroupBox.Size = new System.Drawing.Size(532, 383);
-      // 
       // itemsListView
       // 
-      this.itemsListView.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)));
       this.itemsListView.Dock = System.Windows.Forms.DockStyle.Fill;
-      this.itemsListView.Location = new System.Drawing.Point(0, 0);
-      this.itemsListView.Size = new System.Drawing.Size(200, 364);
-      // 
-      // detailsGroupBox
-      // 
-      this.detailsGroupBox.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)));
-      this.detailsGroupBox.Dock = System.Windows.Forms.DockStyle.Fill;
-      this.detailsGroupBox.Location = new System.Drawing.Point(0, 0);
-      this.detailsGroupBox.Size = new System.Drawing.Size(322, 364);
-      // 
-      // addButton
-      // 
-      this.toolTip.SetToolTip(this.addButton, "Add");
-      this.addButton.Visible = false;
-      // 
-      // removeButton
-      // 
-      this.toolTip.SetToolTip(this.removeButton, "Remove");
-      this.removeButton.Visible = false;
-      // 
-      // moveUpButton
-      // 
-      this.toolTip.SetToolTip(this.moveUpButton, "Move Up");
-      this.moveUpButton.Visible = false;
-      // 
-      // moveDownButton
-      // 
-      this.toolTip.SetToolTip(this.moveDownButton, "Move Down");
-      this.moveDownButton.Visible = false;
       // 
       // viewHost
       // 
-      this.viewHost.Size = new System.Drawing.Size(310, 339);
+      this.viewHost.Dock = System.Windows.Forms.DockStyle.Fill;
       this.viewHost.ViewsLabelVisible = false;
       // 

branches/DataPreprocessing Enhancements/HeuristicLab.DataPreprocessing.Views/3.4/ViewShortcutListView.cs

@@ -21 +21 @@
 
 using System;
-using HeuristicLab.Common;
 using HeuristicLab.Core;
 using HeuristicLab.Core.Views;
@@ -33 +32 @@
     public ViewShortcutListView() {
       InitializeComponent();
-      itemsGroupBox.Text = "View Shortcuts";
+      Controls.Clear();
+      Controls.Add(splitContainer);
+      splitContainer.Panel1.Controls.Clear();
+      splitContainer.Panel1.Controls.Add(itemsListView);
+      splitContainer.Panel2.Controls.Clear();
+      splitContainer.Panel2.Controls.Add(viewHost);
     }
 
@@ -42 +46 @@
         IViewShortcut item = itemsListView.SelectedItems[0].Tag as IViewShortcut;
         if (item != null) {
+          item = (IViewShortcut)item.Clone();
 
-          if (item is IViewChartShortcut)
-            item = (IViewChartShortcut)item.Clone(new Cloner());
-
-          IContentView view = MainFormManager.MainForm.ShowContent(item);
+          var view = MainFormManager.MainForm.ShowContent(item);
           if (view != null) {
             view.ReadOnly = ReadOnly;