Changeset 7850 for branches/Sliding Window GP/HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4

Timestamp:

05/21/12 10:30:41 (12 years ago)

Author:

mkommend

Message:

#1837: Added view for sliding window GP and updated analyzer.

Location:

branches/Sliding Window GP/HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4

Files:

• HeuristicLab.Problems.DataAnalysis.Symbolic.Views-3.4.csproj (modified) (1 diff)
• SlidingWindowDataView.Designer.cs (modified) (2 diffs)
• SlidingWindowDataView.cs (modified) (3 diffs)

branches/Sliding Window GP/HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/HeuristicLab.Problems.DataAnalysis.Symbolic.Views-3.4.csproj

@@ -50 +50 @@
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
-    <OutputPath>$(SolutionDir)\bin\</OutputPath>
+    <OutputPath>..\..\..\..\trunk\sources\bin\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>

branches/Sliding Window GP/HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/SlidingWindowDataView.Designer.cs

@@ -26 +26 @@
     /// </summary>
     private void InitializeComponent() {
+      System.Windows.Forms.DataVisualization.Charting.ChartArea chartArea1 = new System.Windows.Forms.DataVisualization.Charting.ChartArea();
       this.chart = new HeuristicLab.Visualization.ChartControlsExtensions.EnhancedChart();
       ((System.ComponentModel.ISupportInitialize)(this.chart)).BeginInit();
@@ -32 +33 @@
       // chart
       // 
+      chartArea1.Name = "ChartArea1";
+      this.chart.ChartAreas.Add(chartArea1);
       this.chart.Dock = System.Windows.Forms.DockStyle.Fill;
       this.chart.Location = new System.Drawing.Point(0, 0);

branches/Sliding Window GP/HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/SlidingWindowDataView.cs

@@ -51 +51 @@
 
       StripLine stripLine = new StripLine();
-      stripLine.BackColor = Color.Yellow;
+      stripLine.BackColor = Color.Gold;
       stripLine.Font = new Font("Times New Roman", 12, FontStyle.Bold);
       stripLine.Text = "Sliding Window";
@@ -72 +72 @@
 
     private void SlidingWindowPosition_ValueChanged(object sender, System.EventArgs e) {
-      UpdateStripLine();
+      if (InvokeRequired) Invoke((Action<object, EventArgs>)SlidingWindowPosition_ValueChanged, sender, e);
+      else UpdateStripLine();
     }
 
@@ -81 +82 @@
       chart.Series.Add(TARGETVARIABLE_SERIES_NAME);
       chart.Series[TARGETVARIABLE_SERIES_NAME].ChartType = SeriesChartType.FastLine;
-      chart.Series[TARGETVARIABLE_SERIES_NAME].Points.AddY(Content.TargetValues);
+      chart.Series[TARGETVARIABLE_SERIES_NAME].Points.DataBindY(Content.TargetValues.ToArray());
 
       UpdateStripLine();
+      UpdateCursorInterval();
     }