Merged in marius_stanciu/flatcam_beta/Beta (pull request #233)

Beta - Build 8.97

FlatCAMApp.py

@@ -97,6 +97,7 @@ class App(QtCore.QObject):
     except getopt.GetoptError:
         print(cmd_line_help)
         sys.exit(2)
+
     for opt, arg in cmd_line_options:
         if opt == '-h':
             print(cmd_line_help)
@@ -2629,8 +2630,8 @@ class App(QtCore.QObject):
                 print("ERROR: ", ext)
                 sys.exit(2)
 
-            # accept some type file as command line parameter: FlatCAM project, FlatCAM preferences or scripts
-            # the path/file_name must be enclosed in quotes if it contain spaces
+        # accept some type file as command line parameter: FlatCAM project, FlatCAM preferences or scripts
+        # the path/file_name must be enclosed in quotes if it contain spaces
         if App.args:
             self.args_at_startup.emit(App.args)
 
@@ -2764,8 +2765,14 @@ class App(QtCore.QObject):
                             return
 
                 # if it reached here without already returning then the app was registered with a file that it does not
-                # recognize therefore we must quit
-                sys.exit(2)
+                # recognize therefore we must quit but take into consideration the app reboot from within, in that case
+                # the args_to_process will contain the path to the FlatCAM.exe (cx_freezed executable)
+
+                for arg in args_to_process:
+                    if 'FlatCAM.exe' in arg:
+                        continue
+                    else:
+                        sys.exit(2)
 
     def set_ui_title(self, name):
         """

README.md

@@ -9,7 +9,11 @@ CAD program, and create G-Code for Isolation routing.
 
 =================================================
 
-25.09.2019
+27.09.2019
+
+- RELEASE FlatCAM 8.97
+
+26.09.2019
 
 - added a Copy All button in the Code Editor, clicking this button will copy all text in the editor to the clipboard
 - added a 'Milling Type' radio button in Geometry Editor Preferences to contorl the type of geometry will be generated in the Geo Editor (for conventional milling or for the climb milling)
@@ -19,6 +23,9 @@ CAD program, and create G-Code for Isolation routing.
 - French Google-translation at 100%
 - German Google-translation update to 100%
 - updated the other languages and the .POT file
+- changed some strings (that should not have been included for translation) and updated language files and the .POT file
+- fixed issue when rebooting from within in cx_freezed state (it issued a startup arg with the path to FlatCAM.exe but that triggered the last sys.exit(2) that I had in the App.args_at_startup())
+- modified the make_win script for the presence of MatPlotLib
 
 25.09.2019
 

flatcamGUI/PreferencesUI.py

@@ -3214,16 +3214,20 @@ class CNCJobAdvOptPrefGroupUI(OptionsGroupUI):
                      'z_cut', 'z_move', 'z_depthpercut', 'spindlespeed', 'dwelltime']
         self.tc_variable_combo.addItems(variables)
         self.tc_variable_combo.setItemData(0, _("FlatCAM CNC parameters"), Qt.ToolTipRole)
-        self.tc_variable_combo.setItemData(1, _("tool = tool number"), Qt.ToolTipRole)
-        self.tc_variable_combo.setItemData(2, _("tooldia = tool diameter"), Qt.ToolTipRole)
-        self.tc_variable_combo.setItemData(3, _("t_drills = for Excellon, total number of drills"), Qt.ToolTipRole)
-        self.tc_variable_combo.setItemData(4, _("x_toolchange = X coord for Toolchange"), Qt.ToolTipRole)
-        self.tc_variable_combo.setItemData(5, _("y_toolchange = Y coord for Toolchange"), Qt.ToolTipRole)
-        self.tc_variable_combo.setItemData(6, _("z_toolchange = Z coord for Toolchange"), Qt.ToolTipRole)
-        self.tc_variable_combo.setItemData(7, _("z_cut = Z depth for the cut"), Qt.ToolTipRole)
-        self.tc_variable_combo.setItemData(8, _("z_move = Z height for travel"), Qt.ToolTipRole)
-        self.tc_variable_combo.setItemData(9, _("z_depthpercut = the step value for multidepth cut"), Qt.ToolTipRole)
-        self.tc_variable_combo.setItemData(10, _("spindlesspeed = the value for the spindle speed"), Qt.ToolTipRole)
+        self.tc_variable_combo.setItemData(1, 'tool = %s' % _("tool number"), Qt.ToolTipRole)
+        self.tc_variable_combo.setItemData(2, 'tooldia = %s' % _("tool diameter"), Qt.ToolTipRole)
+        self.tc_variable_combo.setItemData(3, 't_drills = %s' % _("for Excellon, total number of drills"),
+                                           Qt.ToolTipRole)
+        self.tc_variable_combo.setItemData(4, 'x_toolchange = %s' % _("X coord for Toolchange"), Qt.ToolTipRole)
+        self.tc_variable_combo.setItemData(5, 'y_toolchange = %s' % _("y_toolchange = Y coord for Toolchange"),
+                                           Qt.ToolTipRole)
+        self.tc_variable_combo.setItemData(6, 'z_toolchange = %s' % _("Z coord for Toolchange"), Qt.ToolTipRole)
+        self.tc_variable_combo.setItemData(7, 'z_cut = %s' % _("Z depth for the cut"), Qt.ToolTipRole)
+        self.tc_variable_combo.setItemData(8, 'z_move = %s' % _("Z height for travel"), Qt.ToolTipRole)
+        self.tc_variable_combo.setItemData(9, 'z_depthpercut = %s' % _("the step value for multidepth cut"),
+                                           Qt.ToolTipRole)
+        self.tc_variable_combo.setItemData(10, 'spindlesspeed = %s' % _("the value for the spindle speed"),
+                                           Qt.ToolTipRole)
         self.tc_variable_combo.setItemData(11,
                                            _("dwelltime = time to dwell to allow the spindle to reach it's set RPM"),
                                            Qt.ToolTipRole)

make_win.py

@@ -45,6 +45,7 @@ include_files.append((os.path.join(site_dir, "svg/path"), "svg"))
 include_files.append((os.path.join(site_dir, "vispy"), "vispy"))
 include_files.append((os.path.join(site_dir, "vispy/app"), "vispy/app"))
 include_files.append((os.path.join(site_dir, "vispy/app/backends"), "vispy/app/backends"))
+# include_files.append((os.path.join(site_dir, "matplotlib"), "matplotlib"))
 include_files.append((os.path.join(site_dir, "rtree"), "rtree"))
 
 if platform.architecture()[0] == '64bit':