Fixed a bug with job colorspace is null when entering job summery on catalog.

Added ContinuousRequestTimeout to MachineOperator and machine studio external bridge connection.
Fixed dispensing nl\sec calculation.
Fixed job brush stops liquid volumes setting by correct process parameters.

2 files changed, 7 insertions, 0 deletions

diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/MachineStudioSettings.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/MachineStudioSettings.cs
index c307a8e33..1831d5aa3 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/MachineStudioSettings.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/MachineStudioSettings.cs
@@ -135,6 +135,11 @@ namespace Tango.MachineStudio.Common
         public TimeSpan ExternalBridgeRequestTimeout { get; set; }
 
         /// <summary>
+        /// Gets or sets the external bridge continuous request timeout.
+        /// </summary>
+        public TimeSpan ExternalBridgeContinuousRequestTimeout { get; set; }
+
+        /// <summary>
         /// Gets the machine service address.
         /// </summary>
         public String MachineServiceAddress
@@ -173,6 +178,7 @@ namespace Tango.MachineStudio.Common
             Theme = MachineStudioTheme.Light;
             JobUnitsMethod = JobUnitsMethods.Operator;
             ExternalBridgeRequestTimeout = TimeSpan.FromSeconds(5);
+            ExternalBridgeContinuousRequestTimeout = TimeSpan.FromSeconds(5);
         }
     }
 }
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MainViewVM.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MainViewVM.cs
index 90fe25c8f..c7fd7a525 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MainViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MainViewVM.cs
@@ -460,6 +460,7 @@ namespace Tango.MachineStudio.UI.ViewModels
                         {
                             x.SelectedMachine.As<ExternalBridgeTcpClient>().EnableApplicationLogs = x.EnableApplicationLogs;
                             x.SelectedMachine.RequestTimeout = _settings.ExternalBridgeRequestTimeout;
+                            x.SelectedMachine.ContinuousRequestTimeout = _settings.ExternalBridgeContinuousRequestTimeout;
                         }
 
                         if (x.SelectedMachine.RequiresAuthentication)