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

1 files changed, 86 insertions, 31 deletions

diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MainView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MainView.xaml
index 8f955beea..61259508a 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MainView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MainView.xaml
@@ -123,8 +123,8 @@
                                         <StackPanel Orientation="Horizontal">
                                             <Image Source="../Images/hardware.png" Width="10" VerticalAlignment="Center" Margin="5" RenderOptions.BitmapScalingMode="Fant"></Image>
                                             <TextBlock Padding="2 0 2 0" VerticalAlignment="Center" TextAlignment="Center" Foreground="Gainsboro" IsHitTestVisible="False" FontSize="6" TextWrapping="Wrap">
-                                            <Run Text="{Binding Configuration.HardwareVersions.Name}"></Run>
-                                            <Run Text="{Binding Configuration.HardwareVersions.Version}"></Run>
+                                            <Run Text="{Binding Configuration.HardwareVersion.Name}"></Run>
+                                            <Run Text="{Binding Configuration.HardwareVersion.Version}"></Run>
                                             </TextBlock>
                                         </StackPanel>
                                     </Border>
@@ -189,7 +189,7 @@
                                                                 <Image.Style>
                                                                     <Style TargetType="Image">
                                                                         <Style.Triggers>
-                                                                            <DataTrigger Binding="{Binding DispenserTypes}" Value="{x:Null}">
+                                                                            <DataTrigger Binding="{Binding DispenserType}" Value="{x:Null}">
                                                                                 <Setter Property="Opacity" Value="0.2"></Setter>
                                                                             </DataTrigger>
                                                                         </Style.Triggers>
@@ -200,7 +200,7 @@
                                                                 <Rectangle.Fill>
                                                                     <LinearGradientBrush StartPoint="0,0" EndPoint="0,0.8" Opacity="0.8">
                                                                         <GradientStop Offset="0" Color="Transparent" />
-                                                                        <GradientStop Offset="1" Color="{Binding LiquidTypes.Color,Converter={StaticResource ColorToIntegerConverter}}"/>
+                                                                        <GradientStop Offset="1" Color="{Binding LiquidType.Color,Converter={StaticResource ColorToIntegerConverter}}"/>
                                                                     </LinearGradientBrush>
                                                                 </Rectangle.Fill>
                                                             </Rectangle>
@@ -211,7 +211,7 @@
                                                                 <Image.Style>
                                                                     <Style TargetType="Image">
                                                                         <Style.Triggers>
-                                                                            <DataTrigger Binding="{Binding MidTankTypes}" Value="{x:Null}">
+                                                                            <DataTrigger Binding="{Binding MidTankType}" Value="{x:Null}">
                                                                                 <Setter Property="Opacity" Value="0.2"></Setter>
                                                                             </DataTrigger>
                                                                         </Style.Triggers>
@@ -222,10 +222,16 @@
                                                                 <Rectangle.Fill>
                                                                     <LinearGradientBrush StartPoint="0,0" EndPoint="0,0.8" Opacity="0.8">
                                                                         <GradientStop Offset="0" Color="Transparent" />
-                                                                        <GradientStop Offset="1" Color="{Binding LiquidTypes.Color,Converter={StaticResource ColorToIntegerConverter}}"/>
+                                                                        <GradientStop Offset="1" Color="{Binding LiquidType.Color,Converter={StaticResource ColorToIntegerConverter}}"/>
                                                                     </LinearGradientBrush>
                                                                 </Rectangle.Fill>
                                                             </Rectangle>
+
+                                                            <TextBlock Text="{Binding IdsPackFormula.Name}" TextWrapping="Wrap" Height="30" IsHitTestVisible="False" Width="50" Margin="-20 15 0 0" FontSize="7" TextAlignment="Center" RenderTransformOrigin="0.5,0.5" Foreground="White" HorizontalAlignment="Center" VerticalAlignment="Center">
+                                                                <TextBlock.LayoutTransform>
+                                                                    <RotateTransform Angle="90" />
+                                                                </TextBlock.LayoutTransform>
+                                                            </TextBlock>
                                                         </Grid>
                                                     </UniformGrid>
 
@@ -233,7 +239,7 @@
                                                         <Grid.Style>
                                                             <Style TargetType="Grid">
                                                                 <Style.Triggers>
-                                                                    <DataTrigger Binding="{Binding CartridgeTypes}" Value="{x:Null}">
+                                                                    <DataTrigger Binding="{Binding CartridgeType}" Value="{x:Null}">
                                                                         <Setter Property="Opacity" Value="0.2"></Setter>
                                                                     </DataTrigger>
                                                                 </Style.Triggers>
@@ -251,7 +257,7 @@
                                                             <Border.Background>
                                                                 <LinearGradientBrush Opacity="0.7">
                                                                     <GradientStop Offset="0" Color="Transparent" />
-                                                                    <GradientStop Offset="1" Color="{Binding LiquidTypes.Color,Converter={StaticResource ColorToIntegerConverter}}"/>
+                                                                    <GradientStop Offset="1" Color="{Binding LiquidType.Color,Converter={StaticResource ColorToIntegerConverter}}"/>
                                                                 </LinearGradientBrush>
                                                             </Border.Background>
                                                         </Border>
@@ -294,13 +300,13 @@
 
                                     <StackPanel Orientation="Horizontal">
                                         <Image Source="../Images/embedded.png" Width="10" VerticalAlignment="Center" Margin="1" RenderOptions.BitmapScalingMode="Fant"></Image>
-                                        <TextBlock VerticalAlignment="Center" Padding="1" Foreground="Gainsboro"  IsHitTestVisible="False" FontSize="5" TextAlignment="Center" TextWrapping="Wrap" Height="15" Margin="0,6,0,0" Width="47"><Run Text="{Binding Configuration.EmbeddedFirmwareVersions.Name}"/><Run Text=" "/><Run Text="{Binding Configuration.EmbeddedFirmwareVersions.Version}"/></TextBlock>
+                                        <TextBlock VerticalAlignment="Center" Padding="1" Foreground="Gainsboro"  IsHitTestVisible="False" FontSize="5" TextAlignment="Center" TextWrapping="Wrap" Height="15" Margin="0,6,0,0" Width="47"><Run Text="{Binding Configuration.EmbeddedFirmwareVersion.Name}"/><Run Text=" "/><Run Text="{Binding Configuration.EmbeddedFirmwareVersion.Version}"/></TextBlock>
                                     </StackPanel>
                                     <StackPanel Grid.Row="1" Orientation="Horizontal">
                                         <Image Source="../Images/embedded-software.png" Width="10" VerticalAlignment="Center" Margin="1" RenderOptions.BitmapScalingMode="Fant"></Image>
                                         <TextBlock Padding="1" IsHitTestVisible="False" VerticalAlignment="Center" Foreground="Gainsboro" FontSize="5" TextAlignment="Center" TextWrapping="Wrap" Height="14" Margin="0,6,0,1" Width="47">
-                                        <Run Text="{Binding Configuration.EmbeddedSoftwareVersions.Name}"></Run>
-                                        <Run Text="{Binding Configuration.EmbeddedSoftwareVersions.Version}"></Run>
+                                        <Run Text="{Binding Configuration.EmbeddedSoftwareVersion.Name}"></Run>
+                                        <Run Text="{Binding Configuration.EmbeddedSoftwareVersion.Version}"></Run>
                                         </TextBlock>
                                     </StackPanel>
                                 </Grid>
@@ -356,16 +362,16 @@
                                     <StackPanel>
                                         <Image Source="../Images/tablet.png" Width="10" Margin="2" RenderOptions.BitmapScalingMode="Fant"></Image>
                                         <TextBlock Padding="2 0 2 0" Foreground="Gainsboro"  IsHitTestVisible="False" FontSize="6" TextAlignment="Center" TextWrapping="Wrap">
-                                        <Run Text="{Binding Configuration.ApplicationDisplayPanelVersions.Name}"></Run>
-                                        <Run Text="{Binding Configuration.ApplicationDisplayPanelVersions.Version}"></Run>
+                                        <Run Text="{Binding Configuration.ApplicationDisplayPanelVersion.Name}"></Run>
+                                        <Run Text="{Binding Configuration.ApplicationDisplayPanelVersion.Version}"></Run>
                                         </TextBlock>
                                     </StackPanel>
 
                                     <StackPanel Grid.Row="2" >
                                         <Image Source="../Images/app.png" Width="10" Margin="2" RenderOptions.BitmapScalingMode="Fant"></Image>
                                         <TextBlock Padding="2 0 2 0" IsHitTestVisible="False" Foreground="Gainsboro" FontSize="6" TextAlignment="Center" TextWrapping="Wrap">
-                                        <Run Text="{Binding Configuration.ApplicationVersions.Name}"></Run>
-                                        <Run Text="{Binding Configuration.ApplicationVersions.Version}"></Run>
+                                        <Run Text="{Binding Configuration.ApplicationVersion.Name}"></Run>
+                                        <Run Text="{Binding Configuration.ApplicationVersion.Version}"></Run>
                                         </TextBlock>
                                     </StackPanel>
 
@@ -373,16 +379,16 @@
                                     <StackPanel Grid.Row="3" >
                                         <Image Source="../Images/application-firmware.png" Width="10" Margin="2" RenderOptions.BitmapScalingMode="Fant"></Image>
                                         <TextBlock Padding="2 0 2 0" IsHitTestVisible="False" Foreground="Gainsboro" FontSize="6" TextAlignment="Center" TextWrapping="Wrap">
-                                        <Run Text="{Binding Configuration.ApplicationFirmwareVersions.Name}"></Run>
-                                        <Run Text="{Binding Configuration.ApplicationFirmwareVersions.Version}"></Run>
+                                        <Run Text="{Binding Configuration.ApplicationFirmwareVersion.Name}"></Run>
+                                        <Run Text="{Binding Configuration.ApplicationFirmwareVersion.Version}"></Run>
                                         </TextBlock>
                                     </StackPanel>
 
                                     <StackPanel Grid.Row="1" >
                                         <Image Source="../Images/android.png" Width="10" Margin="2" RenderOptions.BitmapScalingMode="Fant"></Image>
                                         <TextBlock Padding="2 0 2 0" IsHitTestVisible="False" Foreground="Gainsboro" FontSize="6" TextAlignment="Center" TextWrapping="Wrap">
-                                        <Run Text="{Binding Configuration.ApplicationOsVersions.Name}"></Run>
-                                        <Run Text="{Binding Configuration.ApplicationOsVersions.Version}"></Run>
+                                        <Run Text="{Binding Configuration.ApplicationOsVersion.Name}"></Run>
+                                        <Run Text="{Binding Configuration.ApplicationOsVersion.Version}"></Run>
                                         </TextBlock>
                                     </StackPanel>
                                 </Grid>
@@ -403,19 +409,23 @@
                                         <StackPanel Margin="20 0 0 0">
                                             <StackPanel Orientation="Horizontal" Margin="0 3 0 3">
                                                 <Image RenderOptions.BitmapScalingMode="Fant" Source="../Images/injection.png" Width="12" VerticalAlignment="Center"></Image>
-                                                <TextBlock Margin="5 0 0 0" VerticalAlignment="Center"><Run FontWeight="Bold">Dispenser:</Run> <Run FontStyle="Italic" Text="{Binding DispenserTypes.Name}"></Run></TextBlock>
+                                                <TextBlock Margin="5 0 0 0" VerticalAlignment="Center"><Run FontWeight="Bold">Dispenser:</Run> <Run FontStyle="Italic" Text="{Binding DispenserType.Name}"></Run></TextBlock>
                                             </StackPanel>
                                             <StackPanel Orientation="Horizontal" Margin="0 3 0 3">
                                                 <Image RenderOptions.BitmapScalingMode="Fant" Source="../Images/tank.png" Width="12" VerticalAlignment="Center"></Image>
-                                                <TextBlock Margin="5 0 0 0" VerticalAlignment="Center"><Run FontWeight="Bold">Mid Tank:</Run> <Run FontStyle="Italic" Text="{Binding MidTankTypes.Name}"></Run></TextBlock>
+                                                <TextBlock Margin="5 0 0 0" VerticalAlignment="Center"><Run FontWeight="Bold">Mid Tank:</Run> <Run FontStyle="Italic" Text="{Binding MidTankType.Name}"></Run></TextBlock>
                                             </StackPanel>
                                             <StackPanel Orientation="Horizontal" Margin="0 3 0 3">
                                                 <Image RenderOptions.BitmapScalingMode="Fant" Source="../Images/cartridge.png" Width="12" VerticalAlignment="Center"></Image>
-                                                <TextBlock Margin="5 0 0 0" VerticalAlignment="Center"><Run FontWeight="Bold">Cartridge:</Run> <Run FontStyle="Italic" Text="{Binding CartridgeTypes.Name}"></Run></TextBlock>
+                                                <TextBlock Margin="5 0 0 0" VerticalAlignment="Center"><Run FontWeight="Bold">Cartridge:</Run> <Run FontStyle="Italic" Text="{Binding CartridgeType.Name}"></Run></TextBlock>
                                             </StackPanel>
                                             <StackPanel Orientation="Horizontal" Margin="0 3 0 3">
                                                 <Image RenderOptions.BitmapScalingMode="Fant" Source="../Images/liquid.png" Width="12" VerticalAlignment="Center"></Image>
-                                                <TextBlock Margin="5 0 0 0" VerticalAlignment="Center"><Run FontWeight="Bold">Liquid:</Run> <Run FontStyle="Italic" Text="{Binding LiquidTypes.Name}"></Run></TextBlock>
+                                                <TextBlock Margin="5 0 0 0" VerticalAlignment="Center"><Run FontWeight="Bold">Liquid:</Run> <Run FontStyle="Italic" Text="{Binding LiquidType.Name}"></Run></TextBlock>
+                                            </StackPanel>
+                                            <StackPanel Orientation="Horizontal" Margin="0 3 0 3">
+                                                <Image RenderOptions.BitmapScalingMode="Fant" Source="../Images/formula.png" Width="12" VerticalAlignment="Center"></Image>
+                                                <TextBlock Margin="5 0 0 0" VerticalAlignment="Center"><Run FontWeight="Bold">Formula:</Run> <Run FontStyle="Italic" Text="{Binding IdsPackFormula.Name}"></Run></TextBlock>
                                             </StackPanel>
                                         </StackPanel>
                                     </StackPanel>
@@ -431,7 +441,7 @@
             <Grid Grid.Column="1">
                 <Grid.RowDefinitions>
                     <RowDefinition/>
-                    <RowDefinition Height="70"/>
+                    <RowDefinition Height="60"/>
                 </Grid.RowDefinitions>
                 <ScrollViewer HorizontalScrollBarVisibility="Disabled" VerticalScrollBarVisibility="Auto">
                     <Grid>
@@ -447,7 +457,14 @@
                                     <TextBox Text="{Binding Machine.Name,UpdateSourceTrigger=PropertyChanged}"></TextBox>
 
                                     <TextBlock Margin="0 15 0 0" FontSize="10" Foreground="Gray">Machine Version</TextBlock>
-                                    <ComboBox ItemsSource="{Binding Adapter.MachineVersions}" SelectedItem="{Binding Machine.MachineVersions}" DisplayMemberPath="Name"></ComboBox>
+                                    <Grid>
+                                        <Grid.ColumnDefinitions>
+                                            <ColumnDefinition Width="1*"></ColumnDefinition>
+                                            <ColumnDefinition Width="80"></ColumnDefinition>
+                                        </Grid.ColumnDefinitions>
+                                        <ComboBox ItemsSource="{Binding Adapter.MachineVersions}" SelectedItem="{Binding Machine.MachineVersion}" DisplayMemberPath="Name"></ComboBox>
+                                        <Button Grid.Column="1" Command="{Binding SetVersionConfigurationCommand}" Height="25" Margin="10 2 2 2" ToolTip="Sets the current configuration to the selected machine version default configuration">SET</Button>
+                                    </Grid>
 
                                     <TextBlock Margin="0 15 0 0" FontSize="10" Foreground="Gray">Organization</TextBlock>
                                     <ComboBox ItemsSource="{Binding Adapter.Organizations}" SelectedItem="{Binding Machine.Organization}" DisplayMemberPath="Name"></ComboBox>
@@ -611,6 +628,32 @@
                                         </ListBox>
                                     </Expander>
                                     <Border Height="1" HorizontalAlignment="Stretch" Background="{DynamicResource MaterialDesignDivider}" SnapsToDevicePixels="True" />
+                                    <Expander HorizontalAlignment="Stretch" Header="Formulas">
+                                        <ListBox ItemsSource="{Binding Adapter.IdsPackFormulasViewSource}" HorizontalContentAlignment="Stretch">
+                                            <ListBox.ItemContainerStyle>
+                                                <Style TargetType="ListBoxItem" BasedOn="{StaticResource {x:Type ListBoxItem}}">
+                                                    <Setter Property="HorizontalContentAlignment" Value="Stretch"></Setter>
+                                                    <Setter Property="VerticalContentAlignment" Value="Stretch"></Setter>
+                                                    <Setter Property="Padding" Value="1"></Setter>
+                                                </Style>
+                                            </ListBox.ItemContainerStyle>
+                                            <ListBox.ItemTemplate>
+                                                <DataTemplate>
+                                                    <Grid Background="Transparent" IsHitTestVisible="True" dragAndDrop:DragAndDropService.DraggableBorderBrush="{StaticResource AccentColorBrush}" dragAndDrop:DragAndDropService.Draggable="True" dragAndDrop:DragAndDropService.DraggingSurface="{Binding RelativeSource={RelativeSource AncestorType=UserControl},Path=DraggingSurface}">
+                                                        <StackPanel Orientation="Horizontal" Margin="2 8">
+                                                            <Image IsHitTestVisible="False" Width="24" Height="24" Source="../Images/formula.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 Name}"></Run></TextBlock>
+                                                            </StackPanel>
+                                                        </StackPanel>
+
+                                                        <Rectangle Margin="0 10 0 0" VerticalAlignment="Bottom" Stroke="Gainsboro" StrokeThickness="1"></Rectangle>
+                                                    </Grid>
+                                                </DataTemplate>
+                                            </ListBox.ItemTemplate>
+                                        </ListBox>
+                                    </Expander>
+                                    <Border Height="1" HorizontalAlignment="Stretch" Background="{DynamicResource MaterialDesignDivider}" SnapsToDevicePixels="True" />
                                     <Expander HorizontalAlignment="Stretch" Header="Touch Panels">
                                         <ListBox ItemsSource="{Binding Adapter.ApplicationDisplayPanelVersionsViewSource}" HorizontalContentAlignment="Stretch">
                                             <ListBox.ItemContainerStyle>
@@ -806,12 +849,24 @@
                 </ScrollViewer>
 
                 <Grid Grid.Row="1" Margin="10">
-                    <Button Height="50" Command="{Binding SaveCommand}" Margin="0 0 15 0">
-                        <StackPanel Orientation="Horizontal">
-                            <materialDesign:PackIcon Width="24" Height="24" VerticalAlignment="Center" Kind="ContentSaveSettings"></materialDesign:PackIcon>
-                            <TextBlock FontSize="18" Margin="10 0 0 0" VerticalAlignment="Center">SAVE</TextBlock>
-                        </StackPanel>
-                    </Button>
+                    <Grid>
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="61*"/>
+                            <ColumnDefinition Width="84*"/>
+                        </Grid.ColumnDefinitions>
+                        <Button Height="Auto" Command="{Binding SaveCommand}" Margin="0 0 5 0">
+                            <StackPanel Orientation="Horizontal">
+                                <materialDesign:PackIcon Width="20" Height="20" VerticalAlignment="Center" Kind="ContentSaveSettings"></materialDesign:PackIcon>
+                                <TextBlock FontSize="14" Margin="10 0 0 0" VerticalAlignment="Center">SAVE</TextBlock>
+                            </StackPanel>
+                        </Button>
+                        <Button ToolTip="Set this configuration as a default machine configuration" Height="Auto" Background="#FF5C5C" BorderBrush="#FF5C5C" Command="{Binding SetAsDefaultCommand}" Margin="0 0 15 0" Grid.Column="1">
+                            <StackPanel Orientation="Horizontal">
+                                <materialDesign:PackIcon Width="20" Height="20" VerticalAlignment="Center" Kind="Verified"></materialDesign:PackIcon>
+                                <TextBlock FontSize="14" Margin="10 0 0 0" VerticalAlignment="Center">SET DEFAULT</TextBlock>
+                            </StackPanel>
+                        </Button>
+                    </Grid>
                 </Grid>
             </Grid>
         </Grid>