Changeset 10882 for branches/DataPreprocessing/HeuristicLab.DataPreprocessing.Views

Timestamp:

05/21/14 15:28:27 (10 years ago)

Author:

aesterer

Message:

Added scatter plot view

Location:

branches/DataPreprocessing/HeuristicLab.DataPreprocessing.Views/3.3

Files:

• DataPreprocessingView.cs (modified) (2 diffs)
• HeuristicLab.DataPreprocessing.Views-3.3.csproj (modified) (1 diff)
• MultiScatterPlotView.Designer.cs (added)
• MultiScatterPlotView.cs (added)
• PreprocessingScatterPlotView.Designer.cs (copied) (copied from branches/DataPreprocessing/HeuristicLab.Analysis.Views/3.3/ScatterPlotView.Designer.cs) (3 diffs)
• PreprocessingScatterPlotView.cs (copied) (copied from branches/DataPreprocessing/HeuristicLab.Analysis.Views/3.3/ScatterPlotView.cs) (4 diffs)

branches/DataPreprocessing/HeuristicLab.DataPreprocessing.Views/3.3/DataPreprocessingView.cs

@@ -49 +49 @@
         var statisticsLogic = new StatisticsLogic(data, searchLogic);
         var manipulationLogic = new ManipulationLogic(data, searchLogic, statisticsLogic, dataGridLogic);
-        var lineChartLogic = new ChartLogic(data);
-        var histogramLogic = new ChartLogic(data);
+        var chartLogic = new ChartLogic(data);
         var filterLogic = new FilterLogic(data);
         var dataCompletenessLogic = new ChartLogic(data);
@@ -60 +59 @@
           new TransformationContent(data),
           new ManipulationContent(manipulationLogic, searchLogic),
-          new LineChartContent(lineChartLogic),
-          new HistogramContent(histogramLogic)//,
+          new LineChartContent(chartLogic),
+          new HistogramContent(chartLogic),
+          new ScatterPlotContent(chartLogic)
+          //,
           //new DataCompletenessChartContent(dataCompletenessLogic)
         };

branches/DataPreprocessing/HeuristicLab.DataPreprocessing.Views/3.3/HeuristicLab.DataPreprocessing.Views-3.3.csproj

@@ -113 +113 @@
       <DependentUpon>FilterView.cs</DependentUpon>
     </Compile>
+    <Compile Include="MultiScatterPlotView.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="MultiScatterPlotView.Designer.cs">
+      <DependentUpon>MultiScatterPlotView.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">
       <SubType>Form</SubType>

branches/DataPreprocessing/HeuristicLab.DataPreprocessing.Views/3.3/PreprocessingScatterPlotView.Designer.cs

@@ -20 +20 @@
 #endregion
 
-namespace HeuristicLab.Analysis.Views {
-  partial class ScatterPlotView {
+namespace HeuristicLab.DataPreprocessing.Views {
+  partial class PreprocessingScatterPlotView {
     /// <summary> 
     /// Required designer variable.
@@ -50 +50 @@
       System.Windows.Forms.DataVisualization.Charting.Title title1 = new System.Windows.Forms.DataVisualization.Charting.Title();
       this.chart = new HeuristicLab.Visualization.ChartControlsExtensions.EnhancedChart();
-      ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).BeginInit();
       ((System.ComponentModel.ISupportInitialize)(this.chart)).BeginInit();
       this.SuspendLayout();
-      // 
-      // nameTextBox
-      // 
-      this.errorProvider.SetIconAlignment(this.nameTextBox, System.Windows.Forms.ErrorIconAlignment.MiddleLeft);
-      this.errorProvider.SetIconPadding(this.nameTextBox, 2);
-      this.nameTextBox.Location = new System.Drawing.Point(55, 0);
-      this.nameTextBox.Size = new System.Drawing.Size(279, 20);
-      // 
-      // infoLabel
-      // 
-      this.infoLabel.Location = new System.Drawing.Point(340, 3);
       // 
       // chart
@@ -107 +95 @@
       this.Name = "ScatterPlotView";
       this.Size = new System.Drawing.Size(359, 274);
-      this.Controls.SetChildIndex(this.infoLabel, 0);
       this.Controls.SetChildIndex(this.chart, 0);
-      this.Controls.SetChildIndex(this.nameLabel, 0);
-      this.Controls.SetChildIndex(this.nameTextBox, 0);
-      ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).EndInit();
       ((System.ComponentModel.ISupportInitialize)(this.chart)).EndInit();
       this.ResumeLayout(false);

branches/DataPreprocessing/HeuristicLab.DataPreprocessing.Views/3.3/PreprocessingScatterPlotView.cs

@@ -26 +26 @@
 using System.Windows.Forms;
 using System.Windows.Forms.DataVisualization.Charting;
+using HeuristicLab.Analysis;
+using HeuristicLab.Analysis.Views;
 using HeuristicLab.Collections;
 using HeuristicLab.Common;
@@ -31 +33 @@
 using HeuristicLab.MainForm;
 
-namespace HeuristicLab.Analysis.Views {
-  [View("ScatterPlot View")]
-  [Content(typeof(ScatterPlot), true)]
-  public partial class ScatterPlotView : NamedItemView, IConfigureableView {
+namespace HeuristicLab.DataPreprocessing.Views {
+  [View("Preprocessing ScatterPlot View")]
+  [Content(typeof(ScatterPlot), false)]
+  public partial class PreprocessingScatterPlotView : ItemView, IConfigureableView {
     protected List<Series> invisibleSeries;
     protected Dictionary<IObservableList<Point2D<double>>, ScatterPlotDataRow> pointsRowsTable;
@@ -43 +45 @@
     }
 
-    public ScatterPlotView() {
+    public PreprocessingScatterPlotView() {
       InitializeComponent();
       pointsRowsTable = new Dictionary<IObservableList<Point2D<double>>, ScatterPlotDataRow>();
@@ -227 +229 @@
     #region Event Handlers
     #region Content Event Handlers
-    protected override void Content_NameChanged(object sender, EventArgs e) {
-      if (InvokeRequired)
-        Invoke(new EventHandler(Content_NameChanged), sender, e);
-      else {
-        chart.Titles[0].Text = Content.Name;
-        base.Content_NameChanged(sender, e);
-      }
-    }
+
     private void Content_VisualPropertiesChanged(object sender, EventArgs e) {
       if (InvokeRequired)