From 10692d6af49f30f6a4eb5054945a6368dd181022 Mon Sep 17 00:00:00 2001
From: Roy Ben-Shabat <Roy@Twine-s.com>
Date: Wed, 22 Aug 2018 14:21:23 +0300
Subject: Refactored Machine Versions Module !!!! Embedded sqlexaminer.msi to
 repo. Implemented precompiled views ? Fixed an issue with RemoteDB DAL. Added
 Active field to hardware components.

---
 .../Views/MainView.xaml                            | 74 +++++++++++-----------
 1 file changed, 37 insertions(+), 37 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 86e0da5b5..8df9e465d 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
@@ -14,7 +14,7 @@
              xmlns:observables="clr-namespace:Tango.BL.Entities;assembly=Tango.BL"
              xmlns:global="clr-namespace:Tango.MachineStudio.HardwareDesigner"
              mc:Ignorable="d" 
-             d:DesignHeight="720" d:DesignWidth="1280" d:DataContext="{d:DesignInstance Type=vm:MainViewVM, IsDesignTimeCreatable=False}" DataContext="{x:Static global:ViewModelLocator.MainViewVM}">
+             d:DesignHeight="2000" d:DesignWidth="1280" d:DataContext="{d:DesignInstance Type=vm:MainViewVM, IsDesignTimeCreatable=False}" DataContext="{x:Static global:ViewModelLocator.MainViewVM}">
 
     <UserControl.Resources>
         <converters:DoubleToIntConverter x:Key="DoubleToIntConverter" />
@@ -57,7 +57,7 @@
                                 <TextBlock FontSize="30" FontStyle="Italic" VerticalAlignment="Center" Margin="50 10 10 0" Foreground="Silver" FontWeight="Bold">HARDWARE DESIGNER</TextBlock>
                                 <StackPanel Orientation="Horizontal" VerticalAlignment="Center" Margin="10 10 0 0">
                                     <materialDesign:PackIcon Kind="Pencil" Width="32" Height="32" Foreground="Silver" />
-                                    <ComboBox ItemsSource="{Binding Adapter.HardwareVersions}" SelectedItem="{Binding SelectedVersion}" Width="300" FontSize="16" FontWeight="Bold" Margin="5 0 0 0" materialDesign:HintAssist.Hint="Hardware Version">
+                                    <ComboBox ItemsSource="{Binding HardwareVersions}" SelectedItem="{Binding SelectedVersion}" Width="300" FontSize="16" FontWeight="Bold" Margin="5 0 0 0" materialDesign:HintAssist.Hint="Hardware Version">
                                         <ComboBox.ItemTemplate>
                                             <DataTemplate>
                                                 <TextBlock><Run Text="{Binding Name}"></Run> <Run></Run> <Run Foreground="Gray" FontSize="14">v</Run><Run Foreground="Gray" FontSize="14" Text="{Binding Version}"></Run></TextBlock>
@@ -78,16 +78,16 @@
                                         <Image VerticalAlignment="Center" Source="../Images/engine.png" Width="32"></Image>
                                         <TextBlock Margin="10 0 0 0" VerticalAlignment="Center" FontSize="18" FontWeight="SemiBold">MOTORS</TextBlock>
                                     </StackPanel>
-                                    <ListBox Style="{StaticResource typesList}" HorizontalContentAlignment="Stretch" ItemsSource="{Binding MotorTypes}" Margin="60 15" SelectedItem="{Binding SelectedHardwareObjectType}">
+                                    <ListBox Style="{StaticResource typesList}" HorizontalContentAlignment="Stretch" ItemsSource="{Binding CurrentVersion.HardwareMotors}" Margin="60 15" SelectedItem="{Binding SelectedHardwareObject}">
                                         <ListBox.ItemTemplate>
-                                            <DataTemplate DataType="{x:Type entities:HardwareMotorType}">
+                                            <DataTemplate DataType="{x:Type entities:HardwareMotor}">
                                                 <DockPanel>
                                                     <Button DockPanel.Dock="Right" Cursor="Hand" Foreground="DimGray" Height="20" FontSize="10" ToolTip="Copy this item parameters to the selected item" Command="{Binding RelativeSource={RelativeSource AncestorType=UserControl},Path=DataContext.CopyParametersCommand}" CommandParameter="{Binding}">
                                                         <Button.Style>
                                                             <Style TargetType="Button" BasedOn="{StaticResource MaterialDesignFlatButton}">
                                                                 <Setter Property="Visibility" Value="Collapsed"></Setter>
                                                                 <Style.Triggers>
-                                                                    <DataTrigger Binding="{Binding RelativeSource={RelativeSource AncestorType=UserControl},Path=DataContext.SelectedHardwareObjectType.Data.ObjectType.BaseType}" Value="{x:Type entities:HardwareMotorType}">
+                                                                    <DataTrigger Binding="{Binding RelativeSource={RelativeSource AncestorType=UserControl},Path=DataContext.SelectedHardwareObject.ObjectType.BaseType}" Value="{x:Type entities:HardwareMotor}">
                                                                         <Setter Property="Visibility" Value="Visible"></Setter>
                                                                     </DataTrigger>
                                                                     <DataTrigger Binding="{Binding RelativeSource={RelativeSource AncestorType=ListBoxItem},Path=IsSelected}" Value="True">
@@ -104,8 +104,8 @@
                                                         </Button.Content>
                                                     </Button>
                                                     <StackPanel Orientation="Horizontal">
-                                                        <CheckBox VerticalAlignment="Center" IsChecked="{Binding IsSelected}"></CheckBox>
-                                                        <TextBlock Margin="10 0 0 0" VerticalAlignment="Center" Text="{Binding Data.Description}"></TextBlock>
+                                                        <CheckBox VerticalAlignment="Center" IsChecked="{Binding Active}"></CheckBox>
+                                                        <TextBlock Margin="10 0 0 0" VerticalAlignment="Center" Text="{Binding HardwareMotorType.Description}"></TextBlock>
                                                     </StackPanel>
                                                 </DockPanel>
                                             </DataTemplate>
@@ -116,16 +116,16 @@
                                         <Image VerticalAlignment="Center" Source="../Images/compass.png" Width="32"></Image>
                                         <TextBlock Margin="10 0 0 0" VerticalAlignment="Center" FontSize="18" FontWeight="SemiBold">DANCERS</TextBlock>
                                     </StackPanel>
-                                    <ListBox Style="{StaticResource typesList}" HorizontalContentAlignment="Stretch" ItemsSource="{Binding DancerTypes}" Margin="60 15" SelectedItem="{Binding SelectedHardwareObjectType}">
+                                    <ListBox Style="{StaticResource typesList}" HorizontalContentAlignment="Stretch" ItemsSource="{Binding CurrentVersion.HardwareDancers}" Margin="60 15" SelectedItem="{Binding SelectedHardwareObject}">
                                         <ListBox.ItemTemplate>
-                                            <DataTemplate DataType="{x:Type entities:HardwareDancerType}">
+                                            <DataTemplate DataType="{x:Type entities:HardwareDancer}">
                                                 <DockPanel>
                                                     <Button DockPanel.Dock="Right" Cursor="Hand" Foreground="DimGray" Height="20" FontSize="10" ToolTip="Copy this item parameters to the selected item" Command="{Binding RelativeSource={RelativeSource AncestorType=UserControl},Path=DataContext.CopyParametersCommand}" CommandParameter="{Binding}">
                                                         <Button.Style>
                                                             <Style TargetType="Button" BasedOn="{StaticResource MaterialDesignFlatButton}">
                                                                 <Setter Property="Visibility" Value="Collapsed"></Setter>
                                                                 <Style.Triggers>
-                                                                    <DataTrigger Binding="{Binding RelativeSource={RelativeSource AncestorType=UserControl},Path=DataContext.SelectedHardwareObjectType.Data.ObjectType.BaseType}" Value="{x:Type entities:HardwareDancerType}">
+                                                                    <DataTrigger Binding="{Binding RelativeSource={RelativeSource AncestorType=UserControl},Path=DataContext.SelectedHardwareObject.ObjectType.BaseType}" Value="{x:Type entities:HardwareDancer}">
                                                                         <Setter Property="Visibility" Value="Visible"></Setter>
                                                                     </DataTrigger>
                                                                     <DataTrigger Binding="{Binding RelativeSource={RelativeSource AncestorType=ListBoxItem},Path=IsSelected}" Value="True">
@@ -142,8 +142,8 @@
                                                         </Button.Content>
                                                     </Button>
                                                     <StackPanel Orientation="Horizontal">
-                                                        <CheckBox VerticalAlignment="Center" IsChecked="{Binding IsSelected}"></CheckBox>
-                                                        <TextBlock Margin="10 0 0 0" VerticalAlignment="Center" Text="{Binding Data.Description}"></TextBlock>
+                                                        <CheckBox VerticalAlignment="Center" IsChecked="{Binding Active}"></CheckBox>
+                                                        <TextBlock Margin="10 0 0 0" VerticalAlignment="Center" Text="{Binding HardwareDancerType.Description}"></TextBlock>
                                                     </StackPanel>
                                                 </DockPanel>
                                             </DataTemplate>
@@ -154,16 +154,16 @@
                                         <Image VerticalAlignment="Center" Source="../Images/balance.png" Width="32"></Image>
                                         <TextBlock Margin="10 0 0 0" VerticalAlignment="Center" FontSize="18" FontWeight="SemiBold">PID CONTROLS</TextBlock>
                                     </StackPanel>
-                                    <ListBox Style="{StaticResource typesList}" HorizontalContentAlignment="Stretch" ItemsSource="{Binding PidControlTypes}" Margin="60 15" SelectedItem="{Binding SelectedHardwareObjectType}">
+                                    <ListBox Style="{StaticResource typesList}" HorizontalContentAlignment="Stretch" ItemsSource="{Binding CurrentVersion.HardwarePidControls}" Margin="60 15" SelectedItem="{Binding SelectedHardwareObject}">
                                         <ListBox.ItemTemplate>
-                                            <DataTemplate DataType="{x:Type entities:HardwarePidControlType}">
+                                            <DataTemplate DataType="{x:Type entities:HardwarePidControl}">
                                                 <DockPanel>
                                                     <Button DockPanel.Dock="Right" Cursor="Hand" Foreground="DimGray" Height="20" FontSize="10" ToolTip="Copy this item parameters to the selected item" Command="{Binding RelativeSource={RelativeSource AncestorType=UserControl},Path=DataContext.CopyParametersCommand}" CommandParameter="{Binding}">
                                                         <Button.Style>
                                                             <Style TargetType="Button" BasedOn="{StaticResource MaterialDesignFlatButton}">
                                                                 <Setter Property="Visibility" Value="Collapsed"></Setter>
                                                                 <Style.Triggers>
-                                                                    <DataTrigger Binding="{Binding RelativeSource={RelativeSource AncestorType=UserControl},Path=DataContext.SelectedHardwareObjectType.Data.ObjectType.BaseType}" Value="{x:Type entities:HardwarePidControlType}">
+                                                                    <DataTrigger Binding="{Binding RelativeSource={RelativeSource AncestorType=UserControl},Path=DataContext.SelectedHardwareObject.ObjectType.BaseType}" Value="{x:Type entities:HardwarePidControl}">
                                                                         <Setter Property="Visibility" Value="Visible"></Setter>
                                                                     </DataTrigger>
                                                                     <DataTrigger Binding="{Binding RelativeSource={RelativeSource AncestorType=ListBoxItem},Path=IsSelected}" Value="True">
@@ -180,8 +180,8 @@
                                                         </Button.Content>
                                                     </Button>
                                                     <StackPanel Orientation="Horizontal">
-                                                        <CheckBox VerticalAlignment="Center" IsChecked="{Binding IsSelected}"></CheckBox>
-                                                        <TextBlock Margin="10 0 0 0" VerticalAlignment="Center" Text="{Binding Data.Description}"></TextBlock>
+                                                        <CheckBox VerticalAlignment="Center" IsChecked="{Binding Active}"></CheckBox>
+                                                        <TextBlock Margin="10 0 0 0" VerticalAlignment="Center" Text="{Binding HardwarePidControlType.Description}"></TextBlock>
                                                     </StackPanel>
                                                 </DockPanel>
                                             </DataTemplate>
@@ -192,16 +192,16 @@
                                         <Image VerticalAlignment="Center" Source="../Images/thread.png" Width="32"></Image>
                                         <TextBlock Margin="10 0 0 0" VerticalAlignment="Center" FontSize="18" FontWeight="SemiBold">WINDERS</TextBlock>
                                     </StackPanel>
-                                    <ListBox Style="{StaticResource typesList}" HorizontalContentAlignment="Stretch" ItemsSource="{Binding WinderTypes}" Margin="60 15" SelectedItem="{Binding SelectedHardwareObjectType}">
+                                    <ListBox Style="{StaticResource typesList}" HorizontalContentAlignment="Stretch" ItemsSource="{Binding CurrentVersion.HardwareWinders}" Margin="60 15" SelectedItem="{Binding SelectedHardwareObject}">
                                         <ListBox.ItemTemplate>
-                                            <DataTemplate DataType="{x:Type entities:HardwareWinderType}">
+                                            <DataTemplate DataType="{x:Type entities:HardwareWinder}">
                                                 <DockPanel>
                                                     <Button DockPanel.Dock="Right" Cursor="Hand" Foreground="DimGray" Height="20" FontSize="10" ToolTip="Copy this item parameters to the selected item" Command="{Binding RelativeSource={RelativeSource AncestorType=UserControl},Path=DataContext.CopyParametersCommand}" CommandParameter="{Binding}">
                                                         <Button.Style>
                                                             <Style TargetType="Button" BasedOn="{StaticResource MaterialDesignFlatButton}">
                                                                 <Setter Property="Visibility" Value="Collapsed"></Setter>
                                                                 <Style.Triggers>
-                                                                    <DataTrigger Binding="{Binding RelativeSource={RelativeSource AncestorType=UserControl},Path=DataContext.SelectedHardwareObjectType.Data.ObjectType.BaseType}" Value="{x:Type entities:HardwareWinderType}">
+                                                                    <DataTrigger Binding="{Binding RelativeSource={RelativeSource AncestorType=UserControl},Path=DataContext.SelectedHardwareObject.ObjectType.BaseType}" Value="{x:Type entities:HardwareWinder}">
                                                                         <Setter Property="Visibility" Value="Visible"></Setter>
                                                                     </DataTrigger>
                                                                     <DataTrigger Binding="{Binding RelativeSource={RelativeSource AncestorType=ListBoxItem},Path=IsSelected}" Value="True">
@@ -218,8 +218,8 @@
                                                         </Button.Content>
                                                     </Button>
                                                     <StackPanel Orientation="Horizontal">
-                                                        <CheckBox VerticalAlignment="Center" IsChecked="{Binding IsSelected}"></CheckBox>
-                                                        <TextBlock Margin="10 0 0 0" VerticalAlignment="Center" Text="{Binding Data.Description}"></TextBlock>
+                                                        <CheckBox VerticalAlignment="Center" IsChecked="{Binding Active}"></CheckBox>
+                                                        <TextBlock Margin="10 0 0 0" VerticalAlignment="Center" Text="{Binding HardwareWinderType.Description}"></TextBlock>
                                                     </StackPanel>
                                                 </DockPanel>
                                             </DataTemplate>
@@ -230,16 +230,16 @@
                                         <Image VerticalAlignment="Center" Source="../Images/speed.png" Width="32"></Image>
                                         <TextBlock Margin="10 0 0 0" VerticalAlignment="Center" FontSize="18" FontWeight="SemiBold">SPEED SENSORS</TextBlock>
                                     </StackPanel>
-                                    <ListBox Style="{StaticResource typesList}" HorizontalContentAlignment="Stretch" ItemsSource="{Binding SpeedSensorTypes}" Margin="60 15" SelectedItem="{Binding SelectedHardwareObjectType}">
+                                    <ListBox Style="{StaticResource typesList}" HorizontalContentAlignment="Stretch" ItemsSource="{Binding CurrentVersion.HardwareSpeedSensors}" Margin="60 15" SelectedItem="{Binding SelectedHardwareObject}">
                                         <ListBox.ItemTemplate>
-                                            <DataTemplate DataType="{x:Type entities:HardwareSpeedSensorType}">
+                                            <DataTemplate DataType="{x:Type entities:HardwareSpeedSensor}">
                                                 <DockPanel>
                                                     <Button DockPanel.Dock="Right" Cursor="Hand" Foreground="DimGray" Height="20" FontSize="10" ToolTip="Copy this item parameters to the selected item" Command="{Binding RelativeSource={RelativeSource AncestorType=UserControl},Path=DataContext.CopyParametersCommand}" CommandParameter="{Binding}">
                                                         <Button.Style>
                                                             <Style TargetType="Button" BasedOn="{StaticResource MaterialDesignFlatButton}">
                                                                 <Setter Property="Visibility" Value="Collapsed"></Setter>
                                                                 <Style.Triggers>
-                                                                    <DataTrigger Binding="{Binding RelativeSource={RelativeSource AncestorType=UserControl},Path=DataContext.SelectedHardwareObjectType.Data.ObjectType.BaseType}" Value="{x:Type entities:HardwareSpeedSensorType}">
+                                                                    <DataTrigger Binding="{Binding RelativeSource={RelativeSource AncestorType=UserControl},Path=DataContext.SelectedHardwareObject.ObjectType.BaseType}" Value="{x:Type entities:HardwareSpeedSensor}">
                                                                         <Setter Property="Visibility" Value="Visible"></Setter>
                                                                     </DataTrigger>
                                                                     <DataTrigger Binding="{Binding RelativeSource={RelativeSource AncestorType=ListBoxItem},Path=IsSelected}" Value="True">
@@ -256,8 +256,8 @@
                                                         </Button.Content>
                                                     </Button>
                                                     <StackPanel Orientation="Horizontal">
-                                                        <CheckBox VerticalAlignment="Center" IsChecked="{Binding IsSelected}"></CheckBox>
-                                                        <TextBlock Margin="10 0 0 0" VerticalAlignment="Center" Text="{Binding Data.Description}"></TextBlock>
+                                                        <CheckBox VerticalAlignment="Center" IsChecked="{Binding Active}"></CheckBox>
+                                                        <TextBlock Margin="10 0 0 0" VerticalAlignment="Center" Text="{Binding HardwareSpeedSensorType.Description}"></TextBlock>
                                                     </StackPanel>
                                                 </DockPanel>
                                             </DataTemplate>
@@ -268,16 +268,16 @@
                                         <Image VerticalAlignment="Center" Source="../Images/blower.png" Width="32"></Image>
                                         <TextBlock Margin="10 0 0 0" VerticalAlignment="Center" FontSize="18" FontWeight="SemiBold">BLOWERS</TextBlock>
                                     </StackPanel>
-                                    <ListBox Style="{StaticResource typesList}" HorizontalContentAlignment="Stretch" ItemsSource="{Binding BlowerTypes}" Margin="60 15" SelectedItem="{Binding SelectedHardwareObjectType}">
+                                    <ListBox Style="{StaticResource typesList}" HorizontalContentAlignment="Stretch" ItemsSource="{Binding CurrentVersion.HardwareBlowers}" Margin="60 15" SelectedItem="{Binding SelectedHardwareObject}">
                                         <ListBox.ItemTemplate>
-                                            <DataTemplate DataType="{x:Type entities:HardwareBlowerType}">
+                                            <DataTemplate DataType="{x:Type entities:HardwareBlower}">
                                                 <DockPanel>
                                                     <Button DockPanel.Dock="Right" Cursor="Hand" Foreground="DimGray" Height="20" FontSize="10" ToolTip="Copy this item parameters to the selected item" Command="{Binding RelativeSource={RelativeSource AncestorType=UserControl},Path=DataContext.CopyParametersCommand}" CommandParameter="{Binding}">
                                                         <Button.Style>
                                                             <Style TargetType="Button" BasedOn="{StaticResource MaterialDesignFlatButton}">
                                                                 <Setter Property="Visibility" Value="Collapsed"></Setter>
                                                                 <Style.Triggers>
-                                                                    <DataTrigger Binding="{Binding RelativeSource={RelativeSource AncestorType=UserControl},Path=DataContext.SelectedHardwareObjectType.Data.ObjectType.BaseType}" Value="{x:Type entities:HardwareBlowerType}">
+                                                                    <DataTrigger Binding="{Binding RelativeSource={RelativeSource AncestorType=UserControl},Path=DataContext.SelectedHardwareObject.ObjectType.BaseType}" Value="{x:Type entities:HardwareBlower}">
                                                                         <Setter Property="Visibility" Value="Visible"></Setter>
                                                                     </DataTrigger>
                                                                     <DataTrigger Binding="{Binding RelativeSource={RelativeSource AncestorType=ListBoxItem},Path=IsSelected}" Value="True">
@@ -294,8 +294,8 @@
                                                         </Button.Content>
                                                     </Button>
                                                     <StackPanel Orientation="Horizontal">
-                                                        <CheckBox VerticalAlignment="Center" IsChecked="{Binding IsSelected}"></CheckBox>
-                                                        <TextBlock Margin="10 0 0 0" VerticalAlignment="Center" Text="{Binding Data.Description}"></TextBlock>
+                                                        <CheckBox VerticalAlignment="Center" IsChecked="{Binding Active}"></CheckBox>
+                                                        <TextBlock Margin="10 0 0 0" VerticalAlignment="Center" Text="{Binding HardwareBlowerType.Description}"></TextBlock>
                                                     </StackPanel>
                                                 </DockPanel>
                                             </DataTemplate>
@@ -306,16 +306,16 @@
                                         <Image VerticalAlignment="Center" Source="../Images/break.png" Width="32"></Image>
                                         <TextBlock Margin="10 0 0 0" VerticalAlignment="Center" FontSize="18" FontWeight="SemiBold">BREAK SENSORS</TextBlock>
                                     </StackPanel>
-                                    <ListBox Style="{StaticResource typesList}" HorizontalContentAlignment="Stretch" ItemsSource="{Binding BreakSensorTypes}" Margin="60 15" SelectedItem="{Binding SelectedHardwareObjectType}">
+                                    <ListBox Style="{StaticResource typesList}" HorizontalContentAlignment="Stretch" ItemsSource="{Binding CurrentVersion.HardwareBreakSensors}" Margin="60 15" SelectedItem="{Binding SelectedHardwareObject}">
                                         <ListBox.ItemTemplate>
-                                            <DataTemplate DataType="{x:Type entities:HardwareBreakSensorType}">
+                                            <DataTemplate DataType="{x:Type entities:HardwareBreakSensor}">
                                                 <DockPanel>
                                                     <Button DockPanel.Dock="Right" Cursor="Hand" Foreground="DimGray" Height="20" FontSize="10" ToolTip="Copy this item parameters to the selected item" Command="{Binding RelativeSource={RelativeSource AncestorType=UserControl},Path=DataContext.CopyParametersCommand}" CommandParameter="{Binding}">
                                                         <Button.Style>
                                                             <Style TargetType="Button" BasedOn="{StaticResource MaterialDesignFlatButton}">
                                                                 <Setter Property="Visibility" Value="Collapsed"></Setter>
                                                                 <Style.Triggers>
-                                                                    <DataTrigger Binding="{Binding RelativeSource={RelativeSource AncestorType=UserControl},Path=DataContext.SelectedHardwareObjectType.Data.ObjectType.BaseType}" Value="{x:Type entities:HardwareBreakSensorType}">
+                                                                    <DataTrigger Binding="{Binding RelativeSource={RelativeSource AncestorType=UserControl},Path=DataContext.SelectedHardwareObject.ObjectType.BaseType}" Value="{x:Type entities:HardwareBreakSensor}">
                                                                         <Setter Property="Visibility" Value="Visible"></Setter>
                                                                     </DataTrigger>
                                                                     <DataTrigger Binding="{Binding RelativeSource={RelativeSource AncestorType=ListBoxItem},Path=IsSelected}" Value="True">
@@ -332,8 +332,8 @@
                                                         </Button.Content>
                                                     </Button>
                                                     <StackPanel Orientation="Horizontal">
-                                                        <CheckBox VerticalAlignment="Center" IsChecked="{Binding IsSelected}"></CheckBox>
-                                                        <TextBlock Margin="10 0 0 0" VerticalAlignment="Center" Text="{Binding Data.Description}"></TextBlock>
+                                                        <CheckBox VerticalAlignment="Center" IsChecked="{Binding Active}"></CheckBox>
+                                                        <TextBlock Margin="10 0 0 0" VerticalAlignment="Center" Text="{Binding HardwareBreakSensorType.Description}"></TextBlock>
                                                     </StackPanel>
                                                 </DockPanel>
                                             </DataTemplate>
-- 
cgit v1.3.1


From 439ee2d80eab039c2dee00f697d2d814ec67247e Mon Sep 17 00:00:00 2001
From: Roy Ben-Shabat <Roy@Twine-s.com>
Date: Wed, 22 Aug 2018 18:33:29 +0300
Subject: Added IsFree to base ViewModel. Implemented IsFree on
 HardwareVersions & ColorLab modules.

---
 .../ViewModels/MainViewVM.cs                       | 40 ++++++++++++++---
 .../Views/MainView.xaml                            |  6 +--
 .../Views/JobView.xaml                             |  4 +-
 .../ViewModels/MainViewVM.cs                       | 36 ++++++++++++---
 .../Views/MainView.xaml                            |  6 +--
 .../Tango.MachineStudio.Common/StudioViewModel.cs  | 17 -------
 .../ViewModels/UpdateViewVM.cs                     |  3 ++
 Software/Visual_Studio/Tango.SharedUI/ViewModel.cs | 52 +++++++++-------------
 8 files changed, 99 insertions(+), 65 deletions(-)

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

diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorLab/ViewModels/MainViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorLab/ViewModels/MainViewVM.cs
index 3764e00de..5c513af9e 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorLab/ViewModels/MainViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorLab/ViewModels/MainViewVM.cs
@@ -239,6 +239,12 @@ namespace Tango.MachineStudio.ColorLab.ViewModels
 
         #endregion
 
+        #region Constructors
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="MainViewVM"/> class.
+        /// </summary>
+        /// <param name="notification">The notification.</param>
         public MainViewVM(INotificationProvider notification) : base()
         {
             _notification = notification;
@@ -248,20 +254,28 @@ namespace Tango.MachineStudio.ColorLab.ViewModels
             SourceColor = new RgbVM();
             SourceColor.ColorChanged += SourceColor_ColorChanged;
 
-            ImportForwardDataCommand = new RelayCommand(ImportForwardData, () => SelectedRML != null);
-            ImportInverseDataCommand = new RelayCommand(ImportInverseData, () => SelectedRML != null);
+            ImportForwardDataCommand = new RelayCommand(ImportForwardData, () => SelectedRML != null && IsFree);
+            ImportInverseDataCommand = new RelayCommand(ImportInverseData, () => SelectedRML != null && IsFree);
 
-            ExportForwardDataCommand = new RelayCommand(ExportForwardData, () => SelectedRML != null && CCT != null && CCT.ForwardFileName != null);
-            ExportInverseDataCommand = new RelayCommand(ExportInverseData, () => SelectedRML != null && CCT != null && CCT.InverseFileName != null);
+            ExportForwardDataCommand = new RelayCommand(ExportForwardData, () => SelectedRML != null && CCT != null && CCT.ForwardFileName != null && IsFree);
+            ExportInverseDataCommand = new RelayCommand(ExportInverseData, () => SelectedRML != null && CCT != null && CCT.InverseFileName != null && IsFree);
 
-            SaveCommand = new RelayCommand(Save, () => SelectedRML != null);
+            SaveCommand = new RelayCommand(Save, () => SelectedRML != null && IsFree);
         }
 
+        #endregion
+
+        #region Event Handlers
+
         private void SourceColor_ColorChanged(object sender, Color e)
         {
             GetHiveSuggestions();
         }
 
+        #endregion
+
+        #region Application Ready
+
         public override void OnApplicationReady()
         {
             base.OnApplicationReady();
@@ -277,6 +291,8 @@ namespace Tango.MachineStudio.ColorLab.ViewModels
             });
         }
 
+        #endregion
+
         #region ColorLab
 
         private void GetHiveSuggestions()
@@ -427,6 +443,8 @@ namespace Tango.MachineStudio.ColorLab.ViewModels
         {
             if (SelectedMachine != null)
             {
+                IsFree = false;
+
                 _dbContext.GetConfiguration(x => x.Guid == SelectedMachine.ConfigurationGuid);
 
                 LiquidVolumes = SelectedMachine.Configuration.NoneEmptyIdsPacks.OrderBy(x => x.PackIndex).Select(x => new LiquidVolumeVM()
@@ -445,6 +463,8 @@ namespace Tango.MachineStudio.ColorLab.ViewModels
 
                 SelectedMachine.Modified -= SelectedMachine_Modified;
                 SelectedMachine.Modified += SelectedMachine_Modified;
+
+                IsFree = true;
             }
         }
 
@@ -534,6 +554,8 @@ namespace Tango.MachineStudio.ColorLab.ViewModels
         {
             if (SelectedRML != null && SelectedMachine != null)
             {
+                IsFree = false;
+
                 await Task.Factory.StartNew(() =>
                 {
                     using (_notification.PushTaskItem("Loading RML data..."))
@@ -581,6 +603,8 @@ namespace Tango.MachineStudio.ColorLab.ViewModels
                         }
                     }
                 });
+
+                IsFree = true;
             }
         }
 
@@ -594,6 +618,8 @@ namespace Tango.MachineStudio.ColorLab.ViewModels
             {
                 try
                 {
+                    IsFree = false;
+
                     if (_isNewCCT)
                     {
                         _dbContext.Ccts.Add(CCT);
@@ -631,6 +657,10 @@ namespace Tango.MachineStudio.ColorLab.ViewModels
                 {
                     _notification.ShowError(LogManager.Log(ex, "An error occurred while trying to save to data base.").Message + Environment.NewLine + ex.Message);
                 }
+                finally
+                {
+                    IsFree = true;
+                }
             }
         }
 
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorLab/Views/MainView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorLab/Views/MainView.xaml
index d8ef015be..78eaf04e8 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorLab/Views/MainView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorLab/Views/MainView.xaml
@@ -35,7 +35,7 @@
             <ColumnDefinition Width="1*"/>
         </Grid.ColumnDefinitions>
 
-        <Grid Background="#B1FFFFFF">
+        <Grid Background="#B1FFFFFF" IsEnabled="{Binding IsFree}">
             <DockPanel>
                 <Grid DockPanel.Dock="Bottom" Margin="20">
                     <Button Height="60" Command="{Binding SaveCommand}"  Width="200" HorizontalAlignment="Right">
@@ -269,7 +269,7 @@
                                 </StackPanel>
                             </StackPanel>
 
-                            <ItemsControl ItemsSource="{Binding LiquidVolumes}" VerticalAlignment="Center" MinWidth="420">
+                            <ItemsControl ItemsSource="{Binding LiquidVolumes}" VerticalAlignment="Center" MinWidth="420" IsEnabled="{Binding IsFree}">
                                 <ItemsControl.ItemsPanel>
                                     <ItemsPanelTemplate>
                                         <StackPanel VerticalAlignment="Center" Orientation="Horizontal" IsItemsHost="True"></StackPanel>
@@ -361,7 +361,7 @@
                         </Grid>
 
                         <Grid Margin="0 20 0 0">
-                            <ItemsControl DockPanel.Dock="Top" ItemsSource="{Binding LiquidsCalibrationData}">
+                            <ItemsControl DockPanel.Dock="Top" ItemsSource="{Binding LiquidsCalibrationData}" IsEnabled="{Binding IsFree}">
                                 <ItemsControl.ItemsPanel>
                                     <ItemsPanelTemplate>
                                         <UniformGrid Rows="1" />
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/JobView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/JobView.xaml
index 368f615a0..016718075 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/JobView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/JobView.xaml
@@ -1493,9 +1493,9 @@
                                     </Grid>
                                 </Grid>
                             </Expander>
-                            <Expander Header="CONTROL PARAMETERS" IsExpanded="False" Background="#8EFFFFFF">
+                            <!--<Expander Header="CONTROL PARAMETERS" IsExpanded="False" Background="#8EFFFFFF">
 
-                            </Expander>
+                            </Expander>-->
                         </StackPanel>
                     </ScrollViewer>
 
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.HardwareDesigner/ViewModels/MainViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.HardwareDesigner/ViewModels/MainViewVM.cs
index 9e67c247b..9197ad989 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.HardwareDesigner/ViewModels/MainViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.HardwareDesigner/ViewModels/MainViewVM.cs
@@ -69,14 +69,14 @@ namespace Tango.MachineStudio.HardwareDesigner.ViewModels
 
             CurrentVersion = new HardwareVersion();
 
-            SaveCommand = new RelayCommand(Save, () => SelectedVersion != null);
-            NewCommand = new RelayCommand(New);
-            DeleteCommand = new RelayCommand(Delete, () => !_isNew && SelectedVersion != null);
+            SaveCommand = new RelayCommand(Save, () => SelectedVersion != null && IsFree);
+            NewCommand = new RelayCommand(New,() => IsFree);
+            DeleteCommand = new RelayCommand(Delete, () => !_isNew && SelectedVersion != null && IsFree);
 
             CurrentVersion = new HardwareVersion();
 
-            CopyParametersCommand = new RelayCommand(CopyParameters, (x) => SelectedVersion != null);
-            CloneCommand = new RelayCommand(CloneCurrentVersion, () => SelectedVersion != null);
+            CopyParametersCommand = new RelayCommand(CopyParameters, (x) => SelectedVersion != null && IsFree);
+            CloneCommand = new RelayCommand(CloneCurrentVersion, () => SelectedVersion != null && IsFree);
         }
 
         public override void OnApplicationReady()
@@ -218,6 +218,8 @@ namespace Tango.MachineStudio.HardwareDesigner.ViewModels
             {
                 using (_notification.PushTaskItem("Loading hardware version..."))
                 {
+                    IsFree = false;
+
                     await Task.Factory.StartNew(() =>
                     {
                         _isNew = false;
@@ -232,6 +234,8 @@ namespace Tango.MachineStudio.HardwareDesigner.ViewModels
                             RaisePropertyChanged(nameof(SelectedVersion));
                         });
                     });
+
+                    IsFree = true;
                 }
             }
 
@@ -246,6 +250,8 @@ namespace Tango.MachineStudio.HardwareDesigner.ViewModels
             {
                 using (_notification.PushTaskItem("Creating new machine version..."))
                 {
+                    IsFree = false;
+
                     await Task.Factory.StartNew(() =>
                     {
                         SelectedVersion = null;
@@ -268,6 +274,8 @@ namespace Tango.MachineStudio.HardwareDesigner.ViewModels
                         _isNew = true;
                         InvalidateRelayCommands();
                     });
+
+                    IsFree = true;
                 }
             }
         }
@@ -278,6 +286,8 @@ namespace Tango.MachineStudio.HardwareDesigner.ViewModels
             {
                 try
                 {
+                    IsFree = false;
+
                     await Task.Factory.StartNew(() =>
                     {
                         _db.SaveChanges();
@@ -294,6 +304,10 @@ namespace Tango.MachineStudio.HardwareDesigner.ViewModels
                     LogManager.Log(ex, "Could not save hardware version.");
                     _notification.ShowError($"An error occurred while trying to save this hardware version.\n{ex.Message}");
                 }
+                finally
+                {
+                    IsFree = true;
+                }
             }
         }
 
@@ -309,6 +323,8 @@ namespace Tango.MachineStudio.HardwareDesigner.ViewModels
                     {
                         try
                         {
+                            IsFree = false;
+
                             await Task.Factory.StartNew(() =>
                             {
                                 var cloned = CurrentVersion.Clone();
@@ -329,6 +345,10 @@ namespace Tango.MachineStudio.HardwareDesigner.ViewModels
                             LogManager.Log(ex, "Could not clone hardware version.");
                             _notification.ShowError($"An error occurred while trying to clone this hardware version.\n{ex.Message}");
                         }
+                        finally
+                        {
+                            IsFree = true;
+                        }
                     }
                 }
             }
@@ -343,6 +363,8 @@ namespace Tango.MachineStudio.HardwareDesigner.ViewModels
                 {
                     try
                     {
+                        IsFree = false;
+
                         await CurrentVersion.DeleteCascadeAsync(_db);
 
                         await Task.Factory.StartNew(() =>
@@ -360,6 +382,10 @@ namespace Tango.MachineStudio.HardwareDesigner.ViewModels
                         LogManager.Log(ex, "Could not delete hardware version.");
                         _notification.ShowError($"An error occurred while trying to delete this hardware version.\n{ex.Message}");
                     }
+                    finally
+                    {
+                        IsFree = true;
+                    }
                 }
             }
         }
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 8df9e465d..293b947f0 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
@@ -57,7 +57,7 @@
                                 <TextBlock FontSize="30" FontStyle="Italic" VerticalAlignment="Center" Margin="50 10 10 0" Foreground="Silver" FontWeight="Bold">HARDWARE DESIGNER</TextBlock>
                                 <StackPanel Orientation="Horizontal" VerticalAlignment="Center" Margin="10 10 0 0">
                                     <materialDesign:PackIcon Kind="Pencil" Width="32" Height="32" Foreground="Silver" />
-                                    <ComboBox ItemsSource="{Binding HardwareVersions}" SelectedItem="{Binding SelectedVersion}" Width="300" FontSize="16" FontWeight="Bold" Margin="5 0 0 0" materialDesign:HintAssist.Hint="Hardware Version">
+                                    <ComboBox IsEnabled="{Binding IsFree}" ItemsSource="{Binding HardwareVersions}" SelectedItem="{Binding SelectedVersion}" Width="300" FontSize="16" FontWeight="Bold" Margin="5 0 0 0" materialDesign:HintAssist.Hint="Hardware Version">
                                         <ComboBox.ItemTemplate>
                                             <DataTemplate>
                                                 <TextBlock><Run Text="{Binding Name}"></Run> <Run></Run> <Run Foreground="Gray" FontSize="14">v</Run><Run Foreground="Gray" FontSize="14" Text="{Binding Version}"></Run></TextBlock>
@@ -72,7 +72,7 @@
                         <Grid Grid.Row="1">
 
 
-                            <ScrollViewer VerticalScrollBarVisibility="Auto" Margin="50 20 0 0">
+                            <ScrollViewer VerticalScrollBarVisibility="Auto" Margin="50 20 0 0" IsEnabled="{Binding IsFree}">
                                 <StackPanel>
                                     <StackPanel Orientation="Horizontal">
                                         <Image VerticalAlignment="Center" Source="../Images/engine.png" Width="32"></Image>
@@ -353,7 +353,7 @@
                         <RowDefinition Height="60"/>
                     </Grid.RowDefinitions>
 
-                    <ScrollViewer HorizontalScrollBarVisibility="Disabled" VerticalScrollBarVisibility="Auto" Margin="0 90 0 10">
+                    <ScrollViewer IsEnabled="{Binding IsFree}" HorizontalScrollBarVisibility="Disabled" VerticalScrollBarVisibility="Auto" Margin="0 90 0 10">
                         <Grid>
                             <StackPanel>
                                 <materialDesign:Card Margin="5,10,5,0" Background="{DynamicResource MaterialDesignBackground}" Padding="20 10">
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/StudioViewModel.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/StudioViewModel.cs
index 36e3994ad..08ddbc073 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/StudioViewModel.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/StudioViewModel.cs
@@ -107,14 +107,6 @@ namespace Tango.MachineStudio.Common
         /// </summary>
         public bool IsModuleLoaded { get; private set; }
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="StudioViewModel{Module}"/> class.
-        /// </summary>
-        public StudioViewModel() : base()
-        {
-
-        }
-
         /// <summary>
         /// Called when another module has wants to navigate to this module with some arguments.
         /// </summary>
@@ -186,15 +178,6 @@ namespace Tango.MachineStudio.Common
     /// <seealso cref="Tango.MachineStudio.Common.IStudioViewModel" />
     public abstract class StudioViewModel<Module, T> : ViewModel<T>, IStudioViewModel where Module : IStudioModule where T : IView
     {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="StudioViewModel{Module, T}"/> class.
-        /// </summary>
-        /// <param name="view">The view.</param>
-        public StudioViewModel(T view) : base(view)
-        {
-
-        }
-
         /// <summary>
         /// Called when the application has been started
         /// </summary>
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/UpdateViewVM.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/UpdateViewVM.cs
index f2550c598..6dbc99591 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/UpdateViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/UpdateViewVM.cs
@@ -294,6 +294,9 @@ namespace Tango.MachineStudio.UI.ViewModels
                         }
                     }
 
+                    //Copy new updater utility to app path.
+                    File.Copy(Path.Combine(_newPackageTempFolder, "Tango.MachineStudio.Updater.exe"), Path.Combine(_appPath, "Tango.MachineStudio.Updater.exe"), true);
+
                     TangoIOC.Default.GetInstance<MainViewVM>().DisableCheckForUpdates = true;
                     Status = UpdateStatus.UpdateCompleted;
                 }
diff --git a/Software/Visual_Studio/Tango.SharedUI/ViewModel.cs b/Software/Visual_Studio/Tango.SharedUI/ViewModel.cs
index 7d215cd06..d4f26c79d 100644
--- a/Software/Visual_Studio/Tango.SharedUI/ViewModel.cs
+++ b/Software/Visual_Studio/Tango.SharedUI/ViewModel.cs
@@ -23,6 +23,7 @@ namespace Tango.SharedUI
     public abstract class ViewModel : ExtendedObject, INotifyDataErrorInfo
     {
         private List<KeyValuePair<String, String>> _currentErrors = new List<KeyValuePair<string, string>>(); //Holds the current validation errors.
+        private bool _isFreeSet;
 
         private bool _hasErrors;
         /// <summary>
@@ -34,6 +35,16 @@ namespace Tango.SharedUI
             set { _hasErrors = value; RaisePropertyChangedAuto(); }
         }
 
+        private bool _isFree;
+        /// <summary>
+        /// Gets or sets a value indicating whether this view model is free to perform actions.
+        /// </summary>
+        public bool IsFree
+        {
+            get { return _isFree; }
+            set { _isFree = value; RaisePropertyChangedAuto(); InvalidateRelayCommands(); }
+        }
+
         private ObservableCollection<String> _validationErrors;
         /// <summary>
         /// Gets or sets the validation errors.
@@ -49,6 +60,14 @@ namespace Tango.SharedUI
         /// </summary>
         public event EventHandler<DataErrorsChangedEventArgs> ErrorsChanged;
 
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ViewModel"/> class.
+        /// </summary>
+        public ViewModel()
+        {
+            IsFree = true;
+        }
+
         /// <summary>
         /// Gets the validation errors for a specified property or for the entire entity.
         /// </summary>
@@ -160,42 +179,15 @@ namespace Tango.SharedUI
         /// </summary>
         public T View { get; set; }
 
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ViewModel{T}"/> class.
-        /// </summary>
-        /// <param name="view">The view.</param>
-        public ViewModel(T view)
-        {
-            View = view;
-            View.ViewAttached += (x, e) =>
-            {
-                View = (T)e;
-                OnViewAttached();
-            };
-        }
-
         /// <summary>
         /// Initializes a new instance of the <see cref="ViewModel{T}"/> class.
         /// </summary>
-        /// <param name="view">The view.</param>
-        /// <param name="delayed">if set to <c>true</c> waits for the view to be valid before registering for the <see cref="IView.ViewAttached"/> event.</param>
-        public ViewModel(T view, bool delayed)
+        public ViewModel() : base()
         {
-            Task.Factory.StartNew(() =>
-            {
-                while (view == null)
-                {
-                    Thread.Sleep(10);
-                }
-            }).ContinueWith((c) =>
+            TangoIOC.Default.GetInstanceWhenAvailable<T>((view) => 
             {
                 View = view;
-                View.ViewAttached += (x, e) =>
-                {
-                    View = (T)e;
-                    OnViewAttached();
-                };
+                OnViewAttached();
             });
         }
 
-- 
cgit v1.3.1