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

Various updates (command line call to classification, etc.)

Browse Source
This commit is contained in:
Daniel Girardeau-Montaut
2019-01-19 00:49:29 +01:00
parent 3150548792
commit ecbdb4973e
19 changed files with 372 additions and 141 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ContextBasedFeature.cpp
+4 -3
View File
@@ -24,7 +24,8 @@ using namespace masc;
bool ContextBasedFeature::prepare( const CorePoints& corePoints,
QString& error,
CCLib::GenericProgressCallback* progressCb/*=nullptr*/)
CCLib::GenericProgressCallback* progressCb/*=nullptr*/,
SFCollector* generatedScalarFields/*=nullptr*/)
{
if (!cloud1 || !corePoints.cloud)
{
@@ -62,7 +63,7 @@ bool ContextBasedFeature::prepare( const CorePoints& corePoints,
//and the scalar field
assert(!sf);
sf = PrepareSF(corePoints.cloud, qPrintable(resultSFName));
sf = PrepareSF(corePoints.cloud, qPrintable(resultSFName), generatedScalarFields);
if (!sf)
{
error = QString("Failed to prepare scalar %1 @ scale %2").arg(resultSFName).arg(scale);
@@ -117,7 +118,7 @@ bool ContextBasedFeature::prepare( const CorePoints& corePoints,
ScalarType s = NAN_VALUE;
int neighborhoodSize = 0;
if (octree->findPointNeighbourhood(P, &Yk, static_cast<unsigned>(kNN), octreeLevel, maxSquareDist, 0, &neighborhoodSize) >= kNN)
if (octree->findPointNeighbourhood(P, &Yk, static_cast<unsigned>(kNN), octreeLevel, maxSquareDist, 0, &neighborhoodSize) >= static_cast<unsigned>(kNN))
{
CCVector3d sumQ(0, 0, 0);
for (int k = 0; k < kNN; ++k)