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

Scalar fields can now handle large values (with an internal double offset). Their names can also be longer than 255 characters.

Browse Source
This commit is contained in:
Daniel Girardeau-Montaut
2024-11-10 17:32:37 +01:00
parent 8a9112cfd5
commit efab553b92
10 changed files with 68 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files
FeaturesInterface.cpp
+10 -7
View File
@@ -25,21 +25,24 @@
using namespace masc;
bool Feature::CheckSFExistence(ccPointCloud* cloud, const char* resultSFName)
bool Feature::CheckSFExistence(ccPointCloud* cloud, const QString& resultSFName)
{
if (!cloud || !resultSFName)
if (!cloud || resultSFName.isEmpty())
{
assert(false);
return false;
}
int sfIdx = cloud->getScalarFieldIndexByName(resultSFName);
int sfIdx = cloud->getScalarFieldIndexByName(resultSFName.toStdString());
return (sfIdx >= 0);
}
CCCoreLib::ScalarField* Feature::PrepareSF(ccPointCloud* cloud, const char* resultSFName, SFCollector* generatedScalarFields/*=nullptr*/, SFCollector::Behavior behavior/*=SFCollector::CAN_REMOVE*/)
CCCoreLib::ScalarField* Feature::PrepareSF( ccPointCloud* cloud,
const QString& resultSFName,
SFCollector* generatedScalarFields/*=nullptr*/,
SFCollector::Behavior behavior/*=SFCollector::CAN_REMOVE*/ )
{
if (!cloud || !resultSFName)
if (!cloud || resultSFName.isEmpty())
{
//invalid input parameters
assert(false);
@@ -47,7 +50,7 @@ CCCoreLib::ScalarField* Feature::PrepareSF(ccPointCloud* cloud, const char* resu
}
CCCoreLib::ScalarField* resultSF = nullptr;
int sfIdx = cloud->getScalarFieldIndexByName(resultSFName);
int sfIdx = cloud->getScalarFieldIndexByName(resultSFName.toStdString());
if (sfIdx >= 0)
{
// ccLog::Warning("Existing SF: " + QString(resultSFName) + ", do not store in generatedScalarFields");
@@ -56,7 +59,7 @@ CCCoreLib::ScalarField* Feature::PrepareSF(ccPointCloud* cloud, const char* resu
else
{
// ccLog::Warning("SF does not exist, create it: " + QString(resultSFName) + ", SFCollector::Behavior " + QString::number(behavior));
ccScalarField* newSF = new ccScalarField(resultSFName);
ccScalarField* newSF = new ccScalarField(resultSFName.toStdString());
if (!newSF->resizeSafe(cloud->size()))
{
ccLog::Warning("Not enough memory");