fix maxthreads limit, GUI: fix crash if no import/export format selected, remove % from json percentage value, remove default export format (need to select or assign it with args), #BUILD beta

Author: unitycoder

MainWindow.xaml.cs

@@ -25,7 +25,7 @@ namespace PointCloudConverter
 {
     public partial class MainWindow : Window
     {
-        static readonly string version = "09.09.2024";
+        static readonly string version = "10.09.2024";
         static readonly string appname = "PointCloud Converter - " + version;
         static readonly string rootFolder = AppDomain.CurrentDomain.BaseDirectory;
 
@@ -88,6 +88,10 @@ private async void Main()
             //var testwriter = PointCloudConverter.Plugins.PluginLoader.LoadWriter("plugins/GLTFWriter.dll");
             //testwriter.Close();
 
+            // for debug: print config file location in appdata local here directly
+            // string configFilePath = System.Configuration.ConfigurationManager.OpenExeConfiguration(System.Configuration.ConfigurationUserLevel.PerUserRoamingAndLocal).FilePath;
+            // Log.WriteLine("Config file: " + configFilePath);
+
             // using from commandline
             if (args.Length > 1)
             {
@@ -168,10 +172,7 @@ private async void Main()
             LoadSettings();
         }
 
-
-
         // main processing loop
-
         private static async Task ProcessAllFiles(object workerParamsObject)
         {
             var workerParams = (WorkerParams)workerParamsObject;
@@ -293,6 +294,7 @@ private static async Task ProcessAllFiles(object workerParamsObject)
             //// hack to fix progress bar not updating on last file
             //progressFile++;
 
+            // clamp to maxfiles
             int maxThreads = Math.Min(importSettings.maxThreads, importSettings.maxFiles);
             // clamp to min 1
             maxThreads = Math.Max(maxThreads, 1);
@@ -301,7 +303,7 @@ private static async Task ProcessAllFiles(object workerParamsObject)
             // init pool
             importSettings.InitWriterPool(maxThreads, importSettings.exportFormat);
 
-            var semaphore = new SemaphoreSlim(importSettings.maxThreads);
+            var semaphore = new SemaphoreSlim(maxThreads);
 
             var tasks = new List<Task>();
 
@@ -325,18 +327,17 @@ 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, if needed
+                    //if (semaphore.CurrentCount == 0) // Make sure we don't release more times than we acquire
+                    //{
+                    //    semaphore.Release();
+                    //}
                 }
                 //int? taskId = Task.CurrentId; // Get the current task ID
 
                 //progressFile = i;
                 Interlocked.Increment(ref progressFile);
 
-
                 //bool isLastTask = (i == len - 1); // Check if this is the last task
 
                 int index = i; // Capture the current file index in the loop
@@ -582,7 +583,7 @@ static void ProgressTick(object sender, EventArgs e)
                                         "\"thread\": " + index + "," +
                                         "\"currentPoint\": " + currentValue + "," +
                                         "\"totalPoints\": " + maxValue + "," +
-                                        "\"percentage\": " + (int)((currentValue / (float)maxValue) * 100) + "%," +
+                                        "\"percentage\": " + (int)((currentValue / (float)maxValue) * 100) + "," +
                                         "\"file\": " + System.Text.Json.JsonSerializer.Serialize(progressInfo.FilePath) +
                                         "}";
                                     Log.WriteLine(jsonString, LogEvent.Progress);
@@ -698,7 +699,7 @@ static bool ParseFile(ImportSettings importSettings, int fileIndex, int? taskId,
                 }
                 else
                 {
-                    Log.WriteLine("Points: " + pointCount);
+                    Log.WriteLine("Points: " + pointCount + " (" + importSettings.inputFiles[fileIndex] + ")");
                 }
 
                 // NOTE only works with formats that have bounds defined in header, otherwise need to loop whole file to get bounds?
@@ -967,7 +968,7 @@ void StartProcess(bool doProcess = true)
             args.Add("-rgb=" + (bool)chkImportRGB.IsChecked);
             args.Add("-intensity=" + (bool)chkImportIntensity.IsChecked);
 
-            if (cmbExportFormat.SelectedItem.ToString().ToUpper().Contains("PCROOT")) args.Add("-gridsize=" + txtGridSize.Text);
+            if (cmbExportFormat.SelectedItem?.ToString()?.ToUpper()?.Contains("PCROOT") == true) args.Add("-gridsize=" + txtGridSize.Text);
 
             if ((bool)chkUseMinPointCount.IsChecked) args.Add("-minpoints=" + txtMinPointCount.Text);
             if ((bool)chkUseScale.IsChecked) args.Add("-scale=" + txtScale.Text);
@@ -1415,10 +1416,10 @@ private void cmbExportFormat_SelectionChanged(object sender, SelectionChangedEve
                 // if PCROOT then filename is required, use default output.pcroot then
                 if (cmbExportFormat.SelectedValue.ToString().ToUpper().Contains("PCROOT"))
                 {
-                    string sourceName= Path.GetFileNameWithoutExtension(txtInputFile.Text);
+                    string sourceName = Path.GetFileNameWithoutExtension(txtInputFile.Text);
                     if (string.IsNullOrEmpty(sourceName)) sourceName = "output";
 
-                    txtOutput.Text = Path.Combine(currentOutput,  sourceName +".pcroot");
+                    txtOutput.Text = Path.Combine(currentOutput, sourceName + ".pcroot");
                 }
                 return;
             }

Structs/ImportSettings.cs

@@ -237,7 +237,7 @@ public void ReleaseReader(int? taskId)
         [JsonConverter(typeof(JsonStringEnumConverter))]
         public ImportFormat importFormat { get; set; } = ImportFormat.LAS; //default to las for now
         [JsonConverter(typeof(JsonStringEnumConverter))]
-        public ExportFormat exportFormat { get; set; } = ExportFormat.PCROOT; // defaults to PCROOT (v3) now
+        public ExportFormat exportFormat { get; set; }// = ExportFormat.PCROOT; // defaults to PCROOT (v3) now
 
         public List<string> inputFiles { get; set; } = new List<string>();
         public string outputFile { get; set; } = null;

Tools/ArgParser.cs

@@ -798,7 +798,7 @@ public static ImportSettings Parse(string[] args, string rootFolder)
             // check required settings
             if (importSettings.exportFormat == ExportFormat.Unknown)
             {
-                importSettings.errors.Add("No export format defined (Example: -exportformat" + argValueSeparator + "UCPC)");
+                importSettings.errors.Add("No export format defined (Example: -exportformat" + argValueSeparator + "PCROOT)");
             }
 
             // cannot have both rgb & intensity