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 | |
| 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')
3 files changed, 26 insertions, 1 deletions
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Converters/StringToFirstLineConverter.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Converters/StringToFirstLineConverter.cs new file mode 100644 index 000000000..2fa456054 --- /dev/null +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Converters/StringToFirstLineConverter.cs @@ -0,0 +1,23 @@ +using System; +using System.Collections.Generic; +using System.Globalization; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows.Data; + +namespace Tango.MachineStudio.Logging.Converters +{ + public class StringToFirstLineConverter : IValueConverter + { + public object Convert(object value, Type targetType, object parameter, CultureInfo culture) + { + return value.ToString().ToLines().First(); + } + + public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture) + { + throw new NotImplementedException(); + } + } +} diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Tango.MachineStudio.Logging.csproj b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Tango.MachineStudio.Logging.csproj index 4b817a124..b893dcb53 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Tango.MachineStudio.Logging.csproj +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Tango.MachineStudio.Logging.csproj @@ -87,6 +87,7 @@ <Compile Include="Converters\EventsToTimeRulerTicksConverter.cs" /> <Compile Include="Converters\MachineEventToXConverter.cs" /> <Compile Include="Converters\SecondsToWidthConverter.cs" /> + <Compile Include="Converters\StringToFirstLineConverter.cs" /> <Compile Include="Converters\TimeSpanToXConverter.cs" /> <Compile Include="Helpers\TimelineHelper.cs" /> <Compile Include="LoggingModule.cs" /> 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> |