fix nullref in metadata only for pcroot, gltf. Add Job metadata in json (converter version, import settings and other data), adding minmax intensity and classification data to reader

Author: unitycoder

MainWindow.xaml.cs

@@ -24,12 +24,13 @@
 using System.Reflection;
 using System.Globalization;
 using System.Windows.Media;
+using PointCloudConverter.Structs.Metadata;
 
 namespace PointCloudConverter
 {
     public partial class MainWindow : Window
     {
-        static readonly string version = "03.04.2025";
+        static readonly string version = "04.04.2025";
         static readonly string appname = "PointCloud Converter - " + version;
         static readonly string rootFolder = AppDomain.CurrentDomain.BaseDirectory;
 
@@ -54,7 +55,7 @@ public partial class MainWindow : Window
         public static MainWindow mainWindowStatic;
         bool isInitialiazing = true;
 
-        static List<LasHeader> lasHeaders = new List<LasHeader>();
+        static JobMetadata jobMetadata = new JobMetadata();
 
         // progress bar data
         static int progressPoint = 0;
@@ -70,10 +71,6 @@ public partial class MainWindow : Window
         private readonly float cellSize = 0.5f;
         private static ConcurrentDictionary<(int, int, int), byte> occupiedCells = new();
 
-        // classification stats
-        static byte minClass = 255;
-        static byte maxClass = 0;
-
         // plugins
         string externalFileFormats = "";
 
@@ -202,10 +199,6 @@ private async void Main()
                 // get elapsed time using time
                 var startTime = DateTime.Now;
 
-                // classification minmax
-                minClass = 255;
-                maxClass = 0;
-
                 // if have files, process them
                 if (importSettings.errors.Count == 0)
                 {
@@ -343,7 +336,15 @@ private static async Task ProcessAllFiles(object workerParamsObject)
                 importSettings.offsetZ = lowestZ;
             } // if useAutoOffset
 
-            lasHeaders.Clear();
+
+            //lasHeaders.Clear();
+            jobMetadata.Job = new Job
+            {
+                ConverterVersion = version,
+                ImportSettings = importSettings,
+                StartTime = DateTime.Now
+            };
+            jobMetadata.lasHeaders.Clear();
             progressFile = 0;
 
             //for (int i = 0, len = importSettings.maxFiles; i < len; i++)
@@ -505,7 +506,11 @@ private static async Task ProcessAllFiles(object workerParamsObject)
                 StringEscapeHandling = StringEscapeHandling.Default // This prevents escaping of characters and write the WKT string properly
             };
 
-            string jsonMeta = JsonConvert.SerializeObject(lasHeaders, settings);
+            // add job date
+            jobMetadata.Job.EndTime = DateTime.Now;
+            jobMetadata.Job.Elapsed = jobMetadata.Job.EndTime - jobMetadata.Job.StartTime;
+
+            string jsonMeta = JsonConvert.SerializeObject(jobMetadata, settings);
 
             // var jsonMeta = JsonSerializer.Serialize(lasHeaders, new JsonSerializerOptions() { WriteIndented = true });
             //Log.Write("MetaData: " + jsonMeta);
@@ -666,8 +671,8 @@ static void ProgressTick(object sender, EventArgs e)
                                 progressBar.Maximum = maxValue;
                                 progressBar.Value = currentValue;
                                 progressBar.Foreground = ((currentValue + 1 >= maxValue) ? Brushes.Lime : Brushes.Red); //+1 hack fix
-                                //progressBar.ToolTip = $"Thread {index} - {currentValue} / {maxValue}"; // not visible, because modal dialog
-                                //Log.Write("ProgressTick: " + index + " " + currentValue + " / " + maxValue);
+                                                                                                                        //progressBar.ToolTip = $"Thread {index} - {currentValue} / {maxValue}"; // not visible, because modal dialog
+                                                                                                                        //Log.Write("ProgressTick: " + index + " " + currentValue + " / " + maxValue);
 
                                 // print json progress
                                 if (progressInfo.UseJsonLog) // TODO now same bool value is for each progressinfo..
@@ -686,12 +691,12 @@ static void ProgressTick(object sender, EventArgs e)
                         }
                     } // foreach progressinfo
                 } // lock
-                //}
-                //else //  finished ?
-                //{
-                //    Log.Write("*************** ProgressTick: progressTotalPoints is 0, finishing..");
-                //    mainWindowStatic.progressBarFiles.Value = 0;
-                //    mainWindowStatic.lblStatus.Content = "";
+                  //}
+                  //else //  finished ?
+                  //{
+                  //    Log.Write("*************** ProgressTick: progressTotalPoints is 0, finishing..");
+                  //    mainWindowStatic.progressBarFiles.Value = 0;
+                  //    mainWindowStatic.lblStatus.Content = "";
 
                 //    foreach (UIElement element in mainWindowStatic.ProgressBarsContainer.Children)
                 //    {
@@ -960,10 +965,6 @@ static bool ParseFile(ImportSettings importSettings, int fileIndex, int? taskId,
                     {
                         classification = taskReader.GetClassification();
 
-                        // get min and max
-                        if (classification < minClass) minClass = classification;
-                        if (classification > maxClass) maxClass = classification;
-
                         //classification = (byte)255;
 
                         //if (classification<0 || classification>1) Log.Write("****: " + classification.ToString());
@@ -1034,11 +1035,7 @@ static bool ParseFile(ImportSettings importSettings, int fileIndex, int? taskId,
                 if (importSettings.importMetadata == true)
                 {
                     var metaData = taskReader.GetMetaData(importSettings, fileIndex);
-                    // NOTE now its added to every file..
-                    metaData.ConverterVersion = version;
-                    metaData.MinClassification = minClass;
-                    metaData.MaxClassification = maxClass;
-                    lasHeaders.Add(metaData);
+                    jobMetadata.lasHeaders.Add(metaData);
                 }
 
             } // if importMetadataOnly == false ^
@@ -1049,7 +1046,7 @@ static bool ParseFile(ImportSettings importSettings, int fileIndex, int? taskId,
                     var metaData = taskReader.GetMetaData(importSettings, fileIndex);
                     // NOTE now its added to every file..
                     metaData.ConverterVersion = version;
-                    lasHeaders.Add(metaData);
+                    jobMetadata.lasHeaders.Add(metaData);
                 }
             }
 

Readers/IReader.cs

@@ -18,11 +18,11 @@ public interface IReader
         // retrieve single point scan time
         double GetTime();
 
-        // close filestream
         void Close();
         byte GetIntensity();
         byte GetClassification();
         LasHeader GetMetaData(ImportSettings importSettings, int fileIndex);
+
         void Dispose();
     }
 }

Readers/LAZ.cs

@@ -30,6 +30,11 @@ public class LAZ : IReader, IDisposable
         //bool importIntensity = false;
         bool customIntensityRange = false;
 
+        byte minClassification = 255;
+        byte maxClassification = 0;
+        byte minIntensity = 255;
+        byte maxIntensity = 0;
+
         int? taskID;
 
         // add constructor
@@ -50,6 +55,12 @@ bool IReader.InitReader(ImportSettings importSettings, int fileIndex)
             //importRGB = importSettings.importRGB;
             //importIntensity = importSettings.importIntensity;
             customIntensityRange = importSettings.useCustomIntensityRange;
+
+            minClassification = 255;
+            maxClassification = 0;
+            minIntensity = 255;
+            maxIntensity = 0;
+
             res = lazReader.open_reader(file, out compressedLAZ); // 0 = ok, 1 = error
             //}
             //catch (Exception e)
@@ -63,6 +74,7 @@ bool IReader.InitReader(ImportSettings importSettings, int fileIndex)
         LasHeader IReader.GetMetaData(ImportSettings importSettings, int fileIndex)
         {
             var h = new LasHeader();
+
             h.FileName = importSettings.inputFiles[fileIndex];
             h.FileSourceID = lazReader.header.file_source_ID;
             h.GlobalEncoding = lazReader.header.global_encoding;
@@ -98,6 +110,18 @@ LasHeader IReader.GetMetaData(ImportSettings importSettings, int fileIndex)
             h.MinZ = lazReader.header.min_z;
             h.MaxZ = lazReader.header.max_z;
 
+            if (importSettings.importClassification)
+            {
+                h.MinClassification = minClassification;
+                h.MaxClassification = maxClassification;
+            }
+
+            if (importSettings.importIntensity)
+            {
+                h.MinIntensity = minIntensity;
+                h.MaxIntensity = maxIntensity;
+            }
+
             if (h.NumberOfVariableLengthRecords > 0)
             {
                 h.VariableLengthRecords = new System.Collections.Generic.List<LasVariableLengthRecord>();
@@ -378,6 +402,12 @@ byte IReader.GetIntensity()
             //c.r = i;
             //c.g = i;
             //c.b = i;
+
+            // get min and max
+            if (i < minIntensity) minIntensity = i;
+            if (i > maxIntensity) maxIntensity = i;
+
+
             return i;
         }
 
@@ -389,6 +419,11 @@ byte IReader.GetClassification()
             byte extended = p.extended_classification;
             // Choose extended if it's valid and not equal to default "unclassified"
             byte finalClassification = (extended > 0 && extended != classification) ? extended : classification;
+
+            // get min and max
+            if (finalClassification < minClassification) minClassification = finalClassification;
+            if (finalClassification > maxClassification) maxClassification = finalClassification;
+
             return finalClassification;
         }
 
@@ -428,6 +463,16 @@ double IReader.GetTime()
             return lazReader.point.gps_time;
         }
 
+        //(byte, byte) IReader.GetClassificationRange()
+        //{
+        //    return (minClassification, maxClassification);
+        //}
+
+        //(byte, byte) IReader.GetIntensityRange()
+        //{
+        //    return (minIntensity, maxIntensity);
+        //}
+
         void IReader.Close()
         {
             lazReader.close_reader();

Structs/ImportSettings.cs

@@ -15,16 +15,22 @@ namespace PointCloudConverter
 {
     public class ImportSettings
     {
-        // filled in by program (so that json serializer is easier)
-        public string version { get; set; } = "0.0.0";
+        // filled in by program (so that json serializer is easier), not used
+        //public string version { get; set; } = "0.0.0";
 
         [JsonConverter(typeof(JsonStringEnumConverter))]
         public Logger.LogEvent @event { get; set; }
-
+        
+        [JsonIgnore] // FIXME doesnt ígnore it
         public IReader reader; // single threaded reader
         //public Dictionary<int?, IReader> Readers { get; set; } = new Dictionary<int?, IReader>();
         public ConcurrentDictionary<int?, IReader> Readers { get; set; } = new ConcurrentDictionary<int?, IReader>();
+        [JsonIgnore] 
         public IWriter writer = new UCPC();
+
+        public string ReaderType => reader?.GetType().Name;
+        public string WriterType => writer?.GetType().Name;
+
         //public Dictionary<int?, IWriter> Writers { get; set; } = new Dictionary<int?, IWriter>();
         //public ConcurrentDictionary<int?, WeakReference<IWriter>> Writers { get; set; } = new ConcurrentDictionary<int?, WeakReference<IWriter>>();
         private readonly ConcurrentBag<IWriter> _writerPool = new ConcurrentBag<IWriter>();

Structs/Metadata/LasHeader.cs

@@ -44,8 +44,12 @@ public class LasHeader
         public double MinY { get; set; }
         public double MaxZ { get; set; }
         public double MinZ { get; set; }
+
         public byte MinClassification { get; set; }
         public byte MaxClassification { get; set; }
+        public byte MinIntensity { get; set; }
+        public byte MaxIntensity { get; set; }
+
         public List<LasVariableLengthRecord> VariableLengthRecords { get; set; }
         public ulong StartOfWaveformDataPacketRecord { get; internal set; }
         public ulong StartOfFirstExtendedVariableLengthRecord { get; internal set; }

Writers/PCROOT.cs

@@ -184,6 +184,9 @@ void IWriter.WriteRGB(float r, float g, float b)
         // for pcroot, this is saving the rootfile
         void IWriter.Close()
         {
+            // this happens if imported metadata only?
+            if (importSettings == null) return;
+
             // save rootfile
             // only save after last file, TODO should save this if process fails or user cancels, so no need to start from 0 again.. but then needs some merge or continue from index n feature
             // if (isLastTask == true)