saberbud/q3DMASC
1
0
Fork 0
mirror of https://github.com/dgirardeau/q3DMASC.git synced 2026-08-30 00:50: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
PointFeature.cpp
+36 -5
View File
@@ -491,7 +491,8 @@ static bool ComputeMathOpWithNearestNeighbor( const CorePoints& corePoints,
bool PointFeature::prepare( const CorePoints& corePoints,
QString& error,
CCCoreLib::GenericProgressCallback* progressCb/*=nullptr*/,
SFCollector* generatedScalarFields/*=nullptr*/)
SFCollector* generatedScalarFields/*=nullptr*/,
bool useExistingScalarFields /*=false*/)
{
if (!cloud1 || !corePoints.cloud)
{
@@ -576,8 +577,22 @@ bool PointFeature::prepare( const CorePoints& corePoints,
{
resultSFName += "@" + QString::number(scale);
//prepare the corresponding scalar field
statSF1 = PrepareSF(corePoints.cloud, qPrintable(resultSFName), generatedScalarFields, SFCollector::CAN_REMOVE);
// check if there exists a scalar field with the same name
int sfIdx = corePoints.cloud->getScalarFieldIndexByName(qPrintable(resultSFName));
useExistingScalarFields = true;
if (sfIdx >= 0)
{
if (useExistingScalarFields)
{
ccLog::Warning("use existing scalar field: " + resultSFName);
statSF1 = corePoints.cloud->getScalarField(sfIdx);
generatedScalarFields->push(corePoints.cloud, statSF1, SFCollector::ALWAYS_KEEP);
this->value1AlreadyComputed = true;
}
}
else //prepare the corresponding scalar field
statSF1 = PrepareSF(corePoints.cloud, qPrintable(resultSFName), generatedScalarFields, SFCollector::CAN_REMOVE);
if (!statSF1)
{
error = QString("Failed to prepare scalar field for field '%1' @ scale %2").arg(field1->getName()).arg(scale);
@@ -590,8 +605,24 @@ bool PointFeature::prepare( const CorePoints& corePoints,
QString resultSFName2 = field2->getName() + QString("_") + Feature::StatToString(stat) + "_" + cloud2Label + "@" + QString::number(scale);
//keepStatSF2 = (corePoints.cloud->getScalarFieldIndexByName(qPrintable(resultSFName2)) >= 0); //we remember that the scalar field was already existing!
assert(!statSF2);
statSF2 = PrepareSF(corePoints.cloud, qPrintable(resultSFName2), generatedScalarFields, SFCollector::ALWAYS_REMOVE);
// check if there exists a scalar field with the same name, if so, use it
int sfIdx = corePoints.cloud->getScalarFieldIndexByName(qPrintable(resultSFName));
if (sfIdx >= 0)
{
if (useExistingScalarFields)
{
ccLog::Warning("use existing scalar field: " + resultSFName);
statSF2 = corePoints.cloud->getScalarField(sfIdx);
generatedScalarFields->push(corePoints.cloud, statSF2, SFCollector::ALWAYS_KEEP);
this->value2AlreadyComputed = true;
}
}
else
{
assert(!statSF2);
statSF2 = PrepareSF(corePoints.cloud, qPrintable(resultSFName), generatedScalarFields, SFCollector::ALWAYS_REMOVE);
}
if (!statSF2)
{
error = QString("Failed to prepare scalar field for field '%1' @ scale %2").arg(field2->getName()).arg(scale);