Implemented velocity graph on technician module using mouse position.

3 files changed, 48 insertions, 2 deletions

diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/ViewModels/SensorsViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/ViewModels/SensorsViewVM.cs
index 5b28916ec..c3cf7386e 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/ViewModels/SensorsViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/ViewModels/SensorsViewVM.cs
@@ -82,9 +82,11 @@ namespace Tango.MachineStudio.Technician.ViewModels
 
                 TemperatureController = new GraphController();
                 PressureController = new GraphController();
+                VelocityController = new GraphController();
 
                 _controllers.Add(TemperatureController);
                 _controllers.Add(PressureController);
+                _controllers.Add(VelocityController);
 
                 var module = moduleLoader.UserModules.SingleOrDefault(x => x is TechnicianModule) as TechnicianModule;
 
@@ -126,8 +128,9 @@ namespace Tango.MachineStudio.Technician.ViewModels
         /// <param name="data">The data.</param>
         private void MachineOperator_SensorsDataAvailable(object sender, PushSensorsResponse data)
         {
-            TemperatureController.PushData(data.Temperature.ToArray().Select(Convert.ToDouble).ToArray());
-            PressureController.PushData(data.Temperature.ToArray().Select(Convert.ToDouble).ToArray());
+            TemperatureController.PushData(data.Temperature.ToArray());
+            PressureController.PushData(data.Temperature.ToArray());
+            VelocityController.PushData(data.Velocity.ToArray());
         }
 
         #endregion
@@ -174,6 +177,16 @@ namespace Tango.MachineStudio.Technician.ViewModels
             set { _pressureController = value; RaisePropertyChanged(nameof(PressureController)); }
         }
 
+        private GraphController _velocityController;
+        /// <summary>
+        /// Gets or sets the velocity sensor graph controller .
+        /// </summary>
+        public GraphController VelocityController
+        {
+            get { return _velocityController; }
+            set { _velocityController = value; RaisePropertyChanged(nameof(VelocityController)); }
+        }
+
         #endregion
     }
 }
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();
         }