Просмотр исходного кода

- made sure that when the Measuring Tools is active after last click the Status bar is no longer deleted

Marius Stanciu 6 лет назад
Родитель
Сommit
328182d863
2 измененных файлов с 12 добавлено и 6 удалено
  1. 11 6
      FlatCAMApp.py
  2. 1 0
      README.md

+ 11 - 6
FlatCAMApp.py

@@ -4893,8 +4893,10 @@ class App(QtCore.QObject):
             try:
                 # select the object(s) only if it is enabled (plotted)
                 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 poly_obj.within(poly_selection):
                             # create the selection box around the selected object
@@ -4937,12 +4939,11 @@ class App(QtCore.QObject):
 
                 if self.call_source != 'measurement':
                     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:
                     self.call_source = 'app'
 
-                # delete any text in the status bar, implicitly the last object name that was selected
-                self.inform.emit("")
-
             else:
                 # case when there is only an object under the click and we toggle it
                 if len(objects_under_the_click_list) == 1:
@@ -4993,7 +4994,11 @@ class App(QtCore.QObject):
                     else:
                         self.collection.set_all_inactive()
                         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:
                     # If there is no selected object

+ 1 - 0
README.md

@@ -17,6 +17,7 @@ CAD program, and create G-Code for Isolation routing.
 - fixed Measuring Tool - after doing a measurement the Notebook was switching to Project Tab without letting the user see the results
 - more work on the translation engine; the app now restarts after a language is applied
 - added protection against using Travel Z parameter with negative or zero value (in Geometry).
+- made sure that when the Measuring Tools is active after last click the Status bar is no longer deleted
 
 6.03.2019