Преглед изворни кода

- the Show Shell in Edit -> Preferences will now toggle the Tcl shell based on the current status of the Tcl Shell
- updated the Tcl command Isolate help for follow parameter

Marius Stanciu пре 5 година
родитељ
комит
4c196f6bae
4 измењених фајлова са 19 додато и 2 уклоњено
  1. 15 0
      FlatCAMApp.py
  2. 2 0
      README.md
  3. 1 1
      flatcamGUI/PreferencesUI.py
  4. 1 1
      tclCommands/TclCommandIsolate.py

+ 15 - 0
FlatCAMApp.py

@@ -5453,6 +5453,21 @@ class App(QtCore.QObject):
         else:
         else:
             self.ui.shell_dock.show()
             self.ui.shell_dock.show()
 
 
+    def on_toggle_shell_from_settings(self, state):
+        """
+        Toggle shell: if is visible close it, if it is closed then open it
+        :return: None
+        """
+
+        self.report_usage("on_toggle_shell_from_settings()")
+
+        if state is True:
+            if not self.ui.shell_dock.isVisible():
+                self.ui.shell_dock.show()
+        else:
+            if self.ui.shell_dock.isVisible():
+                self.ui.shell_dock.hide()
+
     def on_register_files(self, obj_type=None):
     def on_register_files(self, obj_type=None):
         """
         """
         Called whenever there is a need to register file extensions with FlatCAM.
         Called whenever there is a need to register file extensions with FlatCAM.

+ 2 - 0
README.md

@@ -19,6 +19,8 @@ CAD program, and create G-Code for Isolation routing.
 - updated the Tcl command PlotAll to be able to run threaded or not
 - updated the Tcl command PlotAll to be able to run threaded or not
 - updated the Tcl commands PlotAll and PlotObjects to have a parameter that control if the objects are to be plotted or not on canvas; it serve as a disable/enable
 - updated the Tcl commands PlotAll and PlotObjects to have a parameter that control if the objects are to be plotted or not on canvas; it serve as a disable/enable
 - minor update to the autocomplete dictionary
 - minor update to the autocomplete dictionary
+- the Show Shell in Edit -> Preferences will now toggle the Tcl shell based on the current status of the Tcl Shell
+- updated the Tcl command Isolate help for follow parameter 
 
 
 11.04.2020 
 11.04.2020 
 
 

+ 1 - 1
flatcamGUI/PreferencesUI.py

@@ -1736,7 +1736,7 @@ class GeneralAppPrefGroupUI(OptionsGroupUI):
         self.splash_cb.stateChanged.connect(self.on_splash_changed)
         self.splash_cb.stateChanged.connect(self.on_splash_changed)
 
 
         # Monitor the checkbox from the Application Defaults Tab and show the TCL shell or not depending on it's value
         # Monitor the checkbox from the Application Defaults Tab and show the TCL shell or not depending on it's value
-        self.shell_startup_cb.clicked.connect(self.app.on_toggle_shell)
+        self.shell_startup_cb.clicked.connect(self.app.on_toggle_shell_from_settings)
 
 
         self.language_apply_btn.clicked.connect(lambda: fcTranslate.on_language_apply_click(app=self.app, restart=True))
         self.language_apply_btn.clicked.connect(lambda: fcTranslate.on_language_apply_click(app=self.app, restart=True))
 
 

+ 1 - 1
tclCommands/TclCommandIsolate.py

@@ -52,7 +52,7 @@ class TclCommandIsolate(TclCommandSignaled):
                         'E.g: for a 25% from tool diameter overlap use -overlap 25'),
                         'E.g: for a 25% from tool diameter overlap use -overlap 25'),
             ('combine', 'Combine all passes into one geometry. Can be True (1) or False (0)'),
             ('combine', 'Combine all passes into one geometry. Can be True (1) or False (0)'),
             ('outname', 'Name of the resulting Geometry object.'),
             ('outname', 'Name of the resulting Geometry object.'),
-            ('follow', 'Create a Geometry that follows the Gerber path.'),
+            ('follow', 'Create a Geometry that follows the Gerber path. Can be True (1) or False (0).'),
             ('iso_type', 'A value of 0 will isolate exteriors, a value of 1 will isolate interiors '
             ('iso_type', 'A value of 0 will isolate exteriors, a value of 1 will isolate interiors '
                          'and a value of 2 will do full isolation.')
                          'and a value of 2 will do full isolation.')
         ]),
         ]),