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

Merge pull request #11 from p-leroy/verticality

Browse Source 
add the verticality feature (VERT)
This commit is contained in:
Daniel Girardeau-Montaut
2024-08-06 09:31:54 +02:00
committed by GitHub
parent ad47aad516 88727279f7
commit 78ddf39740
4 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CMakeLists.txt
+1 -1
View File
@@ -8,7 +8,7 @@ if (PLUGIN_STANDARD_3DMASC)
project( Q3DMASC_PLUGIN )
AddPlugin( NAME ${PROJECT_NAME} )
set(Q3DMASC_PLUGIN_VERSION "1.0+")
set(Q3DMASC_PLUGIN_VERSION "1.1")
include( CMakePolicies NO_POLICY_SCOPE )
NeighborhoodFeature.cpp
+4
View File
@@ -228,6 +228,7 @@ bool NeighborhoodFeature::computeValue(CCCoreLib::DgmOctree::NeighboursSet& poin
case SPHER:
case LINEA:
case PLANA:
case VERT:
{
CCCoreLib::Neighbourhood::GeomFeature f;
switch (type)
@@ -250,6 +251,9 @@ bool NeighborhoodFeature::computeValue(CCCoreLib::DgmOctree::NeighboursSet& poin
case PLANA:
f = CCCoreLib::Neighbourhood::Planarity;
break;
case VERT:
f = CCCoreLib::Neighbourhood::Verticality;
break;
default:
//impossible
assert(false);
NeighborhoodFeature.h
+5
View File
@@ -48,6 +48,7 @@ namespace masc
, Zmin
, ANISO
, FOM
, VERT
//, LINEF
//, ORIENF
};
@@ -90,6 +91,8 @@ namespace masc
return "ANISO";
case FOM:
return "FOM";
case VERT:
return "VERT";
//case LINEF:
// return "LINEF";
//case ORIENF:
@@ -136,6 +139,8 @@ namespace masc
return ANISO;
else if (token == "FOM")
return FOM;
else if (token == "VERT")
return VERT;
//else if (token == "LINEF")
// return LINEF;
//else if (token == "ORIENF")
q3DMASCTools.cpp
+5 -5
View File
@@ -1297,7 +1297,7 @@ bool Tools::PrepareFeatures(const CorePoints& corePoints, Feature::Set& features
if (!feature->computeStat(nNSS.pointsInNeighbourhood, feature->field1, outputValue))
{
//an error occurred
localErrorStr = "An error occurred during the computation of feature " + feature->toString() + "on cloud " + feature->cloud1->getName();
localErrorStr = "An error occurred during the computation of feature " + feature->toString() + " on cloud " + feature->cloud1->getName();
localSuccess = false;
break;
}
@@ -1313,7 +1313,7 @@ bool Tools::PrepareFeatures(const CorePoints& corePoints, Feature::Set& features
if (!feature->computeStat(nNSS.pointsInNeighbourhood, feature->field2, outputValue))
{
//an error occurred
localErrorStr = "An error occurred during the computation of feature " + feature->toString() + "on cloud " + feature->cloud2->getName();
localErrorStr = "An error occurred during the computation of feature " + feature->toString() + " on cloud " + feature->cloud2->getName();
localSuccess = false;
break;
}
@@ -1332,7 +1332,7 @@ bool Tools::PrepareFeatures(const CorePoints& corePoints, Feature::Set& features
if (!feature->computeValue(nNSS.pointsInNeighbourhood, nNSS.queryPoint, outputValue))
{
//an error occurred
localErrorStr = "An error occurred during the computation of feature " + feature->toString() + "on cloud " + feature->cloud1->getName();
localErrorStr = "An error occurred during the computation of feature " + feature->toString() + " on cloud " + feature->cloud1->getName();
localSuccess = false;
break;
}
@@ -1348,7 +1348,7 @@ bool Tools::PrepareFeatures(const CorePoints& corePoints, Feature::Set& features
if (!feature->computeValue(nNSS.pointsInNeighbourhood, nNSS.queryPoint, outputValue))
{
//an error occurred
localErrorStr = "An error occurred during the computation of feature " + feature->toString() + "on cloud " + feature->cloud2->getName();
localErrorStr = "An error occurred during the computation of feature " + feature->toString() + " on cloud " + feature->cloud2->getName();
localSuccess = false;
break;
}
@@ -1367,7 +1367,7 @@ bool Tools::PrepareFeatures(const CorePoints& corePoints, Feature::Set& features
if (!feature->computeValue(nNSS.pointsInNeighbourhood, nNSS.queryPoint, outputValue))
{
//an error occurred
localErrorStr = "An error occurred during the computation of feature " + feature->toString() + "on cloud " + feature->cloud1->getName();
localErrorStr = "An error occurred during the computation of feature " + feature->toString() + " on cloud " + feature->cloud1->getName();
localSuccess = false;
break;
}