Glassvision/IfcOpenShell
1
0
Fork 0
mirror of https://github.com/IfcOpenShell/IfcOpenShell.git synced 2026-08-10 09:48:32 +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/resource/remove_resource.py
+14
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:
@@ -47,10 +49,16 @@ class Usecase:
self.file,
resource=related_object,
)
history = inverse.OwnerHistory
self.file.remove(inverse)
if history:
ifcopenshell.util.element.remove_deep2(self.file, history)
elif inverse.is_a("IfcRelAssignsToControl"):
if 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["resource"])
@@ -65,7 +73,10 @@ class Usecase:
resource=self.settings["resource"],
)
elif inverse.RelatedObjects == tuple(self.settings["resource"]):
history = inverse.OwnerHistory
self.file.remove(inverse)
if history:
ifcopenshell.util.element.remove_deep2(self.file, history)
if self.settings["resource"].Usage:
self.file.remove(self.settings["resource"].Usage)
if self.settings["resource"].BaseQuantity:
@@ -74,4 +85,7 @@ class Usecase:
self.file,
resource=self.settings["resource"],
)
history = self.settings["resource"].OwnerHistory
self.file.remove(self.settings["resource"])
if history:
ifcopenshell.util.element.remove_deep2(self.file, history)
src/ifcopenshell-python/ifcopenshell/api/resource/unassign_resource.py
+7 -1
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:
@@ -69,7 +71,11 @@ class Usecase:
):
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