diff options
Diffstat (limited to 'Software/Visual_Studio/Tango.BL/LiquidVolume.cs')
| -rw-r--r-- | Software/Visual_Studio/Tango.BL/LiquidVolume.cs | 24 |
1 files changed, 1 insertions, 23 deletions
diff --git a/Software/Visual_Studio/Tango.BL/LiquidVolume.cs b/Software/Visual_Studio/Tango.BL/LiquidVolume.cs index 793f94212..69499905a 100644 --- a/Software/Visual_Studio/Tango.BL/LiquidVolume.cs +++ b/Software/Visual_Studio/Tango.BL/LiquidVolume.cs @@ -7,7 +7,6 @@ using System.Threading.Tasks; using Tango.Core; using Tango.BL.Dispensing; using Tango.BL.Entities; -using Tango.BL.Enumerations; namespace Tango.BL { @@ -68,16 +67,10 @@ namespace Tango.BL } [JsonIgnore] - public LiquidTypes LiquidType - { - get { return (LiquidTypes)IdsPack.LiquidType.Code; } - } - - [JsonIgnore] public DispenserStepDivisions DispenserStepDivision { get { return (DispenserStepDivisions)BrushStop.GetDispensingDivision(IdsPack.PackIndex); } - set { BrushStop.SetDispensingDivision(IdsPack.PackIndex, (int)value); RaisePropertyChangedAuto(); RaisePropertyChanged(nameof(PulsePerSecond)); RaisePropertyChanged(nameof(NanoliterPerStep)); RaisePropertyChanged(nameof(PulsePerSecondFull)); } + set { BrushStop.SetDispensingDivision(IdsPack.PackIndex, (int)value); RaisePropertyChangedAuto(); RaisePropertyChanged(nameof(PulsePerSecond)); RaisePropertyChanged(nameof(NanoliterPerStep)); } } public void Invalidate() @@ -103,7 +96,6 @@ namespace Tango.BL RaisePropertyChanged(nameof(LiquidMaxNanoliterPerCentimeter)); RaisePropertyChanged(nameof(NanoliterPerSecond)); RaisePropertyChanged(nameof(PulsePerSecond)); - RaisePropertyChanged(nameof(PulsePerSecondFull)); RaisePropertyChanged(nameof(NanoliterPerCentimeter)); RaisePropertyChanged(nameof(Volume)); RaisePropertyChanged(nameof(NanoliterPerStep)); @@ -186,15 +178,6 @@ namespace Tango.BL } [JsonIgnore] - public double PulsePerSecondFull - { - get - { - return DispensingCalcService.CalculatePulsePerSecondFull(this); - } - } - - [JsonIgnore] public double NanoliterPerStep { get @@ -210,10 +193,5 @@ namespace Tango.BL cloned.Volume = Volume; return cloned; } - - public override string ToString() - { - return $"{LiquidType}, {Volume}"; - } } } |
