Merged Light Inks To software !

4 files changed, 13 insertions, 20 deletions

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 b13ffb87b..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
@@ -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="8" 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>
@@ -143,6 +143,8 @@
                                     <TextBlock HorizontalAlignment="Center">6</TextBlock>
                                     <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">
@@ -155,7 +157,7 @@
                                         </ListBox.ItemContainerStyle>
                                         <ItemsControl.ItemsPanel>
                                             <ItemsPanelTemplate>
-                                                <UniformGrid Columns="8"></UniformGrid>
+                                                <UniformGrid Columns="10"></UniformGrid>
                                             </ItemsPanelTemplate>
                                         </ItemsControl.ItemsPanel>
                                         <ItemsControl.ItemTemplate>
@@ -439,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..f69606e29 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
@@ -52,28 +52,16 @@
             <Grid>
                 <StackPanel HorizontalAlignment="Left" VerticalAlignment="Top" Margin="20 20 0 0" Width="400">
                     <TextBlock TextWrapping="Wrap" Visibility="{Binding IsNewMachine,Converter={StaticResource BooleanToVisibilityConverter}}">
-                        <Run>Please specify the machine version in order to prototype the new machine with default machine settings and configuration.</Run>
+                        <Run>Specify a machine prototype to create the new machine with default settings and configuration.</Run>
                     </TextBlock>
 
-                    <ComboBox Visibility="{Binding IsNewMachine,Converter={StaticResource BooleanToVisibilityConverter}}" ItemsSource="{Binding MachineVersions}" SelectedItem="{Binding SelectedMachineVersion}" DisplayMemberPath="Name" Margin="0 10 0 0" FontSize="16" materialDesign:HintAssist.Hint="NONE"></ComboBox>
+                    <ComboBox Visibility="{Binding IsNewMachine,Converter={StaticResource BooleanToVisibilityConverter}}" ItemsSource="{Binding Prototypes}" SelectedItem="{Binding SelectedPrototype}" DisplayMemberPath="Name" Margin="0 10 0 0" FontSize="16" materialDesign:HintAssist.Hint="NONE"></ComboBox>
 
                     <TextBlock Margin="0 20 0 0" FontSize="10">Serial Number</TextBlock>
                     <TextBox Margin="0 2 0 0" Text="{Binding SerialNumber,UpdateSourceTrigger=PropertyChanged}"></TextBox>
 
                     <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}">
-                        <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>
-                        </TextBlock>
-                    </CheckBox>
-
-                    <StackPanel Margin="20 10 0 0" Visibility="{Binding IsNewMachine,Converter={StaticResource BooleanToVisibilityConverter}}">
-                        <TextBlock FontSize="10">Dispenser max nl/cm</TextBlock>
-                        <mahapps:NumericUpDown Minimum="0" StringFormat="0.00" Maximum="10" InterceptMouseWheel="True" Value="{Binding DispenserFactor,Mode=TwoWay}" HorizontalContentAlignment="Left" Width="95" HorizontalAlignment="Left" BorderThickness="0 0 0 1" Margin="0 2 0 0" HideUpDownButtons="True" HasDecimals="True" Background="Transparent"></mahapps:NumericUpDown>
-                    </StackPanel>
                 </StackPanel>
             </Grid>
         </DockPanel>
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MachineSettingsView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MachineSettingsView.xaml
index 76517ec37..9b50de49c 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MachineSettingsView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MachineSettingsView.xaml
@@ -109,8 +109,8 @@
                                 <TextBlock FontWeight="SemiBold">Force Version Update</TextBlock>
                                 <ToggleButton HorizontalAlignment="Left" IsChecked="{Binding ActiveMachine.ForceVersionUpdate}"></ToggleButton>
 
-                                <TextBlock FontWeight="SemiBold">Update Schema on Update</TextBlock>
-                                <ToggleButton HorizontalAlignment="Left" IsChecked="{Binding ActiveMachine.PerformSchemaUpdateOnDataUpdate}"></ToggleButton>
+                                <TextBlock FontWeight="SemiBold">Light Inks Installed</TextBlock>
+                                <ToggleButton HorizontalAlignment="Left" IsChecked="{Binding ActiveMachine.LightInksInstalled}"></ToggleButton>
                             </controls:TableGrid>
                         </Grid>
                     </Border>
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 f72344905..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="8" 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>
@@ -78,6 +78,8 @@
                         <TextBlock HorizontalAlignment="Center">6</TextBlock>
                         <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">
@@ -91,7 +93,7 @@
                             </ListBox.ItemContainerStyle>
                             <ItemsControl.ItemsPanel>
                                 <ItemsPanelTemplate>
-                                    <UniformGrid Columns="8"></UniformGrid>
+                                    <UniformGrid Columns="10"></UniformGrid>
                                 </ItemsPanelTemplate>
                             </ItemsControl.ItemsPanel>
                             <ItemsControl.ItemTemplate>