* Restored previous logic of GeoFeature::getElementName() * Added precompiler directive to use the old logic if FC_USE_TNP_FIX isn't defined, otherwise use the new logic * Reworked SketchObjectTest::getElementName() as a consequence of the previous points Signed-off-by: CalligaroV <vincenzo.calligaro@gmail.com>
This commit is contained in:
@@ -87,6 +87,12 @@ GeoFeature::getElementName(const char *name, ElementNameType type) const
|
||||
std::pair<std::string,std::string> ret;
|
||||
if(!name)
|
||||
return ret;
|
||||
|
||||
#ifndef FC_USE_TNP_FIX
|
||||
ret.second = name;
|
||||
|
||||
return ret;
|
||||
#else
|
||||
auto prop = getPropertyOfGeometry();
|
||||
if (!prop) {
|
||||
return std::make_pair("", name);
|
||||
@@ -98,6 +104,7 @@ GeoFeature::getElementName(const char *name, ElementNameType type) const
|
||||
}
|
||||
|
||||
return _getElementName(name, geo->getElementName(name));
|
||||
#endif
|
||||
}
|
||||
|
||||
std::pair<std::string, std::string>
|
||||
|
||||
Reference in New Issue
Block a user