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

- edited some icons so they don't contain white background
- fixed an incorrect usage of object in the app.select_objects() method

Marius Stanciu 6 лет назад
Родитель
Сommit
1c2e5d24f1

+ 2 - 3
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

+ 5 - 0
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

BIN
share/clear_plot32.png


BIN
share/copy32.png


BIN
share/cutpath16.png


BIN
share/cutpath24.png


BIN
share/cutpath32.png


BIN
share/geometry16.png


BIN
share/intersection16.png


BIN
share/intersection24.png


BIN
share/intersection32.png


BIN
share/join16.png


BIN
share/join32.png


BIN
share/move32.png


BIN
share/replot32.png


BIN
share/subtract16.png


BIN
share/subtract24.png


BIN
share/subtract32.png


BIN
share/union16.png


BIN
share/union32.png


BIN
share/zoom_fit32.png


BIN
share/zoom_in32.png