aboutsummaryrefslogtreecommitdiffstats
path: root/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/ViewModels
diff options
context:
space:
mode:
authorRoy Ben-Shabat <Roy@Twine-s.com>2018-01-16 13:15:52 +0200
committerRoy Ben-Shabat <Roy@Twine-s.com>2018-01-16 13:15:52 +0200
commitff183d99def579aeaaee06d89ad6bbbfa47c4107 (patch)
treebbf0e58eae9f7155afc4f272c8b59b75688ad792 /Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/ViewModels
parentc5dba8cec3db88733ee8e1c206c518e27974f867 (diff)
downloadTango-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/ViewModels')
-rw-r--r--Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/ViewModels/SensorsViewVM.cs17
1 files changed, 15 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
}
}