bartool/flatcam-wsl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- added new parameter for Excellon Object in Preferences: Fast Retract. If the checkbox is checked then after reaching the drill depth, the drill bit will be raised out of the hole asap.

Browse Source 
- started to work on GUI forms simplification
- changed the Preferences GUI for Geometry and Excellon Objects to make a difference between parameters that are changed often and those that are not.
This commit is contained in:
Marius Stanciu
2019-02-13 14:30:29 +02:00
committed by Marius
parent c94679919d
commit 899e8b433d
5 changed files with 311 additions and 255 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
FlatCAMApp.py
View File

@@ -347,54 +347,55 @@ class App(QtCore.QObject):
"excellon_units": self.excellon_defaults_form.excellon_gen_group.excellon_units_radio,
"excellon_optimization_type": self.excellon_defaults_form.excellon_gen_group.excellon_optimization_radio,
"excellon_search_time": self.excellon_defaults_form.excellon_gen_group.optimization_time_entry,
"excellon_offset": self.excellon_defaults_form.excellon_gen_group.offset_entry,
"excellon_toolchangexy": self.excellon_defaults_form.excellon_gen_group.toolchangexy_entry,
"excellon_startz": self.excellon_defaults_form.excellon_gen_group.estartz_entry,
"excellon_endz": self.excellon_defaults_form.excellon_gen_group.eendz_entry,
"excellon_feedrate_rapid": self.excellon_defaults_form.excellon_gen_group.feedrate_rapid_entry,
"excellon_z_pdepth": self.excellon_defaults_form.excellon_gen_group.pdepth_entry,
"excellon_feedrate_probe": self.excellon_defaults_form.excellon_gen_group.feedrate_probe_entry,
"excellon_f_plunge": self.excellon_defaults_form.excellon_gen_group.fplunge_cb,
"excellon_f_retract": self.excellon_defaults_form.excellon_gen_group.fretract_cb,
"excellon_drillz": self.excellon_defaults_form.excellon_opt_group.cutz_entry,
"excellon_travelz": self.excellon_defaults_form.excellon_opt_group.travelz_entry,
"excellon_feedrate": self.excellon_defaults_form.excellon_opt_group.feedrate_entry,
"excellon_feedrate_rapid": self.excellon_defaults_form.excellon_opt_group.feedrate_rapid_entry,
"excellon_feedrate_probe": self.excellon_defaults_form.excellon_opt_group.feedrate_probe_entry,
"excellon_spindlespeed": self.excellon_defaults_form.excellon_opt_group.spindlespeed_entry,
"excellon_dwell": self.excellon_defaults_form.excellon_opt_group.dwell_cb,
"excellon_dwelltime": self.excellon_defaults_form.excellon_opt_group.dwelltime_entry,
"excellon_toolchange": self.excellon_defaults_form.excellon_opt_group.toolchange_cb,
"excellon_toolchangez": self.excellon_defaults_form.excellon_opt_group.toolchangez_entry,
"excellon_toolchangexy": self.excellon_defaults_form.excellon_opt_group.toolchangexy_entry,
"excellon_ppname_e": self.excellon_defaults_form.excellon_opt_group.pp_excellon_name_cb,
"excellon_z_pdepth": self.excellon_defaults_form.excellon_opt_group.pdepth_entry,
"excellon_f_plunge": self.excellon_defaults_form.excellon_opt_group.fplunge_cb,
"excellon_startz": self.excellon_defaults_form.excellon_opt_group.estartz_entry,
"excellon_endz": self.excellon_defaults_form.excellon_opt_group.eendz_entry,
"excellon_tooldia": self.excellon_defaults_form.excellon_opt_group.tooldia_entry,
"excellon_offset": self.excellon_defaults_form.excellon_opt_group.offset_entry,
"excellon_slot_tooldia": self.excellon_defaults_form.excellon_opt_group.slot_tooldia_entry,
"excellon_gcode_type": self.excellon_defaults_form.excellon_opt_group.excellon_gcode_type_radio,
"geometry_plot": self.geometry_defaults_form.geometry_gen_group.plot_cb,
"geometry_cnctooldia": self.geometry_defaults_form.geometry_gen_group.cnctooldia_entry,
"geometry_circle_steps": self.geometry_defaults_form.geometry_gen_group.circle_steps_entry,
"geometry_segx": self.geometry_defaults_form.geometry_gen_group.segx_entry,
"geometry_segy": self.geometry_defaults_form.geometry_gen_group.segy_entry,
"geometry_feedrate_rapid": self.geometry_defaults_form.geometry_gen_group.cncfeedrate_rapid_entry,
"geometry_feedrate_probe": self.geometry_defaults_form.geometry_gen_group.feedrate_probe_entry,
"geometry_z_pdepth": self.geometry_defaults_form.geometry_gen_group.pdepth_entry,
"geometry_f_plunge": self.geometry_defaults_form.geometry_gen_group.fplunge_cb,
"geometry_toolchangexy": self.geometry_defaults_form.geometry_gen_group.toolchangexy_entry,
"geometry_startz": self.geometry_defaults_form.geometry_gen_group.gstartz_entry,
"geometry_endz": self.geometry_defaults_form.geometry_gen_group.gendz_entry,
"geometry_extracut": self.geometry_defaults_form.geometry_gen_group.extracut_cb,
"geometry_segx": self.geometry_defaults_form.geometry_opt_group.segx_entry,
"geometry_segy": self.geometry_defaults_form.geometry_opt_group.segy_entry,
"geometry_cutz": self.geometry_defaults_form.geometry_opt_group.cutz_entry,
"geometry_travelz": self.geometry_defaults_form.geometry_opt_group.travelz_entry,
"geometry_feedrate": self.geometry_defaults_form.geometry_opt_group.cncfeedrate_entry,
"geometry_feedrate_z": self.geometry_defaults_form.geometry_opt_group.cncplunge_entry,
"geometry_feedrate_rapid": self.geometry_defaults_form.geometry_opt_group.cncfeedrate_rapid_entry,
"geometry_feedrate_probe": self.geometry_defaults_form.geometry_opt_group.feedrate_probe_entry,
"geometry_spindlespeed": self.geometry_defaults_form.geometry_opt_group.cncspindlespeed_entry,
"geometry_dwell": self.geometry_defaults_form.geometry_opt_group.dwell_cb,
"geometry_dwelltime": self.geometry_defaults_form.geometry_opt_group.dwelltime_entry,
"geometry_ppname_g": self.geometry_defaults_form.geometry_opt_group.pp_geometry_name_cb,
"geometry_z_pdepth": self.geometry_defaults_form.geometry_opt_group.pdepth_entry,
"geometry_f_plunge": self.geometry_defaults_form.geometry_opt_group.fplunge_cb,
"geometry_toolchange": self.geometry_defaults_form.geometry_opt_group.toolchange_cb,
"geometry_toolchangez": self.geometry_defaults_form.geometry_opt_group.toolchangez_entry,
"geometry_toolchangexy": self.geometry_defaults_form.geometry_opt_group.toolchangexy_entry,
"geometry_startz": self.geometry_defaults_form.geometry_opt_group.gstartz_entry,
"geometry_endz": self.geometry_defaults_form.geometry_opt_group.gendz_entry,
"geometry_multidepth": self.geometry_defaults_form.geometry_opt_group.multidepth_cb,
"geometry_depthperpass": self.geometry_defaults_form.geometry_opt_group.depthperpass_entry,
"geometry_extracut": self.geometry_defaults_form.geometry_opt_group.extracut_cb,
"geometry_multidepth": self.geometry_defaults_form.geometry_opt_group.multidepth_cb,
"cncjob_plot": self.cncjob_defaults_form.cncjob_gen_group.plot_cb,
"cncjob_plot_kind": self.cncjob_defaults_form.cncjob_gen_group.cncplot_method_radio,
@@ -564,6 +565,7 @@ class App(QtCore.QObject):
"excellon_ppname_e": 'default',
"excellon_z_pdepth": -0.02,
"excellon_f_plunge": False,
"excellon_f_retract": False,
"excellon_gcode_type": "drills",
"geometry_plot": True,
@@ -708,46 +710,46 @@ class App(QtCore.QObject):
"excellon_zeros": self.excellon_options_form.excellon_gen_group.excellon_zeros_radio,
"excellon_units": self.excellon_options_form.excellon_gen_group.excellon_units_radio,
"excellon_optimization_type": self.excellon_options_form.excellon_gen_group.excellon_optimization_radio,
"excellon_feedrate_rapid": self.excellon_options_form.excellon_gen_group.feedrate_rapid_entry,
"excellon_toolchangexy": self.excellon_options_form.excellon_gen_group.toolchangexy_entry,
"excellon_f_plunge": self.excellon_options_form.excellon_gen_group.fplunge_cb,
"excellon_startz": self.excellon_options_form.excellon_gen_group.estartz_entry,
"excellon_endz": self.excellon_options_form.excellon_gen_group.eendz_entry,
"excellon_drillz": self.excellon_options_form.excellon_opt_group.cutz_entry,
"excellon_travelz": self.excellon_options_form.excellon_opt_group.travelz_entry,
"excellon_feedrate": self.excellon_options_form.excellon_opt_group.feedrate_entry,
"excellon_feedrate_rapid": self.excellon_options_form.excellon_opt_group.feedrate_rapid_entry,
"excellon_spindlespeed": self.excellon_options_form.excellon_opt_group.spindlespeed_entry,
"excellon_dwell": self.excellon_options_form.excellon_opt_group.dwell_cb,
"excellon_dwelltime": self.excellon_options_form.excellon_opt_group.dwelltime_entry,
"excellon_toolchange": self.excellon_options_form.excellon_opt_group.toolchange_cb,
"excellon_toolchangez": self.excellon_options_form.excellon_opt_group.toolchangez_entry,
"excellon_toolchangexy": self.excellon_options_form.excellon_opt_group.toolchangexy_entry,
"excellon_tooldia": self.excellon_options_form.excellon_opt_group.tooldia_entry,
"excellon_ppname_e": self.excellon_options_form.excellon_opt_group.pp_excellon_name_cb,
"excellon_f_plunge": self.excellon_options_form.excellon_opt_group.fplunge_cb,
"excellon_startz": self.excellon_options_form.excellon_opt_group.estartz_entry,
"excellon_endz": self.excellon_options_form.excellon_opt_group.eendz_entry,
"geometry_plot": self.geometry_options_form.geometry_gen_group.plot_cb,
"geometry_cnctooldia": self.geometry_options_form.geometry_gen_group.cnctooldia_entry,
"geometry_segx": self.geometry_options_form.geometry_gen_group.segx_entry,
"geometry_segy": self.geometry_options_form.geometry_gen_group.segy_entry,
"geometry_feedrate_rapid": self.geometry_options_form.geometry_gen_group.cncfeedrate_rapid_entry,
"geometry_f_plunge": self.geometry_options_form.geometry_gen_group.fplunge_cb,
"geometry_toolchangexy": self.geometry_options_form.geometry_gen_group.toolchangexy_entry,
"geometry_startz": self.geometry_options_form.geometry_gen_group.gstartz_entry,
"geometry_endz": self.geometry_options_form.geometry_gen_group.gendz_entry,
"geometry_extracut": self.geometry_options_form.geometry_gen_group.extracut_cb,
"geometry_segx": self.geometry_options_form.geometry_opt_group.segx_entry,
"geometry_segy": self.geometry_options_form.geometry_opt_group.segy_entry,
"geometry_cutz": self.geometry_options_form.geometry_opt_group.cutz_entry,
"geometry_travelz": self.geometry_options_form.geometry_opt_group.travelz_entry,
"geometry_feedrate": self.geometry_options_form.geometry_opt_group.cncfeedrate_entry,
"geometry_feedrate_z": self.geometry_options_form.geometry_opt_group.cncplunge_entry,
"geometry_feedrate_rapid": self.geometry_options_form.geometry_opt_group.cncfeedrate_rapid_entry,
"geometry_spindlespeed": self.geometry_options_form.geometry_opt_group.cncspindlespeed_entry,
"geometry_dwell": self.geometry_options_form.geometry_opt_group.dwell_cb,
"geometry_dwelltime": self.geometry_options_form.geometry_opt_group.dwelltime_entry,
"geometry_ppname_g": self.geometry_options_form.geometry_opt_group.pp_geometry_name_cb,
"geometry_f_plunge": self.geometry_options_form.geometry_opt_group.fplunge_cb,
"geometry_toolchange": self.geometry_options_form.geometry_opt_group.toolchange_cb,
"geometry_toolchangez": self.geometry_options_form.geometry_opt_group.toolchangez_entry,
"geometry_toolchangexy": self.geometry_options_form.geometry_opt_group.toolchangexy_entry,
"geometry_startz": self.geometry_options_form.geometry_opt_group.gstartz_entry,
"geometry_endz": self.geometry_options_form.geometry_opt_group.gendz_entry,
"geometry_depthperpass": self.geometry_options_form.geometry_opt_group.depthperpass_entry,
"geometry_multidepth": self.geometry_options_form.geometry_opt_group.multidepth_cb,
"geometry_extracut": self.geometry_options_form.geometry_opt_group.extracut_cb,
"cncjob_plot": self.cncjob_options_form.cncjob_gen_group.plot_cb,
"cncjob_tooldia": self.cncjob_options_form.cncjob_gen_group.tooldia_entry,