Quellcode durchsuchen

- in Corner Markers Tool - the new Gerber object will have also follow_geometry

Marius Stanciu vor 5 Jahren
Ursprung
Commit
540eb27673
2 geänderte Dateien mit 4 neuen und 2 gelöschten Zeilen
  1. 1 0
      CHANGELOG.md
  2. 3 2
      appTools/ToolCorners.py

+ 1 - 0
CHANGELOG.md

@@ -16,6 +16,7 @@ CHANGELOG for FlatCAM beta
 - PEP8 corrections all over the app
 - PEP8 corrections all over the app
 - made sure that the object selection will not work while in Editors or in the App Tools
 - made sure that the object selection will not work while in Editors or in the App Tools
 - some minor changes to strings and icons
 - some minor changes to strings and icons
+- in Corner Markers Tool - the new Gerber object will have also follow_geometry
 
 
 1.11.2020
 1.11.2020
 
 

+ 3 - 2
appTools/ToolCorners.py

@@ -160,7 +160,7 @@ class ToolCorners(AppTool):
         marker_type = self.ui.type_radio.get_value()
         marker_type = self.ui.type_radio.get_value()
         line_thickness = self.ui.thick_entry.get_value()
         line_thickness = self.ui.thick_entry.get_value()
         margin = self.ui.margin_entry.get_value()
         margin = self.ui.margin_entry.get_value()
-        line_length = self.ui.l_entry.get_value()
+        line_length = self.ui.l_entry.get_value() / 2.0
 
 
         geo_list = []
         geo_list = []
 
 
@@ -306,9 +306,10 @@ class ToolCorners(AppTool):
         def initialize(grb_obj, app_obj):
         def initialize(grb_obj, app_obj):
             grb_obj.multitool = False
             grb_obj.multitool = False
             grb_obj.multigeo = False
             grb_obj.multigeo = False
-            grb_obj.follow = False
+            grb_obj.follow = deepcopy(g_obj.follow)
             grb_obj.apertures = new_apertures
             grb_obj.apertures = new_apertures
             grb_obj.solid_geometry = unary_union(s_list)
             grb_obj.solid_geometry = unary_union(s_list)
+            grb_obj.follow_geometry = deepcopy(g_obj.follow_geometry) + geo_list
 
 
             grb_obj.source_file = app_obj.f_handlers.export_gerber(obj_name=outname, filename=None, local_use=grb_obj,
             grb_obj.source_file = app_obj.f_handlers.export_gerber(obj_name=outname, filename=None, local_use=grb_obj,
                                                                    use_thread=False)
                                                                    use_thread=False)