Changeset 14983 for branches/DataPreprocessing Enhancements/HeuristicLab.DataPreprocessing.Views/3.4/ScatterPlotMultiView.cs

Timestamp:

05/15/17 16:30:45 (7 years ago)

Author:

pfleck

Message:

#2709 Adapted DataTable/ScatterPlotControl to the recent (re-) merge of the -View and -Control.

File:

• branches/DataPreprocessing Enhancements/HeuristicLab.DataPreprocessing.Views/3.4/ScatterPlotMultiView.cs (modified) (8 diffs)

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

@@ -416 +416 @@
           foreach (var dataRow in dataTable.Rows)
             dataRow.VisualProperties.IsVisibleInLegend = groupingComboBox.SelectedIndex > 0;
-          var pcv = new DataTableControl {
+          var pcv = new DataTableView {
             Name = key.ToString(),
             Content = dataTable,
             Dock = DockStyle.Fill,
+            ShowName = false
             //ShowLegend = false,
             //XAxisFormat = "G3"
@@ -444 +445 @@
           }
           scatterPlot.VisualProperties.Title = string.Empty;
-          var scatterPlotControl = new ScatterPlotControl {
+          var scatterPlotView = new ScatterPlotView {
             Name = key.ToString(),
             Content = scatterPlot,
             Dock = DockStyle.Fill,
+            ShowName = false
             //ShowLegend = false,
             //XAxisFormat = "G3"
           };
-          //scatterPlotControl.DoubleClick += ScatterPlotDoubleClick; // ToDo: not working; double click is already handled by the chart
-          bodyCache.Add(key, scatterPlotControl);
+          //scatterPlotView.DoubleClick += ScatterPlotDoubleClick; // ToDo: not working; double click is already handled by the chart
+          bodyCache.Add(key, scatterPlotView);
         }
       }
@@ -536 +538 @@
     //Open scatter plot in new tab with new content when double clicked
     private void ScatterPlotDoubleClick(object sender, EventArgs e) {
-      var scatterPlotControl = (ScatterPlotControl)sender;
+      var scatterPlotView = (ScatterPlotView)sender;
       var scatterContent = new SingleScatterPlotContent(Content.PreprocessingData);
-      ScatterPlot scatterPlot = scatterPlotControl.Content;
+      ScatterPlot scatterPlot = scatterPlotView.Content;
 
       //Extract variable names from scatter plot and set them in content
@@ -552 +554 @@
     //open histogram in new tab with new content when double clicked
     private void HistogramDoubleClick(object sender, EventArgs e) {
-      DataTableControl pcv = (DataTableControl)sender;
+      DataTableView pcv = (DataTableView)sender;
       HistogramContent histoContent = new HistogramContent(Content.PreprocessingData);  // create new content     
                                                                                         //ToDo: histoContent.VariableItemList = Content.CreateVariableItemList();
@@ -655 +657 @@
       int pointSize = (int)pointSizeNumericUpDown.Value;
       foreach (var control in bodyCache.ToList()) {
-        var scatterPlotControl = control.Value as ScatterPlotControl;
-        if (scatterPlotControl != null) {
-          foreach (var row in scatterPlotControl.Content.Rows) {
+        var scatterPlotView = control.Value as ScatterPlotView;
+        if (scatterPlotView != null) {
+          foreach (var row in scatterPlotView.Content.Rows) {
             row.VisualProperties.PointSize = pointSize;
           }
@@ -666 +668 @@
       float opacity = (float)pointOpacityNumericUpDown.Value;
       foreach (var control in bodyCache.ToList()) {
-        var scatterPlotControl = control.Value as ScatterPlotControl;
-        if (scatterPlotControl != null) {
-          foreach (var row in scatterPlotControl.Content.Rows) {
+        var scatterPlotView = control.Value as ScatterPlotView;
+        if (scatterPlotView != null) {
+          foreach (var row in scatterPlotView.Content.Rows) {
             var color = row.VisualProperties.Color;
             if (color.IsEmpty)
@@ -700 +702 @@
         }
 
-        var scatterPlotControl = control.Value as ScatterPlotControl;
-        if (scatterPlotControl != null) {
-          foreach (var row in scatterPlotControl.Content.Rows) {
+        var scatterPlotView = control.Value as ScatterPlotView;
+        if (scatterPlotView != null) {
+          foreach (var row in scatterPlotView.Content.Rows) {
             row.VisualProperties.IsRegressionVisibleInLegend = false;
             row.VisualProperties.RegressionType = regressionType;
@@ -726 +728 @@
         }
 
-        var histogramControl = control.Value as DataTableControl;
+        var histogramControl = control.Value as DataTableView;
         if (histogramControl != null) {
           foreach (var row in histogramControl.Content.Rows) {