fix autooffset value bug, fixed crash for cancel process with 1 thread, import/export settings, now properly sets all fields, tilerows: dont replace comma in filenames, rename GLTF plugin to GLB, #BUILD beta

Author: unitycoder

MainWindow.xaml.cs

@@ -23,12 +23,13 @@
 using PointCloudConverter.Writers;
 using System.Reflection;
 using System.Globalization;
+using System.Windows.Media;
 
 namespace PointCloudConverter
 {
     public partial class MainWindow : Window
     {
-        static readonly string version = "23.09.2024";
+        static readonly string version = "24.09.2024";
         static readonly string appname = "PointCloud Converter - " + version;
         static readonly string rootFolder = AppDomain.CurrentDomain.BaseDirectory;
 
@@ -310,7 +311,7 @@ private static async Task ProcessAllFiles(object workerParamsObject)
                     if (boundsListTemp[iii].z < lowestZ) lowestZ = (float)boundsListTemp[iii].z;
                 }
 
-                //Console.WriteLine("Lowest bounds: " + lowestX + " " + lowestY + " " + lowestZ);
+                //Log.Write("Lowest bounds: " + lowestX + " " + lowestY + " " + lowestZ);
                 // TODO could take center for XZ, and lowest for Y?
                 importSettings.offsetX = lowestX;
                 importSettings.offsetY = lowestY;
@@ -382,11 +383,18 @@ private static async Task ProcessAllFiles(object workerParamsObject)
                 }
                 finally
                 {
-                    //// Ensure the semaphore is released, if needed
-                    //if (semaphore.CurrentCount == 0) // Make sure we don't release more times than we acquire
-                    //{
-                    //    semaphore.Release();
-                    //}
+                    // Ensure the semaphore is released safely
+                    if (semaphore.CurrentCount == 0) // Make sure we don't release more times than we acquire
+                    {
+                        try
+                        {
+                            semaphore.Release();
+                        }
+                        catch (SemaphoreFullException ex)
+                        {
+                            //Log.Write($"Semaphore was already fully released. Exception: {ex.Message}");
+                        }
+                    }
                 }
                 //int? taskId = Task.CurrentId; // Get the current task ID
 
@@ -768,13 +776,18 @@ static bool ParseFile(ImportSettings importSettings, int fileIndex, int? taskId,
                     importSettings.offsetY = importSettings.manualOffsetY;
                     importSettings.offsetZ = importSettings.manualOffsetZ;
                 }
-                else // neither
+                else // no autooffset either
                 {
-                    importSettings.offsetX = 0;
-                    importSettings.offsetY = 0;
-                    importSettings.offsetZ = 0;
+                    if (importSettings.useAutoOffset == false)
+                    {
+                        importSettings.offsetX = 0;
+                        importSettings.offsetY = 0;
+                        importSettings.offsetZ = 0;
+                    }
                 }
 
+                //Log.Write("************** Offsets: " + importSettings.offsetX + " " + importSettings.offsetY + " " + importSettings.offsetZ);
+
                 var taskWriter = importSettings.GetOrCreateWriter(taskId);
 
                 // for saving pcroot header, we need this writer
@@ -1020,7 +1033,8 @@ void StartProcess(bool doProcess = true)
             args.Add("-output=" + txtOutput.Text);
 
             // check if using autooffset
-            if ((bool)chkAutoOffset.IsChecked && !(bool)chkManualOffset.IsChecked)
+            //if ((bool)chkAutoOffset.IsChecked && !(bool)chkManualOffset.IsChecked)
+            if (!(bool)chkManualOffset.IsChecked)
             {
                 args.Add("-offset=" + (bool)chkAutoOffset.IsChecked);
             }
@@ -1123,6 +1137,9 @@ void ImportArgs(string rawArgs)
             bool isFirstArgExe = args[0].EndsWith(".exe", StringComparison.OrdinalIgnoreCase);
             int startIndex = isFirstArgExe ? 1 : 0;
 
+            // reset all checkboxes to false
+            UncheckAllCheckboxes(this);
+
             for (int i = startIndex; i < args.Length; i++)
             {
                 string arg = args[i];
@@ -1246,6 +1263,27 @@ void ImportArgs(string rawArgs)
             } // for all args
         } // ImportArgs()
 
+        private void UncheckAllCheckboxes(DependencyObject parent)
+        {
+            // Loop through all the child elements
+            for (int i = 0; i < VisualTreeHelper.GetChildrenCount(parent); i++)
+            {
+                var child = VisualTreeHelper.GetChild(parent, i);
+
+                // If the child is a CheckBox, set it to unchecked
+                if (child is CheckBox checkBox)
+                {
+                    checkBox.IsChecked = false;
+                }
+
+                // If the child is a container, recursively call the function to check its children
+                if (VisualTreeHelper.GetChildrenCount(child) > 0)
+                {
+                    UncheckAllCheckboxes(child);
+                }
+            }
+        }
+
         private void Window_Closing(object sender, System.ComponentModel.CancelEventArgs e)
         {
             SaveSettings();

Tools/ArgParser.cs

@@ -867,7 +867,12 @@ public static ImportSettings Parse(string[] args, string rootFolder, ILogger log
 
             if (importSettings.batch == true && importSettings.exportFormat == ExportFormat.UCPC && Path.GetExtension(importSettings.outputFile).ToLower() == ".ucpc")
             {
-                importSettings.errors.Add("With UCPC batching, do not set output filename - set ONLY output folder (each ucpc file will be saved separately)");
+                importSettings.errors.Add("With batch processing whole input folder, do not set output filename - Set output folder (each .UCPP file will be saved separately)");
+            }
+
+            if (importSettings.batch == true && importSettings.exportFormat == ExportFormat.External && Path.GetExtension(importSettings.outputFile).ToLower() == ".glb")
+            {
+                importSettings.errors.Add("With batch processing whole input folder, do not set output filename - Set output folder (each .GLB file will be saved separately)");
             }
 
             if (importSettings.skipPoints == true && importSettings.keepPoints == true)
@@ -885,7 +890,7 @@ public static ImportSettings Parse(string[] args, string rootFolder, ILogger log
             if (importSettings.exportFormat == ExportFormat.PCROOT && importSettings.useGrid == false)
             {
                 //importSettings.errors.Add("V3 pcroot export format requires -usegrid=true to use grid");
-                Log.Write("V3 pcroot export format requires -usegrid=true to use grid, enabling it..");
+                Log.Write("V3 pcroot export format requires -usegrid=true to use grid, enabling it now.");
                 importSettings.useGrid = true;
             }
 

Tools/PluginLoader.cs

@@ -30,7 +30,7 @@ public static IWriter LoadWriter(string pluginName)
             var pluginAssembly = Assembly.LoadFrom(pluginPath);
 
             // Find the specific type 'PointCloudConverter.Writers.GLTF'
-            var writerType = pluginAssembly.GetType("PointCloudConverter.Writers.GLTF");
+            var writerType = pluginAssembly.GetType("PointCloudConverter.Writers.GLB");
 
             if (writerType == null)
                 throw new InvalidOperationException($"No valid implementation of IWriter found in {pluginPath}");

Tools/Tools.cs

@@ -289,7 +289,7 @@ public static void PrintHelpAndExit(char argSeparator, bool waitEnter = false)
             // TODO Console.WriteLine("-decimate" + separator + "50\t\t\tRemoves 50% of the points (by skipping every x point)\tDefault is off");
             //Console.WriteLine("-version" + argSeparator + "2\t\t2=v2 .ucpc, 3=v3 .pcroot tiles\tDefault is 2");
             Console.WriteLine("-randomize" + argSeparator + "true\t\tRandomize point indexes, to use Dynamic resolution\tDefault is true (Always enabled for v3)");
-            Console.WriteLine("-seed" + argSeparator + "42\t\tSet random seed\tDefault is random value");
+            Console.WriteLine("-seed" + argSeparator + "42\t\tSet random seed\tDefault is some random value");
             Console.WriteLine("-json" + argSeparator + "false\t\tOutput console log in JSON format\tDefault is false");
             Console.WriteLine("-customintensityrange" + argSeparator + "false\t\tCustom intensity range (0-65535)\tDefault is false");
             Console.WriteLine("-metadata" + argSeparator + "false\t\tRead metadata from header, outputs into json file\tDefault is false");

Writers/PCROOT.cs

@@ -230,9 +230,10 @@ void IWriter.Close()
             // add to tileroot list
             for (int i = 0, len = nodeBounds.Count; i < len; i++)
             {
-                var tilerow = nodeBounds[i].fileName + sep + nodeBounds[i].totalPoints + sep + nodeBounds[i].minX + sep + nodeBounds[i].minY + sep + nodeBounds[i].minZ + sep + nodeBounds[i].maxX + sep + nodeBounds[i].maxY + sep + nodeBounds[i].maxZ + sep + nodeBounds[i].cellX + sep + nodeBounds[i].cellY + sep + nodeBounds[i].cellZ + sep + nodeBounds[i].averageTimeStamp + sep + nodeBounds[i].overlapRatio;
-                // force dot as decimal separator
+                var tilerow = nodeBounds[i].totalPoints + sep + nodeBounds[i].minX + sep + nodeBounds[i].minY + sep + nodeBounds[i].minZ + sep + nodeBounds[i].maxX + sep + nodeBounds[i].maxY + sep + nodeBounds[i].maxZ + sep + nodeBounds[i].cellX + sep + nodeBounds[i].cellY + sep + nodeBounds[i].cellZ + sep + nodeBounds[i].averageTimeStamp + sep + nodeBounds[i].overlapRatio;
+                // force dot as decimal separator for values
                 tilerow = tilerow.Replace(",", ".");
+                tilerow = nodeBounds[i].fileName + sep + tilerow;
                 tilerootdata.Add(tilerow);
                 totalPointCount += nodeBounds[i].totalPoints;
             }