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 'v2.13' of https://github.com/dgirardeau/q3DMASC.git into dev

Browse Source 
# Conflicts:
#	q3DMASCTools.cpp
This commit is contained in:
Paul Leroy
2023-02-07 16:28:42 +01:00
parent 9ce4499c61 4b4341c2a9
commit f250bb6406
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
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;
}
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);