Ver Fonte

- made those settings just added for Gerber, to be updated on object creation
- added the Geo Tolerance parameter to those that are converted from MM to INCH

Marius Stanciu há 6 anos atrás
pai
commit
c685f41db0
4 ficheiros alterados com 8 adições e 3 exclusões
  1. 1 1
      FlatCAMApp.py
  2. 4 1
      FlatCAMObj.py
  3. 2 0
      README.md
  4. 1 1
      flatcamGUI/PreferencesUI.py

+ 1 - 1
FlatCAMApp.py

@@ -5363,7 +5363,7 @@ class App(QtCore.QObject):
                       "tools_solderpaste_z_toolchange", "tools_solderpaste_xy_toolchange", "tools_solderpaste_frxy",
                       "tools_solderpaste_frz", "tools_solderpaste_frz_dispense",
 
-                      'global_gridx', 'global_gridy', 'global_snap_max']
+                      'global_gridx', 'global_gridy', 'global_snap_max', "global_tolerance"]
 
         def scale_options(sfactor):
             for dim in dimensions:

+ 4 - 1
FlatCAMObj.py

@@ -626,11 +626,13 @@ class FlatCAMGerber(FlatCAMObj, Gerber):
         self.ui.type_obj_combo.currentIndexChanged.connect(self.on_type_obj_index_changed)
 
         self.ui.tool_type_radio.activated_custom.connect(self.on_tool_type_change)
-        self.ui.tool_type_radio.set_value('circular')
+        # establish visibility for the GUI elements found in the slot function
+        self.ui.tool_type_radio.activated_custom.emit(self.options['tool_type'])
 
         # Show/Hide Advanced Options
         if self.app.defaults["global_app_level"] == 'b':
             self.ui.level.setText('<span style="color:green;"><b>%s</b></span>' % _('Basic'))
+            self.options['tool_type'] = 'circular'
 
             self.ui.tool_type_label.hide()
             self.ui.tool_type_radio.hide()
@@ -4678,6 +4680,7 @@ class FlatCAMGeometry(FlatCAMObj, Geometry):
 
         :param segx: number of segments on the X axis, for auto-levelling
         :param segy: number of segments on the Y axis, for auto-levelling
+        :param plot: if True the generated object will be plotted; if False will not be plotted
         :param use_thread: if True use threading
         :return: None
         """

+ 2 - 0
README.md

@@ -18,6 +18,8 @@ CAD program, and create G-Code for Isolation routing.
 - added a fix in the Gerber parser to work even when there is no information about zero suppression in the Gerber file
 - added new settings in Edit -> Preferences -> Gerber for Gerber Units and Gerber Zeros to be used as defaults in case that those informations are missing from the Gerber file
 - added new settings for the Gerber newly introduced feature to isolate with the V-Shape tools (tip dia, tip angle, tool_type and cut Z) in Edit -> Preferences -> Gerber Advanced
+- made those settings just added for Gerber, to be updated on object creation
+- added the Geo Tolerance parameter to those that are converted from MM to INCH
 
 30.09.2019
 

+ 1 - 1
flatcamGUI/PreferencesUI.py

@@ -883,7 +883,7 @@ class GeneralAppPrefGroupUI(OptionsGroupUI):
                                   {'label': _('OpenGL(3D)'), 'value': '3D'}])
 
         # Application Level for FlatCAM
-        self.app_level_label = QtWidgets.QLabel('<b>%s:</b>' % _('APP. LEVEL'))
+        self.app_level_label = QtWidgets.QLabel('<span style="color:red;"><b>%s:</b></span>' % _('APP. LEVEL'))
         self.app_level_label.setToolTip(_("Choose the default level of usage for FlatCAM.\n"
                                           "BASIC level -> reduced functionality, best for beginner's.\n"
                                           "ADVANCED level -> full functionality.\n\n"