Просмотр исходного кода

- 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

Marius Stanciu 6 лет назад
Родитель
Сommit
883cf3372a
3 измененных файлов с 10 добавлено и 5 удалено
  1. 5 1
      README.md
  2. 3 3
      camlib.py
  3. 2 1
      flatcamGUI/FlatCAMGUI.py

+ 5 - 1
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

+ 3 - 3
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.

+ 2 - 1
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]