From 60dae81ccd16a1bd4f5af3b2c5b561e201ec97da Mon Sep 17 00:00:00 2001
From: Roy Ben Shabat <Roy.mail.net@gmail.com>
Date: Thu, 28 Jan 2021 20:40:01 +0200
Subject: Added support for light inks cleaner 10' ids pack !

---
 .../Tango.MachineStudio.MachineDesigner/ViewModels/MainViewVM.cs     | 4 ++--
 .../Tango.MachineStudio.MachineDesigner/Views/ConfigurationView.xaml | 5 +++--
 .../Tango.MachineStudio.MachineDesigner/Views/MachineView.xaml       | 5 +++--
 3 files changed, 8 insertions(+), 6 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 ea9470bb1..3aab57481 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
@@ -263,7 +263,7 @@ namespace Tango.MachineStudio.MachineDesigner.ViewModels
             _machines_action_timer = new ActionTimer(TimeSpan.FromMilliseconds(200));
             _dispensers_action_timer = new ActionTimer(TimeSpan.FromMilliseconds(200));
 
-            AddIdsCommand = new RelayCommand(AddIds, (x) => ActiveMachine != null && ActiveMachine.Configuration != null && ActiveMachine.Configuration.IdsPacks.Count < 9);
+            AddIdsCommand = new RelayCommand(AddIds, (x) => ActiveMachine != null && ActiveMachine.Configuration != null && ActiveMachine.Configuration.IdsPacks.Count < 10);
             RemoveIdsCommand = new RelayCommand(RemoveIds, (x) => SelectedIds != null);
             EditMachineCommand = new RelayCommand(() => LoadSelectedMachine(), () => SelectedMachine != null);
             BackToMachinesCommand = new RelayCommand(() => View.NavigateTo(MachineDesignerNavigationView.MachinesView));
@@ -546,7 +546,7 @@ namespace Tango.MachineStudio.MachineDesigner.ViewModels
 
                     if ((newMachine || clone) && machineCreationDialogVM.GenerateDispensers)
                     {
-                        for (int i = 0; i < 9; i++)
+                        for (int i = 0; i < 10; i++)
                         {
                             var serial = machineCreationDialogVM.SerialNumber + "-" + (i + 1);
 
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 9253ac440..dbebd270c 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
@@ -134,7 +134,7 @@
                                     <materialDesign:PackIcon Kind="Minus" Width="24" Height="24"></materialDesign:PackIcon>
                                 </Button>
 
-                                <UniformGrid Width="310" Canvas.Top="295" Canvas.Left="420" Rows="1" Columns="9" TextElement.FontSize="9">
+                                <UniformGrid Width="310" Canvas.Top="295" Canvas.Left="420" Rows="1" Columns="10" TextElement.FontSize="9">
                                     <TextBlock HorizontalAlignment="Center">1</TextBlock>
                                     <TextBlock HorizontalAlignment="Center">2</TextBlock>
                                     <TextBlock HorizontalAlignment="Center">3</TextBlock>
@@ -144,6 +144,7 @@
                                     <TextBlock HorizontalAlignment="Center">7</TextBlock>
                                     <TextBlock HorizontalAlignment="Center">8</TextBlock>
                                     <TextBlock HorizontalAlignment="Center">9</TextBlock>
+                                    <TextBlock HorizontalAlignment="Center">10</TextBlock>
                                 </UniformGrid>
                                 <Grid x:Name="gridIds" Width="310" Height="195" Canvas.Top="314" Canvas.Left="420">
                                     <ListBox ItemsSource="{Binding ActiveMachine.Configuration.IdsPacks}" SelectedItem="{Binding SelectedIds}" ScrollViewer.VerticalScrollBarVisibility="Disabled" ScrollViewer.HorizontalScrollBarVisibility="Disabled">
@@ -156,7 +157,7 @@
                                         </ListBox.ItemContainerStyle>
                                         <ItemsControl.ItemsPanel>
                                             <ItemsPanelTemplate>
-                                                <UniformGrid Columns="9"></UniformGrid>
+                                                <UniformGrid Columns="10"></UniformGrid>
                                             </ItemsPanelTemplate>
                                         </ItemsControl.ItemsPanel>
                                         <ItemsControl.ItemTemplate>
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MachineView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MachineView.xaml
index fadb9ece0..54e47c0d4 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MachineView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MachineView.xaml
@@ -69,7 +69,7 @@
                         <Rectangle Stroke="Gray" HorizontalAlignment="Left" StrokeThickness="1" StrokeDashArray="5" RenderTransformOrigin="0.5,0.5"/>
                     </Grid>
 
-                    <UniformGrid Width="310" Canvas.Top="295" Canvas.Left="420" Rows="1" Columns="9" TextElement.FontSize="9">
+                    <UniformGrid Width="310" Canvas.Top="295" Canvas.Left="420" Rows="1" Columns="10" TextElement.FontSize="9">
                         <TextBlock HorizontalAlignment="Center">1</TextBlock>
                         <TextBlock HorizontalAlignment="Center">2</TextBlock>
                         <TextBlock HorizontalAlignment="Center">3</TextBlock>
@@ -79,6 +79,7 @@
                         <TextBlock HorizontalAlignment="Center">7</TextBlock>
                         <TextBlock HorizontalAlignment="Center">8</TextBlock>
                         <TextBlock HorizontalAlignment="Center">9</TextBlock>
+                        <TextBlock HorizontalAlignment="Center">10</TextBlock>
                     </UniformGrid>
 
                     <Grid x:Name="gridIds" Width="310" Height="195" Canvas.Top="314" Canvas.Left="420">
@@ -92,7 +93,7 @@
                             </ListBox.ItemContainerStyle>
                             <ItemsControl.ItemsPanel>
                                 <ItemsPanelTemplate>
-                                    <UniformGrid Columns="9"></UniformGrid>
+                                    <UniformGrid Columns="10"></UniformGrid>
                                 </ItemsPanelTemplate>
                             </ItemsControl.ItemsPanel>
                             <ItemsControl.ItemTemplate>
-- 
cgit v1.3.1