diff options
| author | Roy Ben-Shabat <Roy@Twine-s.com> | 2018-09-26 16:51:10 +0300 |
|---|---|---|
| committer | Roy Ben-Shabat <Roy@Twine-s.com> | 2018-09-26 16:51:10 +0300 |
| commit | da4ccc0ba58968b90519825abc45a86c2b026743 (patch) | |
| tree | dda5f8fb292829a19d3d25ee5b2b538c5cfd6095 /Software/Visual_Studio | |
| parent | 8bb81a7302e5a72322eae61b82389dfa7039c98c (diff) | |
| download | Tango-da4ccc0ba58968b90519825abc45a86c2b026743.tar.gz Tango-da4ccc0ba58968b90519825abc45a86c2b026743.zip | |
Implemented new step division control.
Diffstat (limited to 'Software/Visual_Studio')
3 files changed, 13 insertions, 3 deletions
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/JobView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/JobView.xaml index 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); |