Added sensors data support for developer module.

8 files changed, 74 insertions, 17 deletions

diff --git a/Software/DB/Tango.mdf b/Software/DB/Tango.mdf
index b4d1e4ec6..68b085631 100644
--- a/Software/DB/Tango.mdf
+++ b/Software/DB/Tango.mdf
diff --git a/Software/DB/Tango_log.ldf b/Software/DB/Tango_log.ldf
index c73054bf9..00c57b0bd 100644
--- a/Software/DB/Tango_log.ldf
+++ b/Software/DB/Tango_log.ldf
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Tango.MachineStudio.Developer.csproj b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Tango.MachineStudio.Developer.csproj
index 622e4f51c..43c5707ef 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Tango.MachineStudio.Developer.csproj
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Tango.MachineStudio.Developer.csproj
@@ -40,6 +40,9 @@
     <Reference Include="GalaSoft.MvvmLight.Platform, Version=5.3.0.19032, Culture=neutral, PublicKeyToken=5f873c45e98af8a1, processorArchitecture=MSIL">
       <HintPath>..\..\..\packages\MvvmLightLibs.5.3.0.0\lib\net45\GalaSoft.MvvmLight.Platform.dll</HintPath>
     </Reference>
+    <Reference Include="Google.Protobuf, Version=3.4.1.0, Culture=neutral, PublicKeyToken=a7d26565bac4d604, processorArchitecture=MSIL">
+      <HintPath>..\..\..\packages\Google.Protobuf.3.4.1\lib\net45\Google.Protobuf.dll</HintPath>
+    </Reference>
     <Reference Include="MahApps.Metro, Version=1.5.0.23, Culture=neutral, PublicKeyToken=f4fb5a3c4d1e5b4f, processorArchitecture=MSIL">
       <HintPath>..\..\..\packages\MahApps.Metro.1.5.0\lib\net45\MahApps.Metro.dll</HintPath>
     </Reference>
@@ -159,6 +162,10 @@
       <Project>{4206ac58-3b57-4699-8835-90bf6db01a61}</Project>
       <Name>Tango.Integration</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\..\Tango.PMR\Tango.PMR.csproj">
+      <Project>{e4927038-348d-4295-aaf4-861c58cb3943}</Project>
+      <Name>Tango.PMR</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\..\Tango.Settings\Tango.Settings.csproj">
       <Project>{D8F1AD85-526A-4F50-B6DC-D437AF63D8D8}</Project>
       <Name>Tango.Settings</Name>
@@ -167,6 +174,10 @@
       <Project>{8491d07b-c1f6-4b62-a412-41b9fd2d6538}</Project>
       <Name>Tango.SharedUI</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\..\Tango.Transport\Tango.Transport.csproj">
+      <Project>{74e700b0-1156-4126-be40-ee450d3c3026}</Project>
+      <Name>Tango.Transport</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\..\Tango.Video\Tango.Video.csproj">
       <Project>{9652f972-2bd1-4283-99cb-fc6240434c17}</Project>
       <Name>Tango.Video</Name>
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs
index 52d67a141..4f045627d 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs
@@ -19,6 +19,9 @@ using System.Windows.Threading;
 using Tango.Settings;
 using Tango.MachineStudio.Developer.Views;
 using Tango.Video.DirectCapture;
+using Tango.Integration.Operators;
+using Tango.PMR.Diagnostics;
+using System.Reflection;
 
 namespace Tango.MachineStudio.Developer.ViewModels
 {
@@ -292,6 +295,17 @@ namespace Tango.MachineStudio.Developer.ViewModels
         /// Gets or sets the capture devices.
         /// </summary>
         public ObservableCollection<CaptureDevice> CaptureDevices { get; set; }
+
+        private IMachineOperator _machineOperator;
+        /// <summary>
+        /// Gets or sets the machine operator.
+        /// </summary>
+        public IMachineOperator MachineOperator
+        {
+            get { return _machineOperator; }
+            set { _machineOperator = value; RaisePropertyChangedAuto(); }
+        }
+
         #endregion
 
         #region Commands
@@ -441,6 +455,40 @@ namespace Tango.MachineStudio.Developer.ViewModels
             }
 
             ToggleCameraCommand = new RelayCommand<CaptureDevice>(ToggleCamera);
+
+            ApplicationManager.ConnectedMachineChanged += ApplicationManager_ConnectedMachineChanged;
+        }
+
+        private void ApplicationManager_ConnectedMachineChanged(object sender, Integration.Services.IExternalBridgeClient machine)
+        {
+            MachineOperator = machine;
+
+            if (MachineOperator != null)
+            {
+                MachineOperator.EnableSensorsUpdate = true;
+                MachineOperator.DiagnosticsDataAvailable += MachineOperator_DiagnosticsDataAvailable;
+            }
+        }
+
+        private void MachineOperator_DiagnosticsDataAvailable(object sender, StartDiagnosticsResponse response)
+        {
+            foreach (var prop in response.GetType().GetProperties(BindingFlags.Public | BindingFlags.Instance))
+            {
+                GraphControllerBase controller = null;
+
+                if (_controllers.TryGetValue(prop.Name, out controller))
+                {
+                    if (controller is GraphController)
+                    {
+                        double[] arr = Enumerable.ToArray(prop.GetValue(response) as IEnumerable<double>);
+                        (controller as GraphController).PushData(arr);
+                    }
+                    else
+                    {
+                        //Multi Graph...
+                    }
+                }
+            }
         }
 
         #endregion
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/packages.config b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/packages.config
index 4fd672b32..9f69ed86f 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/packages.config
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/packages.config
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="CommonServiceLocator" version="1.3" targetFramework="net46" />
+  <package id="Google.Protobuf" version="3.4.1" targetFramework="net46" />
   <package id="MahApps.Metro" version="1.5.0" targetFramework="net46" />
   <package id="MaterialDesignColors" version="1.1.2" targetFramework="net46" />
   <package id="MaterialDesignThemes" version="2.3.1.953" targetFramework="net46" />
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 de2f200c8..1a87ad4f3 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
@@ -128,9 +128,9 @@ namespace Tango.MachineStudio.Technician.ViewModels
         /// <param name="data">The data.</param>
         private void MachineOperator_DiagnosticsDataAvailable(object sender, StartDiagnosticsResponse data)
         {
-            TemperatureController.PushData(data.Temperature.ToArray());
-            PressureController.PushData(data.Temperature.ToArray());
-            VelocityController.PushData(data.Velocity.ToArray());
+            //TemperatureController.PushData(data.Temperature.ToArray());
+            //PressureController.PushData(data.Temperature.ToArray());
+            //VelocityController.PushData(data.Velocity.ToArray());
         }
 
         #endregion
@@ -143,14 +143,14 @@ namespace Tango.MachineStudio.Technician.ViewModels
         /// <param name="machineOperator">The machine operator.</param>
         private void InitializeConnectedMachine(IMachineOperator machineOperator)
         {
-            MachineOperator = machineOperator;
+            //MachineOperator = machineOperator;
 
-            if (MachineOperator != null)
-            {
-                MachineOperator.EnableSensorsUpdate = true;
-                MachineOperator.DiagnosticsDataAvailable -= MachineOperator_DiagnosticsDataAvailable;
-                MachineOperator.DiagnosticsDataAvailable += MachineOperator_DiagnosticsDataAvailable;
-            }
+            //if (MachineOperator != null)
+            //{
+            //    MachineOperator.EnableSensorsUpdate = true;
+            //    MachineOperator.DiagnosticsDataAvailable -= MachineOperator_DiagnosticsDataAvailable;
+            //    MachineOperator.DiagnosticsDataAvailable += MachineOperator_DiagnosticsDataAvailable;
+            //}
         }
 
         #endregion
diff --git a/Software/Visual_Studio/SideChains/RealTimeGraphEx/RealTimeGraphExBase.cs b/Software/Visual_Studio/SideChains/RealTimeGraphEx/RealTimeGraphExBase.cs
index 70ce3881f..16264aa4b 100644
--- a/Software/Visual_Studio/SideChains/RealTimeGraphEx/RealTimeGraphExBase.cs
+++ b/Software/Visual_Studio/SideChains/RealTimeGraphEx/RealTimeGraphExBase.cs
@@ -1348,11 +1348,7 @@ namespace RealTimeGraphEx
         {
             if (pushThread != null)
             {
-                try
-                {
-                    pushThread.Abort();
-                }
-                catch { }
+                StopPushThread();
             }
         }
 
diff --git a/Software/Visual_Studio/Tango.Emulations/Emulators/MachineEmulator.cs b/Software/Visual_Studio/Tango.Emulations/Emulators/MachineEmulator.cs
index 925408a0a..570ef5498 100644
--- a/Software/Visual_Studio/Tango.Emulations/Emulators/MachineEmulator.cs
+++ b/Software/Visual_Studio/Tango.Emulations/Emulators/MachineEmulator.cs
@@ -114,10 +114,11 @@ namespace Tango.Emulations.Emulators
                                 for (int i = 0; i < 10; i++)
                                 {
                                     value++;
-                                    res.Temperature.Add((int)(150 + 75 * Math.Sin(2 * 3.14 * 10 * value)));
+                                    res.Dancer1Angle.Add((int)(150 + 75 * Math.Sin(2 * 3.14 * 10 * value)));
                                 }
 
-                                res.Velocity.Add(Cursor.Position.Y);
+                                res.Dancer2Angle.Add(Cursor.Position.Y);
+                                res.Dancer3Angle.Add(Cursor.Position.Y);
                             }
 
                             Transporter.SendResponse<StartDiagnosticsResponse>(res, container.Token);