diff --git a/FlatCAMApp.py b/FlatCAMApp.py index ffa688ae..5b11c1a6 100644 --- a/FlatCAMApp.py +++ b/FlatCAMApp.py @@ -8869,15 +8869,14 @@ class App(QtCore.QObject): # create the selection box around the selected object if self.defaults['global_selection_shape'] is True: self.draw_selection_shape(obj) - obj.selection_shape_drawn = True self.collection.set_active(obj.options['name']) else: if poly_selection.intersects(poly_obj): # create the selection box around the selected object if self.defaults['global_selection_shape'] is True: self.draw_selection_shape(obj) - obj.selection_shape_drawn = True self.collection.set_active(obj.options['name']) + obj.selection_shape_drawn = True except Exception as e: # the Exception here will happen if we try to select on screen and we have an newly (and empty) # just created Geometry or Excellon object that do not have the xmin, xmax, ymin, ymax options. @@ -8957,7 +8956,7 @@ class App(QtCore.QObject): # make active the first element of the overlapped objects list if self.collection.get_active() is None: self.collection.set_active(objects_under_the_click_list[0]) - objects_under_the_click_list[0].selection_shape_drawn = True + self.collection.get_by_name(objects_under_the_click_list[0]).selection_shape_drawn = True name_sel_obj = self.collection.get_active().options['name'] # In case that there is a selected object but it is not in the overlapped object list diff --git a/README.md b/README.md index d6417ac3..68a0b476 100644 --- a/README.md +++ b/README.md @@ -9,6 +9,11 @@ CAD program, and create G-Code for Isolation routing. ================================================= +24.12.2019 + +- edited some icons so they don't contain white background +- fixed an incorrect usage of object in the app.select_objects() method + 23.12.2019 - some fixes in the Legacy(2D) graphic mode regarding the possibility of changing the color of the Gerber objects diff --git a/share/clear_plot32.png b/share/clear_plot32.png index ff5bdc3b..9859a828 100644 Binary files a/share/clear_plot32.png and b/share/clear_plot32.png differ diff --git a/share/copy32.png b/share/copy32.png index a484c3f9..695aeb4e 100644 Binary files a/share/copy32.png and b/share/copy32.png differ diff --git a/share/cutpath16.png b/share/cutpath16.png index c023e0f2..2b9eb401 100644 Binary files a/share/cutpath16.png and b/share/cutpath16.png differ diff --git a/share/cutpath24.png b/share/cutpath24.png index 6d041fe6..8daca2e3 100644 Binary files a/share/cutpath24.png and b/share/cutpath24.png differ diff --git a/share/cutpath32.png b/share/cutpath32.png index 6b685d0c..316c3dc9 100644 Binary files a/share/cutpath32.png and b/share/cutpath32.png differ diff --git a/share/geometry16.png b/share/geometry16.png index 404f07dc..ceb53909 100644 Binary files a/share/geometry16.png and b/share/geometry16.png differ diff --git a/share/intersection16.png b/share/intersection16.png index d6ae14a5..13fc8d82 100644 Binary files a/share/intersection16.png and b/share/intersection16.png differ diff --git a/share/intersection24.png b/share/intersection24.png index 2e08f94f..6a51c1ff 100644 Binary files a/share/intersection24.png and b/share/intersection24.png differ diff --git a/share/intersection32.png b/share/intersection32.png index 4b4f22a6..acf2f58b 100644 Binary files a/share/intersection32.png and b/share/intersection32.png differ diff --git a/share/join16.png b/share/join16.png index 4d8b3fb0..cadf1263 100644 Binary files a/share/join16.png and b/share/join16.png differ diff --git a/share/join32.png b/share/join32.png index 5765494f..0acc5819 100644 Binary files a/share/join32.png and b/share/join32.png differ diff --git a/share/move32.png b/share/move32.png index 2922b3ec..24ea5088 100644 Binary files a/share/move32.png and b/share/move32.png differ diff --git a/share/replot32.png b/share/replot32.png index 13a30c83..ee6c90b0 100644 Binary files a/share/replot32.png and b/share/replot32.png differ diff --git a/share/subtract16.png b/share/subtract16.png index b87aa663..aa44dc12 100644 Binary files a/share/subtract16.png and b/share/subtract16.png differ diff --git a/share/subtract24.png b/share/subtract24.png index 180f4170..025e0b2e 100644 Binary files a/share/subtract24.png and b/share/subtract24.png differ diff --git a/share/subtract32.png b/share/subtract32.png index 57bfd778..85d55e6b 100644 Binary files a/share/subtract32.png and b/share/subtract32.png differ diff --git a/share/union16.png b/share/union16.png index 411270e5..89708e66 100644 Binary files a/share/union16.png and b/share/union16.png differ diff --git a/share/union32.png b/share/union32.png index 305c6e49..5f454454 100644 Binary files a/share/union32.png and b/share/union32.png differ diff --git a/share/zoom_fit32.png b/share/zoom_fit32.png index c7362fa0..9996e3ae 100644 Binary files a/share/zoom_fit32.png and b/share/zoom_fit32.png differ diff --git a/share/zoom_in32.png b/share/zoom_in32.png index 6e5614b4..13b4f713 100644 Binary files a/share/zoom_in32.png and b/share/zoom_in32.png differ