saberbud/q3DMASC
1
0
Fork 0
mirror of https://github.com/dgirardeau/q3DMASC.git synced 2026-08-29 08:34:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' of https://github.com/p-leroy/q3DMASC into dev

Browse Source
This commit is contained in:
Paul Leroy
2023-03-22 23:45:38 +01:00
parent ec5507be5b 55421bdb79
commit 7062d8c5e2
4 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CMakeLists.txt
+1 -1
View File
@@ -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 )
NeighborhoodFeature.cpp
+2 -2
View File
@@ -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;
}
q3DMASCClassifier.cpp
+2 -1
View File
@@ -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;
}
q3DMASCTools.cpp
+3 -3
View File
@@ -687,8 +687,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();
}
@@ -1137,7 +1137,7 @@ bool Tools::PrepareFeatures(const CorePoints& corePoints, Feature::Set& features
for (int i = 0; i < static_cast<int>(pointCount); ++i)
{
//spherical neighborhood extraction structure
CCCoreLib::DgmOctree::NearestNeighboursSearchStruct nNSS;
CCCoreLib::DgmOctree::NearestNeighboursSearchStruct nNSS;
{
nNSS.level = octreeLevel;
nNSS.queryPoint = *corePoints.cloud->getPoint(i);