aboutsummaryrefslogtreecommitdiffstats
path: root/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging
diff options
context:
space:
mode:
authorRoy Ben-Shabat <Roy@Twine-s.com>2018-07-29 13:03:22 +0300
committerRoy Ben-Shabat <Roy@Twine-s.com>2018-07-29 13:03:22 +0300
commit86919dc24020229cbd1d8c59f29a4a36895f5b7a (patch)
treee0acd81cad23bbd0948978d76dc841d0553bcbcf /Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging
parentd62b12aab4f521ff287da135b6e66e92629a50dd (diff)
downloadTango-86919dc24020229cbd1d8c59f29a4a36895f5b7a.tar.gz
Tango-86919dc24020229cbd1d8c59f29a4a36895f5b7a.zip
Implemented diagnostics frame rate monitor on IDiagnosticsFrameProvider.
Added diagnostics frame rate to connected machine dialog. Implemented dynamic graphs max points using frame rate on tech board!. Implemented speed control on DIagnosticsFilePlayer & Data Capture module. Implemented graphs duration control on tech board.
Diffstat (limited to 'Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging')
-rw-r--r--Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Views/TimelineView.xaml.cs6
1 files changed, 5 insertions, 1 deletions
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Views/TimelineView.xaml.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Views/TimelineView.xaml.cs
index 8004ef154..92d176671 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Views/TimelineView.xaml.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Views/TimelineView.xaml.cs
@@ -44,7 +44,11 @@ namespace Tango.MachineStudio.Logging.Views
private void ItemsControl_SizeChanged(object sender, SizeChangedEventArgs e)
{
TimelineEventGroup group = (sender as FrameworkElement).DataContext as TimelineEventGroup;
- group.Height = e.NewSize.Height;
+
+ if (group != null)
+ {
+ group.Height = e.NewSize.Height;
+ }
}
private void scrollViewer_ScrollChanged(object sender, ScrollChangedEventArgs e)