From 37d47dd053e02118c5b314a3ec5e8f1f2b0fc8e6 Mon Sep 17 00:00:00 2001
From: Roy Ben Shabat <Roy.mail.net@gmail.com>
Date: Sun, 22 Mar 2020 18:34:00 +0200
Subject: Added new head cleaning parameters support. Added build up pressure
 to process parameters.

---
 .../Controls/JobOutlineControl.cs                          | 14 ++++++++++++++
 .../Tango.MachineStudio.Developer/Views/JobView.xaml       |  2 +-
 2 files changed, 15 insertions(+), 1 deletion(-)

(limited to 'Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer')

diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Controls/JobOutlineControl.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Controls/JobOutlineControl.cs
index 5a3f5d337..68dc7e3bf 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Controls/JobOutlineControl.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Controls/JobOutlineControl.cs
@@ -150,6 +150,20 @@ namespace Tango.MachineStudio.Developer.Controls
                     _sizeControl.Height += NORMAL_FONT_HEIGHT;
                 }
             }
+            //JobTicket.HeadCleaningParameters
+            if (job.HeadCleaningParameters != null)
+            {
+                _sizeControl.Height += 20;
+                DrawHeaderText(drawingContext, "HEAD CLEANING PARAMETERS", 17, LevelOffset.level_0);
+                _sizeControl.Height += TITLE_FONT_HEIGHT;
+                _sizeControl.Height += 5.0;
+                basicProps = GetNameValueList(job.HeadCleaningParameters);
+                foreach (var prop in basicProps)
+                {
+                    DrawNameValueText(drawingContext, prop, LevelOffset.level_1, PackIconKind.Settings);
+                    _sizeControl.Height += NORMAL_FONT_HEIGHT;
+                }
+            }
             //JobTicket.Segments
             if (job.Segments != null)
             {
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/JobView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/JobView.xaml
index ed8fc57fe..ed832f468 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/JobView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/JobView.xaml
@@ -1553,7 +1553,7 @@
                                                                                         <Grid Background="Transparent">
                                                                                             <ContentControl>
                                                                                                 <StackPanel>
-                                                                                                    <TextBlock IsHitTestVisible="False" Margin="0 5 0 5" Text="{Binding Name}" FontSize="11" Foreground="{StaticResource MainWindow.Foreground}"></TextBlock>
+                                                                                                    <TextBlock ToolTip="{Binding Name}" IsHitTestVisible="False" Margin="0 5 0 5" Text="{Binding Name}" FontSize="11" Foreground="{StaticResource MainWindow.Foreground}"></TextBlock>
                                                                                                     <mahapps:NumericUpDown FontSize="20" Minimum="0" Margin="0 0 5 0" HideUpDownButtons="True" HorizontalContentAlignment="Center" Maximum="10000" StringFormat="{Binding StringFormat}" InterceptArrowKeys="True" Background="Transparent" BorderThickness="0" InterceptMouseWheel="True" HasDecimals="True" Value="{Binding Value,Mode=TwoWay}" Foreground="{StaticResource MainWindow.Foreground}"></mahapps:NumericUpDown>
                                                                                                 </StackPanel>
                                                                                             </ContentControl>
-- 
cgit v1.3.1


From 8f57d4962fa84499c8a153ebfff6e7766434ee1c Mon Sep 17 00:00:00 2001
From: Victoria Plitt <Victoria.Plitt@twine-s.com>
Date: Wed, 25 Mar 2020 14:57:56 +0200
Subject: Machine Studio. Added bottom margin to the job outline to show the
 "BACK TO JOBS" button.

Related Work Items: #2607
---
 .../Modules/Tango.MachineStudio.Developer/Views/RunningJobView.xaml     | 2 +-
 .../Tango.Integration/ExternalBridge/ExternalBridgeScanner.cs           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer')

diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/RunningJobView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/RunningJobView.xaml
index e7f16146b..0400ee7e6 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/RunningJobView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/RunningJobView.xaml
@@ -208,7 +208,7 @@
             </Grid>
         </Grid>
 
-        <Grid HorizontalAlignment="Right">
+        <Grid HorizontalAlignment="Right" Margin="0 0 0 82">
             <ContentControl Content="{Binding}">
                 <ContentControl.Style>
                     <Style TargetType="ContentControl">
diff --git a/Software/Visual_Studio/Tango.Integration/ExternalBridge/ExternalBridgeScanner.cs b/Software/Visual_Studio/Tango.Integration/ExternalBridge/ExternalBridgeScanner.cs
index ce0a6ad43..2f9356da3 100644
--- a/Software/Visual_Studio/Tango.Integration/ExternalBridge/ExternalBridgeScanner.cs
+++ b/Software/Visual_Studio/Tango.Integration/ExternalBridge/ExternalBridgeScanner.cs
@@ -293,7 +293,7 @@ namespace Tango.Integration.ExternalBridge
                         foreach (var machine in machines.Where(x => !AvailableMachines.OfType<ExternalBridgeSignalRClient>().ToList().Exists(y => y.SerialNumber == x.SerialNumber)))
                         {
                             ExternalBridgeSignalRClient newMachine = null;
-                            var knownMachine = KnownMachines.FirstOrDefault(x => x.SerialNumber == machine.SerialNumber);
+                            var knownMachine = KnownMachines != null ? KnownMachines.FirstOrDefault(x => x.SerialNumber == machine.SerialNumber) : null;
 
                             if (knownMachine == null)
                             {
-- 
cgit v1.3.1