|
@@ -4893,8 +4893,10 @@ class App(QtCore.QObject):
|
|
|
try:
|
|
try:
|
|
|
# select the object(s) only if it is enabled (plotted)
|
|
# select the object(s) only if it is enabled (plotted)
|
|
|
if obj.options['plot']:
|
|
if obj.options['plot']:
|
|
|
- poly_obj = Polygon([(obj.options['xmin'], obj.options['ymin']), (obj.options['xmax'], obj.options['ymin']),
|
|
|
|
|
- (obj.options['xmax'], obj.options['ymax']), (obj.options['xmin'], obj.options['ymax'])])
|
|
|
|
|
|
|
+ poly_obj = Polygon([(obj.options['xmin'], obj.options['ymin']),
|
|
|
|
|
+ (obj.options['xmax'], obj.options['ymin']),
|
|
|
|
|
+ (obj.options['xmax'], obj.options['ymax']),
|
|
|
|
|
+ (obj.options['xmin'], obj.options['ymax'])])
|
|
|
if sel_type is True:
|
|
if sel_type is True:
|
|
|
if poly_obj.within(poly_selection):
|
|
if poly_obj.within(poly_selection):
|
|
|
# create the selection box around the selected object
|
|
# create the selection box around the selected object
|
|
@@ -4937,12 +4939,11 @@ class App(QtCore.QObject):
|
|
|
|
|
|
|
|
if self.call_source != 'measurement':
|
|
if self.call_source != 'measurement':
|
|
|
self.ui.notebook.setCurrentWidget(self.ui.project_tab)
|
|
self.ui.notebook.setCurrentWidget(self.ui.project_tab)
|
|
|
|
|
+ # delete any text in the status bar, implicitly the last object name that was selected
|
|
|
|
|
+ self.inform.emit("")
|
|
|
else:
|
|
else:
|
|
|
self.call_source = 'app'
|
|
self.call_source = 'app'
|
|
|
|
|
|
|
|
- # delete any text in the status bar, implicitly the last object name that was selected
|
|
|
|
|
- self.inform.emit("")
|
|
|
|
|
-
|
|
|
|
|
else:
|
|
else:
|
|
|
# case when there is only an object under the click and we toggle it
|
|
# case when there is only an object under the click and we toggle it
|
|
|
if len(objects_under_the_click_list) == 1:
|
|
if len(objects_under_the_click_list) == 1:
|
|
@@ -4993,7 +4994,11 @@ class App(QtCore.QObject):
|
|
|
else:
|
|
else:
|
|
|
self.collection.set_all_inactive()
|
|
self.collection.set_all_inactive()
|
|
|
self.delete_selection_shape()
|
|
self.delete_selection_shape()
|
|
|
- self.inform.emit("")
|
|
|
|
|
|
|
+ if self.call_source != 'measurement':
|
|
|
|
|
+ # delete any text in the status bar, implicitly the last object name that was selected
|
|
|
|
|
+ self.inform.emit("")
|
|
|
|
|
+ else:
|
|
|
|
|
+ self.call_source = 'app'
|
|
|
|
|
|
|
|
else:
|
|
else:
|
|
|
# If there is no selected object
|
|
# If there is no selected object
|