Merged updated software branch.

11 files changed, 92 insertions, 20 deletions

diff --git a/Software/Visual_Studio/Advanced Installer Projects/Machine Studio Installer.aip b/Software/Visual_Studio/Advanced Installer Projects/Machine Studio Installer.aip
index 19b3b39d3..d78e37f68 100644
--- a/Software/Visual_Studio/Advanced Installer Projects/Machine Studio Installer.aip
+++ b/Software/Visual_Studio/Advanced Installer Projects/Machine Studio Installer.aip
@@ -16,10 +16,10 @@
     <ROW Property="ARPCOMMENTS" Value="This installer database contains the logic and data required to install [|ProductName]." ValueLocId="*"/>
     <ROW Property="ARPNOREPAIR" MultiBuildValue="DefaultBuild:1"/>
     <ROW Property="Manufacturer" Value="Twine"/>
-    <ROW Property="ProductCode" Value="1033:{FD1BB362-311C-4C2B-8B3A-1F87B0DF074F} " Type="16"/>
+    <ROW Property="ProductCode" Value="1033:{8B3B7897-753D-4BD6-9BB3-E582EB6F1823} " Type="16"/>
     <ROW Property="ProductLanguage" Value="1033"/>
     <ROW Property="ProductName" Value="Machine Studio"/>
-    <ROW Property="ProductVersion" Value="4.9.5.0" Type="32"/>
+    <ROW Property="ProductVersion" Value="4.9.6.0" Type="32"/>
     <ROW Property="SecureCustomProperties" Value="OLDPRODUCTS;AI_NEWERPRODUCTFOUND;AI_SETUPEXEPATH;SETUPEXEDIR"/>
     <ROW Property="UpgradeCode" Value="{CBEE5CAE-7C5A-4280-98DE-AA98113764E4}"/>
     <ROW Property="WindowsType9X" MultiBuildValue="DefaultBuild:Windows 9x/ME" ValueLocId="-"/>
@@ -845,7 +845,7 @@
     <ROW Action="AI_DetectSoftware" Sequence="101"/>
   </COMPONENT>
   <COMPONENT cid="caphyon.advinst.msicomp.BuildComponent">
-    <ROW BuildKey="DefaultBuild" BuildName="DefaultBuild" BuildOrder="1" BuildType="0" PackageFolder="..\Build\Installers\Machine Studio\Release" PackageFileName="Machine Studio Installer_v4.9.5" Languages="en" InstallationType="4" CabsLocation="1" PackageType="1" FilesInsideExe="true" ExtractionFolder="[AppDataFolder][|Manufacturer]\[|ProductName] [|ProductVersion]\install" ExtUI="true" UseLargeSchema="true" ExeName="Machine Studio Installer_v4.9.5"/>
+    <ROW BuildKey="DefaultBuild" BuildName="DefaultBuild" BuildOrder="1" BuildType="0" PackageFolder="..\Build\Installers\Machine Studio\Release" PackageFileName="Machine Studio Installer_v4.9.6" Languages="en" InstallationType="4" CabsLocation="1" PackageType="1" FilesInsideExe="true" ExtractionFolder="[AppDataFolder][|Manufacturer]\[|ProductName] [|ProductVersion]\install" ExtUI="true" UseLargeSchema="true" ExeName="Machine Studio Installer_v4.9.6"/>
   </COMPONENT>
   <COMPONENT cid="caphyon.advinst.msicomp.DictionaryComponent">
     <ROW Path="&lt;AI_DICTS&gt;ui.ail"/>
diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Diagnostics/Project/Widgets/RealTimeGraph/RealTimeGraphWidgetSettingsView.xaml b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Diagnostics/Project/Widgets/RealTimeGraph/RealTimeGraphWidgetSettingsView.xaml
index 073d9dc23..823df1ffe 100644
--- a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Diagnostics/Project/Widgets/RealTimeGraph/RealTimeGraphWidgetSettingsView.xaml
+++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Diagnostics/Project/Widgets/RealTimeGraph/RealTimeGraphWidgetSettingsView.xaml
@@ -26,11 +26,11 @@
             <controls:FSEGroupBox Margin="0 10 0 0" Header="RANGE" HeaderFontSize="{StaticResource FSE_SmallFontSize}">
                 <StackPanel>
                     <DockPanel>
-                        <TextBlock DockPanel.Dock="Right" FontSize="{StaticResource FSE_SmallerFontSize}" >
-                            <Run Text="{Binding Settings.Min,Mode=OneWay}"></Run>
-                            <Run>-</Run>
-                            <Run Text="{Binding Settings.Max,Mode=OneWay}"></Run>
-                        </TextBlock>
+                        <StackPanel Margin="0 -5 0 0" DockPanel.Dock="Right" Orientation="Horizontal">
+                            <TextBox Width="70" Style="{StaticResource FSE_Rounded_Corners_TextBox}" FontSize="{StaticResource FSE_SmallerFontSize}" Text="{Binding Settings.Min}"></TextBox>
+                            <TextBlock Margin="5 0">-</TextBlock>
+                            <TextBox Width="70" Style="{StaticResource FSE_Rounded_Corners_TextBox}" FontSize="{StaticResource FSE_SmallerFontSize}" Text="{Binding Settings.Max}"></TextBox>
+                        </StackPanel>
                         <TextBlock FontSize="{StaticResource FSE_SmallerFontSize}" >Y Min/Max</TextBlock>
                     </DockPanel>
                     <mahapps:RangeSlider Margin="0 5 0 0" 
diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Diagnostics/Project/Widgets/RealTimeGraphMultiChannel/RealTimeGraphMultiChannelWidgetSettingsView.xaml b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Diagnostics/Project/Widgets/RealTimeGraphMultiChannel/RealTimeGraphMultiChannelWidgetSettingsView.xaml
index 253b1e5ac..451f6fa03 100644
--- a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Diagnostics/Project/Widgets/RealTimeGraphMultiChannel/RealTimeGraphMultiChannelWidgetSettingsView.xaml
+++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Diagnostics/Project/Widgets/RealTimeGraphMultiChannel/RealTimeGraphMultiChannelWidgetSettingsView.xaml
@@ -26,11 +26,11 @@
             <controls:FSEGroupBox Margin="0 10 0 0" Header="RANGE" HeaderFontSize="{StaticResource FSE_SmallFontSize}">
                 <StackPanel>
                     <DockPanel>
-                        <TextBlock DockPanel.Dock="Right" FontSize="{StaticResource FSE_SmallerFontSize}" >
-                            <Run Text="{Binding Settings.Min,Mode=OneWay}"></Run>
-                            <Run>-</Run>
-                            <Run Text="{Binding Settings.Max,Mode=OneWay}"></Run>
-                        </TextBlock>
+                        <StackPanel Margin="0 -5 0 0" DockPanel.Dock="Right" Orientation="Horizontal">
+                            <TextBox Width="70" Style="{StaticResource FSE_Rounded_Corners_TextBox}" FontSize="{StaticResource FSE_SmallerFontSize}" Text="{Binding Settings.Min}"></TextBox>
+                            <TextBlock Margin="5 0">-</TextBlock>
+                            <TextBox Width="70" Style="{StaticResource FSE_Rounded_Corners_TextBox}" FontSize="{StaticResource FSE_SmallerFontSize}" Text="{Binding Settings.Max}"></TextBox>
+                        </StackPanel>
                         <TextBlock FontSize="{StaticResource FSE_SmallerFontSize}" >Y Min/Max</TextBlock>
                     </DockPanel>
                     <mahapps:RangeSlider Margin="0 5 0 0" 
diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Statistics/ViewModels/MainViewVM.cs b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Statistics/ViewModels/MainViewVM.cs
index 07f856b7e..d77b0b5a1 100644
--- a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Statistics/ViewModels/MainViewVM.cs
+++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Statistics/ViewModels/MainViewVM.cs
@@ -239,7 +239,7 @@ namespace Tango.FSE.Statistics.ViewModels
 
             JobsAutoCompleteProvider = new AutoCompleteSource<string>(AutoCompleteJobs);
 
-            StartSelectedDate = DateTime.Now.AddMonths(-1);
+            StartSelectedDate = DateTime.Now.AddDays(-7);
             EndSelectedDate = DateTime.Now;
             LengthUpperValue = 10000;
 
diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Statistics/Views/MainView.xaml b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Statistics/Views/MainView.xaml
index f65bb8fda..5f0ceaa5a 100644
--- a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Statistics/Views/MainView.xaml
+++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Statistics/Views/MainView.xaml
@@ -131,7 +131,7 @@
                                                                         </Style>
                                                                     </material:PackIcon.Style>
                                                                 </material:PackIcon>
-                                                                <TextBlock Margin="10 0 0 0" Width="140" TextWrapping="NoWrap" TextTrimming="CharacterEllipsis" FontWeight="Bold" VerticalAlignment="Center" FontSize="14" Text="{Binding Items[0].Items[0].JobRun.JobName}" />
+                                                                <TextBlock Margin="10 0 0 0" Width="140" TextWrapping="NoWrap" TextTrimming="CharacterEllipsis" FontWeight="Bold" VerticalAlignment="Center" FontSize="14" Text="{Binding Items[0].Items[0].JobRun.JobName}" Background="Transparent" ToolTip="{Binding Items[0].Items[0].JobRun.JobName}" />
                                                                 <TextBlock Margin="55 0 0 0" Text="{Binding Items[0].Items[0].ThreadName}" VerticalAlignment="Center" Width="100" TextWrapping="Wrap"></TextBlock>
                                                                 <TextBlock Margin="20 0 0 0" Text="{Binding Items[0].Items[0].LogicalLength,Mode=OneWay}" Background="Transparent" VerticalAlignment="Center" Width="80">
                                                                     <TextBlock.ToolTip>
@@ -261,7 +261,40 @@
                         <DataGridTextColumn Header="END POINT" Width="100" CellStyle="{StaticResource EmptyColumnStyle2}" />
                         <DataGridTextColumn Header="OFFSET" Width="75" Binding="{Binding StartMeters}" />
                         <DataGridTextColumn Header="COLOR SPACE" Width="120" Binding="{Binding ColorSpace}" />
-                        <DataGridTextColumn Header="INPUT" Width="150" Binding="{Binding Input}" />
+                        <DataGridTemplateColumn Header="INPUT" Width="150">
+                            <DataGridTemplateColumn.CellTemplate>
+                                <DataTemplate>
+                                    <ContentControl Content="{Binding}">
+                                        <ContentControl.Style>
+                                            <Style TargetType="ContentControl">
+                                                <Setter Property="ContentTemplate">
+                                                    <Setter.Value>
+                                                        <DataTemplate>
+                                                            <TextBlock Text="{Binding Input}"></TextBlock>
+                                                        </DataTemplate>
+                                                    </Setter.Value>
+                                                </Setter>
+                                                <Style.Triggers>
+                                                    <DataTrigger Binding="{Binding ColorSpace}" Value="Catalog">
+                                                        <Setter Property="ContentTemplate">
+                                                            <Setter.Value>
+                                                                <DataTemplate>
+                                                                    <TextBlock Margin="0 -4 0 0" TextWrapping="NoWrap">
+                                                                        <Run FontSize="10" Foreground="{StaticResource FSE_GrayBrush}" Text="{Binding Catalog,Mode=OneWay}"></Run>
+                                                                        <LineBreak/>
+                                                                        <Run FontSize="11" Text="{Binding CatalogItem,Mode=OneWay}"></Run>
+                                                                    </TextBlock>
+                                                                </DataTemplate>
+                                                            </Setter.Value>
+                                                        </Setter>
+                                                    </DataTrigger>
+                                                </Style.Triggers>
+                                            </Style>
+                                        </ContentControl.Style>
+                                    </ContentControl>
+                                </DataTemplate>
+                            </DataGridTemplateColumn.CellTemplate>
+                        </DataGridTemplateColumn>
                         <DataGridTemplateColumn Header="OUTPUT" Width="*">
                             <DataGridTemplateColumn.CellTemplate>
                                 <DataTemplate>
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 66489e131..4217d9712 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
@@ -762,7 +762,7 @@
                                                                                 <DataTemplate>
                                                                                     <DockPanel>
                                                                                         <StackPanel DockPanel.Dock="Left">
-                                                                                            <TextBlock Text="{Binding Name}" FontWeight="Bold" FontStyle="Italic"></TextBlock>
+                                                                                            <TextBlock Text="{Binding FinalName}" FontWeight="Bold" FontStyle="Italic"></TextBlock>
                                                                                             <TextBlock FontSize="11" Text="{Binding Manufacturer}" Foreground="Gray"></TextBlock>
                                                                                         </StackPanel>
                                                                                         <TextBlock Margin="20 0 0 0" VerticalAlignment="Center" HorizontalAlignment="Right">
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Properties/AssemblyInfo.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Properties/AssemblyInfo.cs
index 110772b2d..c87abde49 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Properties/AssemblyInfo.cs
@@ -4,5 +4,5 @@ using System.Runtime.InteropServices;
 
 [assembly: System.Windows.ThemeInfo(System.Windows.ResourceDictionaryLocation.None, System.Windows.ResourceDictionaryLocation.SourceAssembly)]
 [assembly: AssemblyTitle("Tango - Machine Studio")]
-[assembly: AssemblyVersion("4.9.5.0")]
+[assembly: AssemblyVersion("4.9.6.0")]
 [assembly: ComVisible(false)]
\ No newline at end of file
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MachineConnectionViewVM.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MachineConnectionViewVM.cs
index 165841905..c7c8335f0 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MachineConnectionViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MachineConnectionViewVM.cs
@@ -38,7 +38,16 @@ namespace Tango.MachineStudio.UI.ViewModels
         public IExternalBridgeClient SelectedMachine
         {
             get { return _selectedMachine; }
-            set { _selectedMachine = value; RaisePropertyChangedAuto(); RaisePropertyChanged(nameof(RequiresAuthentication)); InvalidateRelayCommands(); }
+            set
+            {
+                if (value != null)
+                {
+                    _selectedMachine = value;
+                    RaisePropertyChangedAuto();
+                    RaisePropertyChanged(nameof(RequiresAuthentication));
+                    InvalidateRelayCommands();
+                }
+            }
         }
 
         /// <summary>
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Printing/DefaultPrintingManager.cs b/Software/Visual_Studio/PPC/Tango.PPC.UI/Printing/DefaultPrintingManager.cs
index d920b32a4..f4a3f643d 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Printing/DefaultPrintingManager.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Printing/DefaultPrintingManager.cs
@@ -149,6 +149,8 @@ namespace Tango.PPC.UI.Printing
 
             handler.Completed += async (x, e) =>
             {
+                if (job.Designation == JobDesignations.FineTuning) return;
+
                 try
                 {
                     job.JobStatus = JobStatuses.Completed;
@@ -179,6 +181,8 @@ namespace Tango.PPC.UI.Printing
             };
             handler.Canceled += (x, e) =>
             {
+                if (job.Designation == JobDesignations.FineTuning) return;
+
                 try
                 {
                     //No change in status !
@@ -192,6 +196,8 @@ namespace Tango.PPC.UI.Printing
             };
             handler.Failed += async (x, e) =>
             {
+                if (job.Designation == JobDesignations.FineTuning) return;
+
                 try
                 {
 
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/app.manifest b/Software/Visual_Studio/PPC/Tango.PPC.UI/app.manifest
index d72e75011..efc5f8179 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/app.manifest
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/app.manifest
@@ -16,7 +16,7 @@
             Remove this element if your application requires this virtualization for backwards
             compatibility.
         -->
-        <requestedExecutionLevel level="requireAdministrator" uiAccess="false" />
+        <!--<requestedExecutionLevel level="requireAdministrator" uiAccess="false" />-->
       </requestedPrivileges>
     </security>
   </trustInfo>
diff --git a/Software/Visual_Studio/Tango.BL/Helpers/SegmentsCsvHelper.cs b/Software/Visual_Studio/Tango.BL/Helpers/SegmentsCsvHelper.cs
index 704e005fe..18dde341b 100644
--- a/Software/Visual_Studio/Tango.BL/Helpers/SegmentsCsvHelper.cs
+++ b/Software/Visual_Studio/Tango.BL/Helpers/SegmentsCsvHelper.cs
@@ -161,6 +161,14 @@ namespace Tango.BL.Helpers
                     if (rml == null) throw new InvalidOperationException($"Thread type '{threadName}' not found.");
                 }
 
+                if (machine.SiteGuid != null)
+                {
+                    if (!context.SitesRmls.Any(x => x.SiteGuid == machine.SiteGuid && x.RmlGuid == rml.Guid))
+                    {
+                        throw new InvalidOperationException($"Thread type '{threadName}' is not allowed for this machine's site.");
+                    }
+                }
+
                 var idsPacks = machine.Configuration.NoneEmptyIdsPacks.ToList();
 
                 var cyanIdsPack = idsPacks.FirstOrDefault(x => x.LiquidType.Type == LiquidTypes.Cyan);
@@ -357,6 +365,14 @@ namespace Tango.BL.Helpers
                                 throw new InvalidOperationException($"Catalog '{row.CatalogName1}' not found on line '{lineCount}'.");
                             }
 
+                            if (machine.SiteGuid != null)
+                            {
+                                if (!context.SitesCatalogs.Any(x => x.SiteGuid == machine.SiteGuid && x.ColorCatalogGuid == catalog.Guid))
+                                {
+                                    throw new InvalidOperationException($"Catalog '{catalog.Name}' is not assigned for this machine's site.");
+                                }
+                            }
+
                             var item = catalog.ColorCatalogsGroups.SelectMany(x => x.ColorCatalogsItems).FirstOrDefault(x => x.Name == row.CatalogItem1);
                             if (item == null)
                             {
@@ -374,6 +390,14 @@ namespace Tango.BL.Helpers
                                     throw new InvalidOperationException($"Catalog '{row.CatalogName2}' not found on line '{lineCount}'.");
                                 }
 
+                                if (machine.SiteGuid != null)
+                                {
+                                    if (!context.SitesCatalogs.Any(x => x.SiteGuid == machine.SiteGuid && x.ColorCatalogGuid == catalog2.Guid))
+                                    {
+                                        throw new InvalidOperationException($"Catalog '{catalog2.Name}' is not assigned for this machine's site.");
+                                    }
+                                }
+
                                 var item2 = catalog2.ColorCatalogsGroups.SelectMany(x => x.ColorCatalogsItems).FirstOrDefault(x => x.Name == row.CatalogItem2);
                                 if (item2 == null)
                                 {