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

Fix #3974. Bug where orphaned histories would be left in API remove operations.

Browse Source
This commit is contained in:
Dion Moult
2023-11-28 10:45:49 +11:00
parent 58414777be
commit 6e932ec2fb
50 changed files with 314 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ifcopenshell-python/ifcopenshell/api/sequence/assign_lag_time.py
+4 -13
View File
@@ -20,9 +20,7 @@ import ifcopenshell.util.date
class Usecase:
def __init__(
self, file, rel_sequence=None, lag_value=None, duration_type="WORKTIME"
):
def __init__(self, file, rel_sequence=None, lag_value=None, duration_type="WORKTIME"):
"""Assign a lag time to a sequence relationship between tasks
A task sequence (e.g. finish to start) may optionally have a lag time
@@ -94,22 +92,15 @@ class Usecase:
def execute(self):
lag_value = self.file.createIfcDuration(
ifcopenshell.util.date.datetime2ifc(
self.settings["lag_value"], "IfcDuration"
)
ifcopenshell.util.date.datetime2ifc(self.settings["lag_value"], "IfcDuration")
)
lag_time = self.file.create_entity(
"IfcLagTime",
**{
"DurationType": self.settings["duration_type"],
"LagValue": lag_value,
}
"IfcLagTime", DurationType=self.settings["duration_type"], LagValue=lag_value
)
if self.settings["rel_sequence"].is_a("IfcRelSequence"):
if (
self.settings["rel_sequence"].TimeLag
and len(self.file.get_inverse(self.settings["rel_sequence"].TimeLag))
== 1
and len(self.file.get_inverse(self.settings["rel_sequence"].TimeLag)) == 1
):
self.file.remove(self.settings["rel_sequence"].TimeLag)
self.settings["rel_sequence"].TimeLag = lag_time
src/ifcopenshell-python/ifcopenshell/api/sequence/remove_task.py
+31 -20
View File
@@ -16,7 +16,9 @@
# You should have received a copy of the GNU Lesser General Public License
# along with IfcOpenShell. If not, see <http://www.gnu.org/licenses/>.
import ifcopenshell
import ifcopenshell.api
import ifcopenshell.util.element
class Usecase:
@@ -67,15 +69,19 @@ class Usecase:
self.file.remove(self.settings["task"].TaskTime)
for inverse in self.file.get_inverse(self.settings["task"]):
if inverse.is_a("IfcRelSequence"):
history = inverse.OwnerHistory
self.file.remove(inverse)
if history:
ifcopenshell.util.element.remove_deep2(self.file, history)
elif inverse.is_a("IfcRelNests"):
if inverse.RelatingObject == self.settings["task"]:
for related_object in inverse.RelatedObjects:
ifcopenshell.api.run(
"sequence.remove_task", self.file, task=related_object
)
ifcopenshell.api.run("sequence.remove_task", self.file, task=related_object)
elif not inverse.RelatedObjects:
history = inverse.OwnerHistory
self.file.remove(inverse)
if history:
ifcopenshell.util.element.remove_deep2(self.file, history)
elif self.settings["task"] in inverse.RelatedObjects:
related_objects = list(inverse.RelatedObjects)
related_objects.remove(self.settings["task"])
@@ -84,17 +90,16 @@ class Usecase:
else:
inverse.RelatedObjects = related_objects
elif inverse.is_a("IfcRelAssignsToControl"):
if (
inverse.RelatingControl == self.settings["task"]
or len(inverse.RelatedObjects) == 1
):
if inverse.RelatingControl == self.settings["task"] or len(inverse.RelatedObjects) == 1:
history = inverse.OwnerHistory
self.file.remove(inverse)
if history:
ifcopenshell.util.element.remove_deep2(self.file, history)
else:
related_objects = list(inverse.RelatedObjects)
related_objects.remove(self.settings["task"])
inverse.RelatedObjects = related_objects
elif inverse.is_a("IfcRelDefinesByProperties"):
print(inverse.RelatingPropertyDefinition.Name)
ifcopenshell.api.run(
"pset.remove_pset",
self.file,
@@ -102,32 +107,38 @@ class Usecase:
pset=inverse.RelatingPropertyDefinition,
)
elif inverse.is_a("IfcRelAssignsToProcess"):
if (
inverse.RelatingProcess == self.settings["task"]
or len(inverse.RelatedObjects) == 1
):
if inverse.RelatingProcess == self.settings["task"] or len(inverse.RelatedObjects) == 1:
history = inverse.OwnerHistory
self.file.remove(inverse)
if history:
ifcopenshell.util.element.remove_deep2(self.file, history)
elif inverse.is_a("IfcRelAssignsToProduct"):
if (
inverse.RelatingProduct == self.settings["task"]
or len(inverse.RelatedObjects) == 1
):
if inverse.RelatingProduct == self.settings["task"] or len(inverse.RelatedObjects) == 1:
history = inverse.OwnerHistory
self.file.remove(inverse)
if history:
ifcopenshell.util.element.remove_deep2(self.file, history)
else:
related_objects = list(inverse.RelatedObjects)
related_objects.remove(self.settings["task"])
inverse.RelatedObjects = related_objects
elif inverse.is_a("IfcRelAssignsToObject"):
if (
inverse.RelatingObject == self.settings["task"]
or len(inverse.RelatedObjects) == 1
):
if inverse.RelatingObject == self.settings["task"] or len(inverse.RelatedObjects) == 1:
history = inverse.OwnerHistory
self.file.remove(inverse)
if history:
ifcopenshell.util.element.remove_deep2(self.file, history)
else:
related_objects = list(inverse.RelatedObjects)
related_objects.remove(self.settings["task"])
inverse.RelatedObjects = related_objects
elif inverse.is_a("IfcRelAssignsToProcess"):
history = inverse.OwnerHistory
self.file.remove(inverse)
if history:
ifcopenshell.util.element.remove_deep2(self.file, history)
history = self.settings["task"].OwnerHistory
self.file.remove(self.settings["task"])
if history:
ifcopenshell.util.element.remove_deep2(self.file, history)
src/ifcopenshell-python/ifcopenshell/api/sequence/remove_work_calendar.py
+7 -5
View File
@@ -17,6 +17,7 @@
# along with IfcOpenShell. If not, see <http://www.gnu.org/licenses/>.
import ifcopenshell
import ifcopenshell.util.element
class Usecase:
@@ -54,13 +55,14 @@ class Usecase:
)
if self.settings["work_calendar"].Controls:
for rel in self.settings["work_calendar"].Controls:
for object in rel.RelatedObjects:
for related_object in rel.RelatedObjects:
ifcopenshell.api.run(
"control.unassign_control",
self.file,
**{
"relating_control": self.settings["work_calendar"],
"related_object": object,
}
relating_control=self.settings["work_calendar"],
related_object=related_object,
)
history = self.settings["work_calendar"].OwnerHistory
self.file.remove(self.settings["work_calendar"])
if history:
ifcopenshell.util.element.remove_deep2(self.file, history)
src/ifcopenshell-python/ifcopenshell/api/sequence/remove_work_plan.py
+4
View File
@@ -17,6 +17,7 @@
# along with IfcOpenShell. If not, see <http://www.gnu.org/licenses/>.
import ifcopenshell
import ifcopenshell.util.element
class Usecase:
@@ -52,4 +53,7 @@ class Usecase:
definition=self.settings["work_plan"],
relating_context=self.file.by_type("IfcContext")[0],
)
history = self.settings["work_plan"].OwnerHistory
self.file.remove(self.settings["work_plan"])
if history:
ifcopenshell.util.element.remove_deep2(self.file, history)
src/ifcopenshell-python/ifcopenshell/api/sequence/remove_work_schedule.py
+10 -7
View File
@@ -16,7 +16,9 @@
# You should have received a copy of the GNU Lesser General Public License
# along with IfcOpenShell. If not, see <http://www.gnu.org/licenses/>.
import ifcopenshell
import ifcopenshell.api
import ifcopenshell.util.element
class Usecase:
@@ -65,22 +67,23 @@ class Usecase:
)
for inverse in self.file.get_inverse(self.settings["work_schedule"]):
if inverse.is_a("IfcRelDefinesByObject"):
if (
inverse.RelatingObject == self.settings["work_schedule"]
or len(inverse.RelatedObjects) == 1
):
if inverse.RelatingObject == self.settings["work_schedule"] or len(inverse.RelatedObjects) == 1:
history = inverse.OwnerHistory
self.file.remove(inverse)
if history:
ifcopenshell.util.element.remove_deep2(self.file, history)
else:
related_objects = list(inverse.RelatedObjects)
related_objects.remove(self.settings["work_schedule"])
inverse.RelatedObjects = related_objects
elif inverse.is_a("IfcRelAssignsToControl"):
[
ifcopenshell.api.run(
"sequence.remove_task", self.file, task=related_object
)
ifcopenshell.api.run("sequence.remove_task", self.file, task=related_object)
for related_object in inverse.RelatedObjects
if related_object.is_a("IfcTask")
]
history = self.settings["work_schedule"].OwnerHistory
self.file.remove(self.settings["work_schedule"])
if history:
ifcopenshell.util.element.remove_deep2(self.file, history)
src/ifcopenshell-python/ifcopenshell/api/sequence/unassign_process.py
+8 -8
View File
@@ -18,6 +18,7 @@
import ifcopenshell
import ifcopenshell.api
import ifcopenshell.util.element
class Usecase:
@@ -63,17 +64,16 @@ class Usecase:
def execute(self):
for rel in self.settings["related_object"].HasAssignments or []:
if (
not rel.is_a("IfcRelAssignsToProcess")
or rel.RelatingProcess != self.settings["relating_process"]
):
if not rel.is_a("IfcRelAssignsToProcess") or rel.RelatingProcess != self.settings["relating_process"]:
continue
if len(rel.RelatedObjects) == 1:
return self.file.remove(rel)
history = rel.OwnerHistory
self.file.remove(rel)
if history:
ifcopenshell.util.element.remove_deep2(self.file, history)
return
related_objects = list(rel.RelatedObjects)
related_objects.remove(self.settings["related_object"])
rel.RelatedObjects = related_objects
ifcopenshell.api.run(
"owner.update_owner_history", self.file, **{"element": rel}
)
ifcopenshell.api.run("owner.update_owner_history", self.file, element=rel)
return rel
src/ifcopenshell-python/ifcopenshell/api/sequence/unassign_product.py
+8 -8
View File
@@ -18,6 +18,7 @@
import ifcopenshell
import ifcopenshell.api
import ifcopenshell.util.element
class Usecase:
@@ -63,17 +64,16 @@ class Usecase:
def execute(self):
for rel in self.settings["related_object"].HasAssignments or []:
if (
not rel.is_a("IfcRelAssignsToProduct")
or rel.RelatingProduct != self.settings["relating_product"]
):
if not rel.is_a("IfcRelAssignsToProduct") or rel.RelatingProduct != self.settings["relating_product"]:
continue
if len(rel.RelatedObjects) == 1:
return self.file.remove(rel)
history = rel.OwnerHistory
self.file.remove(rel)
if history:
ifcopenshell.util.element.remove_deep2(self.file, history)
return
related_objects = list(rel.RelatedObjects)
related_objects.remove(self.settings["related_object"])
rel.RelatedObjects = related_objects
ifcopenshell.api.run(
"owner.update_owner_history", self.file, **{"element": rel}
)
ifcopenshell.api.run("owner.update_owner_history", self.file, element=rel)
return rel
src/ifcopenshell-python/ifcopenshell/api/sequence/unassign_recurrence_pattern.py
+2 -2
View File
@@ -16,8 +16,6 @@
# You should have received a copy of the GNU Lesser General Public License
# along with IfcOpenShell. If not, see <http://www.gnu.org/licenses/>.
import ifcopenshell.api
class Usecase:
def __init__(self, file, recurrence_pattern=None):
@@ -53,4 +51,6 @@ class Usecase:
self.settings = {"recurrence_pattern": recurrence_pattern}
def execute(self):
for time_period in self.settings["recurrence_pattern"].TimePeriods or []:
self.file.remove(time_period)
self.file.remove(self.settings["recurrence_pattern"])
src/ifcopenshell-python/ifcopenshell/api/sequence/unassign_sequence.py
+5 -5
View File
@@ -18,6 +18,7 @@
import ifcopenshell
import ifcopenshell.api
import ifcopenshell.util.element
class Usecase:
@@ -65,9 +66,8 @@ class Usecase:
def execute(self):
for rel in self.settings["related_process"].IsSuccessorFrom or []:
if rel.RelatingProcess == self.settings["relating_process"]:
history = rel.OwnerHistory
self.file.remove(rel)
ifcopenshell.api.run(
"sequence.cascade_schedule",
self.file,
task=self.settings["related_process"],
)
if history:
ifcopenshell.util.element.remove_deep2(self.file, history)
ifcopenshell.api.run("sequence.cascade_schedule", self.file, task=self.settings["related_process"])