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/SL1File.cs')
-rw-r--r--UVtools.Core/FileFormats/SL1File.cs17
1 files changed, 11 insertions, 6 deletions
diff --git a/UVtools.Core/FileFormats/SL1File.cs b/UVtools.Core/FileFormats/SL1File.cs
index 398f874..23e0fb1 100644
--- a/UVtools.Core/FileFormats/SL1File.cs
+++ b/UVtools.Core/FileFormats/SL1File.cs
@@ -441,21 +441,26 @@ namespace UVtools.Core.FileFormats
public override float MaterialMilliliters
{
- get => OutputConfigSettings.UsedMaterial;
+ get
+ {
+ var materialMl = base.MaterialMilliliters;
+ return materialMl > 0 ? materialMl : OutputConfigSettings.UsedMaterial;
+ }
set
{
- OutputConfigSettings.UsedMaterial = (float)Math.Round(value, 2);
- RaisePropertyChanged();
+ if (value <= 0) value = base.MaterialMilliliters;
+ OutputConfigSettings.UsedMaterial = (float)Math.Round(value, 3);
+ base.MaterialMilliliters = OutputConfigSettings.UsedMaterial;
}
}
- public override float MaterialGrams
+ public override float MaterialGrams
{
- get => (float) Math.Round(OutputConfigSettings.UsedMaterial * MaterialSettings.MaterialDensity, 2);
+ get => (float) Math.Round(OutputConfigSettings.UsedMaterial * MaterialSettings.MaterialDensity, 3);
set { }
}
- public override float MaterialCost => MaterialSettings.BottleVolume > 0 ? (float) Math.Round(OutputConfigSettings.UsedMaterial * MaterialSettings.BottleCost / MaterialSettings.BottleVolume, 2) : 0;
+ public override float MaterialCost => MaterialSettings.BottleVolume > 0 ? (float) Math.Round(OutputConfigSettings.UsedMaterial * MaterialSettings.BottleCost / MaterialSettings.BottleVolume, 3) : 0;
public override string MaterialName
{