From f1a77b05c2e56cd073180803947aa991a09f9b40 Mon Sep 17 00:00:00 2001
From: Roy Ben-Shabat <Roy@Twine-s.com>
Date: Tue, 27 Feb 2018 17:25:26 +0200
Subject: Implemented hardware designer new, save, delete.

---
 .../Views/MainView.xaml                            | 30 +++++++++++-----------
 1 file changed, 15 insertions(+), 15 deletions(-)

(limited to 'Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.HardwareDesigner/Views')

diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.HardwareDesigner/Views/MainView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.HardwareDesigner/Views/MainView.xaml
index 3e840467f..f8de83966 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.HardwareDesigner/Views/MainView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.HardwareDesigner/Views/MainView.xaml
@@ -250,8 +250,8 @@
 
                                 <materialDesign:Card Margin="5,10,5,0" Background="{DynamicResource MaterialDesignBackground}">
                                     <StackPanel>
-                                        <Expander HorizontalAlignment="Stretch" Header="Motors">
-                                            <ListBox ItemsSource="{Binding Adapter.HardwareMotorTypes}" HorizontalContentAlignment="Stretch">
+                                        <Expander HorizontalAlignment="Stretch" Header="PID Controls">
+                                            <ListBox ItemsSource="{Binding Adapter.HardwarePidControlTypes}" HorizontalContentAlignment="Stretch">
                                                 <ListBox.ItemContainerStyle>
                                                     <Style TargetType="ListBoxItem" BasedOn="{StaticResource {x:Type ListBoxItem}}">
                                                         <Setter Property="HorizontalContentAlignment" Value="Stretch"></Setter>
@@ -263,7 +263,7 @@
                                                     <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/engine.png" Stretch="Fill" RenderOptions.BitmapScalingMode="Fant"></Image>
+                                                                <Image IsHitTestVisible="False" Width="24" Height="24" Source="../Images/balance.png" Stretch="Fill" RenderOptions.BitmapScalingMode="Fant"></Image>
                                                                 <StackPanel Margin="5 0 0 0" IsHitTestVisible="False" VerticalAlignment="Center">
                                                                     <TextBlock IsHitTestVisible="False" FontSize="10" Foreground="DimGray"><Run Text="{Binding Name}"></Run></TextBlock>
                                                                 </StackPanel>
@@ -280,8 +280,8 @@
 
                                 <materialDesign:Card Margin="5,10,5,0" Background="{DynamicResource MaterialDesignBackground}">
                                     <StackPanel>
-                                        <Expander HorizontalAlignment="Stretch" Header="Dancers">
-                                            <ListBox ItemsSource="{Binding Adapter.HardwareDancerTypes}" HorizontalContentAlignment="Stretch">
+                                        <Expander HorizontalAlignment="Stretch" Header="Motors">
+                                            <ListBox ItemsSource="{Binding Adapter.HardwareMotorTypes}" HorizontalContentAlignment="Stretch">
                                                 <ListBox.ItemContainerStyle>
                                                     <Style TargetType="ListBoxItem" BasedOn="{StaticResource {x:Type ListBoxItem}}">
                                                         <Setter Property="HorizontalContentAlignment" Value="Stretch"></Setter>
@@ -293,7 +293,7 @@
                                                     <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/compass.png" Stretch="Fill" RenderOptions.BitmapScalingMode="Fant"></Image>
+                                                                <Image IsHitTestVisible="False" Width="24" Height="24" Source="../Images/engine.png" Stretch="Fill" RenderOptions.BitmapScalingMode="Fant"></Image>
                                                                 <StackPanel Margin="5 0 0 0" IsHitTestVisible="False" VerticalAlignment="Center">
                                                                     <TextBlock IsHitTestVisible="False" FontSize="10" Foreground="DimGray"><Run Text="{Binding Name}"></Run></TextBlock>
                                                                 </StackPanel>
@@ -310,8 +310,8 @@
 
                                 <materialDesign:Card Margin="5,10,5,0" Background="{DynamicResource MaterialDesignBackground}">
                                     <StackPanel>
-                                        <Expander HorizontalAlignment="Stretch" Header="PID Controls">
-                                            <ListBox ItemsSource="{Binding Adapter.HardwarePidControlTypes}" HorizontalContentAlignment="Stretch">
+                                        <Expander HorizontalAlignment="Stretch" Header="Dancers">
+                                            <ListBox ItemsSource="{Binding Adapter.HardwareDancerTypes}" HorizontalContentAlignment="Stretch">
                                                 <ListBox.ItemContainerStyle>
                                                     <Style TargetType="ListBoxItem" BasedOn="{StaticResource {x:Type ListBoxItem}}">
                                                         <Setter Property="HorizontalContentAlignment" Value="Stretch"></Setter>
@@ -323,7 +323,7 @@
                                                     <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/balance.png" Stretch="Fill" RenderOptions.BitmapScalingMode="Fant"></Image>
+                                                                <Image IsHitTestVisible="False" Width="24" Height="24" Source="../Images/compass.png" Stretch="Fill" RenderOptions.BitmapScalingMode="Fant"></Image>
                                                                 <StackPanel Margin="5 0 0 0" IsHitTestVisible="False" VerticalAlignment="Center">
                                                                     <TextBlock IsHitTestVisible="False" FontSize="10" Foreground="DimGray"><Run Text="{Binding Name}"></Run></TextBlock>
                                                                 </StackPanel>
@@ -341,8 +341,8 @@
                                 <materialDesign:Card Margin="5,10,5,0" Background="{DynamicResource MaterialDesignBackground}">
                                     <StackPanel>
                                         <Grid>
-                                            <Expander HorizontalAlignment="Stretch" Header="Motor Properties">
-                                                <editors:ParameterizedEditor ParameterizedObject="{Binding ElementName=listMotors,Path=SelectedItem}" Padding="10">
+                                            <Expander HorizontalAlignment="Stretch" Header="PID Control Properties">
+                                                <editors:ParameterizedEditor ParameterizedObject="{Binding ElementName=listPid,Path=SelectedItem}" Padding="10">
                                                     <editors:ParameterizedEditor.ItemsPanel>
                                                         <ItemsPanelTemplate>
                                                             <StackPanel></StackPanel>
@@ -381,8 +381,8 @@
                                 <materialDesign:Card Margin="5,10,5,0" Background="{DynamicResource MaterialDesignBackground}">
                                     <StackPanel>
                                         <Grid>
-                                            <Expander HorizontalAlignment="Stretch" Header="Dancer Properties">
-                                                <editors:ParameterizedEditor ParameterizedObject="{Binding ElementName=listDancers,Path=SelectedItem}" Padding="10">
+                                            <Expander HorizontalAlignment="Stretch" Header="Motor Properties">
+                                                <editors:ParameterizedEditor ParameterizedObject="{Binding ElementName=listMotors,Path=SelectedItem}" Padding="10">
                                                     <editors:ParameterizedEditor.ItemsPanel>
                                                         <ItemsPanelTemplate>
                                                             <StackPanel></StackPanel>
@@ -421,8 +421,8 @@
                                 <materialDesign:Card Margin="5,10,5,0" Background="{DynamicResource MaterialDesignBackground}">
                                     <StackPanel>
                                         <Grid>
-                                            <Expander HorizontalAlignment="Stretch" Header="PID Control Properties">
-                                                <editors:ParameterizedEditor ParameterizedObject="{Binding ElementName=listPid,Path=SelectedItem}" Padding="10">
+                                            <Expander HorizontalAlignment="Stretch" Header="Dancer Properties">
+                                                <editors:ParameterizedEditor ParameterizedObject="{Binding ElementName=listDancers,Path=SelectedItem}" Padding="10">
                                                     <editors:ParameterizedEditor.ItemsPanel>
                                                         <ItemsPanelTemplate>
                                                             <StackPanel></StackPanel>
-- 
cgit v1.3.1