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.

---
 .../Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs   | 5 ++++-
 .../Modules/Tango.MachineStudio.Developer/Views/JobView.xaml         | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

(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 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>
-- 
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