From f25823d812134a71b901562b72adfdb9185812a9 Mon Sep 17 00:00:00 2001
From: Roy Ben-Shabat <Roy@Twine-s.com>
Date: Mon, 18 Jun 2018 14:49:53 +0300
Subject: Fixed issue with RML in Machine Studio DB Module. Implemented
 TouchTextBox. Made some modifications to ViewModel validation.

---
 .../Tango.MachineStudio.DB.csproj                  | 16 +++++++
 .../Tango.MachineStudio.DB/ViewModelLocator.cs     | 10 ++++
 .../ViewModels/SpoolTypesViewVM.cs                 | 18 ++++++++
 .../Views/DBViews/RmlView.xaml                     |  2 +-
 .../Views/DBViews/RmlsView.xaml                    |  2 +-
 .../Views/DBViews/SpoolTypeView.xaml               | 53 ++++++++++++++++++++++
 .../Views/DBViews/SpoolTypeView.xaml.cs            | 28 ++++++++++++
 .../Views/DBViews/SpoolTypesView.xaml              | 32 +++++++++++++
 .../Views/DBViews/SpoolTypesView.xaml.cs           | 32 +++++++++++++
 9 files changed, 191 insertions(+), 2 deletions(-)
 create mode 100644 Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/SpoolTypesViewVM.cs
 create mode 100644 Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/SpoolTypeView.xaml
 create mode 100644 Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/SpoolTypeView.xaml.cs
 create mode 100644 Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/SpoolTypesView.xaml
 create mode 100644 Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/SpoolTypesView.xaml.cs

(limited to 'Software/Visual_Studio/MachineStudio')

diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Tango.MachineStudio.DB.csproj b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Tango.MachineStudio.DB.csproj
index baa6042f0..e7d4a4022 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Tango.MachineStudio.DB.csproj
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Tango.MachineStudio.DB.csproj
@@ -79,6 +79,7 @@
     <Compile Include="Converters\EntityFieldNameToFriendlyStringConverter.cs" />
     <Compile Include="Converters\EventTypeActionsToStringConverter.cs" />
     <Compile Include="Converters\LiquidTypeRmlsToStringConverter.cs" />
+    <Compile Include="Converters\MediaColorToColorConverter.cs" />
     <Compile Include="Converters\RolesPermissionsToStringConverter.cs" />
     <Compile Include="DBModule.cs" />
     <Compile Include="Messages\CloseEntityEditViewMessage.cs" />
@@ -126,6 +127,7 @@
     <Compile Include="ViewModels\ProcessParametersTablesGroupsViewVM.cs" />
     <Compile Include="ViewModels\RmlsViewVM.cs" />
     <Compile Include="ViewModels\RolesViewVM.cs" />
+    <Compile Include="ViewModels\SpoolTypesViewVM.cs" />
     <Compile Include="ViewModels\UsersViewVM.cs" />
     <Compile Include="ViewModels\EntityViewModel.cs" />
     <Compile Include="ViewModels\MainViewVM.cs" />
@@ -136,6 +138,12 @@
     <Compile Include="Views\DBViews\ActionTypeView.xaml.cs">
       <DependentUpon>ActionTypeView.xaml</DependentUpon>
     </Compile>
+    <Compile Include="Views\DBViews\SpoolTypesView.xaml.cs">
+      <DependentUpon>SpoolTypesView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Views\DBViews\SpoolTypeView.xaml.cs">
+      <DependentUpon>SpoolTypeView.xaml</DependentUpon>
+    </Compile>
     <Compile Include="Views\DBViews\EventTypesGroupsView.xaml.cs">
       <DependentUpon>EventTypesGroupsView.xaml</DependentUpon>
     </Compile>
@@ -402,6 +410,14 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
+    <Page Include="Views\DBViews\SpoolTypesView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Views\DBViews\SpoolTypeView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
     <Page Include="Views\DBViews\EventTypesGroupsView.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModelLocator.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModelLocator.cs
index d2506c362..7bf3c6717 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModelLocator.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModelLocator.cs
@@ -65,6 +65,8 @@ namespace Tango.MachineStudio.DB
             TangoIOC.Default.Register<HardwarePidControlTypesViewVM>();
 
             TangoIOC.Default.Register<EventTypesGroupsViewVM>();
+
+            TangoIOC.Default.Register<SpoolTypesViewVM>();
         }
 
         public static MainViewVM MainViewVM
@@ -402,5 +404,13 @@ namespace Tango.MachineStudio.DB
                 return TangoIOC.Default.GetInstance<EventTypesGroupsViewVM>();
             }
         }
+
+        public static SpoolTypesViewVM SpoolTypesViewVM
+        {
+            get
+            {
+                return TangoIOC.Default.GetInstance<SpoolTypesViewVM>();
+            }
+        }
     }
 }
\ No newline at end of file
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/SpoolTypesViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/SpoolTypesViewVM.cs
new file mode 100644
index 000000000..cc52e6e95
--- /dev/null
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/SpoolTypesViewVM.cs
@@ -0,0 +1,18 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Tango.BL.Entities;
+using Tango.MachineStudio.Common.Notifications;
+
+namespace Tango.MachineStudio.DB.ViewModels
+{
+    public class SpoolTypesViewVM : DbTableViewModel<SpoolType>
+    {
+        public SpoolTypesViewVM(INotificationProvider notification) : base(notification)
+        {
+
+        }
+    }
+}
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/RmlView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/RmlView.xaml
index 43a17d8e4..9bddd3937 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/RmlView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/RmlView.xaml
@@ -41,7 +41,7 @@
                         <StackPanel Orientation="Horizontal">
                             <Rectangle Width="16" Height="16" VerticalAlignment="Center">
                                 <Rectangle.Fill>
-                                    <SolidColorBrush Color="{Binding Color,Converter={StaticResource ColorToIntegerConverter}}"></SolidColorBrush>
+                                    <SolidColorBrush Color="{Binding Color}"></SolidColorBrush>
                                 </Rectangle.Fill>
                             </Rectangle>
                         </StackPanel>
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/RmlsView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/RmlsView.xaml
index 86a61d400..8cd51ccac 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/RmlsView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/RmlsView.xaml
@@ -29,7 +29,7 @@
                             <DataTemplate>
                                 <Rectangle Width="50">
                                     <Rectangle.Fill>
-                                        <SolidColorBrush Color="{Binding MediaColor.Color,Converter={StaticResource ColorToIntegerConverter},Mode=TwoWay}"></SolidColorBrush>
+                                        <SolidColorBrush Color="{Binding MediaColor.Color}"></SolidColorBrush>
                                     </Rectangle.Fill>
                                 </Rectangle>
                             </DataTemplate>
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/SpoolTypeView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/SpoolTypeView.xaml
new file mode 100644
index 000000000..843b9c244
--- /dev/null
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/SpoolTypeView.xaml
@@ -0,0 +1,53 @@
+<UserControl x:Class="Tango.MachineStudio.DB.Views.DBViews.SpoolTypeView"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:mahapps="http://metro.mahapps.com/winfx/xaml/controls"
+             xmlns:controls="clr-namespace:Tango.MachineStudio.DB.Controls"
+             xmlns:colorPicker="clr-namespace:Tango;assembly=Tango.ColorPicker"
+             xmlns:converters="clr-namespace:Tango.SharedUI.Converters;assembly=Tango.SharedUI"
+             xmlns:vm="clr-namespace:Tango.MachineStudio.DB.ViewModels"
+             xmlns:local="clr-namespace:Tango.MachineStudio.DB.Views.DBViews"
+             mc:Ignorable="d" 
+             d:DesignHeight="400" d:DesignWidth="300" d:DataContext="{d:DesignInstance Type=vm:SpoolTypesViewVM, IsDesignTimeCreatable=False}">
+    
+    <Grid>
+        <controls:TableGrid>
+            <TextBlock Text="ID:" FontWeight="Bold"></TextBlock>
+            <TextBox Text="{Binding EditEntity.ID}" IsReadOnly="True"></TextBox>
+            <TextBlock Text="GUID:" FontWeight="Bold"></TextBlock>
+            <TextBox Text="{Binding EditEntity.Guid}" IsReadOnly="True"></TextBox>
+            <TextBlock Text="Last Updated:" FontWeight="Bold"></TextBlock>
+            <TextBox Text="{Binding EditEntity.LastUpdated}" IsReadOnly="True"></TextBox>
+            <TextBlock Text="Code:" FontWeight="Bold"></TextBlock>
+            <mahapps:NumericUpDown Minimum="0" Maximum="10000" InterceptArrowKeys="True" Background="Transparent" BorderThickness="0" InterceptMouseWheel="True" HasDecimals="False" HorizontalContentAlignment="Left" Value="{Binding EditEntity.Code,Mode=TwoWay}"></mahapps:NumericUpDown>
+            <TextBlock Text="Name:" FontWeight="Bold"></TextBlock>
+            <TextBox Text="{Binding EditEntity.Name,Mode=TwoWay}"></TextBox>
+            
+            <TextBlock Text="Length:" FontWeight="Bold"></TextBlock>
+            <mahapps:NumericUpDown Minimum="0" Maximum="10000" InterceptArrowKeys="True" Background="Transparent" BorderThickness="0" InterceptMouseWheel="True" HasDecimals="True" HorizontalContentAlignment="Left" Value="{Binding EditEntity.Length,Mode=TwoWay}"></mahapps:NumericUpDown>
+
+            <TextBlock Text="Weight:" FontWeight="Bold"></TextBlock>
+            <mahapps:NumericUpDown Minimum="0" Maximum="10000" InterceptArrowKeys="True" Background="Transparent" BorderThickness="0" InterceptMouseWheel="True" HasDecimals="True" HorizontalContentAlignment="Left" Value="{Binding EditEntity.Weight,Mode=TwoWay}"></mahapps:NumericUpDown>
+
+            <TextBlock Text="Diameter:" FontWeight="Bold"></TextBlock>
+            <mahapps:NumericUpDown Minimum="0" Maximum="10000" InterceptArrowKeys="True" Background="Transparent" BorderThickness="0" InterceptMouseWheel="True" HasDecimals="True" HorizontalContentAlignment="Left" Value="{Binding EditEntity.Diameter,Mode=TwoWay}"></mahapps:NumericUpDown>
+
+            <TextBlock Text="Start Offset Pulses:" FontWeight="Bold"></TextBlock>
+            <mahapps:NumericUpDown Minimum="0" Maximum="10000" InterceptArrowKeys="True" Background="Transparent" BorderThickness="0" InterceptMouseWheel="True" HasDecimals="False" HorizontalContentAlignment="Left" Value="{Binding EditEntity.StartOffsetPulses,Mode=TwoWay}"></mahapps:NumericUpDown>
+
+            <TextBlock Text="Backing Rate:" FontWeight="Bold"></TextBlock>
+            <mahapps:NumericUpDown Minimum="0" Maximum="10000" InterceptArrowKeys="True" Background="Transparent" BorderThickness="0" InterceptMouseWheel="True" HasDecimals="False" HorizontalContentAlignment="Left" Value="{Binding EditEntity.BackingRate,Mode=TwoWay}"></mahapps:NumericUpDown>
+
+            <TextBlock Text="Segment Offset Pulses:" FontWeight="Bold"></TextBlock>
+            <mahapps:NumericUpDown Minimum="0" Maximum="10000" InterceptArrowKeys="True" Background="Transparent" BorderThickness="0" InterceptMouseWheel="True" HasDecimals="False" HorizontalContentAlignment="Left" Value="{Binding EditEntity.SegmentOffsetPulses,Mode=TwoWay}"></mahapps:NumericUpDown>
+
+            <TextBlock Text="Bottom Backing Rate:" FontWeight="Bold"></TextBlock>
+            <mahapps:NumericUpDown Minimum="0" Maximum="10000" InterceptArrowKeys="True" Background="Transparent" BorderThickness="0" InterceptMouseWheel="True" HasDecimals="False" HorizontalContentAlignment="Left" Value="{Binding EditEntity.BottomBackingRate,Mode=TwoWay}"></mahapps:NumericUpDown>
+
+            <TextBlock Text="Rotations Per Passage:" FontWeight="Bold"></TextBlock>
+            <mahapps:NumericUpDown Minimum="0" Maximum="10000" InterceptArrowKeys="True" Background="Transparent" BorderThickness="0" InterceptMouseWheel="True" HasDecimals="True" HorizontalContentAlignment="Left" Value="{Binding EditEntity.RotationsPerPassage,Mode=TwoWay}"></mahapps:NumericUpDown>
+        </controls:TableGrid>
+    </Grid>
+</UserControl>
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/SpoolTypeView.xaml.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/SpoolTypeView.xaml.cs
new file mode 100644
index 000000000..51baf49bd
--- /dev/null
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/SpoolTypeView.xaml.cs
@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+
+namespace Tango.MachineStudio.DB.Views.DBViews
+{
+    /// <summary>
+    /// Interaction logic for MachineView.xaml
+    /// </summary>
+    public partial class SpoolTypeView : UserControl
+    {
+        public SpoolTypeView()
+        {
+            InitializeComponent();
+        }
+    }
+}
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/SpoolTypesView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/SpoolTypesView.xaml
new file mode 100644
index 000000000..4ed13cb11
--- /dev/null
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/SpoolTypesView.xaml
@@ -0,0 +1,32 @@
+<UserControl x:Class="Tango.MachineStudio.DB.Views.DBViews.SpoolTypesView"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+             xmlns:global="clr-namespace:Tango.MachineStudio.DB"
+             xmlns:controls="clr-namespace:Tango.MachineStudio.DB.Controls"
+             xmlns:converters="clr-namespace:Tango.SharedUI.Converters;assembly=Tango.SharedUI"
+             xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
+             mc:Ignorable="d" 
+             d:DesignHeight="720" d:DesignWidth="1280" Background="White" DataContext="{x:Static global:ViewModelLocator.SpoolTypesViewVM}">
+    <Grid>
+        <controls:DbTableView>
+            <DataGrid Background="Transparent" ItemsSource="{Binding Adapter.SpoolTypesViewSource}" SelectedItem="{Binding SelectedEntity}" AutoGenerateColumns="False" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" IsReadOnly="True">
+                <DataGrid.Columns>
+                    <DataGridTextColumn Header="ID" Binding="{Binding ID}"></DataGridTextColumn>
+                    <DataGridTextColumn Header="GUID" Binding="{Binding Guid}"></DataGridTextColumn>
+                    <DataGridTextColumn Header="Code" Binding="{Binding Code}"></DataGridTextColumn>
+                    <DataGridTextColumn Header="Name" Binding="{Binding Name}"></DataGridTextColumn>
+                    <DataGridTextColumn Header="Length" Binding="{Binding Length}"></DataGridTextColumn>
+                    <DataGridTextColumn Header="Weight" Binding="{Binding Weight}"></DataGridTextColumn>
+                    <DataGridTextColumn Header="Diameter" Binding="{Binding Diameter}"></DataGridTextColumn>
+                    <DataGridTextColumn Header="Start Offset Pulses" Binding="{Binding StartOffsetPulses}"></DataGridTextColumn>
+                    <DataGridTextColumn Header="Backing Rate" Binding="{Binding BackingRate}"></DataGridTextColumn>
+                    <DataGridTextColumn Header="Segment Offset Pulses" Binding="{Binding SegmentOffsetPulses}"></DataGridTextColumn>
+                    <DataGridTextColumn Header="Bottom Backing Rate" Binding="{Binding BottomBackingRate}"></DataGridTextColumn>
+                    <DataGridTextColumn Header="Rotations Per Passage" Binding="{Binding RotationsPerPassage}"></DataGridTextColumn>
+                </DataGrid.Columns>
+            </DataGrid>
+        </controls:DbTableView>
+    </Grid>
+</UserControl>
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/SpoolTypesView.xaml.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/SpoolTypesView.xaml.cs
new file mode 100644
index 000000000..2f0864ee3
--- /dev/null
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/SpoolTypesView.xaml.cs
@@ -0,0 +1,32 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+using Tango.MachineStudio.DB.CustomAttributes;
+using Tango.MachineStudio.DB.Managers;
+using Tango.SharedUI.Controls;
+
+namespace Tango.MachineStudio.DB.Views.DBViews
+{
+    /// <summary>
+    /// Interaction logic for MachinesView.xaml
+    /// </summary>
+    [DBView]
+    public partial class SpoolTypesView : UserControl
+    {
+        public SpoolTypesView() : base()
+        {
+            InitializeComponent();
+        }
+    }
+}
-- 
cgit v1.3.1


From e155089c0bd92a4be38e286bd08bb28b4e88284f Mon Sep 17 00:00:00 2001
From: Roy Ben-Shabat <Roy@Twine-s.com>
Date: Mon, 18 Jun 2018 15:00:24 +0300
Subject: Machine Studio 1.0.0.2

---
 Software/DB/Tango.mdf                              | Bin 75497472 -> 75497472 bytes
 Software/DB/Tango_log.ldf                          | Bin 1572864 -> 1572864 bytes
 .../Tango.MachineStudio.DB.csproj                  |   1 -
 .../Visual_Studio/Versioning/GlobalVersionInfo.cs  |   4 ++--
 4 files changed, 2 insertions(+), 3 deletions(-)

(limited to 'Software/Visual_Studio/MachineStudio')

diff --git a/Software/DB/Tango.mdf b/Software/DB/Tango.mdf
index b7bd188b4..aeeb78e8d 100644
Binary files a/Software/DB/Tango.mdf and b/Software/DB/Tango.mdf differ
diff --git a/Software/DB/Tango_log.ldf b/Software/DB/Tango_log.ldf
index 9a5318451..d5c552e3a 100644
Binary files a/Software/DB/Tango_log.ldf and b/Software/DB/Tango_log.ldf differ
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Tango.MachineStudio.DB.csproj b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Tango.MachineStudio.DB.csproj
index e7d4a4022..de82ff366 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Tango.MachineStudio.DB.csproj
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Tango.MachineStudio.DB.csproj
@@ -79,7 +79,6 @@
     <Compile Include="Converters\EntityFieldNameToFriendlyStringConverter.cs" />
     <Compile Include="Converters\EventTypeActionsToStringConverter.cs" />
     <Compile Include="Converters\LiquidTypeRmlsToStringConverter.cs" />
-    <Compile Include="Converters\MediaColorToColorConverter.cs" />
     <Compile Include="Converters\RolesPermissionsToStringConverter.cs" />
     <Compile Include="DBModule.cs" />
     <Compile Include="Messages\CloseEntityEditViewMessage.cs" />
diff --git a/Software/Visual_Studio/Versioning/GlobalVersionInfo.cs b/Software/Visual_Studio/Versioning/GlobalVersionInfo.cs
index e067918d5..9d96df6aa 100644
--- a/Software/Visual_Studio/Versioning/GlobalVersionInfo.cs
+++ b/Software/Visual_Studio/Versioning/GlobalVersionInfo.cs
@@ -9,5 +9,5 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyCopyright("Copyright © Twine LTD 2017")]
 [assembly: AssemblyTrademark("Twine LTD")]
 
-[assembly: AssemblyVersion("1.0.0.1")]
-[assembly: AssemblyFileVersion("1.0.0.1")]
+[assembly: AssemblyVersion("1.0.0.2")]
+[assembly: AssemblyFileVersion("1.0.0.2")]
-- 
cgit v1.3.1


From 054debe0f90ef6312f669963c2c62810fc766a8d Mon Sep 17 00:00:00 2001
From: Roy Ben-Shabat <Roy@Twine-s.com>
Date: Mon, 18 Jun 2018 16:31:02 +0300
Subject: Added HeaterZ5 to DB,PMR, Observables.

---
 Software/DB/Tango.mdf                              | Bin 75497472 -> 75497472 bytes
 Software/DB/Tango_log.ldf                          | Bin 1572864 -> 1572864 bytes
 .../Messages/Hardware/HardwarePidControlType.proto |  31 ++++++++++---------
 .../TFS/TeamFoundationServiceExtendedClient.cs     |  11 ++++---
 .../Enumerations/HardwarePidControlTypes.cs        |  34 ++++++++++++---------
 5 files changed, 44 insertions(+), 32 deletions(-)

(limited to 'Software/Visual_Studio/MachineStudio')

diff --git a/Software/DB/Tango.mdf b/Software/DB/Tango.mdf
index aeeb78e8d..4bc275e1e 100644
Binary files a/Software/DB/Tango.mdf and b/Software/DB/Tango.mdf differ
diff --git a/Software/DB/Tango_log.ldf b/Software/DB/Tango_log.ldf
index d5c552e3a..703f3b1f4 100644
Binary files a/Software/DB/Tango_log.ldf and b/Software/DB/Tango_log.ldf differ
diff --git a/Software/PMR/Messages/Hardware/HardwarePidControlType.proto b/Software/PMR/Messages/Hardware/HardwarePidControlType.proto
index 9535eaa33..3bef9e2a4 100644
--- a/Software/PMR/Messages/Hardware/HardwarePidControlType.proto
+++ b/Software/PMR/Messages/Hardware/HardwarePidControlType.proto
@@ -37,46 +37,49 @@ enum HardwarePidControlType
     //Head Heater Zone 4
     HeadHeaterZ4 = 6;
 
+    //Head Heater Zone 5
+    HeadHeaterZ5 = 7;
+
     //Mixer Heater
-    MixerHeater = 7;
+    MixerHeater = 8;
 
     //Waste Control
-    WasteControl = 8;
+    WasteControl = 9;
 
     //Dryer Motor
-    MotorDryer = 9;
+    MotorDryer = 10;
 
     //Feeder Motor
-    MotorFeeder = 10;
+    MotorFeeder = 11;
 
     //Pooler Motor
-    MotorPooler = 11;
+    MotorPooler = 12;
 
     //Winder Motor
-    MotorWinder = 12;
+    MotorWinder = 13;
 
     //Dispenser 1
-    Dispenser1 = 13;
+    Dispenser1 = 14;
 
     //Dispenser 2
-    Dispenser2 = 14;
+    Dispenser2 = 15;
 
     //Dispenser 3
-    Dispenser3 = 15;
+    Dispenser3 = 16;
 
     //Dispenser 4
-    Dispenser4 = 16;
+    Dispenser4 = 17;
 
     //Dispenser 5
-    Dispenser5 = 17;
+    Dispenser5 = 18;
 
     //Dispenser 6
-    Dispenser6 = 18;
+    Dispenser6 = 19;
 
     //Dispenser 7
-    Dispenser7 = 19;
+    Dispenser7 = 20;
 
     //Dispenser 8
-    Dispenser8 = 20;
+    Dispenser8 = 21;
 
 }
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/TFS/TeamFoundationServiceExtendedClient.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/TFS/TeamFoundationServiceExtendedClient.cs
index eb3572728..3dbee402b 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/TFS/TeamFoundationServiceExtendedClient.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/TFS/TeamFoundationServiceExtendedClient.cs
@@ -64,10 +64,13 @@ namespace Tango.MachineStudio.UI.TFS
         {
             try
             {
-                IStudioApplicationManager app = TangoIOC.Default.GetInstance<IStudioApplicationManager>();
-                var items = await GetWorkItemsCreatedBy(Project, GetUserTeamMember());
-                items.Where(x => x.StepsToReproduce != null).ToList().ForEach(x => x.StepsToReproduce = x.StepsToReproduce.Replace("<div style=\"white-space:pre;\">", "").Replace("</div>", ""));
-                ResolvedWorkItems = items.Where(x => x.State == State.Resolved && x.ResolvedReason == ResolvedReason.Fixed && x.IsBuildVersionValid && x.FoundInBuildVersion < Version.Parse(app.Version)).ToObservableCollection();
+                if (Project != null)
+                {
+                    IStudioApplicationManager app = TangoIOC.Default.GetInstance<IStudioApplicationManager>();
+                    var items = await GetWorkItemsCreatedBy(Project, GetUserTeamMember());
+                    items.Where(x => x.StepsToReproduce != null).ToList().ForEach(x => x.StepsToReproduce = x.StepsToReproduce.Replace("<div style=\"white-space:pre;\">", "").Replace("</div>", ""));
+                    ResolvedWorkItems = items.Where(x => x.State == State.Resolved && x.ResolvedReason == ResolvedReason.Fixed && x.IsBuildVersionValid && x.FoundInBuildVersion < Version.Parse(app.Version)).ToObservableCollection();
+                }
             }
             catch (Exception ex)
             {
diff --git a/Software/Visual_Studio/Tango.BL/Enumerations/HardwarePidControlTypes.cs b/Software/Visual_Studio/Tango.BL/Enumerations/HardwarePidControlTypes.cs
index 61d149a90..abe59390a 100644
--- a/Software/Visual_Studio/Tango.BL/Enumerations/HardwarePidControlTypes.cs
+++ b/Software/Visual_Studio/Tango.BL/Enumerations/HardwarePidControlTypes.cs
@@ -51,89 +51,95 @@ namespace Tango.BL.Enumerations
         [Description("Head Heater Zone 4")]
         HeadHeaterZ4 = 6,
 
+        /// <summary>
+        /// (Head Heater Zone 5)
+        /// </summary>
+        [Description("Head Heater Zone 5")]
+        HeadHeaterZ5 = 7,
+
         /// <summary>
         /// (Mixer Heater)
         /// </summary>
         [Description("Mixer Heater")]
-        MixerHeater = 7,
+        MixerHeater = 8,
 
         /// <summary>
         /// (Waste Control)
         /// </summary>
         [Description("Waste Control")]
-        WasteControl = 8,
+        WasteControl = 9,
 
         /// <summary>
         /// (Dryer Motor)
         /// </summary>
         [Description("Dryer Motor")]
-        MotorDryer = 9,
+        MotorDryer = 10,
 
         /// <summary>
         /// (Feeder Motor)
         /// </summary>
         [Description("Feeder Motor")]
-        MotorFeeder = 10,
+        MotorFeeder = 11,
 
         /// <summary>
         /// (Pooler Motor)
         /// </summary>
         [Description("Pooler Motor")]
-        MotorPooler = 11,
+        MotorPooler = 12,
 
         /// <summary>
         /// (Winder Motor)
         /// </summary>
         [Description("Winder Motor")]
-        MotorWinder = 12,
+        MotorWinder = 13,
 
         /// <summary>
         /// (Dispenser 1)
         /// </summary>
         [Description("Dispenser 1")]
-        Dispenser1 = 13,
+        Dispenser1 = 14,
 
         /// <summary>
         /// (Dispenser 2)
         /// </summary>
         [Description("Dispenser 2")]
-        Dispenser2 = 14,
+        Dispenser2 = 15,
 
         /// <summary>
         /// (Dispenser 3)
         /// </summary>
         [Description("Dispenser 3")]
-        Dispenser3 = 15,
+        Dispenser3 = 16,
 
         /// <summary>
         /// (Dispenser 4)
         /// </summary>
         [Description("Dispenser 4")]
-        Dispenser4 = 16,
+        Dispenser4 = 17,
 
         /// <summary>
         /// (Dispenser 5)
         /// </summary>
         [Description("Dispenser 5")]
-        Dispenser5 = 17,
+        Dispenser5 = 18,
 
         /// <summary>
         /// (Dispenser 6)
         /// </summary>
         [Description("Dispenser 6")]
-        Dispenser6 = 18,
+        Dispenser6 = 19,
 
         /// <summary>
         /// (Dispenser 7)
         /// </summary>
         [Description("Dispenser 7")]
-        Dispenser7 = 19,
+        Dispenser7 = 20,
 
         /// <summary>
         /// (Dispenser 8)
         /// </summary>
         [Description("Dispenser 8")]
-        Dispenser8 = 20,
+        Dispenser8 = 21,
 
     }
 }
-- 
cgit v1.3.1