From 7219d145b82c9c4e9aaeac34a0bc1198bfe65974 Mon Sep 17 00:00:00 2001
From: Roy Ben Shabat <Roy.mail.net@gmail.com>
Date: Sat, 13 Feb 2021 15:27:22 +0200
Subject: Machine creation improvements for light inks.

---
 .../ViewModels/MainViewVM.cs                       | 28 ++++++++++++++++++++--
 .../Views/ConfigurationView.xaml                   |  1 +
 .../Views/MachineCreationDialog.xaml               |  6 ++---
 3 files changed, 30 insertions(+), 5 deletions(-)

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

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 3aab57481..dc29515c8 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
@@ -577,7 +577,19 @@ namespace Tango.MachineStudio.MachineDesigner.ViewModels
                                 if (newMachine)
                                 {
                                     dispenser.NlPerPulse = machineCreationDialogVM.DispenserFactor;
-                                    dispenser.DispenserTypeGuid = ActiveMachineAdapter.DispenserTypes.First().Guid;
+
+                                    if (i == 8)
+                                    {
+                                        dispenser.DispenserTypeGuid = ActiveMachineAdapter.DispenserTypes.FirstOrDefault(x => x.Code == BL.Enumerations.DispenserTypes.LubricantDispenser.ToInt32()).Guid;
+                                    }
+                                    else if (i == 9)
+                                    {
+                                        dispenser.DispenserTypeGuid = ActiveMachineAdapter.DispenserTypes.FirstOrDefault(x => x.Code == BL.Enumerations.DispenserTypes.CleanerDispenser.ToInt32()).Guid;
+                                    }
+                                    else
+                                    {
+                                        dispenser.DispenserTypeGuid = ActiveMachineAdapter.DispenserTypes.FirstOrDefault(x => x.Code == BL.Enumerations.DispenserTypes.StandardDispenser.ToInt32()).Guid;
+                                    }
                                 }
                                 else
                                 {
@@ -586,7 +598,19 @@ namespace Tango.MachineStudio.MachineDesigner.ViewModels
                                     if (packBefore != null)
                                     {
                                         dispenser.NlPerPulse = packBefore.Dispenser.NlPerPulse;
-                                        dispenser.DispenserTypeGuid = packBefore.Dispenser.DispenserType.Guid;
+
+                                        if (i == 8)
+                                        {
+                                            dispenser.DispenserTypeGuid = ActiveMachineAdapter.DispenserTypes.FirstOrDefault(x => x.Code == BL.Enumerations.DispenserTypes.LubricantDispenser.ToInt32()).Guid;
+                                        }
+                                        else if (i == 9)
+                                        {
+                                            dispenser.DispenserTypeGuid = ActiveMachineAdapter.DispenserTypes.FirstOrDefault(x => x.Code == BL.Enumerations.DispenserTypes.CleanerDispenser.ToInt32()).Guid;
+                                        }
+                                        else
+                                        {
+                                            dispenser.DispenserTypeGuid = ActiveMachineAdapter.DispenserTypes.FirstOrDefault(x => x.Code == BL.Enumerations.DispenserTypes.StandardDispenser.ToInt32()).Guid;
+                                        }
                                     }
                                     else
                                     {
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/ConfigurationView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/ConfigurationView.xaml
index dbebd270c..03043d04e 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/ConfigurationView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/ConfigurationView.xaml
@@ -441,6 +441,7 @@
                                                                 <Image IsHitTestVisible="False" Width="24" Height="24" Source="../Images/injection.png" Stretch="Fill" RenderOptions.BitmapScalingMode="Fant"></Image>
                                                                 <StackPanel Margin="5 0 0 0" IsHitTestVisible="False">
                                                                     <TextBlock IsHitTestVisible="False" FontSize="10" Foreground="DimGray"><Run Text="{Binding SerialNumber}"></Run></TextBlock>
+                                                                    <TextBlock IsHitTestVisible="False" FontSize="9" Margin="0 2 0 0" Foreground="Gray"><Run Text="{Binding DispenserType.Name}"></Run></TextBlock>
                                                                 </StackPanel>
                                                             </StackPanel>
 
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MachineCreationDialog.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MachineCreationDialog.xaml
index 0640b846e..41e0fa685 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MachineCreationDialog.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MachineCreationDialog.xaml
@@ -63,10 +63,10 @@
                     <TextBlock Margin="0 20 0 0" FontSize="10">Name</TextBlock>
                     <TextBox Margin="0 2 0 0" Text="{Binding Name,UpdateSourceTrigger=PropertyChanged}"></TextBox>
 
-                    <CheckBox Margin="0 30 0 0" IsChecked="{Binding GenerateDispensers}">
+                    <CheckBox Margin="0 30 -200 0" IsChecked="{Binding GenerateDispensers}">
                         <TextBlock>
-                            <Run>Automatically generate 8 dispensers for this machine</Run>
-                            <Run>(</Run><Run Foreground="{StaticResource GrayBrush}" FontSize="10" Text="{Binding SerialNumber}"></Run><Run Foreground="{StaticResource GrayBrush}" FontSize="10">-1-8</Run><Run>)</Run>
+                            <Run>Automatically generate 10 dispensers for this machine</Run>
+                            <Run>(</Run><Run Foreground="{StaticResource GrayBrush}" FontSize="10" Text="{Binding SerialNumber}"></Run><Run Foreground="{StaticResource GrayBrush}" FontSize="10">-1-10</Run><Run>)</Run>
                         </TextBlock>
                     </CheckBox>
 
-- 
cgit v1.3.1