|
27 | 27 |
|
28 | 28 | QtCore, QtGui, QtWidgets, QtOpenGL = get_qt_modules() |
29 | 29 |
|
30 | | -# check if signal available, not available |
31 | | -# on PySide |
32 | | -HAVE_PYQT_SIGNAL = hasattr(QtCore, "pyqtSignal") |
33 | | - |
34 | 30 | logging.basicConfig(stream=sys.stdout, level=logging.DEBUG) |
35 | 31 | log = logging.getLogger(__name__) |
36 | 32 |
|
@@ -67,8 +63,13 @@ class qtViewer3d(qtBaseViewer): |
67 | 63 |
|
68 | 64 | # emit signal when selection is changed |
69 | 65 | # is a list of TopoDS_* |
70 | | - if HAVE_PYQT_SIGNAL: |
| 66 | + HAVE_PYQT_SIGNAL = False |
| 67 | + if hasattr(QtCore, "pyqtSignal"): # PyQt |
71 | 68 | sig_topods_selected = QtCore.pyqtSignal(list) |
| 69 | + HAVE_PYQT_SIGNAL = True |
| 70 | + elif hasattr(QtCore, "Signal"): # PySide2 |
| 71 | + sig_topods_selected = QtCore.Signal(list) |
| 72 | + HAVE_PYQT_SIGNAL = True |
72 | 73 |
|
73 | 74 | def __init__(self, *kargs): |
74 | 75 | qtBaseViewer.__init__(self, *kargs) |
@@ -215,7 +216,8 @@ def mouseReleaseEvent(self, event): |
215 | 216 | # single select otherwise |
216 | 217 | self._display.Select(pt.x(), pt.y()) |
217 | 218 |
|
218 | | - if (self._display.selected_shapes is not None) and HAVE_PYQT_SIGNAL: |
| 219 | + if (self._display.selected_shapes is not None) and self.HAVE_PYQT_SIGNAL: |
| 220 | + |
219 | 221 | self.sig_topods_selected.emit(self._display.selected_shapes) |
220 | 222 |
|
221 | 223 | elif event.button() == QtCore.Qt.RightButton: |
|
0 commit comments