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

1 files changed, 9 insertions, 0 deletions

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 499d6dc89..954ac5f0e 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
@@ -6,6 +6,7 @@
              xmlns:local="clr-namespace:Tango.MachineStudio.MachineDesigner.Views"
              xmlns:global="clr-namespace:Tango.MachineStudio.MachineDesigner"
              xmlns:mahapps="http://metro.mahapps.com/winfx/xaml/controls"
+             xmlns:enumerations="clr-namespace:Tango.BL.Enumerations;assembly=Tango.BL"
              xmlns:observables="clr-namespace:Tango.BL.Entities;assembly=Tango.BL"
              xmlns:vm="clr-namespace:Tango.MachineStudio.MachineDesigner.ViewModels"
              xmlns:controls="clr-namespace:Tango.SharedUI.Controls;assembly=Tango.SharedUI"
@@ -13,6 +14,11 @@
              xmlns:converters="clr-namespace:Tango.SharedUI.Converters;assembly=Tango.SharedUI"
              mc:Ignorable="d" 
              d:DesignHeight="1080" d:DesignWidth="1920" Background="Transparent" d:DataContext="{d:DesignInstance Type=vm:MainViewVM, IsDesignTimeCreatable=False}" DataContext="{x:Static global:ViewModelLocator.MainViewVM}">
+
+    <UserControl.Resources>
+        <converters:EnumToItemsSourceConverter x:Key="EnumToItemsSourceConverter"/>
+    </UserControl.Resources>
+    
     <Grid Margin="20">
         <DockPanel>
             <Grid DockPanel.Dock="Bottom">
@@ -44,6 +50,9 @@
                                     <TextBlock FontWeight="SemiBold">Name</TextBlock>
                                     <TextBox Text="{Binding ActiveMachine.Name}"></TextBox>
 
+                                    <TextBlock FontWeight="SemiBold">Head Type</TextBlock>
+                                    <ComboBox ItemsSource="{Binding Source={x:Type enumerations:HeadTypes},Converter={StaticResource EnumToItemsSourceConverter}}" SelectedValue="{Binding ActiveMachine.MachineHeadType}" SelectedValuePath="Value" DisplayMemberPath="DisplayName"></ComboBox>
+
                                     <TextBlock FontWeight="SemiBold">Machine Version</TextBlock>
                                     <ComboBox Background="Transparent" ItemsSource="{Binding ActiveMachineAdapter.MachineVersions}" SelectedItem="{Binding ActiveMachine.MachineVersion}" DisplayMemberPath="Name" Style="{StaticResource TransparentComboBoxStyle}"></ComboBox>