- added the ability to add exclusion areas from the Excellon object too. Now there is a different in color to differentiate from which type of object the exclusion areas were added but they all serve the same purpose
This commit is contained in:
parent
4ece23c456
commit
eea80aafc3
|
@ -10,6 +10,7 @@ CHANGELOG for FlatCAM beta
|
||||||
7.05.2020
|
7.05.2020
|
||||||
|
|
||||||
- added a fix so the app close is now clean, with exit code 0 as set
|
- added a fix so the app close is now clean, with exit code 0 as set
|
||||||
|
- added the ability to add exclusion areas from the Excellon object too. Now there is a different in color to differentiate from which type of object the exclusion areas were added but they all serve the same purpose
|
||||||
|
|
||||||
6.05.2020
|
6.05.2020
|
||||||
|
|
||||||
|
|
|
@ -275,11 +275,18 @@ class ExclusionAreas:
|
||||||
}
|
}
|
||||||
self.exclusion_areas_storage.append(new_el)
|
self.exclusion_areas_storage.append(new_el)
|
||||||
|
|
||||||
|
if self.obj_type == 'excellon':
|
||||||
|
color = "#FF7400"
|
||||||
|
face_color = "#FF7400BF"
|
||||||
|
else:
|
||||||
|
color = "#098a8f"
|
||||||
|
face_color = "#098a8fBF"
|
||||||
|
|
||||||
# add a temporary shape on canvas
|
# add a temporary shape on canvas
|
||||||
FlatCAMTool.draw_tool_selection_shape(
|
FlatCAMTool.draw_tool_selection_shape(
|
||||||
self, old_coords=(x0, y0), coords=(x1, y1),
|
self, old_coords=(x0, y0), coords=(x1, y1),
|
||||||
color="#FF7400",
|
color=color,
|
||||||
face_color="#FF7400BF",
|
face_color=face_color,
|
||||||
shapes_storage=self.exclusion_shapes)
|
shapes_storage=self.exclusion_shapes)
|
||||||
|
|
||||||
self.first_click = False
|
self.first_click = False
|
||||||
|
@ -328,10 +335,18 @@ class ExclusionAreas:
|
||||||
"overz": self.over_z
|
"overz": self.over_z
|
||||||
}
|
}
|
||||||
self.exclusion_areas_storage.append(new_el)
|
self.exclusion_areas_storage.append(new_el)
|
||||||
|
|
||||||
|
if self.obj_type == 'excellon':
|
||||||
|
color = "#FF7400"
|
||||||
|
face_color = "#FF7400BF"
|
||||||
|
else:
|
||||||
|
color = "#098a8f"
|
||||||
|
face_color = "#098a8fBF"
|
||||||
|
|
||||||
FlatCAMTool.draw_selection_shape_polygon(
|
FlatCAMTool.draw_selection_shape_polygon(
|
||||||
self, points=self.points,
|
self, points=self.points,
|
||||||
color="#FF7400",
|
color=color,
|
||||||
face_color="#FF7400BF",
|
face_color=face_color,
|
||||||
shapes_storage=self.exclusion_shapes)
|
shapes_storage=self.exclusion_shapes)
|
||||||
self.app.inform.emit(
|
self.app.inform.emit(
|
||||||
_("Zone added. Click to start adding next zone or right click to finish."))
|
_("Zone added. Click to start adding next zone or right click to finish."))
|
||||||
|
@ -456,20 +471,28 @@ class ExclusionAreas:
|
||||||
self.app.ui.rel_position_label.setText("<b>Dx</b>: %.4f <b>Dy</b>: "
|
self.app.ui.rel_position_label.setText("<b>Dx</b>: %.4f <b>Dy</b>: "
|
||||||
"%.4f " % (self.app.dx, self.app.dy))
|
"%.4f " % (self.app.dx, self.app.dy))
|
||||||
|
|
||||||
|
if self.obj_type == 'excellon':
|
||||||
|
color = "#FF7400"
|
||||||
|
face_color = "#FF7400BF"
|
||||||
|
else:
|
||||||
|
color = "#098a8f"
|
||||||
|
face_color = "#098a8fBF"
|
||||||
|
|
||||||
# draw the utility geometry
|
# draw the utility geometry
|
||||||
if shape_type == "square":
|
if shape_type == "square":
|
||||||
if self.first_click:
|
if self.first_click:
|
||||||
self.app.delete_selection_shape()
|
self.app.delete_selection_shape()
|
||||||
|
|
||||||
self.app.draw_moving_selection_shape(old_coords=(self.cursor_pos[0], self.cursor_pos[1]),
|
self.app.draw_moving_selection_shape(old_coords=(self.cursor_pos[0], self.cursor_pos[1]),
|
||||||
color="#FF7400",
|
color=color,
|
||||||
face_color="#FF7400BF",
|
face_color=face_color,
|
||||||
coords=(curr_pos[0], curr_pos[1]))
|
coords=(curr_pos[0], curr_pos[1]))
|
||||||
else:
|
else:
|
||||||
FlatCAMTool.delete_moving_selection_shape(self)
|
FlatCAMTool.delete_moving_selection_shape(self)
|
||||||
FlatCAMTool.draw_moving_selection_shape_poly(
|
FlatCAMTool.draw_moving_selection_shape_poly(
|
||||||
self, points=self.points,
|
self, points=self.points,
|
||||||
color="#FF7400",
|
color=color,
|
||||||
face_color="#FF7400BF",
|
face_color=face_color,
|
||||||
data=(curr_pos[0], curr_pos[1]))
|
data=(curr_pos[0], curr_pos[1]))
|
||||||
|
|
||||||
def on_clear_area_click(self):
|
def on_clear_area_click(self):
|
||||||
|
|
|
@ -263,6 +263,10 @@ class FlatCAMDefaults:
|
||||||
"excellon_tooldia": 0.8,
|
"excellon_tooldia": 0.8,
|
||||||
"excellon_slot_tooldia": 1.8,
|
"excellon_slot_tooldia": 1.8,
|
||||||
"excellon_gcode_type": "drills",
|
"excellon_gcode_type": "drills",
|
||||||
|
"excellon_area_exclusion": False,
|
||||||
|
"excellon_area_shape": "polygon",
|
||||||
|
"excellon_area_strategy": "over",
|
||||||
|
"excellon_area_overz": 1.0,
|
||||||
|
|
||||||
# Excellon Advanced Options
|
# Excellon Advanced Options
|
||||||
"excellon_offset": 0.0,
|
"excellon_offset": 0.0,
|
||||||
|
|
|
@ -1292,10 +1292,89 @@ class ExcellonObjectUI(ObjectUI):
|
||||||
self.grid5.addWidget(pp_geo_label, 16, 0)
|
self.grid5.addWidget(pp_geo_label, 16, 0)
|
||||||
self.grid5.addWidget(self.pp_geo_name_cb, 16, 1)
|
self.grid5.addWidget(self.pp_geo_name_cb, 16, 1)
|
||||||
|
|
||||||
|
# Exclusion Areas
|
||||||
|
self.exclusion_cb = FCCheckBox('%s' % _("Exclusion areas"))
|
||||||
|
self.exclusion_cb.setToolTip(
|
||||||
|
_(
|
||||||
|
"Include exclusion areas.\n"
|
||||||
|
"In those areas the travel of the tools\n"
|
||||||
|
"is forbidden."
|
||||||
|
)
|
||||||
|
)
|
||||||
|
self.grid5.addWidget(self.exclusion_cb, 17, 0, 1, 2)
|
||||||
|
|
||||||
|
# ------------------------------------------------------------------------------------------------------------
|
||||||
|
# ------------------------- EXCLUSION AREAS ------------------------------------------------------------------
|
||||||
|
# ------------------------------------------------------------------------------------------------------------
|
||||||
|
self.exclusion_frame = QtWidgets.QFrame()
|
||||||
|
self.exclusion_frame.setContentsMargins(0, 0, 0, 0)
|
||||||
|
self.grid5.addWidget(self.exclusion_frame, 18, 0, 1, 2)
|
||||||
|
|
||||||
|
self.exclusion_box = QtWidgets.QVBoxLayout()
|
||||||
|
self.exclusion_box.setContentsMargins(0, 0, 0, 0)
|
||||||
|
self.exclusion_frame.setLayout(self.exclusion_box)
|
||||||
|
|
||||||
|
h_lay = QtWidgets.QHBoxLayout()
|
||||||
|
self.exclusion_box.addLayout(h_lay)
|
||||||
|
|
||||||
|
# Button Add Area
|
||||||
|
self.add_area_button = QtWidgets.QPushButton(_('Add area'))
|
||||||
|
self.add_area_button.setToolTip(_("Add an Exclusion Area."))
|
||||||
|
h_lay.addWidget(self.add_area_button)
|
||||||
|
|
||||||
|
# Button Delete Area
|
||||||
|
self.delete_area_button = QtWidgets.QPushButton(_('Clear areas'))
|
||||||
|
self.delete_area_button.setToolTip(_("Delete all exclusion areas."))
|
||||||
|
h_lay.addWidget(self.delete_area_button)
|
||||||
|
|
||||||
|
grid_l = QtWidgets.QGridLayout()
|
||||||
|
grid_l.setColumnStretch(0, 0)
|
||||||
|
grid_l.setColumnStretch(1, 1)
|
||||||
|
self.exclusion_box.addLayout(grid_l)
|
||||||
|
|
||||||
|
# Area Selection shape
|
||||||
|
self.area_shape_label = QtWidgets.QLabel('%s:' % _("Shape"))
|
||||||
|
self.area_shape_label.setToolTip(
|
||||||
|
_("The kind of selection shape used for area selection.")
|
||||||
|
)
|
||||||
|
|
||||||
|
self.area_shape_radio = RadioSet([{'label': _("Square"), 'value': 'square'},
|
||||||
|
{'label': _("Polygon"), 'value': 'polygon'}])
|
||||||
|
|
||||||
|
grid_l.addWidget(self.area_shape_label, 0, 0)
|
||||||
|
grid_l.addWidget(self.area_shape_radio, 0, 1)
|
||||||
|
|
||||||
|
# Chose Strategy
|
||||||
|
self.strategy_label = FCLabel('%s:' % _("Strategy"))
|
||||||
|
self.strategy_label.setToolTip(_("The strategy followed when encountering an exclusion area.\n"
|
||||||
|
"Can be:\n"
|
||||||
|
"- Over -> when encountering the area, the tool will go to a set height\n"
|
||||||
|
"- Around -> will avoid the exclusion area by going around the area"))
|
||||||
|
self.strategy_radio = RadioSet([{'label': _('Over'), 'value': 'over'},
|
||||||
|
{'label': _('Around'), 'value': 'around'}])
|
||||||
|
|
||||||
|
grid_l.addWidget(self.strategy_label, 1, 0)
|
||||||
|
grid_l.addWidget(self.strategy_radio, 1, 1)
|
||||||
|
|
||||||
|
# Over Z
|
||||||
|
self.over_z_label = FCLabel('%s:' % _("Over Z"))
|
||||||
|
self.over_z_label.setToolTip(_("The height Z to which the tool will rise in order to avoid\n"
|
||||||
|
"an interdiction area."))
|
||||||
|
self.over_z_entry = FCDoubleSpinner()
|
||||||
|
self.over_z_entry.set_range(0.000, 9999.9999)
|
||||||
|
self.over_z_entry.set_precision(self.decimals)
|
||||||
|
|
||||||
|
grid_l.addWidget(self.over_z_label, 2, 0)
|
||||||
|
grid_l.addWidget(self.over_z_entry, 2, 1)
|
||||||
|
|
||||||
|
# -------------------------- EXCLUSION AREAS END -------------------------------------------------------------
|
||||||
|
# ------------------------------------------------------------------------------------------------------------
|
||||||
|
self.ois_exclusion_geo = OptionalHideInputSection(self.exclusion_cb, [self.exclusion_frame])
|
||||||
|
|
||||||
separator_line = QtWidgets.QFrame()
|
separator_line = QtWidgets.QFrame()
|
||||||
separator_line.setFrameShape(QtWidgets.QFrame.HLine)
|
separator_line.setFrameShape(QtWidgets.QFrame.HLine)
|
||||||
separator_line.setFrameShadow(QtWidgets.QFrame.Sunken)
|
separator_line.setFrameShadow(QtWidgets.QFrame.Sunken)
|
||||||
self.grid5.addWidget(separator_line, 17, 0, 1, 2)
|
self.grid5.addWidget(separator_line, 19, 0, 1, 2)
|
||||||
|
|
||||||
# #################################################################
|
# #################################################################
|
||||||
# ################# GRID LAYOUT 6 ###############################
|
# ################# GRID LAYOUT 6 ###############################
|
||||||
|
@ -2025,7 +2104,7 @@ class GeometryObjectUI(ObjectUI):
|
||||||
# grid4.addWidget(QtWidgets.QLabel(''), 12, 0, 1, 2)
|
# grid4.addWidget(QtWidgets.QLabel(''), 12, 0, 1, 2)
|
||||||
|
|
||||||
# Exclusion Areas
|
# Exclusion Areas
|
||||||
self.exclusion_cb = FCCheckBox('%s:' % _("Exclusion areas"))
|
self.exclusion_cb = FCCheckBox('%s' % _("Exclusion areas"))
|
||||||
self.exclusion_cb.setToolTip(
|
self.exclusion_cb.setToolTip(
|
||||||
_(
|
_(
|
||||||
"Include exclusion areas.\n"
|
"Include exclusion areas.\n"
|
||||||
|
@ -2101,7 +2180,7 @@ class GeometryObjectUI(ObjectUI):
|
||||||
|
|
||||||
# -------------------------- EXCLUSION AREAS END -------------------------------------------------------------
|
# -------------------------- EXCLUSION AREAS END -------------------------------------------------------------
|
||||||
# ------------------------------------------------------------------------------------------------------------
|
# ------------------------------------------------------------------------------------------------------------
|
||||||
self.ois_exclusion_geo = OptionalInputSection(self.exclusion_cb, [self.exclusion_frame])
|
self.ois_exclusion_geo = OptionalHideInputSection(self.exclusion_cb, [self.exclusion_frame])
|
||||||
|
|
||||||
warning_lbl = QtWidgets.QLabel(
|
warning_lbl = QtWidgets.QLabel(
|
||||||
_(
|
_(
|
||||||
|
|
|
@ -567,7 +567,11 @@ class ExcellonObject(FlatCAMObj, Excellon):
|
||||||
"ppname_g": self.ui.pp_geo_name_cb,
|
"ppname_g": self.ui.pp_geo_name_cb,
|
||||||
"z_pdepth": self.ui.pdepth_entry,
|
"z_pdepth": self.ui.pdepth_entry,
|
||||||
"feedrate_probe": self.ui.feedrate_probe_entry,
|
"feedrate_probe": self.ui.feedrate_probe_entry,
|
||||||
# "gcode_type": self.ui.excellon_gcode_type_radio
|
# "gcode_type": self.ui.excellon_gcode_type_radio,
|
||||||
|
"area_exclusion": self.ui.exclusion_cb,
|
||||||
|
"area_shape": self.ui.area_shape_radio,
|
||||||
|
"area_strategy": self.ui.strategy_radio,
|
||||||
|
"area_overz": self.ui.over_z_entry,
|
||||||
})
|
})
|
||||||
|
|
||||||
self.name2option = {
|
self.name2option = {
|
||||||
|
@ -634,6 +638,9 @@ class ExcellonObject(FlatCAMObj, Excellon):
|
||||||
self.ui.generate_milling_button.clicked.connect(self.on_generate_milling_button_click)
|
self.ui.generate_milling_button.clicked.connect(self.on_generate_milling_button_click)
|
||||||
self.ui.generate_milling_slots_button.clicked.connect(self.on_generate_milling_slots_button_click)
|
self.ui.generate_milling_slots_button.clicked.connect(self.on_generate_milling_slots_button_click)
|
||||||
|
|
||||||
|
self.ui.add_area_button.clicked.connect(self.on_add_area_click)
|
||||||
|
self.ui.delete_area_button.clicked.connect(self.on_clear_area_click)
|
||||||
|
|
||||||
self.on_operation_type(val='drill')
|
self.on_operation_type(val='drill')
|
||||||
self.ui.operation_radio.activated_custom.connect(self.on_operation_type)
|
self.ui.operation_radio.activated_custom.connect(self.on_operation_type)
|
||||||
|
|
||||||
|
@ -1467,6 +1474,21 @@ class ExcellonObject(FlatCAMObj, Excellon):
|
||||||
# self.options['startz'] = float(self.options['startz']) * factor
|
# self.options['startz'] = float(self.options['startz']) * factor
|
||||||
# self.options['endz'] = float(self.options['endz']) * factor
|
# self.options['endz'] = float(self.options['endz']) * factor
|
||||||
|
|
||||||
|
def on_add_area_click(self):
|
||||||
|
shape_button = self.ui.area_shape_radio
|
||||||
|
overz_button = self.ui.over_z_entry
|
||||||
|
strategy_radio = self.ui.strategy_radio
|
||||||
|
cnc_button = self.ui.generate_cnc_button
|
||||||
|
solid_geo = self.solid_geometry
|
||||||
|
obj_type = self.kind
|
||||||
|
|
||||||
|
self.app.exc_areas.on_add_area_click(
|
||||||
|
shape_button=shape_button, overz_button=overz_button, cnc_button=cnc_button, strategy_radio=strategy_radio,
|
||||||
|
solid_geo=solid_geo, obj_type=obj_type)
|
||||||
|
|
||||||
|
def on_clear_area_click(self):
|
||||||
|
self.app.exc_areas.on_clear_area_click()
|
||||||
|
|
||||||
def on_solid_cb_click(self, *args):
|
def on_solid_cb_click(self, *args):
|
||||||
if self.muted_ui:
|
if self.muted_ui:
|
||||||
return
|
return
|
||||||
|
|
Loading…
Reference in New Issue