From 35ed836088de79a84a9eaea61cb5dfa02cae8082 Mon Sep 17 00:00:00 2001 From: Daniel Girardeau-Montaut Date: Fri, 12 Aug 2022 14:15:05 +0200 Subject: [PATCH 1/4] Compilation with v2.13 --- q3DMASCTools.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/q3DMASCTools.cpp b/q3DMASCTools.cpp index 8d8c562..5ab3cd5 100644 --- a/q3DMASCTools.cpp +++ b/q3DMASCTools.cpp @@ -685,8 +685,8 @@ bool Tools::LoadFile( const QString& filename, { loadParameters.alwaysDisplayLoadDialog = true; loadParameters.shiftHandlingMode = ccGlobalShiftManager::DIALOG_IF_NECESSARY; - loadParameters.coordinatesShift = &loadCoordinatesShift; - loadParameters.coordinatesShiftEnabled = &loadCoordinatesTransEnabled; + loadParameters._coordinatesShift = &loadCoordinatesShift; + loadParameters._coordinatesShiftEnabled = &loadCoordinatesTransEnabled; loadParameters.parentWidget = parent; FileIOFilter::ResetSesionCounter(); } @@ -1127,11 +1127,10 @@ bool Tools::PrepareFeatures(const CorePoints& corePoints, Feature::Set& features for (int i = 0; i < static_cast(pointCount); ++i) { //spherical neighborhood extraction structure - CCCoreLib::DgmOctree::NearestNeighboursSphericalSearchStruct nNSS; + CCCoreLib::DgmOctree::NearestNeighboursSearchStruct nNSS; { nNSS.level = octreeLevel; nNSS.queryPoint = *corePoints.cloud->getPoint(i); - nNSS.prepare(largestRadius, octree->getCellSize(nNSS.level)); octree->getTheCellPosWhichIncludesThePoint(&nNSS.queryPoint, nNSS.cellPos, nNSS.level); octree->computeCellCenter(nNSS.cellPos, nNSS.level, nNSS.cellCenter); } From 4b4341c2a9e2c765504c2459df0270d906cb4846 Mon Sep 17 00:00:00 2001 From: Daniel Girardeau-Montaut Date: Thu, 18 Aug 2022 10:26:41 +0200 Subject: [PATCH 2/4] Bug fix: Zmin/Zmax/RANGE features were badly computed --- NeighborhoodFeature.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/NeighborhoodFeature.cpp b/NeighborhoodFeature.cpp index 1b3aa5f..e415290 100644 --- a/NeighborhoodFeature.cpp +++ b/NeighborhoodFeature.cpp @@ -304,9 +304,9 @@ bool NeighborhoodFeature::computeValue(CCCoreLib::DgmOctree::NeighboursSet& poin minZ = maxZ = pointsInNeighbourhood[0].point->z; for (size_t i = 1; i < kNN; ++i) { - if (minZ < pointsInNeighbourhood[i].point->z) + if (minZ > pointsInNeighbourhood[i].point->z) minZ = pointsInNeighbourhood[i].point->z; - else if (maxZ > pointsInNeighbourhood[i].point->z) + else if (maxZ < pointsInNeighbourhood[i].point->z) maxZ = pointsInNeighbourhood[i].point->z; } From 9ce4499c61423b39f101aedec1882ad9e4aa7b54 Mon Sep 17 00:00:00 2001 From: Paul Leroy Date: Mon, 6 Feb 2023 16:00:25 +0100 Subject: [PATCH 3/4] bug : confusion matrix shall not be computed when there is no classification field in the data --- CMakeLists.txt | 2 +- q3DMASCClassifier.cpp | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 9393d49..36ea39a 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.2") + set(Q3DMASC_PLUGIN_VERSION "0.3") include( CMakePolicies NO_POLICY_SCOPE ) diff --git a/q3DMASCClassifier.cpp b/q3DMASCClassifier.cpp index 553bc13..18028a0 100644 --- a/q3DMASCClassifier.cpp +++ b/q3DMASCClassifier.cpp @@ -275,7 +275,8 @@ bool Classifier::classify( const Feature::Source::Set& featureSources, QCoreApplication::processEvents(); } - ConfusionMatrix *confusionMatrix = new ConfusionMatrix(*classifSFBackup, *classificationSF); + if (classifSFBackup != nullptr) + ConfusionMatrix *confusionMatrix = new ConfusionMatrix(*classifSFBackup, *classificationSF); return success; } From 55421bdb79f22660e8e0f85e7beb0c64fd8869d0 Mon Sep 17 00:00:00 2001 From: Paul Leroy Date: Thu, 9 Feb 2023 16:37:07 +0100 Subject: [PATCH 4/4] version number changed to 0.3+ --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 36ea39a..8b99703 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.3") + set(Q3DMASC_PLUGIN_VERSION "0.3+") include( CMakePolicies NO_POLICY_SCOPE )