Skip to content

Commit 44105a6

Browse files
LiorBanaiLiorBanai
authored
Merge pull request #1682 from pybride/plot
Adding a new "Values" tab in Timeline Visualizer
2 parents 4990e85 + 977d0a6 commit 44105a6

10 files changed

+530
-24
lines changed

‎Analogy.CommonControls/Forms/DataVisualizerForm.cs

+16-11
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
using System.Collections.Generic;
33
using System.Windows.Forms;
44
using Analogy.Common.Interfaces;
5-
using Analogy.CommonControls.Interfaces;
65
using Analogy.CommonControls.UserControls;
76
using Analogy.Interfaces;
87

@@ -11,27 +10,33 @@ namespace Analogy.CommonControls.Forms
1110
public partial class DataVisualizerForm : DevExpress.XtraEditors.XtraForm
1211
{
1312
private readonly IUserSettingsManager _settingsManager;
13+
private readonly DataVisualizerUC dataVisualizerUC;
1414

1515
public DataVisualizerForm()
1616
{
1717
InitializeComponent();
1818
}
19-
public DataVisualizerForm(IUserSettingsManager settingsManager, Func<List<IAnalogyLogMessage>> messages) : this()
19+
public DataVisualizerForm(IUserSettingsManager settingsManager, Func<List<IAnalogyLogMessage>> messages, IAnalogyLogger analogyLogger) : this()
2020
{
2121
_settingsManager = settingsManager;
22-
DataVisualizerUC uc = new DataVisualizerUC(_settingsManager, messages);
23-
this.Controls.Add(uc);
24-
uc.Dock = DockStyle.Fill;
25-
}
26-
public DataVisualizerForm(List<IAnalogyLogMessage> messages) : this()
27-
{
28-
DataVisualizerUC uc = new DataVisualizerUC(_settingsManager, messages);
29-
this.Controls.Add(uc);
30-
uc.Dock = DockStyle.Fill;
22+
dataVisualizerUC = new DataVisualizerUC(_settingsManager, messages, analogyLogger);
23+
Controls.Add(dataVisualizerUC);
24+
dataVisualizerUC.Dock = DockStyle.Fill;
3125
}
26+
3227
private void DataVisualizerUCForm_Load(object sender, EventArgs e)
3328
{
3429
Icon = _settingsManager.GetIcon();
3530
}
31+
32+
public void AppendMessage(IAnalogyLogMessage message, string dataSource)
33+
{
34+
dataVisualizerUC?.AppendMessage(message, dataSource);
35+
}
36+
37+
public void AppendMessages(List<IAnalogyLogMessage> messages, string dataSource)
38+
{
39+
dataVisualizerUC?.AppendMessages(messages, dataSource);
40+
}
3641
}
3742
}

‎Analogy.CommonControls/UserControls/DataVisualizerUC.Designer.cs

+25-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Analogy.CommonControls/UserControls/DataVisualizerUC.cs

+12-7
Original file line numberDiff line numberDiff line change
@@ -27,17 +27,12 @@ public DataVisualizerUC()
2727
InitializeComponent();
2828
}
2929

30-
public DataVisualizerUC(IUserSettingsManager settings, Func<List<IAnalogyLogMessage>> messagesFunc) : this()
30+
public DataVisualizerUC(IUserSettingsManager settings, Func<List<IAnalogyLogMessage>> messagesFunc, IAnalogyLogger analogyLogger) : this()
3131
{
3232
_settings = settings;
3333
Messages = messagesFunc;
3434
logStatisticsUC1.Statistics = new LogStatistics(messagesFunc.Invoke());
35-
}
36-
public DataVisualizerUC(IUserSettingsManager settings, List<IAnalogyLogMessage> messages) : this()
37-
{
38-
_settings = settings;
39-
Messages = () => messages;
40-
logStatisticsUC1.Statistics = new LogStatistics(messages);
35+
valuesPlotterUC.Init(messagesFunc, analogyLogger);
4136
}
4237

4338
private void DataVisualizerUC_Load(object sender, EventArgs e)
@@ -219,5 +214,15 @@ private void tmrPlotting_Tick(object sender, EventArgs e)
219214
Plot();
220215
tmrPlotting.Enabled = true;
221216
}
217+
218+
public void AppendMessage(IAnalogyLogMessage message, string dataSource)
219+
{
220+
valuesPlotterUC?.AppendMessage(message, dataSource);
221+
}
222+
223+
public void AppendMessages(List<IAnalogyLogMessage> messages, string dataSource)
224+
{
225+
valuesPlotterUC?.AppendMessages(messages, dataSource);
226+
}
222227
}
223228
}

‎Analogy.CommonControls/UserControls/LogMessagesUC.Designer.cs

+2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Analogy.CommonControls/UserControls/LogMessagesUC.cs

+10-2
Original file line numberDiff line numberDiff line change
@@ -188,6 +188,8 @@ public bool RealTimeMode
188188
#region fields
189189
private bool useSpecificColumnForJson;
190190
private string jsonColumnForInlineJsonViewer;
191+
private DataVisualizerForm frmDataVisualizer;
192+
191193
#endregion fields
192194

193195
private JsonTreeUC JsonTreeView { get; set; }
@@ -1768,6 +1770,9 @@ public void AppendMessage(IAnalogyLogMessage message, string dataSource)
17681770
return;
17691771
}
17701772

1773+
if (frmDataVisualizer != null)
1774+
frmDataVisualizer.AppendMessage(message, dataSource);
1775+
17711776
if (ExternalWindowsCount > 0)
17721777
{
17731778
foreach (XtraFormLogGrid grid in ExternalWindows)
@@ -1899,6 +1904,9 @@ public void AppendMessages(List<IAnalogyLogMessage> messages, string dataSource)
18991904
}
19001905
}
19011906

1907+
if (frmDataVisualizer != null)
1908+
frmDataVisualizer.AppendMessages(messages, dataSource);
1909+
19021910
foreach (var (dtr, message) in PagingManager.AppendMessages(messages, dataSource))
19031911
{
19041912
if (diffStartTime > DateTime.MinValue)
@@ -3375,8 +3383,8 @@ private void tsmiREmoveAllPreviousMessages_Click(object sender, EventArgs e)
33753383

33763384
private void bBtnDataVisualizer_ItemClick(object sender, ItemClickEventArgs e)
33773385
{
3378-
DataVisualizerForm sv = new DataVisualizerForm(Settings, () => Messages);
3379-
sv.Show(this);
3386+
frmDataVisualizer = new DataVisualizerForm(Settings, () => Messages, Logger);
3387+
frmDataVisualizer.Show(this);
33803388
}
33813389

33823390
private void bbiScreenshot_ItemClick(object sender, ItemClickEventArgs e)

‎Analogy.CommonControls/UserControls/ServerSideLogMessagesUC.Designer.cs

+2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Analogy.CommonControls/UserControls/ServerSideLogMessagesUC.cs

+9-2
Original file line numberDiff line numberDiff line change
@@ -139,6 +139,8 @@ public GridView LogGrid
139139
}
140140

141141
private bool _realTimeMode;
142+
private DataVisualizerForm frmDataVisualizer;
143+
142144
public bool RealTimeMode
143145
{
144146
set
@@ -1628,6 +1630,9 @@ public void AppendMessage(IAnalogyLogMessage message, string dataSource)
16281630
return;
16291631
}
16301632

1633+
if (frmDataVisualizer != null)
1634+
frmDataVisualizer.AppendMessage(message, dataSource);
1635+
16311636
if (ExternalWindowsCount > 0)
16321637
{
16331638
foreach (XtraFormLogGrid grid in ExternalWindows)
@@ -1746,6 +1751,8 @@ public void AppendMessages(List<IAnalogyLogMessage> messages, string dataSource)
17461751
grid.AppendMessages(messages, dataSource);
17471752
}
17481753
}
1754+
if (frmDataVisualizer != null)
1755+
frmDataVisualizer.AppendMessages(messages, dataSource);
17491756

17501757
foreach (var (dtr, message) in PagingManager.AppendMessages(messages, dataSource))
17511758
{
@@ -3138,8 +3145,8 @@ private void tsmiREmoveAllPreviousMessages_Click(object sender, EventArgs e)
31383145

31393146
private void bBtnDataVisualizer_ItemClick(object sender, ItemClickEventArgs e)
31403147
{
3141-
DataVisualizerForm sv = new DataVisualizerForm(Settings, () => Messages);
3142-
sv.Show(this);
3148+
frmDataVisualizer = new DataVisualizerForm(Settings, () => Messages, Logger);
3149+
frmDataVisualizer.Show(this);
31433150
}
31443151

31453152
private void bbiScreenshot_ItemClick(object sender, ItemClickEventArgs e)

0 commit comments

Comments
 (0)