mirror of
https://github.com/IfcOpenShell/IfcOpenShell.git
synced 2026-08-09 09:21:46 +00:00
Revert "Fix bug where IFC data types were hashed as the same value in RecycleNonRootedElements IfcPatch recipe"
This reverts commit 3be8e4f1ce.
This commit is contained in:
@@ -1,3 +1,4 @@
|
||||
|
||||
# IfcPatch - IFC patching utiliy
|
||||
# Copyright (C) 2020, 2021 Dion Moult <dion@thinkmoult.com>
|
||||
#
|
||||
@@ -19,7 +20,6 @@
|
||||
from collections import deque
|
||||
import ifcopenshell.util.element
|
||||
|
||||
|
||||
class Patcher:
|
||||
def __init__(self, src, file, logger, args=None):
|
||||
self.src = src
|
||||
@@ -31,16 +31,9 @@ class Patcher:
|
||||
deleted = []
|
||||
hashes = {}
|
||||
for element in self.file:
|
||||
if element.is_a("IfcRoot"):
|
||||
if element.is_a('IfcRoot'):
|
||||
continue
|
||||
h = hash(
|
||||
tuple(
|
||||
[
|
||||
a.wrappedValue if isinstance(a, ifcopenshell.entity_instance) and not a.id() else a
|
||||
for a in element
|
||||
]
|
||||
)
|
||||
)
|
||||
h = hash(tuple(element))
|
||||
if h in hashes:
|
||||
for inverse in self.file.get_inverse(element):
|
||||
ifcopenshell.util.element.replace_attribute(inverse, element, hashes[h])
|
||||
@@ -49,13 +42,13 @@ class Patcher:
|
||||
hashes[h] = element
|
||||
deleted.sort()
|
||||
deleted_q = deque(deleted)
|
||||
new = ""
|
||||
for line in self.file.wrapped_data.to_string().split("\n"):
|
||||
new = ''
|
||||
for line in self.file.wrapped_data.to_string().split('\n'):
|
||||
try:
|
||||
if int(line.split("=")[0][1:]) != deleted_q[0]:
|
||||
new += line + "\n"
|
||||
if int(line.split('=')[0][1:]) != deleted_q[0]:
|
||||
new += (line + '\n')
|
||||
else:
|
||||
deleted_q.popleft()
|
||||
except:
|
||||
new += line + "\n"
|
||||
new += (line + '\n')
|
||||
self.file = new
|
||||
|
||||
Reference in New Issue
Block a user