From 484b966beb91cd2112433aff48b873fedd19f8f8 Mon Sep 17 00:00:00 2001
From: Roy Ben-Shabat <Roy@Twine-s.com>
Date: Mon, 17 Sep 2018 10:38:38 +0300
Subject: Added IDS Pack Index + 1 Display.

---
 .../Modules/Tango.MachineStudio.Developer/Views/JobView.xaml           | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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

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 ba7c80f5b..de6532511 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
@@ -71,6 +71,7 @@
         <converters:EnumToDescriptionConverter x:Key="EnumToDescriptionConverter" />
         <converters:IsNotConverter x:Key="IsNotConverter" />
         <converters:ObjectToObjectTypeConverter x:Key="ObjectToObjectTypeConverter" />
+        <converters:MathOperatorConverter x:Key="MathOperatorConverter" />
 
 
         <ObjectDataProvider x:Key="dispenserDivisions" MethodName="GetValues" ObjectType="{x:Type sys:Enum}">
@@ -1001,7 +1002,7 @@
                                                                                                                         <DataGridTemplateColumn Header="IDX">
                                                                                                                             <DataGridTemplateColumn.CellTemplate>
                                                                                                                                 <DataTemplate>
-                                                                                                                                    <TextBlock Text="{Binding IdsPack.PackIndex}" VerticalAlignment="Center" HorizontalAlignment="Center" />
+                                                                                                                                    <TextBlock Text="{Binding IdsPack.PackIndex,Converter={StaticResource MathOperatorConverter},ConverterParameter='+1'}" VerticalAlignment="Center" HorizontalAlignment="Center" />
                                                                                                                                 </DataTemplate>
                                                                                                                             </DataGridTemplateColumn.CellTemplate>
                                                                                                                         </DataGridTemplateColumn>
-- 
cgit v1.3.1


From de2b8a223b4fa65e085fbc0995e521ddba4e9335 Mon Sep 17 00:00:00 2001
From: Roy Ben-Shabat <Roy@Twine-s.com>
Date: Mon, 17 Sep 2018 11:23:05 +0300
Subject: Moved Lubricant to the right.

---
 Software/DB/Tango.mdf                              | Bin 75497472 -> 75497472 bytes
 Software/DB/Tango_log.ldf                          | Bin 15400960 -> 15400960 bytes
 .../LiquidVolumesToLubricantLiquidVolume.cs        |  26 +++++++++
 .../Tango.MachineStudio.Developer.csproj           |   3 +-
 .../Views/JobView.xaml                             |  60 +++++++++++++++++----
 5 files changed, 77 insertions(+), 12 deletions(-)
 create mode 100644 Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Converters/LiquidVolumesToLubricantLiquidVolume.cs

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

diff --git a/Software/DB/Tango.mdf b/Software/DB/Tango.mdf
index 6340f8597..258c3e0f9 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 246f23c64..0a0e39957 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.Developer/Converters/LiquidVolumesToLubricantLiquidVolume.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Converters/LiquidVolumesToLubricantLiquidVolume.cs
new file mode 100644
index 000000000..e59141e7f
--- /dev/null
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Converters/LiquidVolumesToLubricantLiquidVolume.cs
@@ -0,0 +1,26 @@
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Data;
+using Tango.BL;
+using Tango.BL.Enumerations;
+
+namespace Tango.MachineStudio.Developer.Converters
+{
+    public class LiquidVolumesToLubricantLiquidVolume : IValueConverter
+    {
+        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            IEnumerable<LiquidVolume> liquid_volumes = value as IEnumerable<LiquidVolume>;
+            return liquid_volumes.SingleOrDefault(x => x.IdsPack.IdsPackFormula.Code == IdsPackFormulas.Lubricant.ToInt32());
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            throw new NotImplementedException();
+        }
+    }
+}
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Tango.MachineStudio.Developer.csproj b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Tango.MachineStudio.Developer.csproj
index dc96f7112..cbaec81eb 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Tango.MachineStudio.Developer.csproj
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Tango.MachineStudio.Developer.csproj
@@ -102,6 +102,7 @@
     <Compile Include="Converters\InkVolumeToLiquidRmlFactor.cs" />
     <Compile Include="Converters\JobProgressToPositionConverter.cs" />
     <Compile Include="Converters\JobToColumnDefinitionsConverter.cs" />
+    <Compile Include="Converters\LiquidVolumesToLubricantLiquidVolume.cs" />
     <Compile Include="Converters\MillisecondsToTimeSpanConverter.cs" />
     <Compile Include="Converters\ObjectsNotEqualToBooleanConveter.cs" />
     <Compile Include="Converters\OneToPercentConverter.cs" />
@@ -359,7 +360,7 @@
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <ProjectExtensions>
     <VisualStudio>
-      <UserProperties BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UseGlobalSettings="False" BuildVersion_StartDate="2000/1/1" />
+      <UserProperties BuildVersion_StartDate="2000/1/1" BuildVersion_UseGlobalSettings="False" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" />
     </VisualStudio>
   </ProjectExtensions>
 </Project>
\ No newline at end of file
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 de6532511..06e8648e8 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
@@ -72,6 +72,7 @@
         <converters:IsNotConverter x:Key="IsNotConverter" />
         <converters:ObjectToObjectTypeConverter x:Key="ObjectToObjectTypeConverter" />
         <converters:MathOperatorConverter x:Key="MathOperatorConverter" />
+        <localConverters:LiquidVolumesToLubricantLiquidVolume x:Key="LiquidVolumesToLubricantLiquidVolume" />
 
 
         <ObjectDataProvider x:Key="dispenserDivisions" MethodName="GetValues" ObjectType="{x:Type sys:Enum}">
@@ -730,16 +731,28 @@
                                                                                                                                 </ItemsControl.ItemsPanel>
                                                                                                                                 <ItemsControl.ItemTemplate>
                                                                                                                                     <DataTemplate>
-                                                                                                                                        <ContentControl Focusable="False" Style="{StaticResource numberBorder}" Width="60" Height="60" Margin="10 0 0 0">
-                                                                                                                                            <ContentControl.Foreground>
-                                                                                                                                                <SolidColorBrush Color="{Binding IdsPack.LiquidType.Color,Converter={StaticResource ColorToIntegerConverter}}"></SolidColorBrush>
-                                                                                                                                            </ContentControl.Foreground>
-                                                                                                                                            <mahapps:NumericUpDown FontSize="{StaticResource NumbersFontSize}" FontFamily="{StaticResource digital-7}" HorizontalAlignment="Center" Value="{Binding Volume, Mode=TwoWay}" Background="Transparent" Width="40" StringFormat="0" HideUpDownButtons="True" Minimum="0" Maximum="1000" InterceptArrowKeys="True" BorderThickness="0" InterceptMouseWheel="True" HasDecimals="True" HorizontalContentAlignment="Center">
-                                                                                                                                                <mahapps:NumericUpDown.Resources>
-                                                                                                                                                    <StaticResource ResourceKey="SelectAllTextBoxResource"></StaticResource>
-                                                                                                                                                </mahapps:NumericUpDown.Resources>
-                                                                                                                                            </mahapps:NumericUpDown>
-                                                                                                                                        </ContentControl>
+                                                                                                                                        <Border Width="60" Height="60">
+                                                                                                                                            <Border.Style>
+                                                                                                                                                <Style TargetType="Border">
+                                                                                                                                                    <Setter Property="Visibility" Value="Visible"></Setter>
+                                                                                                                                                    <Style.Triggers>
+                                                                                                                                                        <DataTrigger Binding="{Binding IdsPack.IdsPackFormula.Name}" Value="Lubricant">
+                                                                                                                                                            <Setter Property="Visibility" Value="Collapsed"></Setter>
+                                                                                                                                                        </DataTrigger>
+                                                                                                                                                    </Style.Triggers>
+                                                                                                                                                </Style>
+                                                                                                                                            </Border.Style>
+                                                                                                                                            <ContentControl Focusable="False" Style="{StaticResource numberBorder}" Margin="10 0 0 0">
+                                                                                                                                                <ContentControl.Foreground>
+                                                                                                                                                    <SolidColorBrush Color="{Binding IdsPack.LiquidType.Color,Converter={StaticResource ColorToIntegerConverter}}"></SolidColorBrush>
+                                                                                                                                                </ContentControl.Foreground>
+                                                                                                                                                <mahapps:NumericUpDown FontSize="{StaticResource NumbersFontSize}" FontFamily="{StaticResource digital-7}" HorizontalAlignment="Center" Value="{Binding Volume, Mode=TwoWay}" Background="Transparent" Width="40" StringFormat="0" HideUpDownButtons="True" Minimum="0" Maximum="1000" InterceptArrowKeys="True" BorderThickness="0" InterceptMouseWheel="True" HasDecimals="True" HorizontalContentAlignment="Center">
+                                                                                                                                                    <mahapps:NumericUpDown.Resources>
+                                                                                                                                                        <StaticResource ResourceKey="SelectAllTextBoxResource"></StaticResource>
+                                                                                                                                                    </mahapps:NumericUpDown.Resources>
+                                                                                                                                                </mahapps:NumericUpDown>
+                                                                                                                                            </ContentControl>
+                                                                                                                                        </Border>
                                                                                                                                     </DataTemplate>
                                                                                                                                 </ItemsControl.ItemTemplate>
                                                                                                                             </ItemsControl>
@@ -750,7 +763,9 @@
                                                                                                                             </StackPanel>
                                                                                                                         </StackPanel>
 
-                                                                                                                        <TextBlock VerticalAlignment="Center" Margin="40 0 0 0" FontSize="16" FontStyle="Italic" Foreground="Gray">
+                                                                                                                        <materialDesign:PackIcon Kind="ChevronDoubleLeft" Margin="40 2 0 0" VerticalAlignment="Center" Foreground="Gray" />
+
+                                                                                                                        <TextBlock VerticalAlignment="Center" FontSize="16" Margin="5 0 0 0" FontStyle="Italic" Foreground="Gray">
                                                                                                                             <Run>Total:</Run>
                                                                                                                             <Run Text="{Binding TotalLiquidVolume,Mode=OneWay,StringFormat=0}"></Run><Run>%</Run>
                                                                                                                             <Run>(</Run>
@@ -758,6 +773,29 @@
                                                                                                                             <Run FontSize="12">nl</Run>
                                                                                                                             <Run>)</Run>
                                                                                                                         </TextBlock>
+
+                                                                                                                        <Border Margin="60 0 0 0" DataContext="{Binding LiquidVolumes,Converter={StaticResource LiquidVolumesToLubricantLiquidVolume}}" Width="55" Height="55" BorderBrush="#E6E6E6" BorderThickness="1 0 0 0">
+                                                                                                                            <Border.Style>
+                                                                                                                                <Style TargetType="Border">
+                                                                                                                                    <Setter Property="Visibility" Value="Collapsed"></Setter>
+                                                                                                                                    <Style.Triggers>
+                                                                                                                                        <DataTrigger Binding="{Binding Converter={StaticResource NullObjectToBooleanConverter}}" Value="True">
+                                                                                                                                            <Setter Property="Visibility" Value="Visible"></Setter>
+                                                                                                                                        </DataTrigger>
+                                                                                                                                    </Style.Triggers>
+                                                                                                                                </Style>
+                                                                                                                            </Border.Style>
+                                                                                                                            <ContentControl Focusable="False" Style="{StaticResource numberBorder}" Margin="10 0 0 0">
+                                                                                                                                <ContentControl.Foreground>
+                                                                                                                                    <SolidColorBrush Color="{Binding IdsPack.LiquidType.Color,Converter={StaticResource ColorToIntegerConverter}}"></SolidColorBrush>
+                                                                                                                                </ContentControl.Foreground>
+                                                                                                                                <mahapps:NumericUpDown Foreground="#515151"  FontSize="20" FontFamily="{StaticResource digital-7}" HorizontalAlignment="Center" Value="{Binding Volume, Mode=TwoWay}" Background="Transparent" Width="40" StringFormat="0" HideUpDownButtons="True" Minimum="0" Maximum="1000" InterceptArrowKeys="True" BorderThickness="0" InterceptMouseWheel="True" HasDecimals="True" HorizontalContentAlignment="Center">
+                                                                                                                                    <mahapps:NumericUpDown.Resources>
+                                                                                                                                        <StaticResource ResourceKey="SelectAllTextBoxResource"></StaticResource>
+                                                                                                                                    </mahapps:NumericUpDown.Resources>
+                                                                                                                                </mahapps:NumericUpDown>
+                                                                                                                            </ContentControl>
+                                                                                                                        </Border>
                                                                                                                     </StackPanel>
                                                                                                                 </Setter.Value>
                                                                                                             </Setter>
-- 
cgit v1.3.1


From 02263b893b1366b084cf1b2358920dc195cfac01 Mon Sep 17 00:00:00 2001
From: Roy Ben-Shabat <Roy@Twine-s.com>
Date: Mon, 17 Sep 2018 12:01:45 +0300
Subject: Implemented Segments Names Editing.

---
 Software/DB/Tango.mdf                              | Bin 75497472 -> 75497472 bytes
 Software/DB/Tango_log.ldf                          | Bin 15400960 -> 15400960 bytes
 .../ViewModels/MainViewVM.cs                       |   2 +-
 .../Views/JobView.xaml                             |  30 ++++++++++++++-------
 4 files changed, 21 insertions(+), 11 deletions(-)

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

diff --git a/Software/DB/Tango.mdf b/Software/DB/Tango.mdf
index 258c3e0f9..0c2e076fc 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 0a0e39957..b728cc30f 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.Developer/ViewModels/MainViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs
index e04b1539a..bf6a6ecbc 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs
@@ -1810,7 +1810,7 @@ namespace Tango.MachineStudio.Developer.ViewModels
                 LogManager.LogFormat("Adding new segment to job {0}...", ActiveJob.Name);
                 Segment seg = new Segment();
                 seg.Job = ActiveJob;
-                seg.Name = "Untitled Segment";
+                seg.Name = "SEGMENT";
                 seg.Length = 10;
 
                 if (ActiveJob.Segments.Count > 0)
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 06e8648e8..1f2e9294d 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
@@ -353,11 +353,6 @@
                                             </Polygon>
                                             <Border Height="100" Padding="5" IsHitTestVisible="False">
                                                 <Grid>
-                                                    <TextBlock HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="16" FontStyle="Italic">
-                                                <Run>#</Run>
-                                                <Run>SEGMENT</Run>
-                                                <Run Text="{Binding SegmentIndex}"></Run>
-                                                    </TextBlock>
                                                     <Rectangle VerticalAlignment="Bottom" Height="8">
                                                         <Rectangle.Fill>
                                                             <MultiBinding Converter="{StaticResource SegmentToBrushConverterMulti}">
@@ -371,6 +366,21 @@
                                                 </Grid>
                                             </Border>
 
+                                            <Grid Margin="20 10 10 10" TextElement.FontSize="16" TextElement.FontStyle="Italic" >
+                                                <Grid.ColumnDefinitions>
+                                                    <ColumnDefinition Width="Auto" />
+                                                    <ColumnDefinition Width="1*" />
+                                                </Grid.ColumnDefinitions>
+
+                                                <StackPanel Orientation="Horizontal" VerticalAlignment="Center">
+                                                    <TextBlock FontWeight="SemiBold">#</TextBlock>
+                                                    <TextBlock FontWeight="SemiBold" Margin="5 0 0 0" Text="{Binding SegmentIndex}"></TextBlock>
+                                                </StackPanel>
+
+
+                                                <TextBox Grid.Column="1" VerticalAlignment="Center" Width="200" HorizontalContentAlignment="Center" Style="{x:Null}" BorderThickness="0" Background="Transparent" Text="{Binding Name}"></TextBox>
+                                            </Grid>
+
                                         </Grid>
                                     </DataTemplate>
                                 </ListBox.ItemTemplate>
@@ -731,7 +741,7 @@
                                                                                                                                 </ItemsControl.ItemsPanel>
                                                                                                                                 <ItemsControl.ItemTemplate>
                                                                                                                                     <DataTemplate>
-                                                                                                                                        <Border Width="60" Height="60">
+                                                                                                                                        <Border>
                                                                                                                                             <Border.Style>
                                                                                                                                                 <Style TargetType="Border">
                                                                                                                                                     <Setter Property="Visibility" Value="Visible"></Setter>
@@ -742,7 +752,7 @@
                                                                                                                                                     </Style.Triggers>
                                                                                                                                                 </Style>
                                                                                                                                             </Border.Style>
-                                                                                                                                            <ContentControl Focusable="False" Style="{StaticResource numberBorder}" Margin="10 0 0 0">
+                                                                                                                                            <ContentControl Focusable="False" Style="{StaticResource numberBorder}" Margin="10 0 0 0" Width="60" Height="60">
                                                                                                                                                 <ContentControl.Foreground>
                                                                                                                                                     <SolidColorBrush Color="{Binding IdsPack.LiquidType.Color,Converter={StaticResource ColorToIntegerConverter}}"></SolidColorBrush>
                                                                                                                                                 </ContentControl.Foreground>
@@ -774,7 +784,7 @@
                                                                                                                             <Run>)</Run>
                                                                                                                         </TextBlock>
 
-                                                                                                                        <Border Margin="60 0 0 0" DataContext="{Binding LiquidVolumes,Converter={StaticResource LiquidVolumesToLubricantLiquidVolume}}" Width="55" Height="55" BorderBrush="#E6E6E6" BorderThickness="1 0 0 0">
+                                                                                                                        <Border Margin="60 0 0 0" DataContext="{Binding LiquidVolumes,Converter={StaticResource LiquidVolumesToLubricantLiquidVolume}}" BorderBrush="#E6E6E6" BorderThickness="1 0 0 0">
                                                                                                                             <Border.Style>
                                                                                                                                 <Style TargetType="Border">
                                                                                                                                     <Setter Property="Visibility" Value="Collapsed"></Setter>
@@ -785,7 +795,7 @@
                                                                                                                                     </Style.Triggers>
                                                                                                                                 </Style>
                                                                                                                             </Border.Style>
-                                                                                                                            <ContentControl Focusable="False" Style="{StaticResource numberBorder}" Margin="10 0 0 0">
+                                                                                                                            <ContentControl Focusable="False" Style="{StaticResource numberBorder}" Margin="10 0 0 0" Width="55" Height="55">
                                                                                                                                 <ContentControl.Foreground>
                                                                                                                                     <SolidColorBrush Color="{Binding IdsPack.LiquidType.Color,Converter={StaticResource ColorToIntegerConverter}}"></SolidColorBrush>
                                                                                                                                 </ContentControl.Foreground>
@@ -1558,7 +1568,7 @@
                 <Button Background="Transparent" Command="{Binding ToggleSideBarCommand}" Padding="0" Style="{StaticResource MaterialDesignFlatButton}" HorizontalContentAlignment="Stretch" VerticalContentAlignment="Stretch" HorizontalAlignment="Right" VerticalAlignment="Center" Height="200" Width="50" Margin="0 0 -50 0">
                     <Border Background="#F1F1F1" CornerRadius="0 10 10 0" BorderThickness="0 1 1 1" BorderBrush="#383838">
                         <Grid>
-                            <TextBlock Foreground="#FF7272" Text="CONFIGURATION" FontSize="16" RenderTransformOrigin="0.5,0.5" VerticalAlignment="Center" HorizontalAlignment="Center">
+                            <TextBlock Foreground="#FF7272" Text="PROCESS PARAMETERS" FontSize="16" RenderTransformOrigin="0.5,0.5" VerticalAlignment="Center" HorizontalAlignment="Center">
                                 <TextBlock.LayoutTransform>
                                     <RotateTransform Angle="270"></RotateTransform>
                                 </TextBlock.LayoutTransform>
-- 
cgit v1.3.1


From 936f105cf65f1efa7b27cea08080c183f2679568 Mon Sep 17 00:00:00 2001
From: Roy Ben-Shabat <Roy@Twine-s.com>
Date: Mon, 17 Sep 2018 15:32:09 +0300
Subject: Added all segments progress to job status and machine studio running
 job.

---
 Software/DB/Tango.mdf                              | Bin 75497472 -> 75497472 bytes
 Software/DB/Tango_log.ldf                          | Bin 15400960 -> 15400960 bytes
 .../Views/RunningJobView.xaml                      | 100 +++++++++++++++++++--
 .../Views/RunningJobView.xaml.cs                   |   8 ++
 .../Tango.BL/EntitiesExtensions/Job.cs             |   1 +
 .../Tango.BL/EntitiesExtensions/Segment.cs         |  32 +++++++
 .../Tango.Integration/Operation/JobHandler.cs      |  74 +++++++++++++++
 .../Operation/RunningJobStatus.cs                  |  21 +++++
 8 files changed, 230 insertions(+), 6 deletions(-)

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

diff --git a/Software/DB/Tango.mdf b/Software/DB/Tango.mdf
index 0c2e076fc..975ee7c4e 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 b728cc30f..0802f5f6f 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.Developer/Views/RunningJobView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/RunningJobView.xaml
index 11c60c1ef..fe04cead7 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/RunningJobView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/RunningJobView.xaml
@@ -14,15 +14,103 @@
     <UserControl.Resources>
         <converters:DateTimeUTCToStringConverter x:Key="DateTimeUTCToStringConverter" />
     </UserControl.Resources>
-    
-    <Grid>
-        <Grid Margin="40">
+
+    <Grid  Margin="40">
+        <Grid.RowDefinitions>
+            <RowDefinition Height="900*" MinHeight="50" />
+            <RowDefinition Height="5"/>
+            <RowDefinition Height="743*" MinHeight="170"/>
+        </Grid.RowDefinitions>
+
+        <Grid>
             <DockPanel>
-                <StackPanel Margin="0 20 0 0" Orientation="Horizontal" DockPanel.Dock="Top">
-                    <materialDesign:PackIcon Kind="Settings" Width="60" Height="60" />
-                    <TextBlock FontSize="30" FontWeight="SemiBold" VerticalAlignment="Center" Margin="10 0 0 0">Job Status</TextBlock>
+                <StackPanel Margin="0 0 0 0" Orientation="Horizontal" DockPanel.Dock="Top">
+                    <materialDesign:PackIcon Kind="Settings" Width="40" Height="40" />
+                    <TextBlock FontSize="30" FontWeight="SemiBold" VerticalAlignment="Center" Margin="10 0 0 0">Status</TextBlock>
                 </StackPanel>
+                <DataGrid x:Name="gridSegments" SelectionMode="Single" SelectionChanged="DataGrid_SelectionChanged" SelectionUnit="FullRow" RowHeight="40" GridLinesVisibility="None" ItemsSource="{Binding RunningJobStatus.Segments}" IsSynchronizedWithCurrentItem="True" SelectedItem="{Binding RunningJobStatus.CurrentSegment}" Background="Transparent" CanUserAddRows="False" CanUserDeleteRows="False" CanUserReorderColumns="False" CanUserResizeColumns="False" CanUserResizeRows="False" IsReadOnly="True" AutoGenerateColumns="False">
+                    <DataGrid.RowStyle>
+                        <Style TargetType="DataGridRow" BasedOn="{StaticResource {x:Type DataGridRow}}">
+                            <Style.Triggers>
+                                <Trigger Property="IsSelected" Value="True">
+                                    <Setter Property="Foreground" Value="White"></Setter>
+                                    <Setter Property="Background">
+                                        <Setter.Value>
+                                            <LinearGradientBrush StartPoint="0,0.5" EndPoint="1,0.5">
+                                                <GradientStop Color="#FFFF7A7A"/>
+                                                <GradientStop Color="Transparent" Offset="1"/>
+                                            </LinearGradientBrush>
+                                        </Setter.Value>
+                                    </Setter>
+                                    <Setter Property="BorderThickness" Value="1"></Setter>
+                                    <Setter Property="BorderBrush" Value="White"></Setter>
+                                </Trigger>
+                            </Style.Triggers>
+                        </Style>
+                    </DataGrid.RowStyle>
+                    <DataGrid.CellStyle>
+                        <Style TargetType="DataGridCell" BasedOn="{StaticResource {x:Type DataGridCell}}">
+                            <Setter Property="BorderThickness" Value="0"/>
+                            <Setter Property="FocusVisualStyle" Value="{x:Null}"/>
+                            <Setter Property="VerticalContentAlignment" Value="Center"></Setter>
+                            <Style.Triggers>
+                                <Trigger Property="IsSelected" Value="True">
+                                    <Setter Property="Background" Value="Transparent"></Setter>
+                                    <Setter Property="Foreground" Value="White"></Setter>
+                                </Trigger>
+                            </Style.Triggers>
+                        </Style>
+                    </DataGrid.CellStyle>
+                    <DataGrid.Columns>
+                        <DataGridTextColumn Width="Auto" Header="#" Binding="{Binding SegmentIndex}" />
+                        <DataGridTemplateColumn Header="Status">
+                            <DataGridTemplateColumn.CellTemplate>
+                                <DataTemplate>
+                                    <materialDesign:PackIcon VerticalAlignment="Center" HorizontalAlignment="Center">
+                                        <materialDesign:PackIcon.Style>
+                                            <Style TargetType="materialDesign:PackIcon">
+                                                <Setter Property="Kind" Value="PauseCircle"></Setter>
+                                                <Setter Property="Foreground" Value="Gray"></Setter>
+                                                <Style.Triggers>
+                                                    <DataTrigger Binding="{Binding Started}" Value="True">
+                                                        <Setter Property="Kind" Value="ClockFast"></Setter>
+                                                        <Setter Property="Foreground" Value="White"></Setter>
+                                                    </DataTrigger>
+                                                    <DataTrigger Binding="{Binding Completed}" Value="True">
+                                                        <Setter Property="Kind" Value="CheckCircle"></Setter>
+                                                        <Setter Property="Foreground" Value="#29B31D"></Setter>
+                                                    </DataTrigger>
+                                                </Style.Triggers>
+                                            </Style>
+                                        </materialDesign:PackIcon.Style>
+                                    </materialDesign:PackIcon>
+                                </DataTemplate>
+                            </DataGridTemplateColumn.CellTemplate>
+                        </DataGridTemplateColumn>
+                        <DataGridTemplateColumn>
+                            <DataGridTemplateColumn.CellTemplate>
+                                <DataTemplate>
+                                    <Rectangle Width="80" Fill="{Binding SegmentBrush}" Stroke="Gray"></Rectangle>
+                                </DataTemplate>
+                            </DataGridTemplateColumn.CellTemplate>
+                        </DataGridTemplateColumn>
+                        <DataGridTextColumn Header="Name" Binding="{Binding Name}" />
+                        <DataGridTextColumn Header="Length" Binding="{Binding Length,StringFormat={}{0:F2} m}" />
+                        <DataGridTextColumn Header="Progress" Binding="{Binding Progress,StringFormat={}{0:F2} m}" />
+                        <DataGridTextColumn Header="Estimated Duration" Binding="{Binding EstimatedDuration,StringFormat='hh\\:mm\\:ss'}" />
+                        <DataGridTextColumn Header="Remaining Time" Binding="{Binding RemainingTime,StringFormat='hh\\:mm\\:ss'}" />
+                    </DataGrid.Columns>
+                </DataGrid>
+            </DockPanel>
+        </Grid>
 
+        <GridSplitter Grid.Row="1" VerticalAlignment="Center" HorizontalAlignment="Stretch" Height="5" Background="Black" />
+        <Grid Grid.Row="2" Margin="0 40 0 0">
+            <DockPanel>
+                <StackPanel Margin="0 0 0 0" Orientation="Horizontal" DockPanel.Dock="Top">
+                    <materialDesign:PackIcon Kind="Settings" Width="40" Height="40" />
+                    <TextBlock FontSize="30" FontWeight="SemiBold" VerticalAlignment="Center" Margin="10 0 0 0">Events</TextBlock>
+                </StackPanel>
                 <Grid DockPanel.Dock="Bottom" Height="40">
                     <StackPanel Orientation="Horizontal" HorizontalAlignment="Right" Margin="0 0 0 0">
                         <Button Command="{Binding BackToJobCommand}" Style="{StaticResource MaterialDesignFlatButton}" FontSize="16">
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/RunningJobView.xaml.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/RunningJobView.xaml.cs
index 74ace554e..5579870f6 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/RunningJobView.xaml.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/RunningJobView.xaml.cs
@@ -24,5 +24,13 @@ namespace Tango.MachineStudio.Developer.Views
         {
             InitializeComponent();
         }
+
+        private void DataGrid_SelectionChanged(object sender, SelectionChangedEventArgs e)
+        {
+            if (gridSegments.SelectedItem != null)
+            {
+                gridSegments.ScrollIntoView(gridSegments.SelectedItem);
+            }
+        }
     }
 }
diff --git a/Software/Visual_Studio/Tango.BL/EntitiesExtensions/Job.cs b/Software/Visual_Studio/Tango.BL/EntitiesExtensions/Job.cs
index d71658317..9ec711857 100644
--- a/Software/Visual_Studio/Tango.BL/EntitiesExtensions/Job.cs
+++ b/Software/Visual_Studio/Tango.BL/EntitiesExtensions/Job.cs
@@ -488,6 +488,7 @@ namespace Tango.BL.Entities
             {
                 IsInterSegment = true,
                 Length = length,
+                Name = "Inter Segment",
                 BrushStops = new SynchronizedObservableCollection<BrushStop>()
                             {
                                 new BrushStop()
diff --git a/Software/Visual_Studio/Tango.BL/EntitiesExtensions/Segment.cs b/Software/Visual_Studio/Tango.BL/EntitiesExtensions/Segment.cs
index 653f0cf07..e2c919938 100644
--- a/Software/Visual_Studio/Tango.BL/EntitiesExtensions/Segment.cs
+++ b/Software/Visual_Studio/Tango.BL/EntitiesExtensions/Segment.cs
@@ -83,6 +83,24 @@ namespace Tango.BL.Entities
             set { _remainingTime = value; RaisePropertyChangedAuto(); }
         }
 
+        private TimeSpan _estimatedDuration;
+        [NotMapped]
+        [JsonIgnore]
+        public TimeSpan EstimatedDuration
+        {
+            get { return _estimatedDuration; }
+            set { _estimatedDuration = value; }
+        }
+
+        private double _progress;
+        [NotMapped]
+        [JsonIgnore]
+        public double Progress
+        {
+            get { return _progress; }
+            set { _progress = value; RaisePropertyChangedAuto(); }
+        }
+
         private bool _started;
         [NotMapped]
         [JsonIgnore]
@@ -278,5 +296,19 @@ namespace Tango.BL.Entities
 
             return stop;
         }
+
+        /// <summary>
+        /// Gets the duration estimation for this job.
+        /// </summary>
+        /// <param name="processParameters">The process parameters.</param>
+        /// <returns></returns>
+        public TimeSpan GetEstimatedDuration(ProcessParametersTable processParameters)
+        {
+            if (processParameters.DyeingSpeed == 0)
+            {
+                throw new ArgumentException("Process parameters dying speed cannot be zero.");
+            }
+            return TimeSpan.FromSeconds(Length / (processParameters.DyeingSpeed / 100d));
+        }
     }
 }
diff --git a/Software/Visual_Studio/Tango.Integration/Operation/JobHandler.cs b/Software/Visual_Studio/Tango.Integration/Operation/JobHandler.cs
index 0ccc67abb..019ca368a 100644
--- a/Software/Visual_Studio/Tango.Integration/Operation/JobHandler.cs
+++ b/Software/Visual_Studio/Tango.Integration/Operation/JobHandler.cs
@@ -161,6 +161,36 @@ namespace Tango.Integration.Operation
             {
                 Status.CurrentUnitSegments.Add(Job.CreateInterSegment(Job.InterSegmentLength));
             }
+
+            //Create all segments
+            int segment_index = 1;
+
+            for (int j = 0; j < Job.NumberOfUnits; j++)
+            {
+                for (int i = 0; i < _effectiveSegments.Count; i++)
+                {
+                    Segment seg = _effectiveSegments[i].Clone();
+                    seg.EstimatedDuration = seg.GetEstimatedDuration(processParameters);
+                    seg.SegmentIndex = segment_index++;
+                    Status.Segments.Add(seg);
+                }
+
+                if (Job.EnableInterSegment)
+                {
+                    var inter_segment = Job.CreateInterSegment(Job.InterSegmentLength);
+                    inter_segment.SegmentIndex = segment_index++;
+                    Status.Segments.Add(inter_segment);
+                }
+            }
+
+            var last_segment = Status.Segments.Last();
+
+            if (last_segment.IsInterSegment)
+            {
+                Status.Segments.Remove(last_segment);
+            }
+
+            Status.CurrentSegment = Status.Segments.First();
         }
 
         #endregion
@@ -194,6 +224,7 @@ namespace Tango.Integration.Operation
         /// </summary>
         internal void RaiseCompleted()
         {
+            Status.Segments.Last().Completed = true;
             Status.RemainingUnits = 0;
             Status.IsFinalizing = false;
             Status.IsCompleted = true;
@@ -359,6 +390,49 @@ namespace Tango.Integration.Operation
                         segment.RemainingTime = segmentRemainingTime;
                     }
                 }
+
+
+                //Set Segment Completion for All Segments List
+                for (int i = 0; i < Status.Segments.Count; i++)
+                {
+                    Segment segment = Status.Segments[i];
+                    double previousSegmentsLengthWithThis = Status.Segments.Take(i + 1).Sum(x => x.LengthWithFactor);
+                    TimeSpan segmentsDuration = Job.TranslateProgressToTime(previousSegmentsLengthWithThis, ProcessParameters);
+                    TimeSpan segmentRemainingTime = segmentsDuration - Job.TranslateProgressToTime(Status.Progress, ProcessParameters);
+
+                    segment.Progress = Math.Min(Math.Max((previousSegmentsLengthWithThis - segment.Length - Status.Progress) * -1,0),segment.Length);
+
+                    if (i == 0 && Status.Progress > 0)
+                    {
+                        if (!segment.Started)
+                        {
+                            segment.Started = true;
+                            Status.CurrentSegment = segment;
+                        }
+                    }
+
+                    if (Status.Progress >= previousSegmentsLengthWithThis)
+                    {
+                        if (!segment.Completed)
+                        {
+                            segment.Completed = true;
+                        }
+
+                        if (i < Status.Segments.Count - 1)
+                        {
+                            if (!Status.Segments[i + 1].Started)
+                            {
+                                Status.Segments[i + 1].Started = true;
+                                Status.CurrentSegment = Status.Segments[i + 1];
+                            }
+                        }
+                    }
+
+                    if (segment.Started && !segment.Completed)
+                    {
+                        segment.RemainingTime = segmentRemainingTime;
+                    }
+                }
             }
             else
             {
diff --git a/Software/Visual_Studio/Tango.Integration/Operation/RunningJobStatus.cs b/Software/Visual_Studio/Tango.Integration/Operation/RunningJobStatus.cs
index 8d4a79291..b94096813 100644
--- a/Software/Visual_Studio/Tango.Integration/Operation/RunningJobStatus.cs
+++ b/Software/Visual_Studio/Tango.Integration/Operation/RunningJobStatus.cs
@@ -253,12 +253,33 @@ namespace Tango.Integration.Operation
             set { _currentUnitSegments = value; RaisePropertyChangedAuto(); }
         }
 
+        private List<Segment> _segments;
+        /// <summary>
+        /// Gets or sets all job segments.
+        /// </summary>
+        public List<Segment> Segments
+        {
+            get { return _segments; }
+            set { _segments = value; RaisePropertyChangedAuto(); }
+        }
+
+        private Segment _currentSegment;
+        /// <summary>
+        /// Gets or sets the current running segment from the <see cref="Segments"/> collection.
+        /// </summary>
+        public Segment CurrentSegment
+        {
+            get { return _currentSegment; }
+            set { _currentSegment = value; RaisePropertyChangedAuto(); }
+        }
+
         /// <summary>
         /// Initializes a new instance of the <see cref="RunningJobStatus"/> class.
         /// </summary>
         public RunningJobStatus()
         {
             CurrentUnitSegments = new List<Segment>();
+            Segments = new List<Segment>();
         }
     }
 }
-- 
cgit v1.3.1


From 09d6814981ea6103f27843aef998ae261269c632 Mon Sep 17 00:00:00 2001
From: Roy Ben-Shabat <Roy@Twine-s.com>
Date: Mon, 17 Sep 2018 16:47:08 +0300
Subject: Increased research module process parameters font size.

---
 Software/DB/Tango.mdf                              | Bin 75497472 -> 75497472 bytes
 Software/DB/Tango_log.ldf                          | Bin 15400960 -> 15400960 bytes
 .../Views/JobView.xaml                             |   4 ++--
 .../Tango.MachineStudio.Common.csproj              |   2 +-
 4 files changed, 3 insertions(+), 3 deletions(-)

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

diff --git a/Software/DB/Tango.mdf b/Software/DB/Tango.mdf
index addf78007..f6cd64958 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 76ffa3c27..bbc28ea0b 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.Developer/Views/JobView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/JobView.xaml
index 1f2e9294d..4733ebf07 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
@@ -1468,8 +1468,8 @@
                                                                                         <Grid Background="Transparent" Style="{StaticResource draggableDroppableGrid}" dragAndDrop:DragAndDropService.Drop="OnProcessParameterDropped" dragAndDrop:DragAndDropService.DraggingSurface="{Binding RelativeSource={RelativeSource AncestorType=editors:ParameterizedEditor},Path=DraggingSurface}">
                                                                                             <ContentControl>
                                                                                                 <StackPanel>
-                                                                                                    <TextBlock IsHitTestVisible="False" Margin="0 5 0 5" Text="{Binding Name}" FontSize="10"></TextBlock>
-                                                                                                    <mahapps:NumericUpDown FontSize="16" Minimum="0" Margin="0 0 5 0" HideUpDownButtons="True" HorizontalContentAlignment="Center" Maximum="10000" StringFormat="0.0" InterceptArrowKeys="True" Background="Transparent" BorderThickness="0" InterceptMouseWheel="True" HasDecimals="True" Value="{Binding Value,Mode=TwoWay}"></mahapps:NumericUpDown>
+                                                                                                    <TextBlock IsHitTestVisible="False" Margin="0 5 0 5" Text="{Binding Name}" FontSize="11"></TextBlock>
+                                                                                                    <mahapps:NumericUpDown FontSize="20" Minimum="0" Margin="0 0 5 0" HideUpDownButtons="True" HorizontalContentAlignment="Center" Maximum="10000" StringFormat="0.0" InterceptArrowKeys="True" Background="Transparent" BorderThickness="0" InterceptMouseWheel="True" HasDecimals="True" Value="{Binding Value,Mode=TwoWay}"></mahapps:NumericUpDown>
                                                                                                 </StackPanel>
                                                                                             </ContentControl>
                                                                                         </Grid>
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Tango.MachineStudio.Common.csproj b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Tango.MachineStudio.Common.csproj
index 09678b515..81b155748 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Tango.MachineStudio.Common.csproj
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Tango.MachineStudio.Common.csproj
@@ -300,7 +300,7 @@
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <ProjectExtensions>
     <VisualStudio>
-      <UserProperties BuildVersion_StartDate="2000/1/1" BuildVersion_UseGlobalSettings="False" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" />
+      <UserProperties BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UseGlobalSettings="False" BuildVersion_StartDate="2000/1/1" />
     </VisualStudio>
   </ProjectExtensions>
 </Project>
\ No newline at end of file
-- 
cgit v1.3.1


From 94b83ea6d7e62534219801dcf1d53ee6e187837d Mon Sep 17 00:00:00 2001
From: Roy Ben-Shabat <Roy@Twine-s.com>
Date: Thu, 20 Sep 2018 17:48:52 +0300
Subject: Implemented reset process parameters from research module.

---
 Software/DB/Tango.mdf                              | Bin 75497472 -> 75497472 bytes
 Software/DB/Tango_log.ldf                          | Bin 15400960 -> 15400960 bytes
 .../ViewModels/MainViewVM.cs                       |  30 +++++++++++++++++++++
 .../Views/JobView.xaml                             |   5 ++++
 4 files changed, 35 insertions(+)

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

diff --git a/Software/DB/Tango.mdf b/Software/DB/Tango.mdf
index 19bb5b173..db7b9f4f8 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 70cc46c8c..78312551b 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.Developer/ViewModels/MainViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs
index bf6a6ecbc..ff4f47471 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs
@@ -657,6 +657,12 @@ namespace Tango.MachineStudio.Developer.ViewModels
         /// Gets or sets to running job command.
         /// </summary>
         public RelayCommand ToRunningJobCommand { get; set; }
+
+        /// <summary>
+        /// Gets or sets the reset process parameters command.
+        /// </summary>
+        public RelayCommand ResetProcessParametersCommand { get; set; }
+
         #endregion
 
         #region Constructors
@@ -713,6 +719,7 @@ namespace Tango.MachineStudio.Developer.ViewModels
             ImportEmbroideryFileCommand = new RelayCommand(ImportEmbroideryFile, () => SelectedMachine != null && CanWork);
             DisplayJobEmbroideryFileCommand = new RelayCommand<Job>(DisplayJobEmbroideryFile, () => CanWork);
             ReloadMachinesCommand = new RelayCommand(() => LoadMachine(), () => CanWork && SelectedMachine != null);
+            ResetProcessParametersCommand = new RelayCommand(ResetProcessParameters);
 
             ApplicationManager.ConnectedMachineChanged += ApplicationManager_ConnectedMachineChanged;
 
@@ -1491,6 +1498,29 @@ namespace Tango.MachineStudio.Developer.ViewModels
             CanWork = true;
         }
 
+        /// <summary>
+        /// Resets the process parameters.
+        /// </summary>
+        private async void ResetProcessParameters()
+        {
+            if (_notification.ShowQuestion("This will reset the process parameters. Are you sure?"))
+            {
+                using (_notification.PushTaskItem("Resetting process parameters..."))
+                {
+                    try
+                    {
+                        await ApplicationManager.ConnectedMachine.UploadProcessParameters(new ProcessParametersTable());
+                        _notification.ShowInfo("Heaters are turned off.");
+                    }
+                    catch (Exception ex)
+                    {
+                        LogManager.Log(ex, "Error resetting process parameters.");
+                        _notification.ShowError("Error resetting process parameters." + Environment.NewLine + ex.Message);
+                    }
+                }
+            }
+        }
+
         #endregion
 
         #region Active Job Management
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 4733ebf07..627e4d63e 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
@@ -1520,6 +1520,11 @@
                                             </ListBox>
 
                                             <StackPanel Margin="10 20" VerticalAlignment="Bottom" Orientation="Horizontal" HorizontalAlignment="Right">
+                                                <Button Height="40" Width="105" Command="{Binding ResetProcessParametersCommand}" Background="Transparent" BorderBrush="#202020" Foreground="#202020" Margin="0 2 10 0" ToolTip="Resets the current process parameters in the embedded device">
+                                                    <TextBlock TextWrapping="Wrap" TextAlignment="Center">
+                                                        RESET
+                                                    </TextBlock>
+                                                </Button>
                                                 <Button Height="40" Command="{Binding SaveProcessParametersCommand}" HorizontalAlignment="Left">
                                                     <StackPanel Orientation="Horizontal">
                                                         <materialDesign:PackIcon VerticalAlignment="Center" Kind="ContentSave"></materialDesign:PackIcon>
-- 
cgit v1.3.1


From 8bb81a7302e5a72322eae61b82389dfa7039c98c Mon Sep 17 00:00:00 2001
From: Roy Ben-Shabat <Roy@Twine-s.com>
Date: Wed, 26 Sep 2018 15:22:13 +0300
Subject: Default step division 8. Extend graphs FIFO capacity.

---
 Software/DB/Tango.mdf                              | Bin 75497472 -> 75497472 bytes
 Software/DB/Tango_log.ldf                          | Bin 15400960 -> 15400960 bytes
 .../ViewModels/MainViewVM.cs                       |   5 ++++-
 .../Views/JobView.xaml                             |   2 +-
 .../Converters/SecondsToTimeSpanConverter.cs       |  23 +++++++++++++++++++++
 .../Tango.MachineStudio.Technician.csproj          |   1 +
 .../Views/MachineTechView.xaml                     |   9 ++++----
 .../Tango.BL/EntitiesExtensions/BrushStop.cs       |  10 ++++++++-
 Software/Visual_Studio/Tango.sln                   |  12 +++++------
 9 files changed, 49 insertions(+), 13 deletions(-)
 create mode 100644 Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Converters/SecondsToTimeSpanConverter.cs

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

diff --git a/Software/DB/Tango.mdf b/Software/DB/Tango.mdf
index b3f54005e..ac80b21a8 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 e1545e683..19c454a47 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.Developer/ViewModels/MainViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs
index ff4f47471..1dc59ab55 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs
@@ -1908,7 +1908,9 @@ namespace Tango.MachineStudio.Developer.ViewModels
                     newJob.Machine = SelectedMachine;
 
                     SelectedMachine.Jobs.Add(newJob);
-                    newJob.AddSolidSegment();
+                    var segment = newJob.AddSolidSegment();
+                    segment.BrushStops[0].SetAllDispensingStepDivisions(BL.Dispensing.DispenserStepDivisions.D8);
+
                     LogManager.Log("Saving selected machine to database...");
                     await SelectedMachine.SaveAsync(_machineDbContext);
                     SelectedMachineJob = newJob;
@@ -1963,6 +1965,7 @@ namespace Tango.MachineStudio.Developer.ViewModels
                 stop.Segment = SelectedSegment;
                 stop.ColorSpace = ColorSpaces.FirstOrDefault();
                 stop.Color = Colors.Black;
+                stop.SetAllDispensingStepDivisions(BL.Dispensing.DispenserStepDivisions.D8);
                 stop.SetLiquidVolumes(SelectedMachine.Configuration, SelectedRML, SelectedProcessParametersTable);
                 SelectedSegment.BrushStops.Add(stop);
                 SelectedSegment.BrushStops.ToList().ForEach(x => x.RaiseOffsetChanged());
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 627e4d63e..f891f6520 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
@@ -1067,7 +1067,7 @@
                                                                                                                         <DataGridTemplateColumn Header="STEP">
                                                                                                                             <DataGridTemplateColumn.CellTemplate>
                                                                                                                                 <DataTemplate>
-                                                                                                                                    <ComboBox ItemsSource="{Binding Source={StaticResource dispenserDivisions}}" SelectedItem="{Binding DispenserStepDivision,UpdateSourceTrigger=PropertyChanged}">
+                                                                                                                                    <ComboBox ItemsSource="{Binding Source={StaticResource dispenserDivisions}}" SelectedItem="{Binding DispenserStepDivision,UpdateSourceTrigger=PropertyChanged}" BorderThickness="0">
                                                                                                                                         <ComboBox.ItemContainerStyle>
                                                                                                                                             <Style TargetType="ComboBoxItem" BasedOn="{StaticResource {x:Type ComboBoxItem}}">
                                                                                                                                                 <Setter Property="Background" Value="#ECECEC"></Setter>
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Converters/SecondsToTimeSpanConverter.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Converters/SecondsToTimeSpanConverter.cs
new file mode 100644
index 000000000..8098c6751
--- /dev/null
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Converters/SecondsToTimeSpanConverter.cs
@@ -0,0 +1,23 @@
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Data;
+
+namespace Tango.MachineStudio.Technician.Converters
+{
+    public class SecondsToTimeSpanConverter : IValueConverter
+    {
+        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            return TimeSpan.FromSeconds(System.Convert.ToDouble(value));
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            throw new NotImplementedException();
+        }
+    }
+}
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Tango.MachineStudio.Technician.csproj b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Tango.MachineStudio.Technician.csproj
index 38868a649..0d9cd5b63 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Tango.MachineStudio.Technician.csproj
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Tango.MachineStudio.Technician.csproj
@@ -97,6 +97,7 @@
     <Compile Include="Converters\MonitorsToMultiChannleMonitorsConverter.cs" />
     <Compile Include="Converters\MonitorsToSingleChannleMonitorsConverter.cs" />
     <Compile Include="Converters\SecondsToGraphPointsConverter.cs" />
+    <Compile Include="Converters\SecondsToTimeSpanConverter.cs" />
     <Compile Include="Converters\TechIosToDigitalInsConverter.cs" />
     <Compile Include="Converters\TechIosToDigitalOutsConverter.cs" />
     <Compile Include="Converters\TransitionLinkConverter.cs" />
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Views/MachineTechView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Views/MachineTechView.xaml
index dec4cee44..9e675b2ff 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Views/MachineTechView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Views/MachineTechView.xaml
@@ -14,6 +14,7 @@
              xmlns:templates="clr-namespace:Tango.MachineStudio.Technician.PropertiesTemplates"
              xmlns:items="clr-namespace:Tango.MachineStudio.Technician.TechItems"
              xmlns:converters="clr-namespace:Tango.SharedUI.Converters;assembly=Tango.SharedUI"
+             xmlns:localConverters="clr-namespace:Tango.MachineStudio.Technician.Converters"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
              xmlns:local="clr-namespace:Tango.MachineStudio.Technician.Views"
              mc:Ignorable="d" 
@@ -22,6 +23,7 @@
     <UserControl.Resources>
         <converters:BooleanToVisibilityInverseConverter x:Key="BooleanToVisibilityInverseConverter" />
         <converters:NumberToFileSizeConverter x:Key="NumberToFileSizeConverter" />
+        <localConverters:SecondsToTimeSpanConverter x:Key="SecondsToTimeSpanConverter" />
 
         <DataTemplate x:Key="TabTemplate">
             <Grid>
@@ -281,11 +283,10 @@
 
                     <StackPanel HorizontalAlignment="Right" VerticalAlignment="Top" Width="275" Margin="0 15 30 0">
                         <TextBlock HorizontalAlignment="Center" FontWeight="SemiBold" Foreground="Gray">
-                            <Run>GRAPHS DURATION:</Run>
-                            <Run Text="{Binding TempGraphsDurationSeconds,Mode=OneWay}"></Run>
-                            <Run>sec</Run>
+                            <Run>GRAPHS FIFO CAPACITY:</Run>
+                            <Run Text="{Binding TempGraphsDurationSeconds,Converter={StaticResource SecondsToTimeSpanConverter},Mode=OneWay,StringFormat='hh\\:mm\\:ss'}"></Run>
                         </TextBlock>
-                        <Slider Margin="0 5 0 0" Minimum="1" Maximum="60" Value="{Binding TempGraphsDurationSeconds}">
+                        <Slider Margin="0 5 0 0" Minimum="1" Maximum="3600" Value="{Binding TempGraphsDurationSeconds}">
                             <i:Interaction.Triggers>
                                 <i:EventTrigger EventName="PreviewMouseUp">
                                     <i:InvokeCommandAction Command="{Binding UpdateGraphsDurationCommand}"></i:InvokeCommandAction>
diff --git a/Software/Visual_Studio/Tango.BL/EntitiesExtensions/BrushStop.cs b/Software/Visual_Studio/Tango.BL/EntitiesExtensions/BrushStop.cs
index 777f3f202..88ec381c4 100644
--- a/Software/Visual_Studio/Tango.BL/EntitiesExtensions/BrushStop.cs
+++ b/Software/Visual_Studio/Tango.BL/EntitiesExtensions/BrushStop.cs
@@ -319,11 +319,19 @@ namespace Tango.BL.Entities
             return (int)typeof(BrushStop).GetProperty("V" + packIndex + "Div").GetValue(this);
         }
 
-        public void SetDispensingDivision(int packIndex,int division)
+        public void SetDispensingDivision(int packIndex, int division)
         {
             typeof(BrushStop).GetProperty("V" + packIndex + "Div").SetValue(this, division);
         }
 
+        public void SetAllDispensingStepDivisions(Dispensing.DispenserStepDivisions division)
+        {
+            for (int i = 0; i < 8; i++)
+            {
+                typeof(BrushStop).GetProperty("V" + i + "Div").SetValue(this, (int)division);
+            }
+        }
+
         public void SetStopIndex(int index)
         {
             _stopindex = index;
diff --git a/Software/Visual_Studio/Tango.sln b/Software/Visual_Studio/Tango.sln
index 8f108ea51..2879565a9 100644
--- a/Software/Visual_Studio/Tango.sln
+++ b/Software/Visual_Studio/Tango.sln
@@ -4016,12 +4016,12 @@ Global
 		{0BDA9B52-9879-4C5E-84E3-81D00B75DACC} = {5F6BBAA8-EAD0-4B18-97E5-55B4F56DD760}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		BuildVersion_UseGlobalSettings = False
-		BuildVersion_AssemblyInfoFilename = Properties\AssemblyInfo.cs
-		BuildVersion_StartDate = 2000/1/1
-		BuildVersion_UpdateFileVersion = False
-		BuildVersion_UpdateAssemblyVersion = True
-		BuildVersion_BuildVersioningStyle = None.None.Increment.DeltaBaseYearDayOfYear
 		SolutionGuid = {7986F7F4-A86A-4994-B1B6-0988D7F057B6}
+		BuildVersion_BuildVersioningStyle = None.None.Increment.DeltaBaseYearDayOfYear
+		BuildVersion_UpdateAssemblyVersion = True
+		BuildVersion_UpdateFileVersion = False
+		BuildVersion_StartDate = 2000/1/1
+		BuildVersion_AssemblyInfoFilename = Properties\AssemblyInfo.cs
+		BuildVersion_UseGlobalSettings = False
 	EndGlobalSection
 EndGlobal
-- 
cgit v1.3.1


From da4ccc0ba58968b90519825abc45a86c2b026743 Mon Sep 17 00:00:00 2001
From: Roy Ben-Shabat <Roy@Twine-s.com>
Date: Wed, 26 Sep 2018 16:51:10 +0300
Subject: Implemented new step division control.

---
 Software/DB/Tango.mdf                              | Bin 75497472 -> 75497472 bytes
 Software/DB/Tango_log.ldf                          | Bin 15400960 -> 15400960 bytes
 .../Views/JobView.xaml                             |   2 +-
 .../Tango.BL/Dispensing/DispensingCalcBase.cs      |   2 +-
 Software/Visual_Studio/Tango.BL/LiquidVolume.cs    |  12 +++++++++++-
 5 files changed, 13 insertions(+), 3 deletions(-)

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

diff --git a/Software/DB/Tango.mdf b/Software/DB/Tango.mdf
index ac80b21a8..959a348cc 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 19c454a47..5c5f9471c 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.Developer/Views/JobView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/JobView.xaml
index f891f6520..3f1f3b486 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
@@ -1058,7 +1058,7 @@
                                                                                                                             <DataGridTemplateColumn.CellTemplate>
                                                                                                                                 <DataTemplate>
                                                                                                                                     <TextBlock VerticalAlignment="Center">
-                                                                                                                        <Run Text="{Binding IdsPack.DispenserType.NlPerPulse,StringFormat='0.00'}"></Run>
+                                                                                                                        <Run Text="{Binding NanoliterPerStep,Mode=OneWay,StringFormat='0.00'}"></Run>
                                                                                                                         <Run Text="(nl)" FontSize="9" Foreground="Gray"></Run>
                                                                                                                                     </TextBlock>
                                                                                                                                 </DataTemplate>
diff --git a/Software/Visual_Studio/Tango.BL/Dispensing/DispensingCalcBase.cs b/Software/Visual_Studio/Tango.BL/Dispensing/DispensingCalcBase.cs
index 8a85dda6b..cceabb571 100644
--- a/Software/Visual_Studio/Tango.BL/Dispensing/DispensingCalcBase.cs
+++ b/Software/Visual_Studio/Tango.BL/Dispensing/DispensingCalcBase.cs
@@ -53,7 +53,7 @@ namespace Tango.BL.Dispensing
         /// <returns></returns>
         public virtual double CalculatePulsePerSecond(LiquidVolume liquidVolume)
         {
-            return (CalculateNanoliterPerSecond(liquidVolume) / liquidVolume.IdsPack.DispenserType.NlPerPulse) * (liquidVolume.DispenserStepDivision != DispenserStepDivisions.Auto ? (double)liquidVolume.DispenserStepDivision.ToInt32() : 1d);
+            return CalculateNanoliterPerSecond(liquidVolume) / liquidVolume.NanoliterPerStep * 8d;
         }
 
         /// <summary>
diff --git a/Software/Visual_Studio/Tango.BL/LiquidVolume.cs b/Software/Visual_Studio/Tango.BL/LiquidVolume.cs
index b32db4a79..b44c5c554 100644
--- a/Software/Visual_Studio/Tango.BL/LiquidVolume.cs
+++ b/Software/Visual_Studio/Tango.BL/LiquidVolume.cs
@@ -70,7 +70,7 @@ namespace Tango.BL
         public DispenserStepDivisions DispenserStepDivision
         {
             get { return (DispenserStepDivisions)BrushStop.GetDispensingDivision(IdsPack.PackIndex); }
-            set { BrushStop.SetDispensingDivision(IdsPack.PackIndex, (int)value); RaisePropertyChangedAuto(); RaisePropertyChanged(nameof(PulsePerSecond)); }
+            set { BrushStop.SetDispensingDivision(IdsPack.PackIndex, (int)value); RaisePropertyChangedAuto(); RaisePropertyChanged(nameof(PulsePerSecond)); RaisePropertyChanged(nameof(NanoliterPerStep)); }
         }
 
         public void Invalidate()
@@ -98,6 +98,7 @@ namespace Tango.BL
                 RaisePropertyChanged(nameof(PulsePerSecond));
                 RaisePropertyChanged(nameof(NanoliterPerCentimeter));
                 RaisePropertyChanged(nameof(Volume));
+                RaisePropertyChanged(nameof(NanoliterPerStep));
             }
         }
 
@@ -176,6 +177,15 @@ namespace Tango.BL
             }
         }
 
+        [JsonIgnore]
+        public double NanoliterPerStep
+        {
+            get
+            {
+                return (IdsPack.DispenserType.NlPerPulse / ((double)(DispenserStepDivision != DispenserStepDivisions.Auto ? DispenserStepDivision : DispenserStepDivisions.D8) / 8d));
+            }
+        }
+
         public LiquidVolume Clone(BrushStop stop)
         {
             LiquidVolume cloned = new LiquidVolume(Configuration, IdsPack, RML, ProcessParametersTable, stop);
-- 
cgit v1.3.1


From 5c07f82c9690ca53928a9489eba7bb88f1352f8d Mon Sep 17 00:00:00 2001
From: Roy Ben-Shabat <Roy@Twine-s.com>
Date: Thu, 27 Sep 2018 16:45:06 +0300
Subject: Fixed issue with liquid volume loading (Copied from 3.43 branch)

---
 .../Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs   | 5 +++++
 1 file changed, 5 insertions(+)

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

diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs
index 1dc59ab55..6c3e31325 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs
@@ -1605,6 +1605,11 @@ namespace Tango.MachineStudio.Developer.ViewModels
                     SegmentsCollectionView = CollectionViewSource.GetDefaultView(ActiveJob.Segments);
                     SegmentsCollectionView.SortDescriptions.Add(new SortDescription(nameof(Segment.SegmentIndex), ListSortDirection.Ascending));
 
+                    foreach (var segment in ActiveJob.Segments)
+                    {
+                        SetSegmentBrushStopsLiquidVolumes(segment);
+                    }
+
                     SelectedSegment = _selectedSegment;
 
                     UIHelper.DoEvents();
-- 
cgit v1.3.1