Changeset 14441

Timestamp:

12/02/16 13:43:34 (7 years ago)

Author:

pfleck

Message:

#2709 Copied plugins.

Location:

branches/DataPreprocessing Enhancements

Files:

• HeuristicLab.DataPreprocessing (copied) (copied from trunk/sources/HeuristicLab.DataPreprocessing)
• HeuristicLab.DataPreprocessing.Views (copied) (copied from trunk/sources/HeuristicLab.DataPreprocessing.Views)
• HeuristicLab.DataPreprocessing.Views/3.4/DataCompletenessView.cs (modified) (2 diffs)
• HeuristicLab.DataPreprocessing.Views/3.4/HeuristicLab.DataPreprocessing.Views-3.4.csproj (modified) (1 diff)
• HeuristicLab.DataPreprocessing.Views/3.4/ScatterPlotSingleView.Designer.cs (modified) (6 diffs)
• HeuristicLab.DataPreprocessing.Views/3.4/ScatterPlotSingleView.cs (modified) (3 diffs)
• HeuristicLab.DataPreprocessing/3.4/Content/ScatterPlotContent.cs (modified) (2 diffs)

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

@@ -101 +101 @@
         series.IsVisibleInLegend = i < 2; //only first two series are visible, non-missing and missing values
         series.Color = i % 2 == 0 ? colorNonMissingValue : colorMissingValue;
+        series.IsValueShownAsLabel = true;
 
-        var values = yValuesPerColumn.Select(y => i < y.Count ? y[i] : 0).ToArray();
+        // use NaN to indicate "no value" instead of zero-range datapoints
+        var values = yValuesPerColumn.Select(y => (i < y.Count && y[i] != 0) ? y[i] : double.NaN).ToArray();
         series.Points.DataBindY(values);
         chart.Series.Add(series);
@@ -139 +141 @@
         }
         yValues.Add(valueCount);
-        if (missingState) //handle last missing
+        if (missingState) //handle last missing    why?
         {
-          yValues.Add(0);
+          //yValues.Add(0);
         }
         columnsYValues.Add(yValues);

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

@@ -353 +353 @@
       <Private>False</Private>
     </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="ScatterPlotSingleView.resx">
+      <DependentUpon>ScatterPlotSingleView.cs</DependentUpon>
+    </EmbeddedResource>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

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

@@ -23 +23 @@
 using System.Collections.Generic;
 using System.Linq;
+using System.Windows.Forms;
 using HeuristicLab.Analysis;
 using HeuristicLab.Core.Views;
@@ -77 +78 @@
     protected override void OnContentChanged() {
       base.OnContentChanged();
+
+      comboBoxXVariable.Items.Clear();
+      comboBoxYVariable.Items.Clear();
+      comboBoxColor.Items.Clear();
       if (Content != null) {
         InitData();
@@ -88 +93 @@
     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

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);
 
@@ -83 +84 @@
             "",
             values.Select(v => new Point2D<double>(v.x, v.y)),
-            new ScatterPlotDataRowVisualProperties() { Color = gradients[curGradient] });
+            new ScatterPlotDataRowVisualProperties() { Color = gradients[curGradient], });
           curGradient += gradients.Count / numColors;
           scatterPlot.Rows.Add(row);