- Timestamp:
- 05/21/14 15:28:27 (10 years ago)
- Location:
- branches/DataPreprocessing
- Files:
-
- 2 added
- 5 edited
- 3 copied
Legend:
- Unmodified
- Added
- Removed
-
branches/DataPreprocessing/HeuristicLab.DataPreprocessing.Views/3.3/DataPreprocessingView.cs
r10877 r10882 49 49 var statisticsLogic = new StatisticsLogic(data, searchLogic); 50 50 var manipulationLogic = new ManipulationLogic(data, searchLogic, statisticsLogic, dataGridLogic); 51 var lineChartLogic = new ChartLogic(data); 52 var histogramLogic = new ChartLogic(data); 51 var chartLogic = new ChartLogic(data); 53 52 var filterLogic = new FilterLogic(data); 54 53 var dataCompletenessLogic = new ChartLogic(data); … … 60 59 new TransformationContent(data), 61 60 new ManipulationContent(manipulationLogic, searchLogic), 62 new LineChartContent(lineChartLogic), 63 new HistogramContent(histogramLogic)//, 61 new LineChartContent(chartLogic), 62 new HistogramContent(chartLogic), 63 new ScatterPlotContent(chartLogic) 64 //, 64 65 //new DataCompletenessChartContent(dataCompletenessLogic) 65 66 }; -
branches/DataPreprocessing/HeuristicLab.DataPreprocessing.Views/3.3/HeuristicLab.DataPreprocessing.Views-3.3.csproj
r10877 r10882 113 113 <DependentUpon>FilterView.cs</DependentUpon> 114 114 </Compile> 115 <Compile Include="MultiScatterPlotView.cs"> 116 <SubType>UserControl</SubType> 117 </Compile> 118 <Compile Include="MultiScatterPlotView.Designer.cs"> 119 <DependentUpon>MultiScatterPlotView.cs</DependentUpon> 120 </Compile> 121 <Compile Include="PreprocessingScatterPlotView.cs"> 122 <SubType>UserControl</SubType> 123 </Compile> 124 <Compile Include="PreprocessingScatterPlotView.Designer.cs"> 125 <DependentUpon>PreprocessingScatterPlotView.cs</DependentUpon> 126 </Compile> 115 127 <Compile Include="SearchAndReplaceDialog.cs"> 116 128 <SubType>Form</SubType> -
branches/DataPreprocessing/HeuristicLab.DataPreprocessing.Views/3.3/PreprocessingScatterPlotView.Designer.cs
r10877 r10882 20 20 #endregion 21 21 22 namespace HeuristicLab. Analysis.Views {23 partial class ScatterPlotView {22 namespace HeuristicLab.DataPreprocessing.Views { 23 partial class PreprocessingScatterPlotView { 24 24 /// <summary> 25 25 /// Required designer variable. … … 50 50 System.Windows.Forms.DataVisualization.Charting.Title title1 = new System.Windows.Forms.DataVisualization.Charting.Title(); 51 51 this.chart = new HeuristicLab.Visualization.ChartControlsExtensions.EnhancedChart(); 52 ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).BeginInit();53 52 ((System.ComponentModel.ISupportInitialize)(this.chart)).BeginInit(); 54 53 this.SuspendLayout(); 55 //56 // nameTextBox57 //58 this.errorProvider.SetIconAlignment(this.nameTextBox, System.Windows.Forms.ErrorIconAlignment.MiddleLeft);59 this.errorProvider.SetIconPadding(this.nameTextBox, 2);60 this.nameTextBox.Location = new System.Drawing.Point(55, 0);61 this.nameTextBox.Size = new System.Drawing.Size(279, 20);62 //63 // infoLabel64 //65 this.infoLabel.Location = new System.Drawing.Point(340, 3);66 54 // 67 55 // chart … … 107 95 this.Name = "ScatterPlotView"; 108 96 this.Size = new System.Drawing.Size(359, 274); 109 this.Controls.SetChildIndex(this.infoLabel, 0);110 97 this.Controls.SetChildIndex(this.chart, 0); 111 this.Controls.SetChildIndex(this.nameLabel, 0);112 this.Controls.SetChildIndex(this.nameTextBox, 0);113 ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).EndInit();114 98 ((System.ComponentModel.ISupportInitialize)(this.chart)).EndInit(); 115 99 this.ResumeLayout(false); -
branches/DataPreprocessing/HeuristicLab.DataPreprocessing.Views/3.3/PreprocessingScatterPlotView.cs
r10877 r10882 26 26 using System.Windows.Forms; 27 27 using System.Windows.Forms.DataVisualization.Charting; 28 using HeuristicLab.Analysis; 29 using HeuristicLab.Analysis.Views; 28 30 using HeuristicLab.Collections; 29 31 using HeuristicLab.Common; … … 31 33 using HeuristicLab.MainForm; 32 34 33 namespace HeuristicLab. Analysis.Views {34 [View(" ScatterPlot View")]35 [Content(typeof(ScatterPlot), true)]36 public partial class ScatterPlotView : NamedItemView, IConfigureableView {35 namespace HeuristicLab.DataPreprocessing.Views { 36 [View("Preprocessing ScatterPlot View")] 37 [Content(typeof(ScatterPlot), false)] 38 public partial class PreprocessingScatterPlotView : ItemView, IConfigureableView { 37 39 protected List<Series> invisibleSeries; 38 40 protected Dictionary<IObservableList<Point2D<double>>, ScatterPlotDataRow> pointsRowsTable; … … 43 45 } 44 46 45 public ScatterPlotView() {47 public PreprocessingScatterPlotView() { 46 48 InitializeComponent(); 47 49 pointsRowsTable = new Dictionary<IObservableList<Point2D<double>>, ScatterPlotDataRow>(); … … 227 229 #region Event Handlers 228 230 #region Content Event Handlers 229 protected override void Content_NameChanged(object sender, EventArgs e) { 230 if (InvokeRequired) 231 Invoke(new EventHandler(Content_NameChanged), sender, e); 232 else { 233 chart.Titles[0].Text = Content.Name; 234 base.Content_NameChanged(sender, e); 235 } 236 } 231 237 232 private void Content_VisualPropertiesChanged(object sender, EventArgs e) { 238 233 if (InvokeRequired) -
branches/DataPreprocessing/HeuristicLab.DataPreprocessing/3.3/HeuristicLab.DataPreprocessing-3.3.csproj
r10877 r10882 72 72 </ItemGroup> 73 73 <ItemGroup> 74 <Compile Include="Implementations\ScatterPlotContent.cs" /> 74 75 <Compile Include="Implementations\DataCompletenessChartContent.cs" /> 75 76 <Compile Include="Implementations\FilteredPreprocessingData.cs" /> -
branches/DataPreprocessing/HeuristicLab.DataPreprocessing/3.3/Implementations/ChartLogic.cs
r10867 r10882 27 27 using HeuristicLab.Core; 28 28 using HeuristicLab.Data; 29 using HeuristicLab.Common; 29 30 30 31 namespace HeuristicLab.DataPreprocessing { … … 60 61 row.VisualProperties.ChartType = chartType; 61 62 return row; 62 }63 64 private void ReplaceNANwithZero(IList<double> values) {65 for (int i = 0; i < values.Count; i++) {66 if (Double.IsNaN(values[i]))67 values[i] = 0;68 }69 63 } 70 64 … … 148 142 } 149 143 144 public ScatterPlot CreateScatterPlot(string name, string variableNameX, string variableNameY) { 145 ScatterPlot scatterPlot = new ScatterPlot(name, ""); 146 147 148 List<double> xValues = GetVariableValues(variableNameX); 149 List<double> yValues = GetVariableValues(variableNameY); 150 151 List<Point2D<double>> points = new List<Point2D<double>>(); 152 153 for( int i = 0; i < xValues.Count; i++) 154 { 155 Point2D<double> point = new Point2D<double>(xValues[i],yValues[i]); 156 points.Add(point); 157 } 158 159 ScatterPlotDataRow scdr = new ScatterPlotDataRow(variableNameX + " - " + variableNameY,"",points); 160 scatterPlot.Rows.Add(scdr); 161 return scatterPlot; 162 } 163 150 164 #endregion 151 165 } -
branches/DataPreprocessing/HeuristicLab.DataPreprocessing/3.3/Implementations/ScatterPlotContent.cs
r10867 r10882 26 26 namespace HeuristicLab.DataPreprocessing { 27 27 28 [Item(" LineChart", "Represents the line chart grid.")]29 public class LineChartContent : PreprocessingChartContent {28 [Item("ScatterPlot", "Represents a scatter plot.")] 29 public class ScatterPlotContent : PreprocessingChartContent { 30 30 31 public LineChartContent(IChartLogic chartlogic)31 public ScatterPlotContent(IChartLogic chartlogic) 32 32 : base(chartlogic) { 33 33 } 34 34 35 public LineChartContent(LineChartContent content, Cloner cloner)35 public ScatterPlotContent(ScatterPlotContent content, Cloner cloner) 36 36 : base(content, cloner) { 37 37 … … 43 43 44 44 public override IDeepCloneable Clone(Cloner cloner) { 45 return new LineChartContent(this, cloner);45 return new ScatterPlotContent(this, cloner); 46 46 } 47 47 -
branches/DataPreprocessing/HeuristicLab.DataPreprocessing/3.3/Interfaces/IChartLogic.cs
r10867 r10882 45 45 DataRow CreateDataRowRange(string variableName, int start, int end, DataRowVisualProperties.DataRowChartType chartType); 46 46 47 ScatterPlot CreateScatterPlot(string name,string variableNameX,string variableNameY); 48 47 49 string GetVariableNameByIndex(int index); 48 50
Note: See TracChangeset
for help on using the changeset viewer.