fixed classification issue (header wrong format)

Author: unitycoder

MainWindow.xaml.cs

@@ -905,9 +905,9 @@ static bool ParseFile(ImportSettings importSettings, int fileIndex, int? taskId,
                     // TODO get intensity as separate value
                     if (importSettings.importIntensity == true)
                     {
-                        //intensity = taskReader.GetIntensity();
+                        intensity = taskReader.GetIntensity();
                         // works here
-                        intensity = taskReader.GetClassification();
+                        //intensity = taskReader.GetClassification();
                         //if (i < 20000) Log.Write("int: " + intensity);
 
                         // if no rgb, then replace RGB with intensity

Tools/ArgParser.cs

@@ -875,11 +875,17 @@ public static ImportSettings Parse(string[] args, string rootFolder, ILogger log
             //}            
 
             // must have at least one
-            if (importSettings.importRGB == false && (importSettings.importIntensity == false && importSettings.importClassification == false) && importSettings.importClassification == false)
+            if (importSettings.importRGB == false && importSettings.importIntensity == false && importSettings.importClassification == false)
             {
                 importSettings.errors.Add("Must have -rgb OR -intensity OR -classification enabled");
             }
 
+            // but cannot have int and class only
+            if (importSettings.importRGB == false && importSettings.importIntensity == true && importSettings.importClassification == true)
+            {
+                importSettings.errors.Add("Cannot have -intensity and -classification enabled without -rgb");
+            }
+
             if (importSettings.exportFormat == ExportFormat.UCPC && importSettings.maxThreads > 1)
             {
                 importSettings.errors.Add("UCPC format doesnt support multi-threading yet, use 1 thread only (or remove -maxthreads param)");

Writers/PCROOT.cs

@@ -255,7 +255,7 @@ void IWriter.Close()
             int versionID = importSettings.packColors ? 2 : 1; // (1 = original, 2 = packed v3 format)
             if (importSettings.packColors == true) versionID = 2;
             if (useLossyFiltering == true) versionID = 3;
-            if (importSettings.importIntensity == true && importSettings.importRGB && importSettings.packColors) versionID = 4; // new int packed format
+            if ((importSettings.importIntensity == true || importSettings.importClassification == true) && importSettings.importRGB && importSettings.packColors) versionID = 4; // new int packed format
 
             bool addComments = false;
 
@@ -429,7 +429,7 @@ void IWriter.AddPoint(int index, float x, float y, float z, float r, float g, fl
 
                 if (importSettings.importRGB && importSettings.importIntensity == true) nodeIntensity[key].Add(intensity);
                 // TODO separate if rgb and or int?
-                if (importSettings.importClassification == true) nodeClassification[key].Add(classification);
+                if (importSettings.importRGB && importSettings.importClassification == true) nodeClassification[key].Add(classification);
                 if (importSettings.averageTimestamp == true) nodeTime[key].Add(time);
             }
             else // create new list for this key
@@ -443,7 +443,7 @@ void IWriter.AddPoint(int index, float x, float y, float z, float r, float g, fl
                 nodeB[key] = new List<float> { b };
 
                 if (importSettings.importRGB && importSettings.importIntensity == true) nodeIntensity[key] = new List<float> { intensity };
-                if (importSettings.importClassification == true) nodeClassification[key] = new List<float> { classification };
+                if (importSettings.importRGB && importSettings.importClassification == true) nodeClassification[key] = new List<float> { classification };
                 if (importSettings.averageTimestamp == true) nodeTime[key] = new List<double> { time };
             }
         } // addpoint()