Merge branch 'master' of https://twinetfs.visualstudio.com/Tango/_git/Tango

5 files changed, 43 insertions, 10 deletions

diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/App.xaml b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/App.xaml
index fe50851a0..20e381b70 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/App.xaml
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/App.xaml
@@ -11,9 +11,6 @@
                 <!-- Accent and AppTheme setting -->
                 <ResourceDictionary Source="pack://application:,,,/Tango.MachineStudio.Common;component/Resources/MaterialDesign.xaml"></ResourceDictionary>
 
-                <!--RealTimeGraphEx-->
-                <ResourceDictionary Source="pack://application:,,,/RealTimeGraphEx;component/Resources/Resources.xaml"></ResourceDictionary>
-
                 <!-- Include the Dragablz Material Design style -->
                 <ResourceDictionary Source="pack://application:,,,/Dragablz;component/Themes/materialdesign.xaml"/>
 
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 eff1f2521..4717f932a 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.0.11.0")]
+[assembly: AssemblyVersion("4.0.18.0")]
 [assembly: ComVisible(false)]
\ No newline at end of file
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Tango.MachineStudio.UI.csproj b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Tango.MachineStudio.UI.csproj
index 8d9255926..ede1bf828 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Tango.MachineStudio.UI.csproj
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Tango.MachineStudio.UI.csproj
@@ -343,6 +343,14 @@
       <DependentUpon>Settings.settings</DependentUpon>
       <DesignTimeSharedInput>True</DesignTimeSharedInput>
     </Compile>
+    <Content Include="..\..\tcc\benchmarks\benchmarks_rgb_lab.csv">
+      <Link>TCC\benchmarks_rgb_lab.csv</Link>
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+    <Content Include="..\..\tcc\images\template.bmp">
+      <Link>TCC\template.bmp</Link>
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
     <None Include="packages.config" />
     <None Include="Properties\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>
@@ -356,9 +364,13 @@
     <Resource Include="design.ico" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\SideChains\RealTimeGraphEx\RealTimeGraphEx.csproj">
-      <Project>{b9ae25d6-be35-492f-9079-21a7f3e6f7cc}</Project>
-      <Name>RealTimeGraphEx</Name>
+    <ProjectReference Include="..\..\SideChains\RealTimeGraphX-master\RealTimeGraphX.WPF\RealTimeGraphX.WPF.csproj">
+      <Project>{6b9774f7-960d-438e-ad81-c6b9be328d50}</Project>
+      <Name>RealTimeGraphX.WPF</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\SideChains\RealTimeGraphX-master\RealTimeGraphX\RealTimeGraphX.csproj">
+      <Project>{f13a489c-80ee-4cd0-bdd4-92d959215646}</Project>
+      <Name>RealTimeGraphX</Name>
     </ProjectReference>
     <ProjectReference Include="..\..\SideChains\Tango.AutoComplete\Tango.AutoComplete.csproj">
       <Project>{bb2abb74-ba58-4812-83aa-ec8171f42df4}</Project>
@@ -420,6 +432,10 @@
       <Project>{5001990f-977b-48ff-b217-0236a5022ad8}</Project>
       <Name>Tango.Web</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\TCC\Tango.TCC.BL\Tango.TCC.BL.csproj">
+      <Project>{f209fae8-73f9-441b-97f4-0844a0279390}</Project>
+      <Name>Tango.TCC.BL</Name>
+    </ProjectReference>
     <ProjectReference Include="..\Modules\MachineStudio.Dispensers\Tango.MachineStudio.Dispensers.csproj">
       <Project>{f69da3a8-f823-461e-87cf-a9275abc0b15}</Project>
       <Name>Tango.MachineStudio.Dispensers</Name>
@@ -614,7 +630,7 @@ copy /Y "$(SolutionDir)Referenced Assemblies\Microsoft.WITDataStore32.dll" "$(Ta
   </Target>
   <ProjectExtensions>
     <VisualStudio>
-      <UserProperties BuildVersion_StartDate="2000/1/1" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" BuildVersion_BuildVersioningStyle="None.None.Increment.DeltaBaseYearDayOfYear" BuildVersion_UpdateFileVersion="True" BuildVersion_DetectChanges="True" BuildVersion_UseGlobalSettings="False" />
+      <UserProperties BuildVersion_UseGlobalSettings="False" BuildVersion_DetectChanges="True" BuildVersion_UpdateFileVersion="True" BuildVersion_BuildVersioningStyle="None.None.Increment.DeltaBaseYearDayOfYear" BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_StartDate="2000/1/1" />
     </VisualStudio>
   </ProjectExtensions>
 </Project>
\ No newline at end of file
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/AboutView.xaml b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/AboutView.xaml
index 54a8349e6..bf9a52b98 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/AboutView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/AboutView.xaml
@@ -6,6 +6,7 @@
              xmlns:vm="clr-namespace:Tango.MachineStudio.UI.ViewModels"
              xmlns:controls="clr-namespace:Tango.SharedUI.Controls;assembly=Tango.SharedUI"
              xmlns:converters="clr-namespace:Tango.SharedUI.Converters;assembly=Tango.SharedUI"
+             xmlns:pmrPrinting="clr-namespace:Tango.PMR.Printing;assembly=Tango.PMR"
              xmlns:bl="clr-namespace:Tango.BL;assembly=Tango.BL"
              xmlns:local="clr-namespace:Tango.MachineStudio.UI.Views"
              mc:Ignorable="d" 
@@ -67,6 +68,11 @@
                                 <ComboBox Width="150" DockPanel.Dock="Left" ItemsSource="{Binding Source={x:Type bl:ObservablesContextInMemoryCachingMode},Converter={StaticResource EnumToItemsSourceConverter}}" SelectedValue="{Binding MachineStudioSettings.CachingMode}" SelectedValuePath="Value" DisplayMemberPath="DisplayName"></ComboBox>
                                 <TextBlock Margin="20 0 0 0" Foreground="Gray" VerticalAlignment="Center">(Requires restart)</TextBlock>
                             </DockPanel>
+                            <TextBlock FontWeight="SemiBold">Job Upload Strategy:</TextBlock>
+                            <DockPanel>
+                                <ComboBox Width="150" DockPanel.Dock="Left" ItemsSource="{Binding Source={x:Type pmrPrinting:JobUploadStrategy},Converter={StaticResource EnumToItemsSourceConverter}}" SelectedValue="{Binding MachineStudioSettings.JobUploadStrategy}" SelectedValuePath="Value" DisplayMemberPath="DisplayName"></ComboBox>
+                                <TextBlock Margin="20 0 0 0" Foreground="Gray" VerticalAlignment="Center">(Requires restart)</TextBlock>
+                            </DockPanel>
                         </controls:TableGrid>
 
                         <DockPanel Margin="0 0 0 0">
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/ConnectedMachineView.xaml b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/ConnectedMachineView.xaml
index c323ce0b0..338cb2d22 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/ConnectedMachineView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/ConnectedMachineView.xaml
@@ -115,7 +115,14 @@
                                     <TextBlock FontWeight="SemiBold" Text="Embedded Software Version:" />
                                     <TextBlock Text="{Binding DeviceInformation.Version}" />
                                     <TextBlock FontWeight="SemiBold" Text="FPGA Version:" />
-                                    <TextBlock>
+                                    <TextBlock TextTrimming="CharacterEllipsis">
+                                        <TextBlock.ToolTip>
+                                            <TextBlock>
+                                        <Run Text="{Binding DeviceInformation.FPGA1Version}"></Run> •
+                                        <Run Text="{Binding DeviceInformation.FPGA2Version}"></Run> •
+                                        <Run Text="{Binding DeviceInformation.FPGA3Version}"></Run>
+                                            </TextBlock>
+                                        </TextBlock.ToolTip>
                                         <Run Text="{Binding DeviceInformation.FPGA1Version}"></Run> •
                                         <Run Text="{Binding DeviceInformation.FPGA2Version}"></Run> •
                                         <Run Text="{Binding DeviceInformation.FPGA3Version}"></Run>
@@ -162,7 +169,14 @@
                                     <TextBlock FontWeight="SemiBold" Text="Embedded Software Version:" />
                                     <TextBlock Text="{Binding DeviceInformation.Version}" />
                                     <TextBlock FontWeight="SemiBold" Text="FPGA Version:" />
-                                    <TextBlock>
+                                    <TextBlock TextTrimming="CharacterEllipsis">
+                                        <TextBlock.ToolTip>
+                                            <TextBlock>
+                                        <Run Text="{Binding DeviceInformation.FPGA1Version}"></Run> •
+                                        <Run Text="{Binding DeviceInformation.FPGA2Version}"></Run> •
+                                        <Run Text="{Binding DeviceInformation.FPGA3Version}"></Run>
+                                            </TextBlock>
+                                        </TextBlock.ToolTip>
                                         <Run Text="{Binding DeviceInformation.FPGA1Version}"></Run> •
                                         <Run Text="{Binding DeviceInformation.FPGA2Version}"></Run> •
                                         <Run Text="{Binding DeviceInformation.FPGA3Version}"></Run>