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

useExistingScalarFields implementation

Browse Source
This commit is contained in:
Paul Leroy
2023-03-24 18:28:05 +01:00
parent 7062d8c5e2
commit 0db1201087
11 changed files with 132 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
q3DMASCTools.cpp
+8 -6
View File
@@ -984,8 +984,10 @@ bool Tools::PrepareFeatures(const CorePoints& corePoints, Feature::Set& features
return false;
}
// if the feature already exists and if useExistingFeatures is checked, simply populate generatedScalarFields
//prepare the feature
if (!feature->prepare(corePoints, errorStr, progressCb, generatedScalarFields))
bool useExistingScalarFileds = true;
if (!feature->prepare(corePoints, errorStr, progressCb, generatedScalarFields, useExistingScalarFileds))
{
//something failed (error should be up to date)
return false;
@@ -1180,7 +1182,7 @@ bool Tools::PrepareFeatures(const CorePoints& corePoints, Feature::Set& features
//Point features
for (PointFeature::Shared& feature : fas.pointFeaturesPerScale[currentScale])
{
if (feature->cloud1 == sourceCloud && feature->statSF1 && feature->field1)
if (feature->cloud1 == sourceCloud && feature->statSF1 && feature->field1 && !feature->value1AlreadyComputed)
{
double outputValue = 0;
if (!feature->computeStat(nNSS.pointsInNeighbourhood, feature->field1, outputValue))
@@ -1194,7 +1196,7 @@ bool Tools::PrepareFeatures(const CorePoints& corePoints, Feature::Set& features
feature->statSF1->setValue(i, v1);
}
if (feature->cloud2 == sourceCloud && feature->statSF2 && feature->field2)
if (feature->cloud2 == sourceCloud && feature->statSF2 && feature->field2 && !feature->value2AlreadyComputed)
{
assert(feature->op != Feature::NO_OPERATION);
double outputValue = 0;
@@ -1213,7 +1215,7 @@ bool Tools::PrepareFeatures(const CorePoints& corePoints, Feature::Set& features
//Neighborhood features
for (NeighborhoodFeature::Shared& feature : fas.neighborhoodFeaturesPerScale[currentScale])
{
if (feature->cloud1 == sourceCloud && feature->sf1)
if (feature->cloud1 == sourceCloud && feature->sf1 && !feature->value1AlreadyComputed)
{
double outputValue = 0;
if (!feature->computeValue(nNSS.pointsInNeighbourhood, nNSS.queryPoint, outputValue))
@@ -1228,7 +1230,7 @@ bool Tools::PrepareFeatures(const CorePoints& corePoints, Feature::Set& features
feature->sf1->setValue(i, v1);
}
if (feature->cloud2 == sourceCloud && feature->sf2)
if (feature->cloud2 == sourceCloud && feature->sf2 && !feature->value2AlreadyComputed)
{
assert(feature->op != Feature::NO_OPERATION);
double outputValue = 0;
@@ -1248,7 +1250,7 @@ bool Tools::PrepareFeatures(const CorePoints& corePoints, Feature::Set& features
//Context-based features
for (ContextBasedFeature::Shared& feature : fas.contextBasedFeaturesPerScale[currentScale])
{
if (feature->cloud2 == sourceCloud && feature->sf)
if (feature->cloud2 == sourceCloud && feature->sf && !feature->valueAlreadyComputed)
{
ScalarType outputValue = 0;
if (!feature->computeValue(nNSS.pointsInNeighbourhood, nNSS.queryPoint, outputValue))