From a4d014c2d5fb16599c643de076b5910c5c83d8a2 Mon Sep 17 00:00:00 2001 From: Paul Leroy Date: Thu, 1 Jun 2023 09:54:11 +0200 Subject: [PATCH] 0.9 --- CMakeLists.txt | 2 +- q3DMASCClassifier.cpp | 4 ++-- qClassify3DMASCDialog.cpp | 7 +++++++ qClassify3DMASCDialog.h | 1 + 4 files changed, 11 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index e559fbd..513a75c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -8,7 +8,7 @@ if (INSTALL_Q3DMASC_PLUGIN) project( Q3DMASC_PLUGIN ) AddPlugin( NAME ${PROJECT_NAME} ) - set(Q3DMASC_PLUGIN_VERSION "0.8+") + set(Q3DMASC_PLUGIN_VERSION "0.9") include( CMakePolicies NO_POLICY_SCOPE ) diff --git a/q3DMASCClassifier.cpp b/q3DMASCClassifier.cpp index 6b8b7cf..9b83f87 100644 --- a/q3DMASCClassifier.cpp +++ b/q3DMASCClassifier.cpp @@ -328,7 +328,7 @@ bool Classifier::evaluate(const Feature::Source::Set& featureSources, if (outIdx >= 0) testCloud->deleteScalarField(outIdx); else - ccLog::Warning("add " + outputSFName + " to the TEST cloud"); + ccLog::Print("add " + outputSFName + " to the TEST cloud"); outIdx = testCloud->addScalarField(qPrintable(outputSFName)); outSF = static_cast(testCloud->getScalarField(outIdx)); } @@ -339,7 +339,7 @@ bool Classifier::evaluate(const Feature::Source::Set& featureSources, if (cvConfidenceIdx >= 0) // if the scalar field exists, delete it testCloud->deleteScalarField(cvConfidenceIdx); else - ccLog::Warning("add Classification_confidence to the TEST cloud"); + ccLog::Print("add Classification_confidence to the TEST cloud"); cvConfidenceIdx = testCloud->addScalarField("Classification_confidence"); cvConfidenceSF = static_cast(testCloud->getScalarField(cvConfidenceIdx)); } diff --git a/qClassify3DMASCDialog.cpp b/qClassify3DMASCDialog.cpp index 7d47026..d2c825d 100644 --- a/qClassify3DMASCDialog.cpp +++ b/qClassify3DMASCDialog.cpp @@ -116,6 +116,13 @@ Classify3DMASCDialog::Classify3DMASCDialog(ccMainAppInterface* app, bool trainMo } onCloudChanged(0); + + readSettings(); +} + +Classify3DMASCDialog::~Classify3DMASCDialog() +{ + writeSettings(); } void Classify3DMASCDialog::readSettings() diff --git a/qClassify3DMASCDialog.h b/qClassify3DMASCDialog.h index b250c7a..a9599ec 100644 --- a/qClassify3DMASCDialog.h +++ b/qClassify3DMASCDialog.h @@ -34,6 +34,7 @@ public: //! Default constructor Classify3DMASCDialog(ccMainAppInterface* app, bool trainMode = false); + ~Classify3DMASCDialog(); //! read settings void readSettings();