v2.24.3v2.24.3

- (Upgrade) .NET from 5.0.11 to 5.0.12
- (Fix) Anycubic formats: LightOffDelay is WaitTimeBeforeCure (#308)

6 files changed, 31 insertions, 49 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ab3c011..004ddf6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Changelog
 
+## 12/11/2021 - v2.24.3
+
+- (Upgrade) .NET from 5.0.11 to 5.0.12
+- (Fix) Anycubic formats: LightOffDelay is WaitTimeBeforeCure (#308)
+
 ## 05/11/2021 - v2.24.2
 
 - **Export layers to mesh:**
diff --git a/Scripts/010 Editor/PhotonWorkshop.bt b/Scripts/010 Editor/PhotonWorkshop.bt
index 0c65d80..f233b28 100644
--- a/Scripts/010 Editor/PhotonWorkshop.bt
+++ b/Scripts/010 Editor/PhotonWorkshop.bt
@@ -32,7 +32,7 @@ struct HEADER {
     float LayerHeight <fgcolor=cBlack, bgcolor=cRed>;
     float LayerExposureTime <fgcolor=cBlack, bgcolor=cRed>;
        
-    float LightOffDelay <fgcolor=cBlack, bgcolor=cRed>;
+    float WaitTimeBeforeCure <fgcolor=cBlack, bgcolor=cRed>;
     float BottomExposureSeconds <fgcolor=cBlack, bgcolor=cRed>;
     float BottomLayersCount <fgcolor=cBlack, bgcolor=cRed>;
     float LiftHeight <fgcolor=cBlack, bgcolor=cRed>;
diff --git a/UVtools.Core/FileFormats/PhotonWorkshopFile.cs b/UVtools.Core/FileFormats/PhotonWorkshopFile.cs
index 3e5b2d1..33176aa 100644
--- a/UVtools.Core/FileFormats/PhotonWorkshopFile.cs
+++ b/UVtools.Core/FileFormats/PhotonWorkshopFile.cs
@@ -248,17 +248,17 @@ namespace UVtools.Core.FileFormats
             /// <summary>
             /// 48
             /// </summary>
-            [FieldOrder(3)] public float LayerExposureTime { get; set; }
+            [FieldOrder(3)] public float ExposureTime { get; set; }
 
             /// <summary>
             /// 4C
             /// </summary>
-            [FieldOrder(4)] public float LightOffDelay { get; set; } = 1;
+            [FieldOrder(4)] public float WaitTimeBeforeCure { get; set; } = 1;
 
             /// <summary>
             /// 50
             /// </summary>
-            [FieldOrder(5)] public float BottomExposureSeconds { get; set; } 
+            [FieldOrder(5)] public float BottomExposureTime { get; set; } 
 
             /// <summary>
             /// 54
@@ -320,17 +320,13 @@ namespace UVtools.Core.FileFormats
             {
                 get
                 {
-                    switch (PriceCurrencyDec)
+                    return PriceCurrencyDec switch
                     {
-                        case 0x24:
-                            return '$';
-                        case 0xA5C2:
-                            return '¥';
-                        case 0x000020AC:
-                            return '€';
-                        default:
-                            return '$';
-                    }
+                        0x24 => '$',
+                        0xA5C2 => '¥',
+                        0x000020AC => '€',
+                        _ => '$'
+                    };
                 }
             }
 
@@ -359,7 +355,7 @@ namespace UVtools.Core.FileFormats
                 Section = new SectionHeader(SectionMark, this);
             }
 
-            public override string ToString() => $"{nameof(Section)}: {Section}, {nameof(PixelSizeUm)}: {PixelSizeUm}, {nameof(LayerHeight)}: {LayerHeight}, {nameof(LayerExposureTime)}: {LayerExposureTime}, {nameof(LightOffDelay)}: {LightOffDelay}, {nameof(BottomExposureSeconds)}: {BottomExposureSeconds}, {nameof(BottomLayersCount)}: {BottomLayersCount}, {nameof(LiftHeight)}: {LiftHeight}, {nameof(LiftSpeed)}: {LiftSpeed}, {nameof(RetractSpeed)}: {RetractSpeed}, {nameof(VolumeMl)}: {VolumeMl}, {nameof(AntiAliasing)}: {AntiAliasing}, {nameof(ResolutionX)}: {ResolutionX}, {nameof(ResolutionY)}: {ResolutionY}, {nameof(WeightG)}: {WeightG}, {nameof(Price)}: {Price}, {nameof(PriceCurrencyDec)}: {PriceCurrencyDec}, {nameof(PerLayerOverride)}: {PerLayerOverride}, {nameof(PrintTime)}: {PrintTime}, {nameof(Padding1)}: {Padding1}, {nameof(Padding2)}: {Padding2}";
+            public override string ToString() => $"{nameof(Section)}: {Section}, {nameof(PixelSizeUm)}: {PixelSizeUm}, {nameof(LayerHeight)}: {LayerHeight}, {nameof(ExposureTime)}: {ExposureTime}, {nameof(WaitTimeBeforeCure)}: {WaitTimeBeforeCure}, {nameof(BottomExposureTime)}: {BottomExposureTime}, {nameof(BottomLayersCount)}: {BottomLayersCount}, {nameof(LiftHeight)}: {LiftHeight}, {nameof(LiftSpeed)}: {LiftSpeed}, {nameof(RetractSpeed)}: {RetractSpeed}, {nameof(VolumeMl)}: {VolumeMl}, {nameof(AntiAliasing)}: {AntiAliasing}, {nameof(ResolutionX)}: {ResolutionX}, {nameof(ResolutionY)}: {ResolutionY}, {nameof(WeightG)}: {WeightG}, {nameof(Price)}: {Price}, {nameof(PriceCurrencyDec)}: {PriceCurrencyDec}, {nameof(PerLayerOverride)}: {PerLayerOverride}, {nameof(PrintTime)}: {PrintTime}, {nameof(Padding1)}: {Padding1}, {nameof(Padding2)}: {Padding2}";
 
             public void Validate()
             {
@@ -946,14 +942,11 @@ namespace UVtools.Core.FileFormats
         {
             PrintParameterModifier.BottomLayerCount,
 
-            PrintParameterModifier.LightOffDelay,
+            PrintParameterModifier.WaitTimeBeforeCure,
 
             PrintParameterModifier.BottomExposureTime,
             PrintParameterModifier.ExposureTime,
 
-            //PrintParameterModifier.BottomLightOffDelay,
-            //PrintParameterModifier.BottomLiftHeight,
-            //PrintParameterModifier.BottomLiftSpeed,
             PrintParameterModifier.LiftHeight,
             PrintParameterModifier.LiftSpeed,
             PrintParameterModifier.RetractSpeed,
@@ -1086,44 +1079,28 @@ namespace UVtools.Core.FileFormats
             set => base.BottomLayerCount = (ushort) (HeaderSettings.BottomLayersCount = value);
         }
 
-        public override float BottomLightOffDelay => LightOffDelay;
+        public override float BottomLightOffDelay => BottomWaitTimeBeforeCure;
 
-        public override float LightOffDelay
-        {
-            get => HeaderSettings.LightOffDelay;
-            set => base.LightOffDelay = HeaderSettings.LightOffDelay = (float)Math.Round(value, 2);
-        }
+        public override float LightOffDelay => WaitTimeBeforeCure;
 
-        public override float BottomWaitTimeBeforeCure
-        {
-            get => base.BottomWaitTimeBeforeCure;
-            set
-            {
-                SetBottomLightOffDelay(value);
-                base.BottomWaitTimeBeforeCure = value;
-            }
-        }
+        public override float BottomWaitTimeBeforeCure => WaitTimeBeforeCure;
 
         public override float WaitTimeBeforeCure
         {
-            get => base.WaitTimeBeforeCure;
-            set
-            {
-                SetNormalLightOffDelay(value);
-                base.WaitTimeBeforeCure = value;
-            }
+            get => HeaderSettings.WaitTimeBeforeCure;
+            set => base.WaitTimeBeforeCure = HeaderSettings.WaitTimeBeforeCure = (float)Math.Round(value, 2);
         }
 
         public override float BottomExposureTime
         {
-            get => HeaderSettings.BottomExposureSeconds;
-            set => base.BottomExposureTime = HeaderSettings.BottomExposureSeconds = (float) Math.Round(value, 2);
+            get => HeaderSettings.BottomExposureTime;
+            set => base.BottomExposureTime = HeaderSettings.BottomExposureTime = (float) Math.Round(value, 2);
         }
 
         public override float ExposureTime
         {
-            get => HeaderSettings.LayerExposureTime;
-            set => base.ExposureTime = HeaderSettings.LayerExposureTime = (float) Math.Round(value, 2);
+            get => HeaderSettings.ExposureTime;
+            set => base.ExposureTime = HeaderSettings.ExposureTime = (float) Math.Round(value, 2);
         }
 
         public override float BottomLiftHeight => LiftHeight;
diff --git a/UVtools.Core/UVtools.Core.csproj b/UVtools.Core/UVtools.Core.csproj
index 4294f10..b816934 100644
--- a/UVtools.Core/UVtools.Core.csproj
+++ b/UVtools.Core/UVtools.Core.csproj
@@ -10,7 +10,7 @@
     <RepositoryUrl>https://github.com/sn4k3/UVtools</RepositoryUrl>
     <PackageProjectUrl>https://github.com/sn4k3/UVtools</PackageProjectUrl>
     <Description>MSLA/DLP, file analysis, calibration, repair, conversion and manipulation</Description>
-    <Version>2.24.2</Version>
+    <Version>2.24.3</Version>
     <Copyright>Copyright © 2020 PTRTECH</Copyright>
     <PackageIcon>UVtools.png</PackageIcon>
     <Platforms>AnyCPU;x64</Platforms>
@@ -52,7 +52,7 @@
     <PackageReference Include="BinarySerializer" Version="8.6.1.1" />
     <PackageReference Include="Emgu.CV" Version="4.5.4.4788" />
     <PackageReference Include="KdTree" Version="1.4.1" />
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Scripting" Version="4.0.0-6.final" />
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Scripting" Version="4.0.1" />
     <PackageReference Include="morelinq" Version="3.3.2" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
     <PackageReference Include="Portable.BouncyCastle" Version="1.9.0" />
diff --git a/UVtools.InstallerMM/UVtools.InstallerMM.wxs b/UVtools.InstallerMM/UVtools.InstallerMM.wxs
index de15898..beda225 100644
--- a/UVtools.InstallerMM/UVtools.InstallerMM.wxs
+++ b/UVtools.InstallerMM/UVtools.InstallerMM.wxs
@@ -314,8 +314,8 @@
         <Component Id="owc6F31DEF09608AA645959666A4CB7FBBC" Guid="c94570a5-5bb4-a53f-e12f-9581bddf7d08" Win64="yes">
           <File Id="owf6F31DEF09608AA645959666A4CB7FBBC" Source="$(var.SourceDir)\mscordaccore.dll" KeyPath="yes" />
         </Component>
-        <Component Id="owc27CB197EDF512C6F35063F15D0267964" Guid="0b282fd7-a70b-0156-f3c6-3ea462e82c6b" Win64="yes">
-          <File Id="owf27CB197EDF512C6F35063F15D0267964" Source="$(var.SourceDir)\mscordaccore_amd64_amd64_5.0.1121.47308.dll" KeyPath="yes" />
+        <Component Id="owc13B96B351171AF41DD4F9A7656BA6225" Guid="5b98e41c-bbf3-0739-10b6-5d6c2134a0fd" Win64="yes">
+          <File Id="owf13B96B351171AF41DD4F9A7656BA6225" Source="$(var.SourceDir)\mscordaccore_amd64_amd64_5.0.1221.52207.dll" KeyPath="yes" />
         </Component>
         <Component Id="owc5FC34571A1AE47A011FC6C2A95B00DA6" Guid="2591451e-0fe5-ccad-abf6-1d1097251253" Win64="yes">
           <File Id="owf5FC34571A1AE47A011FC6C2A95B00DA6" Source="$(var.SourceDir)\mscordbi.dll" KeyPath="yes" />
diff --git a/UVtools.WPF/UVtools.WPF.csproj b/UVtools.WPF/UVtools.WPF.csproj
index 84b1904..7efce1d 100644
--- a/UVtools.WPF/UVtools.WPF.csproj
+++ b/UVtools.WPF/UVtools.WPF.csproj
@@ -12,7 +12,7 @@
     <PackageLicenseFile>LICENSE</PackageLicenseFile>
     <RepositoryUrl>https://github.com/sn4k3/UVtools</RepositoryUrl>
     <RepositoryType>Git</RepositoryType>
-    <Version>2.24.2</Version>
+    <Version>2.24.3</Version>
     <Platforms>AnyCPU;x64</Platforms>
   </PropertyGroup>