Changeset 14588 for branches/HeuristicLab.DatastreamAnalysis/HeuristicLab.DatastreamAnalysis.Views

Timestamp:

01/19/17 19:15:33 (8 years ago)

Author:

jzenisek

Message:

#2719 updated databar set and view

Location:

branches/HeuristicLab.DatastreamAnalysis/HeuristicLab.DatastreamAnalysis.Views/3.4

Files:

• DataBarSetView.Designer.cs (modified) (4 diffs)
• DataBarSetView.cs (modified) (6 diffs)
• HeuristicLab.DatastreamAnalysis.Views.csproj (modified) (1 diff)
• Plugin.cs (modified) (1 diff)
• Properties/AssemblyInfo.cs (modified) (1 diff)

branches/HeuristicLab.DatastreamAnalysis/HeuristicLab.DatastreamAnalysis.Views/3.4/DataBarSetView.Designer.cs

@@ -45 +45 @@
     /// </summary>
     private void InitializeComponent() {
+      this.components = new System.ComponentModel.Container();
       System.Windows.Forms.DataVisualization.Charting.ChartArea chartArea1 = new System.Windows.Forms.DataVisualization.Charting.ChartArea();
       System.Windows.Forms.DataVisualization.Charting.Legend legend1 = new System.Windows.Forms.DataVisualization.Charting.Legend();
@@ -53 +54 @@
       // chart
       // 
-      this.chart.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
-                  | System.Windows.Forms.AnchorStyles.Left)
-                  | System.Windows.Forms.AnchorStyles.Right)));
+      this.chart.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
+            | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
       chartArea1.Name = "ChartArea1";
       this.chart.ChartAreas.Add(chartArea1);
@@ -74 +75 @@
       // DataBarSetView
       // 
-      this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
       this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit;
       this.Controls.Add(this.chart);
@@ -81 +81 @@
       ((System.ComponentModel.ISupportInitialize)(this.chart)).EndInit();
       this.ResumeLayout(false);
-      this.PerformLayout();
+
     }
     #endregion

branches/HeuristicLab.DatastreamAnalysis/HeuristicLab.DatastreamAnalysis.Views/3.4/DataBarSetView.cs

@@ -32 +32 @@
 namespace HeuristicLab.DatastreamAnalysis.Views {
   [View("DataBarSet")]
-  [Content(typeof(DataBarSet), false)]
+  [Content(typeof(DataBarSet), true)]
   public partial class DataBarSetView : ItemView {
     private bool updateInProgress;
+    private string seriesName = "Ensembles";
 
     public virtual Image ViewImage {
@@ -53 +54 @@
       this.chart.ChartAreas[0].AxisX.ScaleView.Zoomable = true;
       this.chart.ChartAreas[0].AxisX.Title = "Ensembles";
-      this.chart.ChartAreas[0].AxisX.Maximum = 0.0;
-      this.chart.ChartAreas[0].AxisX.Maximum = Content.Bars.Count;
+      //this.chart.ChartAreas[0].AxisX.Maximum = 0.0;
+      //this.chart.ChartAreas[0].AxisX.Maximum = (Content != null && Content.Bars != null) ? Content.Bars.Count : 0.0;
       //AddCustomLabelsToAxis(this.chart.ChartAreas[0].AxisX);
 
-      this.chart.ChartAreas[0].AxisY.Title = "Estimated Values";
+      this.chart.ChartAreas[0].AxisY.Title = "Estimation Quality";
       this.chart.ChartAreas[0].AxisY.IsStartedFromZero = true;
       this.chart.ChartAreas[0].AxisY.Minimum = 0.0;
@@ -69 +70 @@
       axis.CustomLabels.Clear();
 
+      var bars = Content.Bars.ToList();
       for(int i = 0; i < Content.Bars.Count; i++) {
-        var bar = Content.Bars.Keys.ToList()[i].Value;
         CustomLabel barLabel = new CustomLabel();
-        barLabel.Text = bar;
+        barLabel.Text = bars[i].Name;
         barLabel.FromPosition = i;
         barLabel.ToPosition = i + 1;
@@ -82 +83 @@
       base.RegisterContentEvents();
       Content.BarsPropertyChanged += new EventHandler(Content_BarsChanged);
-      Content.BarValuesChanged += new EventHandler(Content_BarValuesChanged);
+      Content.BarValueChanged += new EventHandler(Content_BarValuesChanged);
       Content.ThresholdsPropertyChanged += new EventHandler(Content_ThresholdsChanged);
     }
@@ -89 +90 @@
       base.DeregisterContentEvents();
       Content.BarsPropertyChanged -= new EventHandler(Content_BarsChanged);
-      Content.BarValuesChanged -= new EventHandler(Content_BarValuesChanged);
+      Content.BarValueChanged -= new EventHandler(Content_BarValuesChanged);
       Content.ThresholdsPropertyChanged -= new EventHandler(Content_ThresholdsChanged);
     }
@@ -110 +111 @@
     }
     private void UpdateChart() {
-      if (updateInProgress) {
+      if (InvokeRequired) {
         Invoke((Action) UpdateChart);
-      }
-
-      updateInProgress = true;
-
-      // TODO
-      // clear the whole chart and redraw everything
-
-
-      updateInProgress = false;
+      } else if(!updateInProgress) {
+        if (Content == null) return;
+
+        updateInProgress = true;
+
+        chart.Series.Clear();
+        Series series = chart.Series.Add(seriesName);
+        series.IsVisibleInLegend = false;
+        series.ChartType = SeriesChartType.Column;
+        int i = 0; 
+        foreach (var bar in Content.Bars) {
+          series.Points.Add(new DataPoint(i, bar.Value) { AxisLabel = bar.Name, Color = bar.BarColor });
+          i++;
+        }
+
+        //chart.ChartAreas[0].RecalculateAxesScale();
+        AddThresholds();
+        CheckThresholds();
+
+        chart.Refresh();
+        updateInProgress = false;
+      }
     }
 
     private void UpdateChartValues() {
-      if (updateInProgress) {
-        Invoke((Action)UpdateChart);
-      }
-
-      updateInProgress = true;
-
-      // TODO
-      // simply update the bars' values
-
-      updateInProgress = false;
+      if (InvokeRequired) {
+        Invoke((Action) UpdateChartValues);
+      } else if(!updateInProgress) {
+        if (Content == null) return;
+
+        updateInProgress = true;
+
+        //chart.Series[seriesName].Points.Clear();
+        //foreach (var bar in Content.Bars) {
+        //  chart.Series[seriesName].Points.AddXY(bar.Name, bar.Value);
+        //}
+
+        var bars = Content.Bars.ToList();
+
+        for (int i = 0; i < bars.Count; i++) {
+          chart.Series[seriesName].Points.ElementAt(i).SetValueY(bars[i].Value);
+        }
+
+        CheckThresholds();
+        //chart.ChartAreas[0].RecalculateAxesScale();
+        chart.Refresh();
+        updateInProgress = false;
+      }
+    }
+
+    private void CheckThresholds() {
+      var bars = Content.Bars.ToList();
+      for (int i = 0; i < bars.Count; i++) {
+        var bar = bars[i];
+        if (bar.Value > bar.Threshold) {
+          chart.Series[seriesName].Points[i].Color = Color.Orange;
+        } else {
+          chart.Series[seriesName].Points[i].Color = bar.BarColor;
+        }
+      }
+    }
+
+    private void AddThresholdsOld() {
+      Series series = chart.Series.Add("Thresholds");
+      series.IsVisibleInLegend = false;
+      series.ChartType = SeriesChartType.StackedColumn;
+
+      int i = 0;
+      foreach (var bar in Content.Bars) {
+        //series.Points.Add(new DataPoint(i, new [] { bar.Threshold, bar.Threshold + 0.05 }) { AxisLabel = bar.Name, Color = Color.Transparent, BorderWidth = 2, BorderColor = bar.ThresholdColor});
+        series.Points.Add(new DataPoint(i, new[] { bar.Threshold, bar.Threshold + 0.05 }) { AxisLabel = bar.Name, Color = bar.ThresholdColor });
+        i++;
+      }
     }
 
     private void AddThresholds() {
-
-      foreach (var threshold in Content.Thresholds) {
-        // TODO: add threshold as red bold line to each of bars' conlumns
-      }
-
+      chart.Annotations.Clear();
+
+      var bars = Content.Bars.ToList();
+      for (int i = 0; i < bars.Count; i++) {
+        HorizontalLineAnnotation annotation = new HorizontalLineAnnotation();
+        annotation.AllowMoving = false;
+        annotation.AllowResizing = false;
+        annotation.LineWidth = 2;
+        annotation.LineColor = bars[i].ThresholdColor;
+        annotation.IsInfinitive = false;
+        annotation.ClipToChartArea = chart.ChartAreas[0].Name;
+        annotation.AxisX = chart.ChartAreas[0].AxisX;
+        annotation.AxisY = chart.ChartAreas[0].AxisY;
+        annotation.Y = bars[i].Threshold;
+
+        annotation.Alignment = ContentAlignment.MiddleCenter;
+        annotation.AnchorX = i;
+
+        annotation.X = i - 0.4;
+        annotation.Width = 52.0 / bars.Count;
+        annotation.Name = bars[i].Name;
+        annotation.Tag = bars[i].Name;
+        annotation.BringToFront();
+
+        
+
+        chart.Annotations.Add(annotation);
+      }
     }
 

branches/HeuristicLab.DatastreamAnalysis/HeuristicLab.DatastreamAnalysis.Views/3.4/HeuristicLab.DatastreamAnalysis.Views.csproj

@@ -136 +136 @@
   </ItemGroup>
   <ItemGroup>
+    <EmbeddedResource Include="DataBarSetView.resx">
+      <DependentUpon>DataBarSetView.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="DatastreamAnalysisOptimizerView.resx">
       <DependentUpon>DatastreamAnalysisOptimizerView.cs</DependentUpon>

branches/HeuristicLab.DatastreamAnalysis/HeuristicLab.DatastreamAnalysis.Views/3.4/Plugin.cs

@@ -23 +23 @@
 
 namespace HeuristicLab.DatastreamAnalysis.Views {
-  [Plugin("HeuristicLab.DatastreamAnalysis.Views", "3.4.14.14543")]
+  [Plugin("HeuristicLab.DatastreamAnalysis.Views", "3.4.14.14547")]
   [PluginFile("HeuristicLab.DatastreamAnalysis.Views-3.4.dll", PluginFileType.Assembly)]
   [PluginDependency("HeuristicLab.Collections", "3.3")]

branches/HeuristicLab.DatastreamAnalysis/HeuristicLab.DatastreamAnalysis.Views/3.4/Properties/AssemblyInfo.cs

@@ -54 +54 @@
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("3.4.0.0")]
-[assembly: AssemblyFileVersion("3.4.14.14543")]
+[assembly: AssemblyFileVersion("3.4.14.14547")]