- fixed some errors
This commit is contained in:
parent
da7029dc0b
commit
8b0a9a429a
|
@ -1572,14 +1572,14 @@ class FCDrillArray(FCShapeTool):
|
|||
|
||||
for item in range(self.drill_array_size):
|
||||
if self.drill_axis == 'X':
|
||||
geo = self.util_shape(((data[0] + (self.drill_pitch * item)), data[1]))
|
||||
geo = self.util_shape(((dx + (self.drill_pitch * item)), dy))
|
||||
if self.drill_axis == 'Y':
|
||||
geo = self.util_shape((data[0], (data[1] + (self.drill_pitch * item))))
|
||||
geo = self.util_shape((dx, (dy + (self.drill_pitch * item))))
|
||||
if self.drill_axis == 'A':
|
||||
x_adj = self.drill_pitch * math.cos(math.radians(self.drill_linear_angle))
|
||||
y_adj = self.drill_pitch * math.sin(math.radians(self.drill_linear_angle))
|
||||
geo = self.util_shape(
|
||||
((data[0] + (x_adj * item)), (data[1] + (y_adj * item)))
|
||||
((dx + (x_adj * item)), (dy + (y_adj * item)))
|
||||
)
|
||||
|
||||
if static is None or static is False:
|
||||
|
|
|
@ -1697,7 +1697,8 @@ class FlatCAMExcellon(FlatCAMObj, Excellon):
|
|||
job_obj.z_move = float(self.options["travelz"])
|
||||
job_obj.feedrate = float(self.options["feedrate"])
|
||||
job_obj.feedrate_rapid = float(self.options["feedrate_rapid"])
|
||||
job_obj.spindlespeed = float(self.options["spindlespeed"])
|
||||
|
||||
job_obj.spindlespeed = float(self.options["spindlespeed"]) if self.options["spindlespeed"] else None
|
||||
job_obj.dwell = self.options["dwell"]
|
||||
job_obj.dwelltime = float(self.options["dwelltime"])
|
||||
job_obj.pp_excellon_name = pp_excellon_name
|
||||
|
@ -4307,8 +4308,8 @@ class FlatCAMCNCjob(FlatCAMObj, CNCjob):
|
|||
_filter_ = "G-Code Files (*.nc);;G-Code Files (*.txt);;G-Code Files (*.tap);;G-Code Files (*.cnc);;" \
|
||||
"G-Code Files (*.g-code);;All Files (*.*)"
|
||||
|
||||
dir_file_to_save = self.app.get_last_save_folder() + '/' + str(name)
|
||||
try:
|
||||
dir_file_to_save = self.app.get_last_save_folder() + '/' + str(name)
|
||||
filename, _ = QtWidgets.QFileDialog.getSaveFileName(
|
||||
caption="Export Machine Code ...",
|
||||
directory=dir_file_to_save,
|
||||
|
|
Loading…
Reference in New Issue