Changeset 14462

Timestamp:

12/07/16 15:07:26 (8 years ago)

Author:

pfleck

Message:

#2709

• Added a separate MultiScatterPlot entry and removed the ViewHost views-icon instead.
• Moved legend of DataCompletenessChart to the top and removed the title instead.

Location:

branches/DataPreprocessing Enhancements

Files:

• HeuristicLab.DataPreprocessing.Views/3.4/DataCompletenessView.Designer.cs (modified) (1 diff)
• HeuristicLab.DataPreprocessing.Views/3.4/DataCompletenessView.cs (modified) (1 diff)
• HeuristicLab.DataPreprocessing.Views/3.4/DataPreprocessingView.cs (modified) (1 diff)
• HeuristicLab.DataPreprocessing.Views/3.4/ScatterPlotMultiView.cs (modified) (2 diffs)
• HeuristicLab.DataPreprocessing.Views/3.4/ViewShortcutListView.Designer.cs (modified) (1 diff)
• HeuristicLab.DataPreprocessing/3.4/Content/MultiScatterPlotContent.cs (copied) (copied from branches/DataPreprocessing Enhancements/HeuristicLab.DataPreprocessing/3.4/Content/ScatterPlotContent.cs) (3 diffs)
• HeuristicLab.DataPreprocessing/3.4/HeuristicLab.DataPreprocessing-3.4.csproj (modified) (1 diff)

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

@@ -54 +54 @@
       // 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";
       this.chart.ChartAreas.Add(chartArea1);
+      legend1.Alignment = System.Drawing.StringAlignment.Center;
+      legend1.Docking = System.Windows.Forms.DataVisualization.Charting.Docking.Top;
       legend1.Name = "Legend1";
       this.chart.Legends.Add(legend1);

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

@@ -69 +69 @@
 
     private void PrepareChart() {
-      chart.Titles.Add("DataCompletenessChart");
       chart.EnableDoubleClickResetsZoom = true;
       chart.ChartAreas[0].AxisX.MajorGrid.LineWidth = 0;

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

@@ -62 +62 @@
           new HistogramContent(data),
           new ScatterPlotContent(data),
+          new MultiScatterPlotContent(data),
           new CorrelationMatrixContent(Content),
           new DataCompletenessChartContent(searchLogic),

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

@@ -14 +14 @@
 namespace HeuristicLab.DataPreprocessing.Views {
   [View("Scatter Plot Multi View")]
-  [Content(typeof(ScatterPlotContent), false)]
+  [Content(typeof(MultiScatterPlotContent), true)]
   public partial class ScatterPlotMultiView : PreprocessingCheckedVariablesView {
     private readonly IDictionary<string, Label> columnHeaderCache;
@@ -48 +48 @@
     }
 
-    public new ScatterPlotContent Content {
-      get { return (ScatterPlotContent)base.Content; }
+    public new MultiScatterPlotContent Content {
+      get { return (MultiScatterPlotContent)base.Content; }
       set { base.Content = value; }
     }

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

@@ -98 +98 @@
       // 
       this.viewHost.Size = new System.Drawing.Size(310, 339);
+      this.viewHost.ViewsLabelVisible = false;
       // 
       // showDetailsCheckBox

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

@@ -20 +20 @@
 #endregion
 
-using System.Collections.Generic;
 using System.Drawing;
-using System.Linq;
-using HeuristicLab.Analysis;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
@@ -29 +26 @@
 namespace HeuristicLab.DataPreprocessing {
 
-  [Item("ScatterPlot", "Represents a scatter plot.")]
-  public class ScatterPlotContent : PreprocessingChartContent {
+  [Item("MultiScatterPlot", "Represents a multi scatter plot.")]
+  public class MultiScatterPlotContent : ScatterPlotContent {
 
-    public string SelectedXVariable { get; set; }
-    public string SelectedYVariable { get; set; }
-    public string SelectedColorVariable { get; set; }
-
-    public ScatterPlotContent(IFilteredPreprocessingData preprocessingData)
+    public MultiScatterPlotContent(IFilteredPreprocessingData preprocessingData)
       : base(preprocessingData) {
     }
 
-    public ScatterPlotContent(ScatterPlotContent content, Cloner cloner)
+    public MultiScatterPlotContent(MultiScatterPlotContent content, Cloner cloner)
       : base(content, cloner) {
-      this.SelectedXVariable = content.SelectedXVariable;
-      this.SelectedYVariable = content.SelectedYVariable;
-      this.SelectedColorVariable = content.SelectedColorVariable;
     }
 
@@ -52 +42 @@
 
     public override IDeepCloneable Clone(Cloner cloner) {
-      return new ScatterPlotContent(this, cloner);
-    }
-
-    public ScatterPlot CreateScatterPlot(string variableNameX, string variableNameY, string variableNameColor = "-") {
-      ScatterPlot scatterPlot = new ScatterPlot();
-
-      IList<double> xValues = PreprocessingData.GetValues<double>(PreprocessingData.GetColumnIndex(variableNameX));
-      IList<double> yValues = PreprocessingData.GetValues<double>(PreprocessingData.GetColumnIndex(variableNameY));
-      if (variableNameColor == null || variableNameColor == "-") {
-        List<Point2D<double>> points = new List<Point2D<double>>();
-
-        for (int i = 0; i < xValues.Count; i++) {
-          Point2D<double> point = new Point2D<double>(xValues[i], yValues[i]);
-          points.Add(point);
-        }
-
-        ScatterPlotDataRow scdr = new ScatterPlotDataRow(variableNameX + " - " + variableNameY, "", points);
-        scdr.VisualProperties.IsVisibleInLegend = false;
-        scatterPlot.Rows.Add(scdr);
-
-      } else {
-        var colorValues = PreprocessingData.GetValues<double>(PreprocessingData.GetColumnIndex(variableNameColor));
-        var data = xValues.Zip(yValues, (x, y) => new { x, y }).Zip(colorValues, (v, c) => new { v.x, v.y, c }).ToList();
-        var gradients = ColorGradient.Colors;
-        int curGradient = 0;
-        int numColors = colorValues.Distinct().Count();
-        foreach (var colorValue in colorValues.Distinct()) {
-          var values = data.Where(x => x.c == colorValue);
-          var row = new ScatterPlotDataRow(
-            variableNameX + " - " + variableNameY + " (" + colorValue + ")",
-            "",
-            values.Select(v => new Point2D<double>(v.x, v.y)),
-            new ScatterPlotDataRowVisualProperties() { Color = gradients[curGradient] });
-          curGradient += gradients.Count / numColors;
-          scatterPlot.Rows.Add(row);
-        }
-      }
-      return scatterPlot;
+      return new MultiScatterPlotContent(this, cloner);
     }
   }

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

@@ -120 +120 @@
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="Content\MultiScatterPlotContent.cs" />
     <Compile Include="Content\ScatterPlotContent.cs" />
     <Compile Include="Content\DataCompletenessChartContent.cs" />