Changeset 14446

Timestamp:

12/02/16 15:37:51 (8 years ago)

Author:

pfleck

Message:

#2709 Removed the PreprocessingScatterPlotView and use the HL ScatterPlotControl instead.

Location:

branches/DataPreprocessing Enhancements

Files:

• HeuristicLab.DataPreprocessing.Views/3.4/HeuristicLab.DataPreprocessing.Views-3.4.csproj (modified) (1 diff)
• HeuristicLab.DataPreprocessing.Views/3.4/PreprocessingScatterPlotView.Designer.cs (deleted)
• HeuristicLab.DataPreprocessing.Views/3.4/PreprocessingScatterPlotView.cs (deleted)
• HeuristicLab.DataPreprocessing.Views/3.4/ScatterPlotMultiView.cs (modified) (6 diffs)
• HeuristicLab.DataPreprocessing.Views/3.4/ScatterPlotSingleView.Designer.cs (modified) (6 diffs)
• HeuristicLab.DataPreprocessing.Views/3.4/ScatterPlotSingleView.cs (modified) (1 diff)
• HeuristicLab.DataPreprocessing/3.4/Content/ScatterPlotContent.cs (modified) (1 diff)

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

@@ -256 +256 @@
     <Compile Include="ScatterPlotMultiView.Designer.cs">
       <DependentUpon>ScatterPlotMultiView.cs</DependentUpon>
-    </Compile>
-    <Compile Include="PreprocessingScatterPlotView.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="PreprocessingScatterPlotView.Designer.cs">
-      <DependentUpon>PreprocessingScatterPlotView.cs</DependentUpon>
     </Compile>
     <Compile Include="SearchAndReplaceDialog.cs">

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

@@ -5 +5 @@
 using System.Windows.Forms;
 using HeuristicLab.Analysis;
+using HeuristicLab.Analysis.Views;
 using HeuristicLab.Collections;
 using HeuristicLab.Common;
-using HeuristicLab.Core.Views;
 using HeuristicLab.Data;
 using HeuristicLab.MainForm;
@@ -18 +18 @@
     private readonly IDictionary<string, Label> columnHeaderCache;
     private readonly IDictionary<string, Label> rowHeaderCache;
-    private readonly IDictionary<Tuple<string/*col*/, string/*row*/>, ItemView> bodyCache;
+    private readonly IDictionary<Tuple<string/*col*/, string/*row*/>, Control> bodyCache;
 
     public ScatterPlotMultiView() {
@@ -43 +43 @@
       columnHeaderCache = new Dictionary<string, Label>();
       rowHeaderCache = new Dictionary<string, Label>();
-      bodyCache = new Dictionary<Tuple<string, string>, ItemView>();
+      bodyCache = new Dictionary<Tuple<string, string>, Control>();
 
       bodyScrollPanel.MouseWheel += bodyScrollPanel_MouseWheel;
@@ -249 +249 @@
       return rowHeaderCache[variable];
     }
-    private ItemView GetBody(string colVariable, string rowVariable) {
+    private Control GetBody(string colVariable, string rowVariable) {
       var key = Tuple.Create(colVariable, rowVariable);
       if (!bodyCache.ContainsKey(key)) {
@@ -266 +266 @@
           bodyCache.Add(key, pcv);
         } else { //scatter plot
-          ScatterPlot scatterPlot = Content.CreateScatterPlot(colVariable, rowVariable);
-          PreprocessingScatterPlotView pspv = new PreprocessingScatterPlotView {
+          var scatterPlot = Content.CreateScatterPlot(colVariable, rowVariable);
+          scatterPlot.VisualProperties.Title = string.Empty;
+          var scatterPlotControl = new /*Preprocessing*/ScatterPlotControl {
             Name = key.ToString(),
             Content = scatterPlot,
             Dock = DockStyle.Fill,
-            ShowLegend = false,
-            XAxisFormat = "G3"
+            //ShowLegend = false,
+            //XAxisFormat = "G3"
           };
-          pspv.ChartDoubleClick += ScatterPlotDoubleClick;
-          bodyCache.Add(key, pspv);
+          scatterPlotControl.DoubleClick += ScatterPlotDoubleClick; // ToDo: not working; double click is already handled by the chart
+          bodyCache.Add(key, scatterPlotControl);
         }
       }
@@ -344 +345 @@
     //Open scatter plot in new tab with new content when double clicked
     private void ScatterPlotDoubleClick(object sender, EventArgs e) {
-      PreprocessingScatterPlotView pspv = (PreprocessingScatterPlotView)sender;
+      var scatterPlotControl = (ScatterPlotControl)sender;
       ScatterPlotContent scatterContent = new ScatterPlotContent(Content, new Cloner());  // create new content
-      ScatterPlot scatterPlot = pspv.Content;
+      ScatterPlot scatterPlot = scatterPlotControl.Content;
 
       //Extract variable names from scatter plot and set them in content

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

@@ -45 +45 @@
     /// </summary>
     private void InitializeComponent() {
-      this.scatterPlotView = new HeuristicLab.DataPreprocessing.Views.PreprocessingScatterPlotView();
+      this.scatterPlotControl = new HeuristicLab.Analysis.Views.ScatterPlotControl();
       this.groupBox1 = new System.Windows.Forms.GroupBox();
+      this.label3 = new System.Windows.Forms.Label();
       this.label2 = new System.Windows.Forms.Label();
       this.label1 = new System.Windows.Forms.Label();
+      this.comboBoxColor = new System.Windows.Forms.ComboBox();
       this.comboBoxYVariable = new System.Windows.Forms.ComboBox();
       this.comboBoxXVariable = new System.Windows.Forms.ComboBox();
-      this.label3 = new System.Windows.Forms.Label();
-      this.comboBoxColor = new System.Windows.Forms.ComboBox();
       this.groupBox1.SuspendLayout();
       this.SuspendLayout();
       // 
-      // scatterPlotView
+      // scatterPlotControl
       // 
-      this.scatterPlotView.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
-            | System.Windows.Forms.AnchorStyles.Left)
+      this.scatterPlotControl.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.scatterPlotView.Caption = "ScatterPlot View";
-      this.scatterPlotView.Content = null;
-      this.scatterPlotView.Location = new System.Drawing.Point(169, 3);
-      this.scatterPlotView.Name = "scatterPlotView";
-      this.scatterPlotView.ReadOnly = false;
-      this.scatterPlotView.Size = new System.Drawing.Size(689, 509);
-      this.scatterPlotView.TabIndex = 0;
+      this.scatterPlotControl.Content = null;
+      this.scatterPlotControl.Location = new System.Drawing.Point(169, 3);
+      this.scatterPlotControl.Name = "scatterPlotControl";
+      this.scatterPlotControl.Size = new System.Drawing.Size(689, 509);
+      this.scatterPlotControl.TabIndex = 0;
       // 
       // groupBox1
@@ -83 +81 @@
       this.groupBox1.TabStop = false;
       this.groupBox1.Text = "Options";
+      // 
+      // label3
+      // 
+      this.label3.AutoSize = true;
+      this.label3.Location = new System.Drawing.Point(17, 141);
+      this.label3.Name = "label3";
+      this.label3.Size = new System.Drawing.Size(31, 13);
+      this.label3.TabIndex = 3;
+      this.label3.Text = "Color";
       // 
       // label2
@@ -101 +108 @@
       this.label1.TabIndex = 2;
       this.label1.Text = "X Variable";
+      // 
+      // comboBoxColor
+      // 
+      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);
       // 
       // comboBoxYVariable
@@ -124 +142 @@
       this.comboBoxXVariable.SelectedIndexChanged += new System.EventHandler(this.comboBox_SelectedIndexChanged);
       // 
-      // label3
-      // 
-      this.label3.AutoSize = true;
-      this.label3.Location = new System.Drawing.Point(17, 141);
-      this.label3.Name = "label3";
-      this.label3.Size = new System.Drawing.Size(31, 13);
-      this.label3.TabIndex = 3;
-      this.label3.Text = "Color";
-      // 
-      // comboBoxColor
-      // 
-      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);
-      // 
       // ScatterPlotSingleView
       // 
@@ -149 +147 @@
       this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
       this.Controls.Add(this.groupBox1);
-      this.Controls.Add(this.scatterPlotView);
+      this.Controls.Add(this.scatterPlotControl);
       this.Name = "ScatterPlotSingleView";
       this.Size = new System.Drawing.Size(863, 517);
@@ -160 +158 @@
     #endregion
 
-    private HeuristicLab.DataPreprocessing.Views.PreprocessingScatterPlotView scatterPlotView;
+    private HeuristicLab.Analysis.Views.ScatterPlotControl scatterPlotControl;
     private System.Windows.Forms.GroupBox groupBox1;
     private System.Windows.Forms.Label label2;

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

@@ -88 +88 @@
     private void UpdateScatterPlot() {
       if (comboBoxXVariable.SelectedItem != null && comboBoxYVariable.SelectedItem != null && comboBoxColor.SelectedItem != null) {
-        //get scatter plot with selected x and y variable
-        ScatterPlot scatterPlot = Content.CreateScatterPlot(
-          (string)comboBoxXVariable.SelectedItem,
-          (string)comboBoxYVariable.SelectedItem,
-          (string)comboBoxColor.SelectedItem);
-        scatterPlotView.Content = scatterPlot;
+        var xVariable = (string)comboBoxXVariable.SelectedItem;
+        var yVariable = (string)comboBoxYVariable.SelectedItem;
+        var colorVariable = (string)comboBoxColor.SelectedItem;
+        ScatterPlot scatterPlot = Content.CreateScatterPlot(xVariable, yVariable, colorVariable);
+        var vp = scatterPlot.VisualProperties;
+        vp.Title = string.Empty;
+        vp.XAxisTitle = xVariable;
+        vp.YAxisTitle = yVariable;
 
+        scatterPlotControl.Content = scatterPlot;
+        
         //save selected x and y variable in content
         this.Content.SelectedXVariable = (string)comboBoxXVariable.SelectedItem;

branches/DataPreprocessing Enhancements/HeuristicLab.DataPreprocessing/3.4/Content/ScatterPlotContent.cs

@@ -69 +69 @@
 
         ScatterPlotDataRow scdr = new ScatterPlotDataRow(variableNameX + " - " + variableNameY, "", points);
+        scdr.VisualProperties.IsVisibleInLegend = false;
         scatterPlot.Rows.Add(scdr);