diff options
| author | Roy Ben-Shabat <Roy@Twine-s.com> | 2018-01-16 13:15:52 +0200 |
|---|---|---|
| committer | Roy Ben-Shabat <Roy@Twine-s.com> | 2018-01-16 13:15:52 +0200 |
| commit | ff183d99def579aeaaee06d89ad6bbbfa47c4107 (patch) | |
| tree | bbf0e58eae9f7155afc4f272c8b59b75688ad792 /Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Views | |
| parent | c5dba8cec3db88733ee8e1c206c518e27974f867 (diff) | |
| download | Tango-ff183d99def579aeaaee06d89ad6bbbfa47c4107.tar.gz Tango-ff183d99def579aeaaee06d89ad6bbbfa47c4107.zip | |
Implemented velocity graph on technician module using mouse position.
Diffstat (limited to 'Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Views')
2 files changed, 33 insertions, 0 deletions
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Views/SensorsView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Views/SensorsView.xaml index 2e074ec3c..63feae2f3 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Views/SensorsView.xaml +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Views/SensorsView.xaml @@ -129,6 +129,38 @@ </Border> </Grid> </ContentControl> + + <!--Velocity--> + <ContentControl Grid.Column="2" Style="{StaticResource graphContent}" Margin="0 0 5 5" MinHeight="5"> + <Grid> + <Grid.ColumnDefinitions> + <ColumnDefinition Width="40"/> + <ColumnDefinition Width="438*"/> + </Grid.ColumnDefinitions> + + <Border BorderBrush="{StaticResource AccentColorBrush}" BorderThickness="1 1 0 1"> + <StackPanel Orientation="Horizontal"> + <components:YAxisScroll Interval="6" Graph="{Binding ElementName=graphVelocity}" Width="35" Foreground="{StaticResource MaterialDesignLightForeground}" VerticalOffset="-5" FontSize="8" StringFormat="#0.0"></components:YAxisScroll> + <components:YAxisTicks SmallTickTemplate="{StaticResource graphTicksTemplate}" Width="5" SmallTicks="6" Foreground="{StaticResource MaterialDesignLightForeground}" BigTicks="10" Graph="{Binding ElementName=graphVelocity}"></components:YAxisTicks> + </StackPanel> + </Border> + <Border Grid.Column="1" BorderThickness="1" BorderBrush="{StaticResource borderBrush}" Background="{DynamicResource graphBackground}" Margin="5 0 0 0"> + <graphEx:RealTimeGraphExLineScroll x:Name="graphVelocity" Controller="{Binding VelocityController}" Antialiased="True" RefreshRate="30" MaxPoints="{Binding GraphSeconds,Converter={StaticResource secondsToPoints}, ConverterParameter=1}" Minimum="0" Maximum="1080" FillGraph="True" Fill="#70002BFF" Stroke="#0500FF"> + <graphEx:RealTimeGraphExLineScroll.Components> + <components:MouseValueToolTip ToolTipTemplate="{StaticResource graphTooltipTemplate}" /> + <components:GridLines Rows="4" Columns="6" GridBrush="{DynamicResource graphGridLinesBrush}"></components:GridLines> + </graphEx:RealTimeGraphExLineScroll.Components> + <graphEx:RealTimeGraphExLineScroll.InnerContent> + <Grid> + <Label Style="{StaticResource graphLabel}"> + VELOCITY + </Label> + </Grid> + </graphEx:RealTimeGraphExLineScroll.InnerContent> + </graphEx:RealTimeGraphExLineScroll> + </Border> + </Grid> + </ContentControl> </Grid> <Grid Grid.Row="1"> diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Views/SensorsView.xaml.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Views/SensorsView.xaml.cs index 4727a3603..c94c26414 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Views/SensorsView.xaml.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Views/SensorsView.xaml.cs @@ -31,6 +31,7 @@ namespace Tango.MachineStudio.Technician.Views _syncManager = new SyncManager(); _syncManager.AddGraph(graphTemperature); _syncManager.AddGraph(graphPressure); + _syncManager.AddGraph(graphVelocity); _syncManager.RefreshRate = 30; _syncManager.Start(); } |