Changeset 14495
- Timestamp:
- 12/16/16 14:47:38 (8 years ago)
- Location:
- branches/DataPreprocessing Enhancements
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/DataPreprocessing Enhancements/HeuristicLab.DataPreprocessing.Views/3.4/ScatterPlotMultiView.cs
r14467 r14495 267 267 } else { //scatter plot 268 268 var scatterPlot = Content.CreateScatterPlot(colVariable, rowVariable); 269 foreach (var row in scatterPlot.Rows) 270 row.VisualProperties.PointSize = 3; 269 271 scatterPlot.VisualProperties.Title = string.Empty; 270 272 var scatterPlotControl = new /*Preprocessing*/ScatterPlotControl { -
branches/DataPreprocessing Enhancements/HeuristicLab.DataPreprocessing.Views/3.4/ScatterPlotSingleView.cs
r14474 r14495 88 88 var groupVariable = (string)comboBoxGroup.SelectedItem; 89 89 ScatterPlot scatterPlot = Content.CreateScatterPlot(xVariable, yVariable, groupVariable); 90 foreach (var row in scatterPlot.Rows) 91 row.VisualProperties.PointSize = 6; 90 92 var vp = scatterPlot.VisualProperties; 91 93 vp.Title = string.Empty; … … 115 117 116 118 foreach (var x in newPlot.Rows.Zip(oldPlot.Rows, (nr, or) => new { nr, or })) { 117 x.nr.VisualProperties.PointSize = x.or.VisualProperties.PointSize;118 x.nr.VisualProperties.PointStyle = x.or.VisualProperties.PointStyle;119 x.nr.VisualProperties .Color = x.or.VisualProperties.Color;119 var newVisuapProperties = (ScatterPlotDataRowVisualProperties)x.or.VisualProperties.Clone(); 120 newVisuapProperties.DisplayName = x.nr.VisualProperties.DisplayName; 121 x.nr.VisualProperties = newVisuapProperties; 120 122 } 121 123 } … … 133 135 134 136 foreach (var x in newPlot.Rows.Zip(oldPlot.Rows, (nr, or) => new { nr, or })) { 135 x.nr.VisualProperties.PointSize = x.or.VisualProperties.PointSize;136 x.nr.VisualProperties.PointStyle = x.or.VisualProperties.PointStyle;137 x.nr.VisualProperties .Color = x.or.VisualProperties.Color;137 var newVisuapProperties = (ScatterPlotDataRowVisualProperties)x.or.VisualProperties.Clone(); 138 newVisuapProperties.DisplayName = x.nr.VisualProperties.DisplayName; 139 x.nr.VisualProperties = newVisuapProperties; 138 140 } 139 141 } -
branches/DataPreprocessing Enhancements/HeuristicLab.DataPreprocessing/3.4/Content/ScatterPlotContent.cs
r14474 r14495 42 42 ScatterPlot scatterPlot = new ScatterPlot(); 43 43 44 IList<double> xValues = PreprocessingData.GetValues<double>(PreprocessingData.GetColumnIndex(variableNameX)) ;45 IList<double> yValues = PreprocessingData.GetValues<double>(PreprocessingData.GetColumnIndex(variableNameY)) ;44 IList<double> xValues = PreprocessingData.GetValues<double>(PreprocessingData.GetColumnIndex(variableNameX)).Where(x => !double.IsNaN(x) && !double.IsInfinity(x)).ToList(); 45 IList<double> yValues = PreprocessingData.GetValues<double>(PreprocessingData.GetColumnIndex(variableNameY)).Where(x => !double.IsNaN(x) && !double.IsInfinity(x)).ToList(); 46 46 47 double axisMin, axisMax, axisInterval; 48 try { 49 ChartUtil.CalculateOptimalAxisInterval(xValues.Min(), xValues.Max(), out axisMin, out axisMax, out axisInterval); 50 scatterPlot.VisualProperties.XAxisMinimumAuto = false; 51 scatterPlot.VisualProperties.XAxisMaximumAuto = false; 52 scatterPlot.VisualProperties.XAxisMinimumFixedValue = axisMin; 53 scatterPlot.VisualProperties.XAxisMaximumFixedValue = axisMax; 54 } catch (ArgumentOutOfRangeException) { } // missing values lead to NaNs 55 try { 56 ChartUtil.CalculateOptimalAxisInterval(yValues.Min(), yValues.Max(), out axisMin, out axisMax, out axisInterval); 57 scatterPlot.VisualProperties.YAxisMinimumAuto = false; 58 scatterPlot.VisualProperties.YAxisMaximumAuto = false; 59 scatterPlot.VisualProperties.YAxisMinimumFixedValue = axisMin; 60 scatterPlot.VisualProperties.YAxisMaximumFixedValue = axisMax; 61 } catch (ArgumentOutOfRangeException) { } // missing values lead to NaNs 47 if (xValues.Any()) { 48 try { 49 double axisMin, axisMax, axisInterval; 50 ChartUtil.CalculateOptimalAxisInterval(xValues.Min(), xValues.Max(), out axisMin, out axisMax, out axisInterval); 51 scatterPlot.VisualProperties.XAxisMinimumAuto = false; 52 scatterPlot.VisualProperties.XAxisMaximumAuto = false; 53 scatterPlot.VisualProperties.XAxisMinimumFixedValue = axisMin; 54 scatterPlot.VisualProperties.XAxisMaximumFixedValue = axisMax; 55 } catch (ArgumentOutOfRangeException) { } // error during CalculateOptimalAxisInterval 56 } 57 if (yValues.Any()) { 58 try { 59 double axisMin, axisMax, axisInterval; 60 ChartUtil.CalculateOptimalAxisInterval(yValues.Min(), yValues.Max(), out axisMin, out axisMax, out axisInterval); 61 scatterPlot.VisualProperties.YAxisMinimumAuto = false; 62 scatterPlot.VisualProperties.YAxisMaximumAuto = false; 63 scatterPlot.VisualProperties.YAxisMinimumFixedValue = axisMin; 64 scatterPlot.VisualProperties.YAxisMaximumFixedValue = axisMax; 65 } catch (ArgumentOutOfRangeException) { } // error during CalculateOptimalAxisInterval 66 } 62 67 63 68 if (variableNameGroup == null || variableNameGroup == "-") { … … 69 74 } 70 75 71 ScatterPlotDataRow scdr = new ScatterPlotDataRow(variableNameX + " - " + variableNameY, "", points) { 72 VisualProperties = { PointSize = 6 } 73 }; 76 ScatterPlotDataRow scdr = new ScatterPlotDataRow(variableNameX + " - " + variableNameY, "", points); 74 77 scdr.VisualProperties.IsVisibleInLegend = false; 75 78 scatterPlot.Rows.Add(scdr);
Note: See TracChangeset
for help on using the changeset viewer.