- added some ToolTips (strings needed to be translated too) for the Cut Z entry in Geometry Object UI that explain why is sometime disabled and reason for it's value (sometime is zero)
This commit is contained in:
parent
6d2ffe9c95
commit
f47396a6e5
|
@ -7,6 +7,10 @@ CHANGELOG for FlatCAM beta
|
||||||
|
|
||||||
=================================================
|
=================================================
|
||||||
|
|
||||||
|
01.05.2020
|
||||||
|
|
||||||
|
- added some ToolTips (strings needed to be translated too) for the Cut Z entry in Geometry Object UI that explain why is sometime disabled and reason for it's value (sometime is zero)
|
||||||
|
|
||||||
30.04.2020
|
30.04.2020
|
||||||
|
|
||||||
- made some corrections - due of recent refactoring PyCharm reported errors all over (not correct but it made programming difficult)
|
- made some corrections - due of recent refactoring PyCharm reported errors all over (not correct but it made programming difficult)
|
||||||
|
|
23
camlib.py
23
camlib.py
|
@ -3472,8 +3472,7 @@ class CNCjob(Geometry):
|
||||||
else:
|
else:
|
||||||
log.debug("camlib.CNCJob.generate_from_excellon_by_tool() --> "
|
log.debug("camlib.CNCJob.generate_from_excellon_by_tool() --> "
|
||||||
"The loaded Excellon file has no drills ...")
|
"The loaded Excellon file has no drills ...")
|
||||||
self.app.inform.emit('[ERROR_NOTCL] %s...' %
|
self.app.inform.emit('[ERROR_NOTCL] %s...' % _('The loaded Excellon file has no drills'))
|
||||||
_('The loaded Excellon file has no drills'))
|
|
||||||
return 'fail'
|
return 'fail'
|
||||||
self.z_cut = deepcopy(old_zcut)
|
self.z_cut = deepcopy(old_zcut)
|
||||||
log.debug("The total travel distance with Travelling Salesman Algorithm is: %s" % str(measured_distance))
|
log.debug("The total travel distance with Travelling Salesman Algorithm is: %s" % str(measured_distance))
|
||||||
|
@ -3499,14 +3498,12 @@ class CNCjob(Geometry):
|
||||||
self.app.inform.emit(_("Finished G-Code generation..."))
|
self.app.inform.emit(_("Finished G-Code generation..."))
|
||||||
return 'OK'
|
return 'OK'
|
||||||
|
|
||||||
def generate_from_multitool_geometry(
|
def generate_from_multitool_geometry(self, geometry, append=True, tooldia=None, offset=0.0, tolerance=0, z_cut=1.0,
|
||||||
self, geometry, append=True,
|
z_move=2.0, feedrate=2.0, feedrate_z=2.0, feedrate_rapid=30,
|
||||||
tooldia=None, offset=0.0, tolerance=0, z_cut=1.0, z_move=2.0,
|
spindlespeed=None, spindledir='CW', dwell=False, dwelltime=1.0,
|
||||||
feedrate=2.0, feedrate_z=2.0, feedrate_rapid=30,
|
multidepth=False, depthpercut=None, toolchange=False, toolchangez=1.0,
|
||||||
spindlespeed=None, spindledir='CW', dwell=False, dwelltime=1.0,
|
toolchangexy="0.0, 0.0", extracut=False, extracut_length=0.2,
|
||||||
multidepth=False, depthpercut=None,
|
startz=None, endz=2.0, endxy='', pp_geometry_name=None, tool_no=1):
|
||||||
toolchange=False, toolchangez=1.0, toolchangexy="0.0, 0.0", extracut=False, extracut_length=0.2,
|
|
||||||
startz=None, endz=2.0, endxy='', pp_geometry_name=None, tool_no=1):
|
|
||||||
"""
|
"""
|
||||||
Algorithm to generate from multitool Geometry.
|
Algorithm to generate from multitool Geometry.
|
||||||
|
|
||||||
|
@ -5025,8 +5022,7 @@ class CNCjob(Geometry):
|
||||||
|
|
||||||
return path
|
return path
|
||||||
|
|
||||||
def linear2gcode(self, linear, tolerance=0, down=True, up=True,
|
def linear2gcode(self, linear, tolerance=0, down=True, up=True, z_cut=None, z_move=None, zdownrate=None,
|
||||||
z_cut=None, z_move=None, zdownrate=None,
|
|
||||||
feedrate=None, feedrate_z=None, feedrate_rapid=None, cont=False, old_point=(0, 0)):
|
feedrate=None, feedrate_z=None, feedrate_rapid=None, cont=False, old_point=(0, 0)):
|
||||||
"""
|
"""
|
||||||
|
|
||||||
|
@ -5119,8 +5115,7 @@ class CNCjob(Geometry):
|
||||||
# For Incremental coordinates type G91
|
# For Incremental coordinates type G91
|
||||||
# next_x = pt[0] - prev_x
|
# next_x = pt[0] - prev_x
|
||||||
# next_y = pt[1] - prev_y
|
# next_y = pt[1] - prev_y
|
||||||
self.app.inform.emit('[ERROR_NOTCL] %s' %
|
self.app.inform.emit('[ERROR_NOTCL] %s' % _('G91 coordinates not implemented ...'))
|
||||||
_('G91 coordinates not implemented ...'))
|
|
||||||
next_x = pt[0]
|
next_x = pt[0]
|
||||||
next_y = pt[1]
|
next_y = pt[1]
|
||||||
|
|
||||||
|
|
|
@ -1114,6 +1114,26 @@ class GeometryObject(FlatCAMObj, Geometry):
|
||||||
self.ui.tipanglelabel.show()
|
self.ui.tipanglelabel.show()
|
||||||
self.ui.tipangle_entry.show()
|
self.ui.tipangle_entry.show()
|
||||||
self.ui.cutz_entry.setDisabled(True)
|
self.ui.cutz_entry.setDisabled(True)
|
||||||
|
self.ui.cutzlabel.setToolTip(
|
||||||
|
_("Disabled because the tool is V-shape.\n"
|
||||||
|
"For V-shape tools the depth of cut is\n"
|
||||||
|
"calculated from other parameters like:\n"
|
||||||
|
"- 'V-tip Angle' -> angle at the tip of the tool\n"
|
||||||
|
"- 'V-tip Dia' -> diameter at the tip of the tool \n"
|
||||||
|
"- Tool Dia -> 'Dia' column found in the Tool Table\n"
|
||||||
|
"NB: a value of zero means that Tool Dia = 'V-tip Dia'"
|
||||||
|
)
|
||||||
|
)
|
||||||
|
self.ui.cutz_entry.setToolTip(
|
||||||
|
_("Disabled because the tool is V-shape.\n"
|
||||||
|
"For V-shape tools the depth of cut is\n"
|
||||||
|
"calculated from other parameters like:\n"
|
||||||
|
"- 'V-tip Angle' -> angle at the tip of the tool\n"
|
||||||
|
"- 'V-tip Dia' -> diameter at the tip of the tool \n"
|
||||||
|
"- Tool Dia -> 'Dia' column found in the Tool Table\n"
|
||||||
|
"NB: a value of zero means that Tool Dia = 'V-tip Dia'"
|
||||||
|
)
|
||||||
|
)
|
||||||
|
|
||||||
self.update_cutz()
|
self.update_cutz()
|
||||||
else:
|
else:
|
||||||
|
@ -1122,6 +1142,12 @@ class GeometryObject(FlatCAMObj, Geometry):
|
||||||
self.ui.tipanglelabel.hide()
|
self.ui.tipanglelabel.hide()
|
||||||
self.ui.tipangle_entry.hide()
|
self.ui.tipangle_entry.hide()
|
||||||
self.ui.cutz_entry.setDisabled(False)
|
self.ui.cutz_entry.setDisabled(False)
|
||||||
|
self.ui.cutzlabel.setToolTip(
|
||||||
|
_("Cutting depth (negative)\n"
|
||||||
|
"below the copper surface."
|
||||||
|
)
|
||||||
|
)
|
||||||
|
self.ui.cutz_entry.setToolTip('')
|
||||||
|
|
||||||
def update_cutz(self):
|
def update_cutz(self):
|
||||||
vdia = float(self.ui.tipdia_entry.get_value())
|
vdia = float(self.ui.tipdia_entry.get_value())
|
||||||
|
|
Loading…
Reference in New Issue