Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/sn4k3/UVtools.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'UVtools.Core/FileFormats/PHZFile.cs')
-rw-r--r--UVtools.Core/FileFormats/PHZFile.cs19
1 files changed, 12 insertions, 7 deletions
diff --git a/UVtools.Core/FileFormats/PHZFile.cs b/UVtools.Core/FileFormats/PHZFile.cs
index 76b45ea..073bead 100644
--- a/UVtools.Core/FileFormats/PHZFile.cs
+++ b/UVtools.Core/FileFormats/PHZFile.cs
@@ -953,30 +953,35 @@ namespace UVtools.Core.FileFormats
public override float MaterialMilliliters
{
- get => (float) Math.Round(HeaderSettings.VolumeMl, 2);
+ get
+ {
+ var materialMl = base.MaterialMilliliters;
+ return materialMl > 0 ? materialMl : HeaderSettings.VolumeMl;
+ }
set
{
- HeaderSettings.VolumeMl = (float)Math.Round(value, 2);
- RaisePropertyChanged();
+ if (value <= 0) value = base.MaterialMilliliters;
+ HeaderSettings.VolumeMl = (float)Math.Round(value, 3);
+ base.MaterialMilliliters = HeaderSettings.VolumeMl;
}
}
public override float MaterialGrams
{
- get => HeaderSettings.WeightG;
+ get => (float) Math.Round(HeaderSettings.WeightG, 3);
set
{
- HeaderSettings.WeightG = (float) Math.Round(value, 2);
+ HeaderSettings.WeightG = (float) Math.Round(value, 3);
RaisePropertyChanged();
}
}
public override float MaterialCost
{
- get => (float) Math.Round(HeaderSettings.CostDollars, 2);
+ get => (float) Math.Round(HeaderSettings.CostDollars, 3);
set
{
- HeaderSettings.CostDollars = (float)Math.Round(value, 2);
+ HeaderSettings.CostDollars = (float)Math.Round(value, 3);
RaisePropertyChanged();
}
}