From 20482140c124fd1d5caaffcc9b0dfe853b30dd6f Mon Sep 17 00:00:00 2001
From: Roy <roy.mail.net@gmail.com>
Date: Sat, 27 Jan 2018 17:18:10 +0200
Subject: Re-factored DAL Observables using EF Code First !!!!!!

---
 .../Modules/Tango.MachineStudio.Developer/Views/MainView.xaml  | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

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

diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/MainView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/MainView.xaml
index a18e4145e..243165cd5 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/MainView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/MainView.xaml
@@ -219,7 +219,7 @@
                                                                                                 <ContentPresenter Content="{TemplateBinding Content}"></ContentPresenter>
                                                                                             </Border>
 
-                                                                                            <materialDesign:PackIcon HorizontalAlignment="Left" VerticalAlignment="Top" Margin="-2 -2 0 0" Width="12" Height="12" Kind="Settings"></materialDesign:PackIcon>
+                                                                                            <materialDesign:PackIcon HorizontalAlignment="Left" VerticalAlignment="Top" Margin="0 0 0 0" Width="12" Height="12" Kind="Settings"></materialDesign:PackIcon>
                                                                                         </Grid>
                                                                                     </ControlTemplate>
                                                                                 </Setter.Value>
@@ -455,7 +455,7 @@
                                                     <Image Source="../Images/wind.png" Width="32"></Image>
                                                     <TextBlock VerticalAlignment="Center" Margin="5 0 0 0" FontSize="10">Winding Method</TextBlock>
                                                 </StackPanel>
-                                                <ComboBox ItemsSource="{Binding Adapter.WindingMethods}" SelectedItem="{Binding SelectedJob.WindingMethods}" DisplayMemberPath="Name" ></ComboBox>
+                                                <ComboBox ItemsSource="{Binding Adapter.WindingMethods}" SelectedItem="{Binding SelectedJob.WindingMethod}" DisplayMemberPath="Name" ></ComboBox>
                                             </StackPanel>
                                         </Border>
 
@@ -736,7 +736,7 @@
                                             </DataTemplate>
                                         </ComboBox.ItemTemplate>
                                     </ComboBox>
-                                    <designer:MachineView IsHitTestVisible="False" Margin="0 40 0 0" DataContext="{Binding SelectedMachine}" />
+                                    <designer:MachineView Width="540" IsHitTestVisible="False" Margin="0 40 0 0" DataContext="{Binding SelectedMachine}" />
                                     <Button Command="{Binding EditMachineCommand}" HorizontalAlignment="Right" Margin="0 10 20 20" Style="{StaticResource MaterialDesignFlatButton}">
                                         <StackPanel Orientation="Horizontal">
                                             <materialDesign:PackIcon VerticalAlignment="Center" Kind="Pencil"></materialDesign:PackIcon>
@@ -790,12 +790,12 @@
                                             <ItemsControl.ItemTemplate>
                                                 <DataTemplate DataType="{x:Type observables:LiquidTypesRml}">
                                                     <StackPanel Margin="0 0 10 20">
-                                                        <TextBlock HorizontalAlignment="Center" FontSize="10" Foreground="DimGray" Text="{Binding LiquidTypes.Name}"></TextBlock>
+                                                        <TextBlock HorizontalAlignment="Center" FontSize="10" Foreground="DimGray" Text="{Binding LiquidType.Name}"></TextBlock>
                                                         <Grid Width="60" Height="50" Margin="0 5 0 0">
                                                             <shapes:Hexagon StrokeThickness="1" Stroke="Gray">
                                                                 <shapes:Hexagon.Fill>
                                                                     <LinearGradientBrush Opacity="0.7" >
-                                                                        <GradientStop Color="{Binding LiquidTypes.Color,Converter={StaticResource ColorToIntegerConverter}}"/>
+                                                                        <GradientStop Color="{Binding LiquidType.Color,Converter={StaticResource ColorToIntegerConverter}}"/>
                                                                         <GradientStop Color="White" Offset="1"/>
                                                                     </LinearGradientBrush>
                                                                 </shapes:Hexagon.Fill>
-- 
cgit v1.3.1