aboutsummaryrefslogtreecommitdiffstats
path: root/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Views/MachineTechView.xaml
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.Technician/Views/MachineTechView.xaml
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.Technician/Views/MachineTechView.xaml')
-rw-r--r--Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Views/MachineTechView.xaml17
1 files changed, 17 insertions, 0 deletions
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Views/MachineTechView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Views/MachineTechView.xaml
index 29ba98cd3..c11dbc525 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Views/MachineTechView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Views/MachineTechView.xaml
@@ -4,6 +4,7 @@
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:vm="clr-namespace:Tango.MachineStudio.Technician.ViewModels"
xmlns:global="clr-namespace:Tango.MachineStudio.Technician"
+ xmlns:i="http://schemas.microsoft.com/expression/2010/interactivity"
xmlns:sys="clr-namespace:System;assembly=mscorlib"
xmlns:fa="http://schemas.fontawesome.io/icons/"
xmlns:editors="clr-namespace:Tango.Editors;assembly=Tango.Editors"
@@ -176,6 +177,22 @@
</StackPanel>
<Grid Grid.Row="1">
+
+ <StackPanel HorizontalAlignment="Right" VerticalAlignment="Top" Width="275" Margin="0 15 30 0">
+ <TextBlock HorizontalAlignment="Center" FontWeight="SemiBold" Foreground="Gray">
+ <Run>GRAPHS DURATION:</Run>
+ <Run Text="{Binding TempGraphsDurationSeconds,Mode=OneWay}"></Run>
+ <Run>sec</Run>
+ </TextBlock>
+ <Slider Margin="0 5 0 0" Minimum="1" Maximum="60" Value="{Binding TempGraphsDurationSeconds}">
+ <i:Interaction.Triggers>
+ <i:EventTrigger EventName="PreviewMouseUp">
+ <i:InvokeCommandAction Command="{Binding UpdateGraphsDurationCommand}"></i:InvokeCommandAction>
+ </i:EventTrigger>
+ </i:Interaction.Triggers>
+ </Slider>
+ </StackPanel>
+
<StackPanel HorizontalAlignment="Left" Orientation="Horizontal" Margin="20 0 0 0">
<ListBox ItemContainerStyle="{StaticResource basicListBoxItem}" ItemsSource="{Binding AvailableTechItems}" SelectedItem="{Binding SelectedTechItem,Mode=TwoWay}" HorizontalContentAlignment="Stretch" ScrollViewer.HorizontalScrollBarVisibility="Disabled" ScrollViewer.VerticalScrollBarVisibility="Disabled">
<ListBox.ItemsPanel>