1. Top priority: When stopping job (stop button), the system cannot run again (notes it is still printing). Disconnectconnect solves

2. Dispenser manual control (tech bord)
a. Add Color and name to the dispenser controller at the tech-bord
b. Homing dosnt work on the tech-bord controller
c. When moving the courser from the icon while still pushing and then removing the finger, the motor still running
d. Limit sw are not activated in manual dispenser jogging
3. Read dispenser pressure manually separately for each dispenser
4. High priority: Dispenser pressure is presented in PSI (that’s what written..) ?? I am not sure that the formula is correct even for PSI..
5. TI is calculated in the job by factor and not by min uptake (factor for TI is meaningless)
6. Top priority: TI dispensing amounts are constant: Changing TI amounts by factor did not change the total amount of dispensing (tested by flow sensor)
7. I would like to monitor (tech bord) the RPM or pulse rate of all possible motors (priority: thread system, dispensers, others)
8. I would like to monitor (tech bord) the status of the 3Wvalves of the dispensers (open / close)
9. Top priority: Cannot read head temperatures

10 files changed, 40 insertions, 48 deletions

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 6d10e910e..1b96b27ce 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
@@ -753,7 +753,11 @@
 
                                                                                                                         <TextBlock VerticalAlignment="Center" Margin="40 0 0 0" FontSize="16" FontStyle="Italic" Foreground="Gray">
                                                                                                                             <Run>Total:</Run>
-                                                                                                                            <Run Text="{Binding LiquidVolumesSum,Mode=OneWay,StringFormat=0}"></Run>
+                                                                                                                            <Run Text="{Binding TotalLiquidVolume,Mode=OneWay,StringFormat=0}"></Run><Run>%</Run>
+                                                                                                                            <Run>(</Run>
+                                                                                                                            <Run FontSize="10" Text="{Binding TotalLiquidNanoliterPerCentimeter,Mode=OneWay,StringFormat=0.00}"></Run>
+                                                                                                                            <Run FontSize="12">nl</Run>
+                                                                                                                            <Run>)</Run>
                                                                                                                         </TextBlock>
                                                                                                                     </StackPanel>
                                                                                                                 </Setter.Value>
@@ -1000,7 +1004,7 @@
                                                                                                                             <DataGridTemplateColumn.CellTemplate>
                                                                                                                                 <DataTemplate>
                                                                                                                                     <TextBlock VerticalAlignment="Center">
-                                                                                                                        <Run Text="{Binding IdsPack.DispenserType.NlPerPulse,StringFormat='0.0'}"></Run>
+                                                                                                                        <Run Text="{Binding IdsPack.DispenserType.NlPerPulse,StringFormat='0.00'}"></Run>
                                                                                                                         <Run Text="(nl)" FontSize="9" Foreground="Gray"></Run>
                                                                                                                                     </TextBlock>
                                                                                                                                 </DataTemplate>
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Properties/AssemblyInfo.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Properties/AssemblyInfo.cs
index e02b63000..0b487828b 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Properties/AssemblyInfo.cs
@@ -5,7 +5,7 @@ using System.Runtime.InteropServices;
 using System.Windows;
 
 [assembly: AssemblyTitle("Tango - Machine Studio Logging Module")]
-[assembly: AssemblyVersion("2.0.12.1034")]
+[assembly: AssemblyVersion("2.0.13.1537")]
 
 [assembly: ComVisible(false)]
 
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/DispenserElementEditor.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/DispenserElementEditor.xaml
index f1ead0cad..81ddfd184 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/DispenserElementEditor.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/DispenserElementEditor.xaml
@@ -241,7 +241,7 @@
         <!--Content-->
         <Grid>
             <Border Margin="0 0 0 -23" VerticalAlignment="Bottom">
-                <TextBlock Text="{Binding TechDispenser.Description}" FontSize="14" Foreground="DimGray" HorizontalAlignment="Center"></TextBlock>
+                <TextBlock Text="{Binding DisplayName}" FontSize="14" Foreground="DimGray" HorizontalAlignment="Center"></TextBlock>
             </Border>
         </Grid>
         <!--Content-->
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/DispenserElementEditor.xaml.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/DispenserElementEditor.xaml.cs
index ca686d3e2..037e29b57 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/DispenserElementEditor.xaml.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/DispenserElementEditor.xaml.cs
@@ -117,24 +117,28 @@ namespace Tango.MachineStudio.Technician.Editors
 
         private void OnForwardPressed(object sender, MouseButtonEventArgs e)
         {
+            (e.Source as FrameworkElement).CaptureMouse();
             DispenserItem.RaiseAction(MotorActionType.ForwardPressed);
             AnimateRight();
         }
 
         private void OnForwardReleased(object sender, MouseButtonEventArgs e)
         {
+            (e.Source as FrameworkElement).ReleaseMouseCapture();
             DispenserItem.RaiseAction(MotorActionType.ForwardReleased);
             StopAnimation();
         }
 
         private void OnBackwardPressed(object sender, MouseButtonEventArgs e)
         {
+            (e.Source as FrameworkElement).CaptureMouse();
             DispenserItem.RaiseAction(MotorActionType.BackwardPressed);
             AnimateLeft();
         }
 
         private void OnBackwardReleased(object sender, MouseButtonEventArgs e)
         {
+            (e.Source as FrameworkElement).ReleaseMouseCapture();
             DispenserItem.RaiseAction(MotorActionType.BackwardReleased);
             StopAnimation();
         }
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/MotorElementEditor.xaml.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/MotorElementEditor.xaml.cs
index da65b9ab4..625473521 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/MotorElementEditor.xaml.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/MotorElementEditor.xaml.cs
@@ -117,24 +117,28 @@ namespace Tango.MachineStudio.Technician.Editors
 
         private void OnForwardPressed(object sender, MouseButtonEventArgs e)
         {
+            (e.Source as FrameworkElement).CaptureMouse();
             MotorItem.RaiseAction(MotorActionType.ForwardPressed);
             AnimateRight();
         }
 
         private void OnForwardReleased(object sender, MouseButtonEventArgs e)
         {
+            (e.Source as FrameworkElement).ReleaseMouseCapture();
             MotorItem.RaiseAction(MotorActionType.ForwardReleased);
             StopAnimation();
         }
 
         private void OnBackwardPressed(object sender, MouseButtonEventArgs e)
         {
+            (e.Source as FrameworkElement).CaptureMouse();
             MotorItem.RaiseAction(MotorActionType.BackwardPressed);
             AnimateLeft();
         }
 
         private void OnBackwardReleased(object sender, MouseButtonEventArgs e)
         {
+            (e.Source as FrameworkElement).ReleaseMouseCapture();
             MotorItem.RaiseAction(MotorActionType.BackwardReleased);
             StopAnimation();
         }
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/MotorGroupElementEditor.xaml.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/MotorGroupElementEditor.xaml.cs
index eaee03c2b..5d9954605 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/MotorGroupElementEditor.xaml.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/MotorGroupElementEditor.xaml.cs
@@ -118,24 +118,28 @@ namespace Tango.MachineStudio.Technician.Editors
 
         private void OnForwardPressed(object sender, MouseButtonEventArgs e)
         {
+            (e.Source as FrameworkElement).CaptureMouse();
             MotorGroupItem.RaiseAction(MotorActionType.ForwardPressed);
             AnimateRight();
         }
 
         private void OnForwardReleased(object sender, MouseButtonEventArgs e)
         {
+            (e.Source as FrameworkElement).ReleaseMouseCapture();
             MotorGroupItem.RaiseAction(MotorActionType.ForwardReleased);
             StopAnimation();
         }
 
         private void OnBackwardPressed(object sender, MouseButtonEventArgs e)
         {
+            (e.Source as FrameworkElement).CaptureMouse();
             MotorGroupItem.RaiseAction(MotorActionType.BackwardPressed);
             AnimateLeft();
         }
 
         private void OnBackwardReleased(object sender, MouseButtonEventArgs e)
         {
+            (e.Source as FrameworkElement).ReleaseMouseCapture();
             MotorGroupItem.RaiseAction(MotorActionType.BackwardReleased);
             StopAnimation();
         }
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/ThreadMotionElementEditor.xaml.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/ThreadMotionElementEditor.xaml.cs
index f5565a796..6de37f3a2 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/ThreadMotionElementEditor.xaml.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/ThreadMotionElementEditor.xaml.cs
@@ -105,24 +105,28 @@ namespace Tango.MachineStudio.Technician.Editors
 
         private void OnForwardPressed(object sender, MouseButtonEventArgs e)
         {
+            (e.Source as FrameworkElement).CaptureMouse();
             ThreadMotionItem.RaiseAction(MotorActionType.ForwardPressed);
             AnimateRight();
         }
 
         private void OnForwardReleased(object sender, MouseButtonEventArgs e)
         {
+            (e.Source as FrameworkElement).ReleaseMouseCapture();
             ThreadMotionItem.RaiseAction(MotorActionType.ForwardReleased);
             StopAnimation();
         }
 
         private void OnBackwardPressed(object sender, MouseButtonEventArgs e)
         {
+            (e.Source as FrameworkElement).CaptureMouse();
             ThreadMotionItem.RaiseAction(MotorActionType.BackwardPressed);
             AnimateLeft();
         }
 
         private void OnBackwardReleased(object sender, MouseButtonEventArgs e)
         {
+            (e.Source as FrameworkElement).ReleaseMouseCapture();
             ThreadMotionItem.RaiseAction(MotorActionType.BackwardReleased);
             StopAnimation();
         }
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/PropertiesTemplates/DispenserTemplate.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/PropertiesTemplates/DispenserTemplate.xaml
index df9ebbd4e..d9c0a23e9 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/PropertiesTemplates/DispenserTemplate.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/PropertiesTemplates/DispenserTemplate.xaml
@@ -30,50 +30,10 @@
                 <StackPanel>
                     <TextBlock FontSize="10">Selected Dispenser</TextBlock>
                     <ComboBox Margin="0 5 0 0" ItemsSource="{Binding Adapter.TechDispensers}" SelectedItem="{Binding TechDispenser,Mode=TwoWay}" DisplayMemberPath="Description" />
-                </StackPanel>
-            </GroupBox>
 
-            <GroupBox Header="PARAMETERS" Margin="0 10 0 0">
-                <editors:ParameterizedEditor ParameterizedObject="{Binding DispenserType}" Padding="10">
-                    <editors:ParameterizedEditor.ItemsPanel>
-                        <ItemsPanelTemplate>
-                            <StackPanel></StackPanel>
-                        </ItemsPanelTemplate>
-                    </editors:ParameterizedEditor.ItemsPanel>
-                    <editors:ParameterizedEditor.DoubleTemplate>
-                        <DataTemplate>
-                            <DockPanel>
-                                <mahApps:NumericUpDown  DockPanel.Dock="Right" Background="Transparent" BorderThickness="0 0 0 0" Value="{Binding Value,UpdateSourceTrigger=PropertyChanged}" HasDecimals="True" HorizontalContentAlignment="Center" Width="100" />
-                                <TextBlock Text="{Binding Name}" VerticalAlignment="Center"></TextBlock>
-                            </DockPanel>
-                        </DataTemplate>
-                    </editors:ParameterizedEditor.DoubleTemplate>
-                    <editors:ParameterizedEditor.Int32Template>
-                        <DataTemplate>
-                            <DockPanel>
-                                <DockPanel.Style>
-                                    <Style TargetType="DockPanel">
-                                        <Style.Triggers>
-                                            <DataTrigger Binding="{Binding Name}" Value="Code">
-                                                <Setter Property="Visibility" Value="Collapsed"></Setter>
-                                            </DataTrigger>
-                                        </Style.Triggers>
-                                    </Style>
-                                </DockPanel.Style>
-                                <mahApps:NumericUpDown  DockPanel.Dock="Right" Background="Transparent" BorderThickness="0 0 0 0" Value="{Binding Value,Converter={StaticResource DoubleToIntConverter},UpdateSourceTrigger=PropertyChanged}" HasDecimals="False" HorizontalContentAlignment="Center" Width="100" />
-                                <TextBlock Text="{Binding Name}" VerticalAlignment="Center"></TextBlock>
-                            </DockPanel>
-                        </DataTemplate>
-                    </editors:ParameterizedEditor.Int32Template>
-                    <editors:ParameterizedEditor.BooleanTemplate>
-                        <DataTemplate>
-                            <DockPanel Margin="0 5 0 0">
-                                <ToggleButton DockPanel.Dock="Right"  Width="100" IsChecked="{Binding Value}" HorizontalAlignment="Right" />
-                                <TextBlock Text="{Binding Name}" VerticalAlignment="Center"></TextBlock>
-                            </DockPanel>
-                        </DataTemplate>
-                    </editors:ParameterizedEditor.BooleanTemplate>
-                </editors:ParameterizedEditor>
+                    <TextBlock FontSize="10" Margin="0 30 0 0">Display Name</TextBlock>
+                    <TextBox Margin="0 5 0 0" Text="{Binding DisplayName,UpdateSourceTrigger=PropertyChanged}" />
+                </StackPanel>
             </GroupBox>
 
             <GroupBox Header="COLOR" Margin="0 10 0 0">
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/TechItems/DispenserItem.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/TechItems/DispenserItem.cs
index 573e497d5..5acb2e7e5 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/TechItems/DispenserItem.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/TechItems/DispenserItem.cs
@@ -63,6 +63,7 @@ namespace Tango.MachineStudio.Technician.TechItems
                 if (_techDispenser != null)
                 {
                     DispenserType = DispenserTypes.SingleOrDefault(x => x.Code == int.Parse(_techDispenser.Name.Replace("Dispenser", "")) - 1);
+                    DisplayName = _techDispenser.Description;
                 }
             }
         }
@@ -149,6 +150,16 @@ namespace Tango.MachineStudio.Technician.TechItems
             set { _speed = value; RaisePropertyChangedAuto(); }
         }
 
+        private String _displayName;
+        /// <summary>
+        /// Gets or sets the display name.
+        /// </summary>
+        public String DisplayName
+        {
+            get { return _displayName; }
+            set { _displayName = value; RaisePropertyChangedAuto(); }
+        }
+
         /// <summary>
         /// Initializes a new instance of the <see cref="DispenserItem"/> class.
         /// </summary>
@@ -178,6 +189,7 @@ namespace Tango.MachineStudio.Technician.TechItems
         {
             DispenserItem cloned = base.Clone() as DispenserItem;
             cloned.TechDispenser = TechDispenser;
+            cloned.DisplayName = DisplayName;
             return cloned;
         }
 
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Properties/AssemblyInfo.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Properties/AssemblyInfo.cs
index a8f1af061..922153823 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Properties/AssemblyInfo.cs
@@ -5,7 +5,7 @@ using System.Runtime.InteropServices;
 using System.Windows;
 
 [assembly: AssemblyTitle("Tango - Machine Studio Common Components")]
-[assembly: AssemblyVersion("2.0.20.1034")]
+[assembly: AssemblyVersion("2.0.21.1537")]
 [assembly: ComVisible(false)]
 
 [assembly:ThemeInfo(