- fixed crash when launching with 2D Graphic Engine (due of recent changes)

- in Geometry Editor - added new feature: Zoom on selected (by selecting a geometry element in the Geometry Table)
This commit is contained in:
Marius Stanciu
2020-11-27 14:16:26 +02:00
committed by Marius
parent be84e2b18d
commit 675d7455d4
4 changed files with 95 additions and 34 deletions

View File

@@ -1084,10 +1084,9 @@ class App(QtCore.QObject):
# ###########################################################################################################
# determine if the Legacy Graphic Engine is to be used or the OpenGL one
self.is_legacy = True
if self.defaults["global_graphic_engine"] == '3D':
self.is_legacy = False
else:
self.is_legacy = True
# PlotCanvas Event signals disconnect id holders
self.mp = None
@@ -1140,6 +1139,13 @@ class App(QtCore.QObject):
from appGUI.PlotCanvasLegacy import ShapeCollectionLegacy
self.tool_shapes = ShapeCollectionLegacy(obj=self, app=self, name="tool")
# Storage for Hover Shapes
if self.is_legacy is False:
self.hover_shapes = ShapeCollection(parent=self.plotcanvas.view.scene, layers=1)
else:
# will use the default Matplotlib axes
self.hover_shapes = ShapeCollectionLegacy(obj=self, app=self, name='hover')
# ###########################################################################################################
# ############################################### Worker SETUP ##############################################
# ###########################################################################################################
@@ -7880,12 +7886,6 @@ class App(QtCore.QObject):
else:
self.app_cursor.enabled = False
if self.is_legacy is False:
self.hover_shapes = ShapeCollection(parent=plotcanvas.view.scene, layers=1)
else:
# will use the default Matplotlib axes
self.hover_shapes = ShapeCollectionLegacy(obj=self, app=self, name='hover')
return plotcanvas
def on_zoom_fit(self):