Merge branch 'master' of https://twinetfs.visualstudio.com/_git/Tango

8 files changed, 34 insertions, 29 deletions

diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/MultiGraphElementEditor.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/MultiGraphElementEditor.xaml
index 4d1cc08e4..8e064e30c 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/MultiGraphElementEditor.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/MultiGraphElementEditor.xaml
@@ -33,12 +33,12 @@
             <controls:RealTimeGraphMultiControl x:Name="InnerGraph" UseAutoRange="{Binding UseAutoRange}" IsHitTestVisible="{Binding RelativeSource={RelativeSource AncestorType=local:ElementsEditor},Path=IsEditable,Converter={StaticResource BooleanInverseConverter}}" x:FieldModifier="public" EnableToolBar="False" SensorName="{Binding TechMonitor.Description}" SensorUnits="{Binding TechMonitor.Units}">
                 <controls:RealTimeGraphMultiControl.Style>
                     <Style TargetType="controls:RealTimeGraphMultiControl">
-                        <Setter Property="Minimum" Value="{Binding TechMonitor.Min}"></Setter>
-                        <Setter Property="Maximum" Value="{Binding TechMonitor.Max}"></Setter>
+                        <Setter Property="Minimum" Value="{Binding TechMonitor.Min,Mode=TwoWay}"></Setter>
+                        <Setter Property="Maximum" Value="{Binding TechMonitor.Max,Mode=TwoWay}"></Setter>
                         <Style.Triggers>
                             <DataTrigger Binding="{Binding UseMinMax}" Value="True">
-                                <Setter Property="Minimum" Value="{Binding Min}"></Setter>
-                                <Setter Property="Maximum" Value="{Binding Max}"></Setter>
+                                <Setter Property="Minimum" Value="{Binding Min,Mode=TwoWay}"></Setter>
+                                <Setter Property="Maximum" Value="{Binding Max,Mode=TwoWay}"></Setter>
                             </DataTrigger>
                         </Style.Triggers>
                     </Style>
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/SingleGraphElementEditor.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/SingleGraphElementEditor.xaml
index 4d80478c5..89da5be7c 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/SingleGraphElementEditor.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/SingleGraphElementEditor.xaml
@@ -33,12 +33,12 @@
             <controls:RealTimeGraphControl x:Name="InnerGraph" UseAutoRange="{Binding UseAutoRange}" IsHitTestVisible="{Binding RelativeSource={RelativeSource AncestorType=local:ElementsEditor},Path=IsEditable,Converter={StaticResource BooleanInverseConverter}}" x:FieldModifier="public" EnableToolBar="False" SensorName="{Binding TechMonitor.Description}" Color="{Binding Color,Mode=OneWay}" SensorUnits="{Binding TechMonitor.Units}">
                 <controls:RealTimeGraphControl.Style>
                     <Style TargetType="controls:RealTimeGraphControl">
-                        <Setter Property="Minimum" Value="{Binding TechMonitor.Min}"></Setter>
-                        <Setter Property="Maximum" Value="{Binding TechMonitor.Max}"></Setter>
+                        <Setter Property="Minimum" Value="{Binding TechMonitor.Min,Mode=TwoWay}"></Setter>
+                        <Setter Property="Maximum" Value="{Binding TechMonitor.Max,Mode=TwoWay}"></Setter>
                         <Style.Triggers>
                             <DataTrigger Binding="{Binding UseMinMax}" Value="True">
-                                <Setter Property="Minimum" Value="{Binding Min}"></Setter>
-                                <Setter Property="Maximum" Value="{Binding Max}"></Setter>
+                                <Setter Property="Minimum" Value="{Binding Min,Mode=TwoWay}"></Setter>
+                                <Setter Property="Maximum" Value="{Binding Max,Mode=TwoWay}"></Setter>
                             </DataTrigger>
                         </Style.Triggers>
                     </Style>
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Properties/AssemblyInfo.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Properties/AssemblyInfo.cs
index ed3f8dfb8..15619a3ab 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Properties/AssemblyInfo.cs
@@ -5,7 +5,7 @@ using System.Runtime.InteropServices;
 using System.Windows;
 
 [assembly: AssemblyTitle("Tango - Machine Studio Technician Module")]
-[assembly: AssemblyVersion("2.0.6.1407")]
+[assembly: AssemblyVersion("2.0.7.1608")]
 
 [assembly: ComVisible(false)]
 
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/PropertiesTemplates/MultiGraphTemplate.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/PropertiesTemplates/MultiGraphTemplate.xaml
index 464c12bfd..da5818a6b 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/PropertiesTemplates/MultiGraphTemplate.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/PropertiesTemplates/MultiGraphTemplate.xaml
@@ -37,11 +37,11 @@
                         <UniformGrid Columns="2" Margin="0 5 0 0" IsEnabled="{Binding UseMinMax}">
                             <StackPanel Margin="0 0 5 0">
                                 <TextBlock>Minimum</TextBlock>
-                                <mahapps:NumericUpDown HasDecimals="True" HorizontalContentAlignment="Center" BorderBrush="Gainsboro" Foreground="Gray" Margin="0 5 0 0" Minimum="-1000000" Maximum="1000000" Value="{Binding Min}"></mahapps:NumericUpDown>
+                                <mahapps:NumericUpDown HasDecimals="True" HorizontalContentAlignment="Center" BorderBrush="Gainsboro" Foreground="Gray" Margin="0 5 0 0" Minimum="-1000000" Maximum="1000000" Value="{Binding Min,Mode=TwoWay}"></mahapps:NumericUpDown>
                             </StackPanel>
                             <StackPanel Margin="5 0 0 0">
                                 <TextBlock>Maximum</TextBlock>
-                                <mahapps:NumericUpDown HasDecimals="True" HorizontalContentAlignment="Center" BorderBrush="Gainsboro" Foreground="Gray" Margin="0 5 0 0" Minimum="{Binding Min}" Maximum="1000000" Value="{Binding Max}"></mahapps:NumericUpDown>
+                                <mahapps:NumericUpDown HasDecimals="True" HorizontalContentAlignment="Center" BorderBrush="Gainsboro" Foreground="Gray" Margin="0 5 0 0" Minimum="{Binding Min}" Maximum="1000000" Value="{Binding Max,Mode=TwoWay}"></mahapps:NumericUpDown>
                             </StackPanel>
                         </UniformGrid>
                         <CheckBox Margin="0 10 0 0" IsChecked="{Binding UseMinMax,Converter={StaticResource BooleanInverseConverter}}">Use default ranges</CheckBox>
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/PropertiesTemplates/SingleGraphTemplate.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/PropertiesTemplates/SingleGraphTemplate.xaml
index bb0db666c..d7e40f2e0 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/PropertiesTemplates/SingleGraphTemplate.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/PropertiesTemplates/SingleGraphTemplate.xaml
@@ -37,11 +37,11 @@
                         <UniformGrid Columns="2" Margin="0 5 0 0" IsEnabled="{Binding UseMinMax}">
                             <StackPanel Margin="0 0 5 0">
                                 <TextBlock>Minimum</TextBlock>
-                                <mahapps:NumericUpDown HasDecimals="True" HorizontalContentAlignment="Center" BorderBrush="Gainsboro" Foreground="Gray" Margin="0 5 0 0" Minimum="-1000000" Maximum="1000000" Value="{Binding Min}"></mahapps:NumericUpDown>
+                                <mahapps:NumericUpDown HasDecimals="True" HorizontalContentAlignment="Center" BorderBrush="Gainsboro" Foreground="Gray" Margin="0 5 0 0" Minimum="-1000000" Maximum="1000000" Value="{Binding Min,Mode=TwoWay}"></mahapps:NumericUpDown>
                             </StackPanel>
                             <StackPanel Margin="5 0 0 0">
                                 <TextBlock>Maximum</TextBlock>
-                                <mahapps:NumericUpDown HasDecimals="True" HorizontalContentAlignment="Center" BorderBrush="Gainsboro" Foreground="Gray" Margin="0 5 0 0" Minimum="{Binding Min}" Maximum="1000000" Value="{Binding Max}"></mahapps:NumericUpDown>
+                                <mahapps:NumericUpDown HasDecimals="True" HorizontalContentAlignment="Center" BorderBrush="Gainsboro" Foreground="Gray" Margin="0 5 0 0" Minimum="{Binding Min}" Maximum="1000000" Value="{Binding Max,Mode=TwoWay}"></mahapps:NumericUpDown>
                             </StackPanel>
                         </UniformGrid>
                         <CheckBox Margin="0 10 0 0" IsChecked="{Binding UseMinMax,Converter={StaticResource BooleanInverseConverter}}">Use default ranges</CheckBox>
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/TechItems/MultiGraphItem.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/TechItems/MultiGraphItem.cs
index 072720c4b..52925ee59 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/TechItems/MultiGraphItem.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/TechItems/MultiGraphItem.cs
@@ -96,6 +96,7 @@ namespace Tango.MachineStudio.Technician.TechItems
         /// <summary>
         /// Gets or sets a value indicating whether this instance is paused.
         /// </summary>
+        [XmlIgnore]
         public bool IsPaused
         {
             get { return _isPaused; }
@@ -110,6 +111,7 @@ namespace Tango.MachineStudio.Technician.TechItems
             }
         }
 
+        [XmlIgnore]
         public RelayCommand ClearCommand { get; set; }
 
         /// <summary>
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/TechItems/SingleGraphItem.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/TechItems/SingleGraphItem.cs
index 8a88aad7a..f2bad5349 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/TechItems/SingleGraphItem.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/TechItems/SingleGraphItem.cs
@@ -96,6 +96,7 @@ namespace Tango.MachineStudio.Technician.TechItems
         /// <summary>
         /// Gets or sets a value indicating whether this instance is paused.
         /// </summary>
+        [XmlIgnore]
         public bool IsPaused
         {
             get { return _isPaused; }
@@ -110,6 +111,7 @@ namespace Tango.MachineStudio.Technician.TechItems
             }
         }
 
+        [XmlIgnore]
         public RelayCommand ClearCommand { get; set; }
 
         /// <summary>
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/ViewModels/MachineTechViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/ViewModels/MachineTechViewVM.cs
index 7c2acfdbb..0c09850c1 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/ViewModels/MachineTechViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/ViewModels/MachineTechViewVM.cs
@@ -794,7 +794,7 @@ namespace Tango.MachineStudio.Technician.ViewModels
                     {
                         await MachineOperator.StartMotorJogging(new MotorJoggingRequest()
                         {
-                            Code = item.HardwareMotorType.Code,
+                            MotorType = (PMR.Hardware.HardwareMotorType)item.HardwareMotorType.Code,
                             Direction = MotorDirection.Forward,
                         });
                     }
@@ -802,14 +802,14 @@ namespace Tango.MachineStudio.Technician.ViewModels
                     {
                         await MachineOperator.StopMotorJogging(new MotorAbortJoggingRequest()
                         {
-                            Code = item.HardwareMotorType.Code,
+                            MotorType = (PMR.Hardware.HardwareMotorType)item.HardwareMotorType.Code,
                         });
                     }
                     else if (action == MotorActionType.BackwardPressed)
                     {
                         await MachineOperator.StartMotorJogging(new MotorJoggingRequest()
                         {
-                            Code = item.HardwareMotorType.Code,
+                            MotorType = (PMR.Hardware.HardwareMotorType)item.HardwareMotorType.Code,
                             Direction = MotorDirection.Backward,
                         });
                     }
@@ -817,7 +817,7 @@ namespace Tango.MachineStudio.Technician.ViewModels
                     {
                         await MachineOperator.StopMotorJogging(new MotorAbortJoggingRequest()
                         {
-                            Code = item.HardwareMotorType.Code,
+                            MotorType = (PMR.Hardware.HardwareMotorType)item.HardwareMotorType.Code,
                         });
                     }
                     else if (action == MotorActionType.HomingStarted)
@@ -828,7 +828,7 @@ namespace Tango.MachineStudio.Technician.ViewModels
 
                         MachineOperator.StartMotorHoming(new MotorHomingRequest()
                         {
-                            Code = item.HardwareMotorType.Code
+                            MotorType = (PMR.Hardware.HardwareMotorType)item.HardwareMotorType.Code,
                         })
                         .Subscribe((response) =>
                         {
@@ -848,7 +848,7 @@ namespace Tango.MachineStudio.Technician.ViewModels
                     {
                         await MachineOperator.StopMotorHoming(new MotorAbortHomingRequest()
                         {
-                            Code = item.HardwareMotorType.Code,
+                            MotorType = (PMR.Hardware.HardwareMotorType)item.HardwareMotorType.Code,
                         });
 
                         item.IsHoming = false;
@@ -878,7 +878,7 @@ namespace Tango.MachineStudio.Technician.ViewModels
                     {
                         await MachineOperator.StartDispenserJogging(new DispenserJoggingRequest()
                         {
-                            Code = item.TechDispenser.Code,
+                            Index = item.TechDispenser.Code,
                             Direction = MotorDirection.Forward,
                         });
                     }
@@ -886,14 +886,14 @@ namespace Tango.MachineStudio.Technician.ViewModels
                     {
                         await MachineOperator.StopDispenserJogging(new DispenserAbortJoggingRequest()
                         {
-                            Code = item.TechDispenser.Code,
+                            Index = item.TechDispenser.Code,
                         });
                     }
                     else if (action == MotorActionType.BackwardPressed)
                     {
                         await MachineOperator.StartDispenserJogging(new DispenserJoggingRequest()
                         {
-                            Code = item.TechDispenser.Code,
+                            Index = item.TechDispenser.Code,
                             Direction = MotorDirection.Backward,
                         });
                     }
@@ -901,7 +901,7 @@ namespace Tango.MachineStudio.Technician.ViewModels
                     {
                         await MachineOperator.StopDispenserJogging(new DispenserAbortJoggingRequest()
                         {
-                            Code = item.TechDispenser.Code,
+                            Index = item.TechDispenser.Code,
                         });
                     }
                     else if (action == MotorActionType.HomingStarted)
@@ -912,7 +912,7 @@ namespace Tango.MachineStudio.Technician.ViewModels
 
                         MachineOperator.StartDispenserHoming(new DispenserHomingRequest()
                         {
-                            Code = item.TechDispenser.Code
+                            Index = item.TechDispenser.Code
                         })
                         .Subscribe((response) =>
                         {
@@ -932,7 +932,7 @@ namespace Tango.MachineStudio.Technician.ViewModels
                     {
                         await MachineOperator.StopDispenserHoming(new DispenserAbortHomingRequest()
                         {
-                            Code = item.TechDispenser.Code,
+                            Index = item.TechDispenser.Code,
                         });
 
                         item.IsHoming = false;
@@ -1044,7 +1044,7 @@ namespace Tango.MachineStudio.Technician.ViewModels
                     {
                         await Task.WhenAll(item.TechMotors.Select(motor => MachineOperator.StartMotorJogging(new MotorJoggingRequest()
                         {
-                            Code = motor.Code,
+                            MotorType = (PMR.Hardware.HardwareMotorType)motor.Code,
                             Direction = MotorDirection.Forward,
                         })));
                     }
@@ -1052,14 +1052,14 @@ namespace Tango.MachineStudio.Technician.ViewModels
                     {
                         await Task.WhenAll(item.TechMotors.Select(motor => MachineOperator.StopMotorJogging(new MotorAbortJoggingRequest()
                         {
-                            Code = motor.Code,
+                            MotorType = (PMR.Hardware.HardwareMotorType)motor.Code,
                         })));
                     }
                     else if (action == MotorActionType.BackwardPressed)
                     {
                         await Task.WhenAll(item.TechMotors.Select(motor => MachineOperator.StartMotorJogging(new MotorJoggingRequest()
                         {
-                            Code = motor.Code,
+                            MotorType = (PMR.Hardware.HardwareMotorType)motor.Code,
                             Direction = MotorDirection.Backward,
                         })));
                     }
@@ -1067,7 +1067,7 @@ namespace Tango.MachineStudio.Technician.ViewModels
                     {
                         await Task.WhenAll(item.TechMotors.Select(motor => MachineOperator.StopMotorJogging(new MotorAbortJoggingRequest()
                         {
-                            Code = motor.Code,
+                            MotorType = (PMR.Hardware.HardwareMotorType)motor.Code,
                         })));
                     }
                     //else if (action == MotorActionType.HomingStarted)
@@ -1221,6 +1221,7 @@ namespace Tango.MachineStudio.Technician.ViewModels
                 }
                 catch (Exception ex)
                 {
+                    item.IsJobStarted = false;
                     _notification.ShowError(ex.Message);
                 }
             };