v3.6.1

- (Fix) GCode: Improve the regex for parsing layer index from comments, also fixes chitubox zip format layer parsing - (Fix) MacOS: Auto updater was not copying the files to the right location, leading to not upgrade the program. However this version still need to update manually
sn4k3 · Aug 19, 2022 · f7d989d · f7d989d
1 parent 57f077f
commit f7d989d
Show file tree

Hide file tree

Showing 9 changed files with 27 additions and 21 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Changelog
 
+## 19/08/2022 - v3.6.1
+
+- (Fix) GCode: Improve the regex for parsing layer index from comments, also fixes chitubox zip format layer parsing
+- (Fix) MacOS: Auto updater was not copying the files to the right location, leading to not upgrade the program. However this version still need to update manually
+
 ## 17/08/2022 - v3.6.0
 
 - **File formats:**

diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
@@ -1,12 +1,3 @@
-- **File formats:**
-   - (Add) OSF (Vlare Open File Format)
-   - (Fix) CTB Encrypted: Bottom Retract Height for TSMC was constraining incorrectly with the normal total retract height
-   - (Fix) CWS: Only issue `;<Slice>` command when the exposure is about to happen (#514)
-- **GCode:**
-   - (Add) Command `CommandWaitSyncDelay` for movement wait sync delay instead of depending on G4 wait command
-   - (Fix) Wrong parsing and set of wait times when using a wait after lift / wait before retract
-- (Improvement) Auto update: Make sure the download url exists before attempt the download, if not, instead it will prompt for manual download and update
-- (Improvement) MacOS: Remove `com.apple.quarantine` flag from the auto downloaded files
-- (Upgrade) .NET from 6.0.7 to 6.0.8
-- (Upgrade) AvaloniaUI from 0.10.17 to 0.10.18
+- (Fix) GCode: Improve the regex for parsing layer index from comments, also fixes chitubox zip format layer parsing
+- (Fix) MacOS: Auto updater was not copying the files to the right location, leading to not upgrade the program. However this version still need to update manually
 
diff --git a/Scripts/010 Editor/osf.bt b/Scripts/010 Editor/osf.bt
@@ -105,6 +105,20 @@ struct HEADER {
     ushort Reserved <fgcolor=cWhite, bgcolor=cBlack>;
 
     ubyte ProtocolType <fgcolor=cBlack, bgcolor=cRed>; // 0
+
+    local int leftover = HeaderLength - 350001;
+    if(HeaderLength == 350013) // VLR
+    {
+        uint Unknown <fgcolor=cBlack, bgcolor=cRed>; // 350054
+        ubyte Unknown1[8] <fgcolor=cBlack, bgcolor=cRed>;
+        leftover -= 12;
+    }
+
+
+    if(leftover > 0)
+    {
+        ubyte LeftOvers[leftover] <fgcolor=cBlack, bgcolor=cRed>;
+    }
 } header;
 
 

diff --git a/UVtools.Core/GCode/GCodeBuilder.cs b/UVtools.Core/GCode/GCodeBuilder.cs
@@ -931,7 +931,8 @@ public void ParseLayersFromGCode(FileFormat slicerFile, string? gcode, bool rebu
 
             if (line[0] == ';')
             {
-                match = Regex.Match(line, @"^;.*(layer\s+|layer:\s*|LAYER_START:\s*)(\d+)", RegexOptions.IgnoreCase | RegexOptions.CultureInvariant);
+                // Can be dangerous!
+                match = Regex.Match(line, @"^;\W*(layer\W*|LAYER_START:\s*)(\d+)", RegexOptions.IgnoreCase | RegexOptions.CultureInvariant);
                 if (match.Success && match.Groups.Count > 2 && uint.TryParse(match.Groups[2].Value, out var layerIndex))
                 {
                     if (layerIndex > slicerFile.LayerCount)

diff --git a/UVtools.Core/GCode/GCodeLayer.cs b/UVtools.Core/GCode/GCodeLayer.cs
@@ -29,11 +29,6 @@ public class GCodeLayer
     private float? _retractHeight2;
     private float? _retractSpeed2;
 
-    public enum GCodeLastParsedLine : byte
-    {
-        LayerIndex,
-    }
-
     public bool IsValid => LayerIndex.HasValue;
 
     public FileFormat SlicerFile { get; }

diff --git a/UVtools.Core/SystemOS/SystemAware.cs b/UVtools.Core/SystemOS/SystemAware.cs
@@ -309,7 +309,7 @@ public static bool IsRunningLinuxAppImage(out string? path)
     /// <summary>
     /// Gets if is running under MacOS and under app format
     /// </summary>
-    public static bool IsRunningMacOSApp => OperatingSystem.IsMacOS() && AppContext.BaseDirectory.EndsWith(".app/Contents/MacOS");
+    public static bool IsRunningMacOSApp => OperatingSystem.IsMacOS() && AppContext.BaseDirectory.EndsWith(Path.Combine(".app", "Contents", $"MacOS{Path.DirectorySeparatorChar}"));
 
     /// <summary>
     /// Gets the main name of the operative system

diff --git 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>3.6.0</Version>
+		<Version>3.6.1</Version>
 		<Copyright>Copyright © 2020 PTRTECH</Copyright>
 		<PackageIcon>UVtools.png</PackageIcon>
 		<Platforms>AnyCPU;x64</Platforms>

diff --git a/UVtools.InstallerMM/UVtools.InstallerMM.wxs b/UVtools.InstallerMM/UVtools.InstallerMM.wxs
@@ -2,7 +2,7 @@
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
   <?define ComponentRules="OneToOne"?>
   <!-- SourceDir instructs IsWiX the location of the directory that contains files for this merge module -->
-  <?define SourceDir="..\publish\UVtools_win-x64_v3.6.0"?>
+  <?define SourceDir="..\publish\UVtools_win-x64_v3.6.1"?>
   <Module Id="UVtools" Language="1033" Version="1.0.0.0">
     <Package Id="12aaa1cf-ff06-4a02-abd5-2ac01ac4f83b" Manufacturer="PTRTECH" InstallerVersion="200" Keywords="MSLA, DLP" Description="MSLA/DLP, file analysis, repair, conversion and manipulation" InstallScope="perMachine" Platform="x64" />
     <Directory Id="TARGETDIR" Name="SourceDir">

diff --git 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>3.6.0</Version>
+    <Version>3.6.1</Version>
     <Platforms>AnyCPU;x64</Platforms>
     <PackageIcon>UVtools.png</PackageIcon>
     <PackageReadmeFile>README.md</PackageReadmeFile>