diff options
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() |