From 0849ec4aadd206d711c8ed0c833be5ef6bc1d8a7 Mon Sep 17 00:00:00 2001
From: Roy Ben-Shabat <Roy@Twine-s.com>
Date: Thu, 11 Jul 2019 12:31:52 +0300
Subject: Working MS on bugs and improvement.

---
 .../ViewModels/MainViewVM.cs                       |   2 +-
 .../Views/MainView.xaml                            |   2 +-
 .../Views/MachineJobSelectionView.xaml             |   6 ----
 .../ViewModels/MainViewVM.cs                       |   3 ++
 .../Tango.MachineStudio.RML/Images/data-table.png  | Bin 0 -> 1238 bytes
 .../Tango.MachineStudio.RML.csproj                 |   3 ++
 .../Tango.MachineStudio.RML/Views/RmlView.xaml     |  37 +++++++++++++++++++++
 7 files changed, 45 insertions(+), 8 deletions(-)
 create mode 100644 Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Images/data-table.png

(limited to 'Software/Visual_Studio/MachineStudio/Modules')

diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorLab/ViewModels/MainViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorLab/ViewModels/MainViewVM.cs
index c33ef1f86..a106ea184 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorLab/ViewModels/MainViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorLab/ViewModels/MainViewVM.cs
@@ -628,7 +628,7 @@ namespace Tango.MachineStudio.ColorLab.ViewModels
 
         #region RML
 
-        private async void InvalidateLiquidFactorsCalibrationData()
+        public async void InvalidateLiquidFactorsCalibrationData()
         {
             if (SelectedRML != null && SelectedMachine != null)
             {
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorLab/Views/MainView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorLab/Views/MainView.xaml
index fe4edcb8b..d78424d4e 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorLab/Views/MainView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorLab/Views/MainView.xaml
@@ -141,7 +141,7 @@
                 <Grid>
                     <Grid Margin="10 10 10 0" Height="135" Visibility="{Binding IsHosted,Converter={StaticResource BooleanToVisibilityInverseConverter}}">
                         <StackPanel HorizontalAlignment="Left" Margin="20 0 0 0">
-                            <TextBlock Margin="0 0 0 0" FontSize="20" TextAlignment="Left">COLOR ADJUSTMENT DATA</TextBlock>
+                            <TextBlock Margin="0 0 0 0" FontSize="20" TextAlignment="Left">COLOR CONVERSION TABLE (CCT)</TextBlock>
                             <Grid>
                                 <StackPanel Orientation="Horizontal" Margin="0 5 0 0">
                                     <materialDesign:PackIcon Kind="ArrowLeftBoldHexagonOutline" VerticalAlignment="Center" Width="40" Height="40" />
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/MachineJobSelectionView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/MachineJobSelectionView.xaml
index ab97d7858..0ba2e39d4 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/MachineJobSelectionView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/MachineJobSelectionView.xaml
@@ -55,12 +55,6 @@
                         </autoComplete:AutoCompleteTextBox>
                     </DockPanel>
                     <designer:MachineView Width="600" IsHitTestVisible="False" Margin="0 40 0 0" DataContext="{Binding SelectedMachine}" />
-                    <Button Command="{Binding EditMachineCommand}" HorizontalAlignment="Right" Margin="0 10 20 20" Style="{StaticResource MaterialDesignFlatButton}">
-                        <StackPanel Orientation="Horizontal">
-                            <materialDesign:PackIcon VerticalAlignment="Center" Kind="Pencil"></materialDesign:PackIcon>
-                            <TextBlock Margin="10 0 0 0">EDIT</TextBlock>
-                        </StackPanel>
-                    </Button>
                 </StackPanel>
             </Grid>
 
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/ViewModels/MainViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/ViewModels/MainViewVM.cs
index 15033e295..935cfe5ee 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/ViewModels/MainViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/ViewModels/MainViewVM.cs
@@ -239,6 +239,7 @@ namespace Tango.MachineStudio.MachineDesigner.ViewModels
         public void DropIdsPack(IdsPack idsPack1, IdsPack idsPack2)
         {
             ActiveMachine.Configuration.IdsPacks.Swap(idsPack1, idsPack2);
+            ColorLabVM.InvalidateLiquidFactorsCalibrationData();
         }
 
         /// <summary>
@@ -333,6 +334,7 @@ namespace Tango.MachineStudio.MachineDesigner.ViewModels
         {
             idsPack.LiquidType = liquidType;
             idsPack.LiquidTypeGuid = liquidType.Guid;
+            ColorLabVM.InvalidateLiquidFactorsCalibrationData();
         }
 
         /// <summary>
@@ -358,6 +360,7 @@ namespace Tango.MachineStudio.MachineDesigner.ViewModels
         {
             ActiveMachineAdapter.Context.IdsPacks.Remove(SelectedIds);
             SelectedIds = null;
+            ColorLabVM.InvalidateLiquidFactorsCalibrationData();
         }
 
         /// <summary>
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Images/data-table.png b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Images/data-table.png
new file mode 100644
index 000000000..0d5e5eaa6
Binary files /dev/null and b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Images/data-table.png differ
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Tango.MachineStudio.RML.csproj b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Tango.MachineStudio.RML.csproj
index b1c8f580d..6b113be5f 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Tango.MachineStudio.RML.csproj
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Tango.MachineStudio.RML.csproj
@@ -186,6 +186,9 @@
   <ItemGroup>
     <Resource Include="Images\thread_128px.png" />
   </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Images\data-table.png" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <ProjectExtensions>
     <VisualStudio>
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Views/RmlView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Views/RmlView.xaml
index 8f2c5d187..e43c20c3d 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Views/RmlView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Views/RmlView.xaml
@@ -132,6 +132,43 @@
 
                     <Grid>
                         <DockPanel>
+                            <Border DockPanel.Dock="Top" Background="#E9FFFFFF" Margin="20 0" Padding="5" CornerRadius="5">
+                                <Border.Effect>
+                                    <DropShadowEffect Opacity="0.4" />
+                                </Border.Effect>
+                                <Grid>
+                                    <TextBlock HorizontalAlignment="Left" Margin="20 0 0 0" FontSize="16">COLOR CONVERSION TABLE (CCT)</TextBlock>
+                                </Grid>
+                            </Border>
+                            <Grid DockPanel.Dock="Top" Margin="20 10">
+                                <StackPanel HorizontalAlignment="Left" Margin="20 0 0 0">
+                                    <Grid>
+                                        <StackPanel Orientation="Horizontal" Margin="0 5 0 0">
+                                            <materialDesign:PackIcon Kind="ArrowLeftBoldHexagonOutline" VerticalAlignment="Center" Width="40" Height="40" />
+                                            <Image Source="../Images/data-table.png" Height="80" Opacity="0.8"></Image>
+                                            <StackPanel VerticalAlignment="Center" Width="300" Margin="10 0 0 0">
+
+                                                <TextBox IsReadOnly="False" Margin="0 5 0 0" Text="{Binding CCT.ForwardFileName}" HorizontalContentAlignment="Center"></TextBox>
+                                                <UniformGrid Columns="2" Margin="0 5 0 0" HorizontalAlignment="Right">
+                                                    <Button Style="{StaticResource MaterialDesignFlatButton}" Padding="0" Command="{Binding ImportForwardDataCommand}">
+                                                        <StackPanel Orientation="Horizontal" Margin="0 0 20 0">
+                                                            <materialDesign:PackIcon Kind="Upload" VerticalAlignment="Center" />
+                                                            <TextBlock Margin="5 0 0 0">IMPORT</TextBlock>
+                                                        </StackPanel>
+                                                    </Button>
+                                                    <Button Style="{StaticResource MaterialDesignFlatButton}" Padding="0" Command="{Binding ExportForwardDataCommand}">
+                                                        <StackPanel Orientation="Horizontal">
+                                                            <materialDesign:PackIcon Kind="Download" VerticalAlignment="Center" />
+                                                            <TextBlock Margin="5 0 0 0">EXPORT</TextBlock>
+                                                        </StackPanel>
+                                                    </Button>
+                                                </UniformGrid>
+                                            </StackPanel>
+                                        </StackPanel>
+                                    </Grid>
+                                </StackPanel>
+                            </Grid>
+
                             <Border DockPanel.Dock="Top" Background="#E9FFFFFF" Margin="20 0" Padding="5" CornerRadius="5">
                                 <Border.Effect>
                                     <DropShadowEffect Opacity="0.4" />
-- 
cgit v1.3.1