diff options
| author | Roy Ben-Shabat <Roy@Twine-s.com> | 2018-07-15 13:22:53 +0300 |
|---|---|---|
| committer | Roy Ben-Shabat <Roy@Twine-s.com> | 2018-07-15 13:22:53 +0300 |
| commit | c6b01f3e683b83fb0d6bf080efbd24a9a732b9f5 (patch) | |
| tree | 900238695f8c1e0e2ea1f5786e3b847fcfa1ba43 /Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Views | |
| parent | df9b2580669472d446e109dff88bdfa247b23b1e (diff) | |
| download | Tango-c6b01f3e683b83fb0d6bf080efbd24a9a732b9f5.tar.gz Tango-c6b01f3e683b83fb0d6bf080efbd24a9a732b9f5.zip | |
Implemented process parameters item on machine studio tech board.
Diffstat (limited to 'Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Views')
| -rw-r--r-- | Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Views/MachineTechView.xaml | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Views/MachineTechView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Views/MachineTechView.xaml index 9843162de..5807341b7 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Views/MachineTechView.xaml +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Views/MachineTechView.xaml @@ -155,7 +155,7 @@ <StackPanel Orientation="Horizontal" HorizontalAlignment="Right" VerticalAlignment="Bottom" Margin="0 0 5 10" Height="40"> - <Button Height="Auto" Margin="0 0 10 0" FontSize="12" Command="{Binding ResetHardwareConfigurationCommand}" IsEnabled="{Binding ApplicationManager.IsMachineConnected}" ToolTip="Reset all visual elements to the hardware configuration defined for the current machine"> + <Button Height="Auto" Margin="0 0 10 0" FontSize="12" Command="{Binding ResetHardwareConfigurationCommand}" ToolTip="Reset all visual elements to the hardware configuration defined for the current machine"> <StackPanel Orientation="Horizontal"> <materialDesign:PackIcon Margin="0 0 2 0" Width="24" Height="24" Kind="Refresh"/> <TextBlock VerticalAlignment="Center">RESET</TextBlock> @@ -375,9 +375,12 @@ <ContentControl Margin="0 10 0 0" DataContext="{Binding ElementName=editor,Path=SelectedElement.HostedElement}" Content="{Binding ElementName=editor,Path=SelectedElement.HostedElement}"> <ContentControl.Resources> <DataTemplate DataType="{x:Type sys:Nullable}"> - + + </DataTemplate> + <DataTemplate DataType="{x:Type items:ProcessParametersItem}"> + <templates:ProcessParametersTemplate/> </DataTemplate> - <DataTemplate DataType="{x:Type items:SpeedSensorItem}"> + <DataTemplate DataType="{x:Type items:SpeedSensorItem}"> <templates:SpeedSensorTemplate/> </DataTemplate> <DataTemplate DataType="{x:Type items:DancerItem}"> |