Machine Studio v4.1.2

PPC v1.1.5

Added BYPASS_ROCKERS to SQLExaminer config.

Started integrating FSE Remote/Console To PPC.
Added support for generic continuous request.

7 files changed, 240 insertions, 1 deletions

diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Common/Console/DefaultConsoleEngineService.cs b/Software/Visual_Studio/PPC/Tango.PPC.Common/Console/DefaultConsoleEngineService.cs
index 431545c33..42228614e 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.Common/Console/DefaultConsoleEngineService.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/Console/DefaultConsoleEngineService.cs
@@ -41,5 +41,10 @@ namespace Tango.PPC.Common.Console
                 }
             }
         }
+
+        public void OnReceiverDisconnected(ExternalBridgeReceiver receiver)
+        {
+            
+        }
     }
 }
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Common/PPCSettings.cs b/Software/Visual_Studio/PPC/Tango.PPC.Common/PPCSettings.cs
index aacc40168..71a417190 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.Common/PPCSettings.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/PPCSettings.cs
@@ -251,6 +251,16 @@ namespace Tango.PPC.Common
         public String ExternalBridgeSignalRHub { get; set; }
 
         /// <summary>
+        /// Gets or sets a value indicating whether to enable the internal remote desktop service.
+        /// </summary>
+        public bool EnableRemoteDesktop { get; set; }
+
+        /// <summary>
+        /// Gets or sets the internal remote desktop service frame rate (1-20).
+        /// </summary>
+        public int RemoteDesktopFrameRate { get; set; }
+
+        /// <summary>
         /// Gets the machine service address.
         /// </summary>
         /// <returns></returns>
@@ -299,6 +309,8 @@ namespace Tango.PPC.Common
             TcpTransportAdapterWriteMode = TcpTransportAdapterWriteMode.Interval;
             EnableExternalBridgeSignalR = true;
             ExternalBridgeSignalRHub = "ExternalBridgeHub";
+            EnableRemoteDesktop = true;
+            RemoteDesktopFrameRate = 5;
         }
     }
 }
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Common/RemoteDesktop/DefaultRemoteDesktopService.cs b/Software/Visual_Studio/PPC/Tango.PPC.Common/RemoteDesktop/DefaultRemoteDesktopService.cs
new file mode 100644
index 000000000..9099e6346
--- /dev/null
+++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/RemoteDesktop/DefaultRemoteDesktopService.cs
@@ -0,0 +1,198 @@
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Tango.Core;
+using Tango.Core.DI;
+using Tango.Integration.ExternalBridge;
+using Tango.PPC.Common.Application;
+using Tango.PPC.Common.ExternalBridge;
+using Tango.RemoteDesktop;
+using Tango.RemoteDesktop.CaptureMethods;
+using Tango.RemoteDesktop.Encoders;
+using Tango.RemoteDesktop.Engines;
+using Tango.RemoteDesktop.Frames;
+using Tango.RemoteDesktop.Network;
+using Tango.Settings;
+using Tango.Transport;
+
+namespace Tango.PPC.Common.RemoteDesktop
+{
+    [TangoCreateWhenRegistered]
+    public class DefaultRemoteDesktopService : ExtendedObject, IRemoteDesktopService, IExternalBridgeRequestHandler
+    {
+        private class RemoteDesktopClient
+        {
+            public String Token { get; set; }
+            public ExternalBridgeReceiver Receiver { get; set; }
+            public bool InitialPacketSent { get; set; }
+        }
+
+        private RemoteDesktopPacket _initialPacket;
+        private RasterScreenCaptureEngine _engine;
+        private PPCSettings _settings;
+        private List<RemoteDesktopClient> _clients;
+
+        public DefaultRemoteDesktopService(IPPCApplicationManager applicationManager, IPPCExternalBridgeService externalBridge)
+        {
+            _settings = SettingsManager.Default.GetOrCreate<PPCSettings>();
+            applicationManager.ApplicationReady += ApplicationManager_ApplicationReady;
+
+            externalBridge.RegisterRequestHandler(this);
+
+            _clients = new List<RemoteDesktopClient>();
+            _engine = new RasterScreenCaptureEngine();
+
+            _engine.FrameRate = Math.Min(Math.Max(_settings.RemoteDesktopFrameRate, 1), 20);
+            _engine.FrameReceived += _engine_FrameReceived;
+        }
+
+        private void ApplicationManager_ApplicationReady(object sender, EventArgs e)
+        {
+
+#if DEBUG
+            _engine.CaptureMethod.Dispose();
+
+            var mainWindow = System.Windows.Application.Current.MainWindow;
+
+            _engine.CaptureRegion = new CaptureRegion()
+            {
+                Left = (int)mainWindow.Left,
+                Top = (int)mainWindow.Top,
+                Width = (int)mainWindow.Width,
+                Height = (int)mainWindow.Height
+            };
+            _engine.CaptureMethod = new GdiScreenCapture();
+#endif
+
+            if (_settings.EnableRemoteDesktop)
+            {
+                Start();
+            }
+        }
+
+        private bool _isStarted;
+        public bool IsStarted
+        {
+            get { return _isStarted; }
+            private set { _isStarted = value; RaisePropertyChangedAuto(); }
+        }
+
+        public void Start()
+        {
+            if (!IsStarted)
+            {
+                _engine.Start();
+                IsStarted = true;
+            }
+        }
+
+        public void Stop()
+        {
+            if (IsStarted)
+            {
+                _engine.Stop();
+                IsStarted = false;
+            }
+        }
+
+        [ExternalBridgeRequestHandlerMethod(typeof(StartRemoteDesktopSessionRequest))]
+        public async void OnStartRemoteDesktopSessionRequestReceived(StartRemoteDesktopSessionRequest request, String token, ExternalBridgeReceiver receiver)
+        {
+            var client = _clients.SingleOrDefault(x => x.Receiver == receiver);
+
+            if (client != null)
+            {
+                _clients.Remove(client);
+            }
+
+            _clients.Add(new RemoteDesktopClient()
+            {
+                Receiver = receiver,
+                Token = token
+            });
+
+            await receiver.SendGenericResponse(new StartRemoteDesktopSessionResponse()
+            {
+                FrameRate = _engine.FrameRate
+            }, token, new TransportResponseConfig()
+            {
+                Immediate = true,
+            });
+        }
+
+        private async void _engine_FrameReceived(object sender, ScreenCaptureFrameReceivedEventArgs<RasterFrame> e)
+        {
+            _initialPacket = new RemoteDesktopPacket()
+            {
+                Bitmap = e.Frame.ToEncoder<PngEncoder>().ToArray(),
+            };
+
+            foreach (var client in _clients.ToList().Where(x => !x.InitialPacketSent))
+            {
+                try
+                {
+                    await client.Receiver.SendGenericResponse(new StartRemoteDesktopSessionResponse()
+                    {
+                        Packet = _initialPacket,
+                    }, client.Token, new TransportResponseConfig()
+                    {
+                        Immediate = true,
+                    });
+
+                    client.InitialPacketSent = true;
+                }
+                catch (Exception ex)
+                {
+                    Debug.WriteLine(ex);
+                }
+            }
+
+            if (e.Frame.DifferenceAvailable && e.Frame.DifferenceCount > 0)
+            {
+                var diffFrame = e.Frame.ToDifference();
+                diffFrame = diffFrame.OptimizeBounds();
+
+                RemoteDesktopPacket packet = new RemoteDesktopPacket()
+                {
+                    Bitmap = diffFrame.ToEncoder<PngEncoder>().ToArray(),
+                    IsPartial = true,
+                    PartialRegion = new CaptureRegion(diffFrame.Left, diffFrame.Top, diffFrame.Width, diffFrame.Height),
+                };
+
+                diffFrame.Dispose();
+                e.Frame.Dispose();
+
+                foreach (var client in _clients.ToList().Where(x => x.InitialPacketSent))
+                {
+                    try
+                    {
+                        await client.Receiver.SendGenericResponse(new StartRemoteDesktopSessionResponse()
+                        {
+                            Packet = packet
+                        }, client.Token, new TransportResponseConfig()
+                        {
+                            Immediate = false,
+                        });
+                    }
+                    catch (Exception ex)
+                    {
+                        Debug.WriteLine(ex);
+                    }
+                }
+            }
+        }
+
+        public void OnReceiverDisconnected(ExternalBridgeReceiver receiver)
+        {
+            var client = _clients.SingleOrDefault(x => x.Receiver == receiver);
+
+            if (client != null)
+            {
+                _clients.Remove(client);
+            }
+        }
+    }
+}
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Common/RemoteDesktop/IRemoteDesktopService.cs b/Software/Visual_Studio/PPC/Tango.PPC.Common/RemoteDesktop/IRemoteDesktopService.cs
new file mode 100644
index 000000000..bce1bf51e
--- /dev/null
+++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/RemoteDesktop/IRemoteDesktopService.cs
@@ -0,0 +1,15 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Tango.PPC.Common.RemoteDesktop
+{
+    public interface IRemoteDesktopService
+    {
+        bool IsStarted { get; }
+        void Start();
+        void Stop();
+    }
+}
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Common/Tango.PPC.Common.csproj b/Software/Visual_Studio/PPC/Tango.PPC.Common/Tango.PPC.Common.csproj
index 382405705..80bcf6ef1 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.Common/Tango.PPC.Common.csproj
+++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/Tango.PPC.Common.csproj
@@ -159,6 +159,8 @@
     <Compile Include="MachineSetup\MachineSetupManager.cs" />
     <Compile Include="MachineSetup\MachineSetupProgress.cs" />
     <Compile Include="MachineSetup\MachineSetupResult.cs" />
+    <Compile Include="RemoteDesktop\DefaultRemoteDesktopService.cs" />
+    <Compile Include="RemoteDesktop\IRemoteDesktopService.cs" />
     <Compile Include="Synchronization\DefaultMachineDataSynchronizer.cs" />
     <Compile Include="Synchronization\IMachineDataSynchronizer.cs" />
     <Compile Include="Synchronization\SynchronizationEndedEventArgs.cs" />
@@ -373,6 +375,10 @@
       <Project>{e4927038-348d-4295-aaf4-861c58cb3943}</Project>
       <Name>Tango.PMR</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\Tango.RemoteDesktop\Tango.RemoteDesktop.csproj">
+      <Project>{a78068d4-2061-4376-8ede-583d8d880dec}</Project>
+      <Name>Tango.RemoteDesktop</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\Tango.Settings\Tango.Settings.csproj">
       <Project>{d8f1ad85-526a-4f50-b6dc-d437af63d8d8}</Project>
       <Name>Tango.Settings</Name>
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Properties/AssemblyInfo.cs b/Software/Visual_Studio/PPC/Tango.PPC.UI/Properties/AssemblyInfo.cs
index 18a34afb3..01ccc7654 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Properties/AssemblyInfo.cs
@@ -8,4 +8,4 @@ using System.Windows;
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
 [assembly: AssemblyTitle("Tango PPC Application")]
-[assembly: AssemblyVersion("1.1.4.0")]
+[assembly: AssemblyVersion("1.1.5.0")]
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModelLocator.cs b/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModelLocator.cs
index 3e4a91c73..a8cbcfe2d 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModelLocator.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModelLocator.cs
@@ -22,6 +22,7 @@ using Tango.PPC.Common.Notifications;
 using Tango.PPC.Common.OS;
 using Tango.PPC.Common.Printing;
 using Tango.PPC.Common.RemoteAssistance;
+using Tango.PPC.Common.RemoteDesktop;
 using Tango.PPC.Common.Storage;
 using Tango.PPC.Common.Synchronization;
 using Tango.PPC.Common.Threading;
@@ -80,6 +81,7 @@ namespace Tango.PPC.UI
             TangoIOC.Default.Unregister<IPackageRunner>();
             TangoIOC.Default.Unregister<IMachineDataSynchronizer>();
             TangoIOC.Default.Unregister<IConsoleEngineService>();
+            TangoIOC.Default.Unregister<IRemoteDesktopService>();
 
             if (App.StartupArgs.Contains("-webDebug"))
             {
@@ -103,6 +105,7 @@ namespace Tango.PPC.UI
             TangoIOC.Default.Register<IDiagnosticsFrameProvider, DefaultDiagnosticsFrameProvider>();
             TangoIOC.Default.Register<IPPCExternalBridgeService, PPCExternalBridgeService>();
             TangoIOC.Default.Register<IConsoleEngineService, DefaultConsoleEngineService>();
+            TangoIOC.Default.Register<IRemoteDesktopService, DefaultRemoteDesktopService>();
             TangoIOC.Default.Register<IRemoteAssistanceProvider, DefaultRemoteAssistanceProvider>();
             TangoIOC.Default.Register<IPackageRunner, DefaultPackageRunner>();
             TangoIOC.Default.Register<IMachineSetupManager, MachineSetupManager>();