diff --git a/README.md b/README.md index 73d366a5..40a60b8c 100644 --- a/README.md +++ b/README.md @@ -9,10 +9,14 @@ CAD program, and create G-Code for Isolation routing. ================================================= +11.05.2019 + +- fixed issue in camlib.CNCjob.generate_from_excellon_by_tool() in the drill path optimization algorithm selection when selecting the MH algorithm. The new API's for Google OR-tools required some changes and also the time parameter can be now just an integer therefore I modified the GUI + 10.05.2019 - Gerber Editor - working in conversion to the new data format -- made sure that only units toggle done in Edit -> Preferences will toggle the data in Preferences. THe menu entry Edit -> Toggle Units and the shortcut key 'Q' will change only the display units in the app +- made sure that only units toggle done in Edit -> Preferences will toggle the data in Preferences. The menu entry Edit -> Toggle Units and the shortcut key 'Q' will change only the display units in the app - optimized Transform tool 9.05.2019 diff --git a/camlib.py b/camlib.py index df5e81d4..12c19c32 100644 --- a/camlib.py +++ b/camlib.py @@ -5240,10 +5240,10 @@ class CNCjob(Geometry): # Set search time limit in milliseconds. if float(self.app.defaults["excellon_search_time"]) != 0: - search_parameters.time_limit_ms = int( - float(self.app.defaults["excellon_search_time"]) * 1000) + search_parameters.time_limit.seconds = int( + float(self.app.defaults["excellon_search_time"])) else: - search_parameters.time_limit_ms = 3000 + search_parameters.time_limit.seconds = 3 # Callback to the distance function. The callback takes two # arguments (the from and to node indices) and returns the distance between them. diff --git a/flatcamGUI/FlatCAMGUI.py b/flatcamGUI/FlatCAMGUI.py index 0cf0d8b9..11987e9c 100644 --- a/flatcamGUI/FlatCAMGUI.py +++ b/flatcamGUI/FlatCAMGUI.py @@ -4525,7 +4525,8 @@ class ExcellonGenPrefGroupUI(OptionsGroupUI): ) - self.optimization_time_entry = LengthEntry() + self.optimization_time_entry = IntEntry() + self.optimization_time_entry.setValidator(QtGui.QIntValidator(0, 999)) form_box_excellon.addRow(self.optimization_time_label, self.optimization_time_entry) current_platform = platform.architecture()[0]