|
@@ -221,6 +221,7 @@ class App(QtCore.QObject):
|
|
|
"excellon_travelz": self.defaults_form.excellon_group.travelz_entry,
|
|
"excellon_travelz": self.defaults_form.excellon_group.travelz_entry,
|
|
|
"excellon_feedrate": self.defaults_form.excellon_group.feedrate_entry,
|
|
"excellon_feedrate": self.defaults_form.excellon_group.feedrate_entry,
|
|
|
"excellon_spindlespeed": self.defaults_form.excellon_group.spindlespeed_entry,
|
|
"excellon_spindlespeed": self.defaults_form.excellon_group.spindlespeed_entry,
|
|
|
|
|
+ "excellon_toolchangez": self.defaults_form.excellon_group.toolchangez_entry,
|
|
|
"geometry_plot": self.defaults_form.geometry_group.plot_cb,
|
|
"geometry_plot": self.defaults_form.geometry_group.plot_cb,
|
|
|
"geometry_cutz": self.defaults_form.geometry_group.cutz_entry,
|
|
"geometry_cutz": self.defaults_form.geometry_group.cutz_entry,
|
|
|
"geometry_travelz": self.defaults_form.geometry_group.travelz_entry,
|
|
"geometry_travelz": self.defaults_form.geometry_group.travelz_entry,
|
|
@@ -262,6 +263,7 @@ class App(QtCore.QObject):
|
|
|
"excellon_travelz": 0.1,
|
|
"excellon_travelz": 0.1,
|
|
|
"excellon_feedrate": 3.0,
|
|
"excellon_feedrate": 3.0,
|
|
|
"excellon_spindlespeed": None,
|
|
"excellon_spindlespeed": None,
|
|
|
|
|
+ "excellon_toolchangez": 1.0,
|
|
|
"geometry_plot": True,
|
|
"geometry_plot": True,
|
|
|
"geometry_cutz": -0.002,
|
|
"geometry_cutz": -0.002,
|
|
|
"geometry_travelz": 0.1,
|
|
"geometry_travelz": 0.1,
|
|
@@ -346,6 +348,7 @@ class App(QtCore.QObject):
|
|
|
"excellon_travelz": self.options_form.excellon_group.travelz_entry,
|
|
"excellon_travelz": self.options_form.excellon_group.travelz_entry,
|
|
|
"excellon_feedrate": self.options_form.excellon_group.feedrate_entry,
|
|
"excellon_feedrate": self.options_form.excellon_group.feedrate_entry,
|
|
|
"excellon_spindlespeed": self.options_form.excellon_group.spindlespeed_entry,
|
|
"excellon_spindlespeed": self.options_form.excellon_group.spindlespeed_entry,
|
|
|
|
|
+ "excellon_toolchangez": self.options_form.excellon_group.toolchangez_entry,
|
|
|
"geometry_plot": self.options_form.geometry_group.plot_cb,
|
|
"geometry_plot": self.options_form.geometry_group.plot_cb,
|
|
|
"geometry_cutz": self.options_form.geometry_group.cutz_entry,
|
|
"geometry_cutz": self.options_form.geometry_group.cutz_entry,
|
|
|
"geometry_travelz": self.options_form.geometry_group.travelz_entry,
|
|
"geometry_travelz": self.options_form.geometry_group.travelz_entry,
|
|
@@ -386,6 +389,7 @@ class App(QtCore.QObject):
|
|
|
"excellon_travelz": 0.1,
|
|
"excellon_travelz": 0.1,
|
|
|
"excellon_feedrate": 3.0,
|
|
"excellon_feedrate": 3.0,
|
|
|
"excellon_spindlespeed": None,
|
|
"excellon_spindlespeed": None,
|
|
|
|
|
+ "excellon_toolchangez": 1.0,
|
|
|
"geometry_plot": True,
|
|
"geometry_plot": True,
|
|
|
"geometry_cutz": -0.002,
|
|
"geometry_cutz": -0.002,
|
|
|
"geometry_travelz": 0.1,
|
|
"geometry_travelz": 0.1,
|
|
@@ -1146,7 +1150,7 @@ class App(QtCore.QObject):
|
|
|
# Options to scale
|
|
# Options to scale
|
|
|
dimensions = ['gerber_isotooldia', 'gerber_cutoutmargin', 'gerber_cutoutgapsize',
|
|
dimensions = ['gerber_isotooldia', 'gerber_cutoutmargin', 'gerber_cutoutgapsize',
|
|
|
'gerber_noncoppermargin', 'gerber_bboxmargin', 'excellon_drillz',
|
|
'gerber_noncoppermargin', 'gerber_bboxmargin', 'excellon_drillz',
|
|
|
- 'excellon_travelz', 'excellon_feedrate', 'cncjob_tooldia',
|
|
|
|
|
|
|
+ 'excellon_travelz', 'excellon_feedrate', 'excellon_toolchangez', 'cncjob_tooldia',
|
|
|
'geometry_cutz', 'geometry_travelz', 'geometry_feedrate',
|
|
'geometry_cutz', 'geometry_travelz', 'geometry_feedrate',
|
|
|
'geometry_cnctooldia', 'geometry_painttooldia', 'geometry_paintoverlap',
|
|
'geometry_cnctooldia', 'geometry_painttooldia', 'geometry_paintoverlap',
|
|
|
'geometry_paintmargin']
|
|
'geometry_paintmargin']
|