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

Various updates/fixes

Browse Source
This commit is contained in:
Daniel Girardeau-Montaut
2019-03-25 18:45:28 +01:00
parent 4907e68ae2
commit ba1b4ac58c
11 changed files with 188 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files
q3DMASCClassifier.cpp
+31 -26
View File
@@ -121,9 +121,8 @@ bool Classifier::classify(const Feature::Set& features, ccPointCloud* cloud, QSt
}
//look for the classification field
CCLib::ScalarField* classificationSF = nullptr;
int classifSFIdx = cloud->getScalarFieldIndexByName(LAS_FIELD_NAMES[LAS_CLASSIFICATION]); //LAS_FIELD_NAMES[LAS_CLASSIFICATION] = "Classification"
if (classifSFIdx < 0)
CCLib::ScalarField* classificationSF = GetClassificationSF(cloud);
if (!classificationSF)
{
//create it if necessary
ccScalarField* _classificationSF = new ccScalarField(LAS_FIELD_NAMES[LAS_CLASSIFICATION]);
@@ -133,13 +132,8 @@ bool Classifier::classify(const Feature::Set& features, ccPointCloud* cloud, QSt
errorMessage = QObject::tr("Not enough memory");
return false;
}
classifSFIdx = cloud->addScalarField(_classificationSF);
classificationSF = _classificationSF;
}
else
{
classificationSF = cloud->getScalarField(classifSFIdx);
}
assert(classificationSF);
classificationSF->fill(0); //0 = no classification?
@@ -216,8 +210,13 @@ bool Classifier::classify(const Feature::Set& features, ccPointCloud* cloud, QSt
}
classificationSF->computeMinAndMax();
cloud->setCurrentDisplayedScalarField(classifSFIdx);
cloud->showSF(true);
//show the classification field by default
{
int classifSFIdx = cloud->getScalarFieldIndexByName(classificationSF->getName());
cloud->setCurrentDisplayedScalarField(classifSFIdx);
cloud->showSF(true);
}
if (parentWidget && cloud->getDisplay())
{
cloud->getDisplay()->redraw();
@@ -257,17 +256,11 @@ bool Classifier::evaluate(const Feature::Set& features, CCLib::ReferenceCloud* t
}
//look for the classification field
int classifSFIdx = cloud->getScalarFieldIndexByName(LAS_FIELD_NAMES[LAS_CLASSIFICATION]); //LAS_FIELD_NAMES[LAS_CLASSIFICATION] = "Classification"
if (!classifSFIdx)
{
errorMessage = QObject::tr("Missing 'Classification' field on input cloud");
return false;
}
CCLib::ScalarField* classifSF = cloud->getScalarField(classifSFIdx);
CCLib::ScalarField* classifSF = GetClassificationSF(cloud);
if (!classifSF || classifSF->size() < cloud->size())
{
assert(false);
errorMessage = QObject::tr("Invalid 'Classification' field on input cloud");
errorMessage = QObject::tr("Missing/Invalid 'Classification' field on input cloud");
return false;
}
@@ -385,17 +378,11 @@ bool Classifier::train( const ccPointCloud* cloud,
}
//look for the classification field
int classifSFIdx = cloud->getScalarFieldIndexByName(LAS_FIELD_NAMES[LAS_CLASSIFICATION]); //LAS_FIELD_NAMES[LAS_CLASSIFICATION] = "Classification"
if (!classifSFIdx)
{
errorMessage = QObject::tr("Missing 'Classification' field on input cloud");
return false;
}
CCLib::ScalarField* classifSF = cloud->getScalarField(classifSFIdx);
CCLib::ScalarField* classifSF = GetClassificationSF(cloud);
if (!classifSF || classifSF->size() < cloud->size())
{
assert(false);
errorMessage = QObject::tr("Invalid 'Classification' field on input cloud");
errorMessage = QObject::tr("Missing/invalid 'Classification' field on input cloud");
return false;
}
@@ -603,3 +590,21 @@ bool Classifier::fromFile(QString filename, QWidget* parentWidget/*=nullptr*/)
return true;
}
CCLib::ScalarField* Classifier::GetClassificationSF(const ccPointCloud* cloud)
{
if (!cloud)
{
//invalid input cloud
assert(false);
return nullptr;
}
//look for the classification field
int classifSFIdx = cloud->getScalarFieldIndexByName(LAS_FIELD_NAMES[LAS_CLASSIFICATION]); //LAS_FIELD_NAMES[LAS_CLASSIFICATION] = "Classification"
if (classifSFIdx < 0)
{
return nullptr;
}
return cloud->getScalarField(classifSFIdx);
}