diff --git a/CMakeLists.txt b/CMakeLists.txt index 538dd5a..0b6d89f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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 ) diff --git a/NeighborhoodFeature.cpp b/NeighborhoodFeature.cpp index 9c76027..15cd840 100644 --- a/NeighborhoodFeature.cpp +++ b/NeighborhoodFeature.cpp @@ -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); diff --git a/NeighborhoodFeature.h b/NeighborhoodFeature.h index cf3b517..8c16972 100644 --- a/NeighborhoodFeature.h +++ b/NeighborhoodFeature.h @@ -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") diff --git a/q3DMASCTools.cpp b/q3DMASCTools.cpp index 7d3577c..d4db26c 100644 --- a/q3DMASCTools.cpp +++ b/q3DMASCTools.cpp @@ -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; }