Glassvision/IfcOpenShell
1
0
Fork 0
mirror of https://github.com/IfcOpenShell/IfcOpenShell.git synced 2026-08-11 18:16:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/v0.6.0' into v0.7.0

Browse Source 
# Conflicts:
#	.github/workflows/ci.yml
#	src/ifcparse/IfcParse.cpp
This commit is contained in:
Thomas Krijnen
2021-09-24 09:03:58 +02:00
parent e1a5de793a 4868edaa83
commit 768b754a0b
510 changed files with 12218 additions and 3312 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ifcopenshell-python/ifcopenshell/geom/app.py
+26 -26
View File
@@ -10,7 +10,7 @@ import functools
import multiprocessing
try:
from OCC.Core import AIS
from OCC.Core import AIS
USE_OCCT_HANDLE = False
except ImportError:
@@ -433,30 +433,30 @@ class application(QtWidgets.QApplication):
instanceSelected = QtCore.pyqtSignal([object])
# @staticmethod
# def ais_to_key(ais_handle):
# def yield_shapes():
# ais = ais_handle.GetObject()
# if hasattr(ais, "Shape"):
# yield ais.Shape()
# return
# shp = OCC.AIS.Handle_AIS_Shape.DownCast(ais_handle)
# if not shp.IsNull():
# yield shp.Shape()
# return
# mult = ais_handle
# if mult.IsNull():
# shp = OCC.AIS.Handle_AIS_Shape.DownCast(ais_handle)
# if not shp.IsNull():
# yield shp
# else:
# li = mult.GetObject().ConnectedTo()
# for i in range(li.Length()):
# shp = OCC.AIS.Handle_AIS_Shape.DownCast(li.Value(i + 1))
# if not shp.IsNull():
# yield shp
# @staticmethod
# def ais_to_key(ais_handle):
# def yield_shapes():
# ais = ais_handle.GetObject()
# if hasattr(ais, "Shape"):
# yield ais.Shape()
# return
# shp = OCC.AIS.Handle_AIS_Shape.DownCast(ais_handle)
# if not shp.IsNull():
# yield shp.Shape()
# return
# mult = ais_handle
# if mult.IsNull():
# shp = OCC.AIS.Handle_AIS_Shape.DownCast(ais_handle)
# if not shp.IsNull():
# yield shp
# else:
# li = mult.GetObject().ConnectedTo()
# for i in range(li.Length()):
# shp = OCC.AIS.Handle_AIS_Shape.DownCast(li.Value(i + 1))
# if not shp.IsNull():
# yield shp
# return tuple(shp.HashCode(1 << 24) for shp in yield_shapes())
# return tuple(shp.HashCode(1 << 24) for shp in yield_shapes())
def __init__(self, widget):
qtViewer3d.__init__(self, widget)
@@ -486,8 +486,8 @@ class application(QtWidgets.QApplication):
for shape in shapes:
ais = display_shape(shape, viewer_handle=v)
product = f[shape.data.id]
if USE_OCCT_HANDLE:
if USE_OCCT_HANDLE:
ais.GetObject().SetSelectionPriority(self.counter)
self.ais_to_product[self.counter] = product
self.product_to_ais[product] = ais
src/ifcopenshell-python/ifcopenshell/geom/main.py
+1 -1
View File
@@ -133,7 +133,7 @@ class tree(ifcopenshell_wrapper.tree):
def add_file(self, file, settings):
ifcopenshell_wrapper.tree.add_file(self, file.wrapped_data, settings)
def add_iterator(self, iterator):
ifcopenshell_wrapper.tree.add_file(self, iterator)