fixing classification

Author: unitycoder

MainWindow.xaml.cs

@@ -268,7 +268,7 @@ private static async Task ProcessAllFiles(object workerParamsObject)
             //Log.Write(istrue1 ? "1" : "0");
             //Log.Write(istrue2 ? "1" : "0");
 
-            if ((importSettings.useAutoOffset == true && importSettings.importMetadataOnly == false) || (importSettings.importIntensity == true && importSettings.importRGB == true && importSettings.packColors == true && importSettings.importMetadataOnly == false))
+            if ((importSettings.useAutoOffset == true && importSettings.importMetadataOnly == false) || ((importSettings.importIntensity == true||importSettings.importClassification == true) && importSettings.importRGB == true && importSettings.packColors == true && importSettings.importMetadataOnly == false))
             {
                 int iterations = importSettings.offsetMode == "min" ? importSettings.maxFiles : 1; // 1 for legacy mode
 
@@ -767,7 +767,7 @@ static bool ParseFile(ImportSettings importSettings, int fileIndex, int? taskId,
                 // NOTE only works with formats that have bounds defined in header, otherwise need to loop whole file to get bounds?
 
                 // dont use these bounds, in this case
-                if (importSettings.useAutoOffset == true || (importSettings.importIntensity == true && importSettings.importRGB == true && importSettings.packColors == true))
+                if (importSettings.useAutoOffset == true || ((importSettings.importIntensity == true || importSettings.importClassification == true) && importSettings.importRGB == true && importSettings.packColors == true))
                 {
                     // TODO add manual offset here still?
                     // we use global bounds or Y offset to fix negative Y
@@ -906,9 +906,8 @@ static bool ParseFile(ImportSettings importSettings, int fileIndex, int? taskId,
                     if (importSettings.importIntensity == true)
                     {
                         //intensity = taskReader.GetIntensity();
-                        
+                        // works here
                         intensity = taskReader.GetClassification();
-
                         //if (i < 20000) Log.Write("int: " + intensity);
 
                         // if no rgb, then replace RGB with intensity
@@ -924,12 +923,12 @@ static bool ParseFile(ImportSettings importSettings, int fileIndex, int? taskId,
 
                     if (importSettings.importClassification == true)
                     {
-                        //classification = taskReader.GetClassification();
-                        classification = taskReader.GetIntensity();
+                        classification = taskReader.GetClassification();
+                        //classification = taskReader.GetIntensity();
                         //if (classification<0 || classification>1) Log.Write("****: " + classification.ToString());
 
                         //if (i < 20000) Log.Write("class: " + classification.ToString());
-
+                        //classification = 0;
                         //if (intensity.r < minInt)
                         //{
                         //    minInt = intensity.r;

Tools/ArgParser.cs

@@ -875,7 +875,7 @@ 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)
+            if (importSettings.importRGB == false && (importSettings.importIntensity == false && importSettings.importClassification == false) && importSettings.importClassification == false)
             {
                 importSettings.errors.Add("Must have -rgb OR -intensity OR -classification enabled");
             }

Writers/PCROOT.cs

@@ -265,6 +265,7 @@ void IWriter.Close()
 
             string commentRow = "# version" + sep + "gridsize" + sep + "pointcount" + sep + "boundsMinX" + sep + "boundsMinY" + sep + "boundsMinZ" + sep + "boundsMaxX" + sep + "boundsMaxY" + sep + "boundsMaxZ" + sep + "autoOffsetX" + sep + "autoOffsetY" + sep + "autoOffsetZ" + sep + "packMagicValue";
             if (importSettings.importRGB == true && importSettings.importIntensity == true) commentRow += sep + "intensity";
+            if (importSettings.importRGB == true && importSettings.importClassification == true) commentRow += sep + "classification";
             if (addComments) tilerootdata.Insert(1, commentRow);
 
             // add global header settings to first row
@@ -526,7 +527,8 @@ void IWriter.Save(int fileIndex)
                     nodeTempIntensity = nodeIntensity[key];
                 }
 
-                if (importSettings.importClassification == true)
+                // TODO separate?
+                if (importSettings.importRGB == true && importSettings.importClassification == true)
                 {
                     nodeTempClassification = nodeClassification[key];
                 }
@@ -921,6 +923,7 @@ void IWriter.Save(int fileIndex)
                         writerIntensity.Close();
                         bsIntensity.Dispose();
                     }
+
                     // TEST separate classification
                     if (importSettings.importRGB == true && importSettings.importClassification == true)
                     {