diff options
| author | Roy Ben-Shabat <Roy@Twine-s.com> | 2018-07-19 14:32:56 +0300 |
|---|---|---|
| committer | Roy Ben-Shabat <Roy@Twine-s.com> | 2018-07-19 14:32:56 +0300 |
| commit | 24a77fd5e03c81c6b0e901da02bce4bdccd4c71c (patch) | |
| tree | 3c91c5ab36a01608a8b21862ed8bc80eb7b9e8ee /Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/ViewModels | |
| parent | b8cae8fcfe37cee8df17d0e8ccfbf2b3ac8c2152 (diff) | |
| download | Tango-24a77fd5e03c81c6b0e901da02bce4bdccd4c71c.tar.gz Tango-24a77fd5e03c81c6b0e901da02bce4bdccd4c71c.zip | |
Fixed a bug with logging module display timeline..
Diffstat (limited to 'Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/ViewModels')
2 files changed, 8 insertions, 1 deletions
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/ViewModels/EventsViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/ViewModels/EventsViewVM.cs index e2185bbdc..50caced63 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/ViewModels/EventsViewVM.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/ViewModels/EventsViewVM.cs @@ -199,7 +199,7 @@ namespace Tango.MachineStudio.Logging.ViewModels TimelineViewVM.Initialize(events.ToList()); - _navigation.NavigateTo(LoggingNavigationView.TimelineView); + _navigation.NavigateTo(LoggingNavigationView.TimelineWrapperView); } } } diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/ViewModels/TimelineEventGroup.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/ViewModels/TimelineEventGroup.cs index 978348fd2..6a86f38e6 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/ViewModels/TimelineEventGroup.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/ViewModels/TimelineEventGroup.cs @@ -13,6 +13,13 @@ namespace Tango.MachineStudio.Logging.ViewModels { public String Name { get; set; } + private double _height; + public double Height + { + get { return _height; } + set { _height = value; RaisePropertyChangedAuto(); } + } + public ObservableCollection<MachinesEvent> Events { get; set; } public TimelineEventGroup() |