diff options
| author | Roy Ben-Shabat <Roy@Twine-s.com> | 2018-04-12 12:47:19 +0300 |
|---|---|---|
| committer | Roy Ben-Shabat <Roy@Twine-s.com> | 2018-04-12 12:47:19 +0300 |
| commit | 9c0bad738d47742f39f2b02b240591653da6bc12 (patch) | |
| tree | b3cb5e2d15927f4b04d971998b156a8673863d4e /Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Views | |
| parent | 8926f5b786ba07b3c21a1ada6ed9939a41e247d5 (diff) | |
| download | Tango-9c0bad738d47742f39f2b02b240591653da6bc12.tar.gz Tango-9c0bad738d47742f39f2b02b240591653da6bc12.zip | |
Added changes to PMR hardware.
Implemented Start Job and Record.
Fixed issue with logs timeline event width.
Implemented 'Event Resolved' event to event logs.
Diffstat (limited to 'Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Views')
| -rw-r--r-- | Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Views/TimelineView.xaml | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Views/TimelineView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Views/TimelineView.xaml index 504514cbb..1046fa4e8 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Views/TimelineView.xaml +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Views/TimelineView.xaml @@ -20,6 +20,7 @@ <localConverters:MachineEventToXConverter x:Key="MachineEventToXConverter" /> <localConverters:SecondsToWidthConverter x:Key="SecondsToWidthConverter" /> <converters:BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter" /> + <localConverters:StringToFirstLineConverter x:Key="StringToFirstLineConverter" /> <LinearGradientBrush x:Key="infoBrush" StartPoint="0.5,0" EndPoint="0.5,1"> <GradientStop Color="White"/> @@ -146,7 +147,7 @@ </Border.Style> <StackPanel Orientation="Horizontal"> <TextBlock FontWeight="SemiBold" Text="{Binding EventType.Name}" Height="14" FontSize="11"></TextBlock> - <TextBlock Margin="10 0 0 0" Text="{Binding Description}" Height="14" FontSize="11"></TextBlock> + <TextBlock Margin="10 0 0 0" Text="{Binding Description,Converter={StaticResource StringToFirstLineConverter}}" Height="14" FontSize="11"></TextBlock> </StackPanel> </Border> </Grid> |