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

[IfcConvert] Added IsSuccessorFrom and IsPredecessorTo in xml task export

Browse Source
This commit is contained in:
Christian Martínez de la Rosa
2022-03-30 09:44:28 +02:00
committed by Dion Moult
parent f089d03dc6
commit 89f13aa1e4
1 changed files with 49 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/serializers/schema_dependent/XmlSerializer.cpp
+47 -25
View File
@@ -380,7 +380,6 @@ void format_quantities(IfcSchema::IfcPhysicalQuantity::list::ptr quantities, ptr
} }
} }
#ifdef SCHEMA_IfcRelNests_HAS_RelatedObjects
// Format IfcTask instances and insert into the DOM. // Format IfcTask instances and insert into the DOM.
void format_tasks(IfcSchema::IfcTask* task, ptree& node) { void format_tasks(IfcSchema::IfcTask* task, ptree& node) {
ptree* ntask = format_entity_instance(task, node); ptree* ntask = format_entity_instance(task, node);
@@ -394,6 +393,50 @@ void format_tasks(IfcSchema::IfcTask* task, ptree& node) {
} }
#endif #endif
#ifdef SCHEMA_IfcProcess_HAS_IsSuccessorFrom
IfcSchema::IfcRelSequence::list::ptr successor_from = task->IsSuccessorFrom();
for (IfcSchema::IfcRelSequence::list::it it = successor_from->begin(); it != successor_from->end(); ++it)
{
IfcSchema::IfcProcess* relating_process = (*it)->RelatingProcess();
ptree nobject;
nobject.put("<xmlattr>.id", relating_process->GlobalId());
ntask->add_child("IsSuccessorFrom", nobject);
}
#endif
#ifdef SCHEMA_IfcProcess_HAS_IsPredecessorTo
IfcSchema::IfcRelSequence::list::ptr predecessor_to = task->IsPredecessorTo();
for (IfcSchema::IfcRelSequence::list::it it = predecessor_to->begin(); it != predecessor_to->end(); ++it)
{
IfcSchema::IfcProcess* relating_process = (*it)->RelatedProcess();
ptree nobject;
nobject.put("<xmlattr>.id", relating_process->GlobalId());
ntask->add_child("IsPredecessorTo", nobject);
}
#endif
#ifdef SCHEMA_IfcProcess_HAS_OperatesOn
IfcSchema::IfcRelAssignsToProcess::list::ptr operates = task->OperatesOn();
if (operates->size() > 0)
{
ptree noperates_on;
for (IfcSchema::IfcRelAssignsToProcess::list::it i = operates->begin(); i != operates->end(); ++i)
{
IfcSchema::IfcObjectDefinition::list::ptr objects = (*i)->RelatedObjects();
for (IfcSchema::IfcObjectDefinition::list::it it2 = objects->begin(); it2 != objects->end(); ++it2)
{
IfcSchema::IfcObjectDefinition* object = (*it2);
ptree nobject;
nobject.put("<xmlattr>.id", object->GlobalId());
noperates_on.add_child("Object", nobject);
}
}
ntask->add_child("OperatesOn", noperates_on);
}
#endif
#ifdef SCHEMA_IfcObjectDefinition_HAS_IsNestedBy
IfcSchema::IfcRelNests::list::ptr nested_by = task->IsNestedBy(); IfcSchema::IfcRelNests::list::ptr nested_by = task->IsNestedBy();
for (IfcSchema::IfcRelNests::list::it it = nested_by->begin(); it != nested_by->end(); ++it) for (IfcSchema::IfcRelNests::list::it it = nested_by->begin(); it != nested_by->end(); ++it)
{ {
@@ -407,30 +450,9 @@ void format_tasks(IfcSchema::IfcTask* task, ptree& node) {
format_tasks(task2, *ntask); format_tasks(task2, *ntask);
} }
} }
#ifdef SCHEMA_IfcProcess_HAS_OperatesOn
auto operates = task->OperatesOn();
if (operates->size() > 0)
{
ptree noperates_on;
for (auto i = operates->begin(); i != operates->end(); ++i)
{
auto objects = (*i)->RelatedObjects();
for (auto it2 = objects->begin(); it2 != objects->end(); ++it2)
{
auto object = (*it2);
ptree nobject;
nobject.put("<xmlattr>.id", object->GlobalId());
noperates_on.add_child("Object", nobject);
}
}
ntask->add_child("OperatesOn", noperates_on);
}
#endif #endif
} }
} }
#endif
} // ~unnamed namespace } // ~unnamed namespace
@@ -535,12 +557,12 @@ void MAKE_TYPE_NAME(XmlSerializer)::finalize() {
IfcSchema::IfcTask::list::ptr ptasks = file->instances_by_type<IfcSchema::IfcTask>(); IfcSchema::IfcTask::list::ptr ptasks = file->instances_by_type<IfcSchema::IfcTask>();
for (IfcSchema::IfcTask::list::it it = ptasks->begin(); it != ptasks->end(); ++it) { for (IfcSchema::IfcTask::list::it it = ptasks->begin(); it != ptasks->end(); ++it) {
IfcSchema::IfcTask* ptask = *it; IfcSchema::IfcTask* ptask = *it;
#ifdef SCHEMA_IfcRelNests_HAS_RelatedObjects #ifdef SCHEMA_IfcObjectDefinition_HAS_Nests
if (ptask->Nests()->size() == 0) { if (ptask->Nests()->size() == 0) {
format_tasks(ptask, tasks); format_tasks(ptask, tasks);
} }
#else #else
format_entity_instance(ptask, tasks); format_tasks(ptask, tasks);
#endif #endif
} }
@@ -631,7 +653,7 @@ void MAKE_TYPE_NAME(XmlSerializer)::finalize() {
root.add_child("ifc.quantities", quantities); root.add_child("ifc.quantities", quantities);
root.add_child("ifc.tasks", tasks); root.add_child("ifc.tasks", tasks);
root.add_child("ifc.types", types); root.add_child("ifc.types", types);
root.add_child("ifc.layers", layers); root.add_child("ifc.layers", layers);
root.add_child("ifc.materials", materials); root.add_child("ifc.materials", materials);
root.add_child("ifc.decomposition", decomposition); root.add_child("ifc.decomposition", decomposition);