Glassvision/IfcOpenShell
1
0
Fork 0
mirror of https://github.com/IfcOpenShell/IfcOpenShell.git synced 2026-08-20 20:22:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

IfcConvert/IfcGeom: Possibility to include and exclude simultaneously by type and name, w.i.p.

Browse Source
This commit is contained in:
Stinkfist0
2016-12-16 13:51:07 +02:00
committed by Thomas Krijnen
parent 6b2c8ad23e
commit f1709dc71a
2 changed files with 111 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ifcgeom/IfcGeomIterator.h
+4 -4
View File
@@ -331,7 +331,7 @@ namespace IfcGeom {
}
/// @note Arbitrary names or wildcard expressions are handled case-sensitively.
void include_entity_names(const std::vector<std::string>& names)
void include_entity_names(const std::set<std::string>& names)
{
names_to_include_or_exclude.clear();
foreach(const std::string &name, names)
@@ -340,7 +340,7 @@ namespace IfcGeom {
}
/// @note Arbitrary names or wildcard expressions are handled case-sensitively.
void exclude_entity_names(const std::vector<std::string>& names)
void exclude_entity_names(const std::set<std::string>& names)
{
names_to_include_or_exclude.clear();
foreach(const std::string &name, names)
@@ -546,7 +546,7 @@ namespace IfcGeom {
}
}
if (!type_found && traverse) {
if (type_found != include_entities_in_processing && traverse) {
foreach(IfcSchema::Type::Enum type, entities_to_include_or_exclude) {
IfcSchema::IfcProduct* parent, * current = prod;
while ((parent = static_cast<IfcSchema::IfcProduct*>(kernel.get_decomposing_entity(current))) != 0) {
@@ -570,7 +570,7 @@ namespace IfcGeom {
}
}
if (!name_found && traverse) {
if (name_found != include_names_in_processing_ && traverse) {
foreach(const boost::regex& r, names_to_include_or_exclude) {
IfcSchema::IfcProduct* parent, *current = prod;
while ((parent = static_cast<IfcSchema::IfcProduct*>(kernel.get_decomposing_entity(current))) != 0) {