diff --git a/src/Bonsai.ML.Visualizers/ForecastPlotOverlay.cs b/src/Bonsai.ML.Visualizers/ForecastPlotOverlay.cs index 0e72a32..26a48a6 100644 --- a/src/Bonsai.ML.Visualizers/ForecastPlotOverlay.cs +++ b/src/Bonsai.ML.Visualizers/ForecastPlotOverlay.cs @@ -28,7 +28,7 @@ public override void Show(object value) { var time = DateTime.Now; Forecast forecast = (Forecast)value; - var componentVisualizers = visualizer.componentVisualizers; + var componentVisualizers = visualizer.ComponentVisualizers; for (int i = 0; i < componentVisualizers.Count; i++) { @@ -93,7 +93,7 @@ public override void Load(IServiceProvider provider) var service = provider.GetService(typeof(MashupVisualizer)); visualizer = (KinematicStateVisualizer)service; - var componentVisualizers = visualizer.componentVisualizers; + var componentVisualizers = visualizer.ComponentVisualizers; for (int i = 0; i < componentVisualizers.Count; i++) { diff --git a/src/Bonsai.ML.Visualizers/ForecastVisualizer.cs b/src/Bonsai.ML.Visualizers/ForecastVisualizer.cs index 99cfa8f..856f412 100644 --- a/src/Bonsai.ML.Visualizers/ForecastVisualizer.cs +++ b/src/Bonsai.ML.Visualizers/ForecastVisualizer.cs @@ -20,9 +20,9 @@ namespace Bonsai.ML.Visualizers public class ForecastVisualizer : BufferedVisualizer { - internal int RowCount { get; set; } = 3; - internal int ColumnCount { get; set; } = 2; - internal string[] Labels = new string[] { + private int rowCount = 3; + private int columnCount = 2; + private string[] labels = new string[] { "Forecast Position X", "Forecast Position Y", "Forecast Velocity X", @@ -31,7 +31,7 @@ public class ForecastVisualizer : BufferedVisualizer "Forecast Acceleration Y" }; - internal List componentVisualizers = new(); + private List componentVisualizers = new(); private TableLayoutPanel container; /// @@ -39,27 +39,27 @@ public override void Load(IServiceProvider provider) { container = new TableLayoutPanel { - ColumnCount = ColumnCount, - RowCount = RowCount, + ColumnCount = columnCount, + RowCount = rowCount, Dock = DockStyle.Fill }; for (int i = 0; i < container.RowCount; i++) { - container.RowStyles.Add(new RowStyle(SizeType.Percent, 100f / RowCount)); + container.RowStyles.Add(new RowStyle(SizeType.Percent, 100f / rowCount)); } for (int i = 0; i < container.ColumnCount; i++) { - container.ColumnStyles.Add(new ColumnStyle(SizeType.Percent, 100f / ColumnCount)); + container.ColumnStyles.Add(new ColumnStyle(SizeType.Percent, 100f / columnCount)); } - for (int i = 0 ; i < RowCount; i++) + for (int i = 0 ; i < rowCount; i++) { - for (int j = 0; j < ColumnCount; j++) + for (int j = 0; j < columnCount; j++) { var StateComponentVisualizer = new StateComponentVisualizer() { - Label = Labels[i * ColumnCount + j], + Label = labels[i * columnCount + j], LineSeriesColor = OxyColors.Yellow, AreaSeriesColor = OxyColors.Yellow }; @@ -115,8 +115,8 @@ protected override void ShowBuffer(IList> values) foreach (var item in zippedData) { - item.Visualizer.Plot.ResetLineSeries(item.Visualizer.lineSeries); - item.Visualizer.Plot.ResetAreaSeries(item.Visualizer.areaSeries); + item.Visualizer.Plot.ResetLineSeries(item.Visualizer.LineSeries); + item.Visualizer.Plot.ResetAreaSeries(item.Visualizer.AreaSeries); item.Visualizer.ShowDataBuffer(item.Data); item.Visualizer.Plot.SetAxes(minTime: timestamp.DateTime, maxTime: futureTime.DateTime); }