Glassvision/IfcOpenShell
1
0
Fork 0
mirror of https://github.com/IfcOpenShell/IfcOpenShell.git synced 2026-09-19 14:41:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Allow to diff inverse relationships

Browse Source
This commit is contained in:
Dion Moult
2020-04-03 11:10:14 +11:00
parent 82c38f67ba
commit 22e4eb4570
1 changed files with 35 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ifcdiff/ifcdiff.py
+35 -5
View File
@@ -9,19 +9,20 @@ import argparse
class IfcDiff(): class IfcDiff():
def __init__(self, old_file, new_file, output_file): def __init__(self, old_file, new_file, output_file, inverse_classes=None):
self.old_file = old_file self.old_file = old_file
self.new_file = new_file self.new_file = new_file
self.output_file = output_file self.output_file = output_file
self.change_register = {} self.change_register = {}
self.representation_ids = [] self.representation_ids = []
self.inverse_classes = inverse_classes
def diff(self): def diff(self):
print('# IFC Diff') print('# IFC Diff')
self.load() self.load()
old_elements = set(e.GlobalId for e in self.old.by_type('IfcElement')) old_elements = set(e.GlobalId for e in self.old.by_type('IfcProduct'))
new_elements = set(e.GlobalId for e in self.new.by_type('IfcElement')) new_elements = set(e.GlobalId for e in self.new.by_type('IfcProduct'))
self.deleted_elements = old_elements - new_elements self.deleted_elements = old_elements - new_elements
self.added_elements = new_elements - old_elements self.added_elements = new_elements - old_elements
@@ -42,6 +43,9 @@ class IfcDiff():
new_element = self.new.by_id(global_id) new_element = self.new.by_id(global_id)
self.diff_element(old_element, new_element) self.diff_element(old_element, new_element)
if self.inverse_classes:
self.diff_element_inverse_relationships(old_element, new_element)
representation_id = self.get_representation_id(new_element) representation_id = self.get_representation_id(new_element)
if representation_id in self.representation_ids: if representation_id in self.representation_ids:
continue continue
@@ -81,6 +85,26 @@ class IfcDiff():
if diff and new_element.GlobalId: if diff and new_element.GlobalId:
self.change_register.setdefault(new_element.GlobalId, {}).update(diff) self.change_register.setdefault(new_element.GlobalId, {}).update(diff)
def diff_element_inverse_relationships(self, old_element, new_element):
old_relationships_all = self.old.get_inverse(old_element)
new_relationships_all = self.new.get_inverse(new_element)
old_relationships = [x for x in old_relationships_all if x.is_a() in self.inverse_classes]
new_relationships = [x for x in new_relationships_all if x.is_a() in self.inverse_classes]
diff = DeepDiff(old_relationships, new_relationships,
significant_digits=2, ignore_string_type_changes=True, ignore_numeric_type_changes=True,
exclude_regex_paths=[
r'root.*id$',
r'.*GlobalId.*',
r'.*OwnerHistory.*',
r'.*RelatedObjects.*',
r'.*RelatingObject.*',
r'.*RelatingDefinitions.*',
r'.*RelatedObjectsType.*', # Deprecated in IFC4 anyway
])
if diff and new_element.GlobalId:
self.change_register.setdefault(new_element.GlobalId, {}).update(diff)
def diff_element_geometry(self, old_element, new_element): def diff_element_geometry(self, old_element, new_element):
try: try:
DeepDiff(old_element.ObjectPlacement, new_element.ObjectPlacement, DeepDiff(old_element.ObjectPlacement, new_element.ObjectPlacement,
@@ -126,8 +150,14 @@ if __name__ == '__main__':
type=str, type=str,
help='The JSON diff file to output. Defaults to diff.json', help='The JSON diff file to output. Defaults to diff.json',
default='diff.json') default='diff.json')
parser.add_argument(
'-r',
'--relationships',
type=str,
help='A list of IFC classes to check in inverse relationships, like "IfcRelDefinesByProperties".',
default='')
args = parser.parse_args() args = parser.parse_args()
ifc_diff = IfcDiff(args.old, args.new, args.output) ifc_diff = IfcDiff(args.old, args.new, args.output, args.relationships.split())
ifc_diff.diff() ifc_diff.diff()
ifc_diff.export() ifc_diff.export()