- Gerber Editor: added Add Pad (circular or rectangular type only)
This commit is contained in:
parent
7c0cfac8de
commit
950bcc3767
@ -16,6 +16,7 @@ CAD program, and create G-Code for Isolation routing.
|
|||||||
- fixed setting the Layout combobox in Preferences according to the current layout
|
- fixed setting the Layout combobox in Preferences according to the current layout
|
||||||
- created menu links and shortcut keys for adding a new empty Gerber objects; on update of the edited Gerber, if the source object was an empty one (new blank one) this source obj will be deleted
|
- created menu links and shortcut keys for adding a new empty Gerber objects; on update of the edited Gerber, if the source object was an empty one (new blank one) this source obj will be deleted
|
||||||
- removed the old apertures editing from Gerber Obj selected tab
|
- removed the old apertures editing from Gerber Obj selected tab
|
||||||
|
- Gerber Editor: added Add Pad (circular or rectangular type only)
|
||||||
|
|
||||||
|
|
||||||
9.04.2019
|
9.04.2019
|
||||||
|
@ -34,49 +34,87 @@ class FCPad(FCShapeTool):
|
|||||||
def __init__(self, draw_app):
|
def __init__(self, draw_app):
|
||||||
DrawTool.__init__(self, draw_app)
|
DrawTool.__init__(self, draw_app)
|
||||||
self.name = 'pad'
|
self.name = 'pad'
|
||||||
|
self.draw_app = draw_app
|
||||||
|
|
||||||
self.start_msg = _("Click on CENTER ...")
|
self.storage_obj = self.draw_app.storage_dict[self.draw_app.last_aperture_selected]['solid_geometry']
|
||||||
self.steps_per_circ = self.draw_app.app.defaults["geometry_circle_steps"]
|
self.radius = float(self.draw_app.storage_dict[self.draw_app.last_aperture_selected]['size']) / 2
|
||||||
|
|
||||||
|
# if those cause KeyError exception it means that the aperture type is not 'R'. Only 'R' type has those keys
|
||||||
|
try:
|
||||||
|
self.half_width = float(self.draw_app.storage_dict[self.draw_app.last_aperture_selected]['width']) / 2
|
||||||
|
except KeyError:
|
||||||
|
pass
|
||||||
|
try:
|
||||||
|
self.half_height = float(self.draw_app.storage_dict[self.draw_app.last_aperture_selected]['height']) / 2
|
||||||
|
except KeyError:
|
||||||
|
pass
|
||||||
|
|
||||||
|
geo = self.utility_geometry(data=(self.draw_app.snap_x, self.draw_app.snap_y))
|
||||||
|
|
||||||
|
if isinstance(geo, DrawToolShape) and geo.geo is not None:
|
||||||
|
self.draw_app.draw_utility_geometry(geo=geo)
|
||||||
|
|
||||||
|
self.draw_app.app.inform.emit(_("Click to place ..."))
|
||||||
|
|
||||||
|
# Switch notebook to Selected page
|
||||||
|
self.draw_app.app.ui.notebook.setCurrentWidget(self.draw_app.app.ui.selected_tab)
|
||||||
|
|
||||||
|
self.start_msg = _("Click to place ...")
|
||||||
|
|
||||||
def click(self, point):
|
def click(self, point):
|
||||||
self.points.append(point)
|
|
||||||
|
|
||||||
if len(self.points) == 1:
|
|
||||||
self.draw_app.app.inform.emit(_("Click on Circle perimeter point to complete ..."))
|
|
||||||
return "Click on perimeter to complete ..."
|
|
||||||
|
|
||||||
if len(self.points) == 2:
|
|
||||||
self.make()
|
self.make()
|
||||||
return "Done."
|
return "Done."
|
||||||
|
|
||||||
return ""
|
|
||||||
|
|
||||||
def utility_geometry(self, data=None):
|
def utility_geometry(self, data=None):
|
||||||
if len(self.points) == 1:
|
self.points = data
|
||||||
p1 = self.points[0]
|
geo_data = self.util_shape(data)
|
||||||
p2 = data
|
if geo_data:
|
||||||
radius = sqrt((p1[0] - p2[0]) ** 2 + (p1[1] - p2[1]) ** 2)
|
return DrawToolUtilityShape(geo_data)
|
||||||
return DrawToolUtilityShape(Point(p1).buffer(radius, int(self.steps_per_circ / 4)))
|
else:
|
||||||
|
return None
|
||||||
|
|
||||||
|
def util_shape(self, point):
|
||||||
|
if point[0] is None and point[1] is None:
|
||||||
|
point_x = self.draw_app.x
|
||||||
|
point_y = self.draw_app.y
|
||||||
|
else:
|
||||||
|
point_x = point[0]
|
||||||
|
point_y = point[1]
|
||||||
|
|
||||||
|
ap_type = self.draw_app.storage_dict[self.draw_app.last_aperture_selected]['type']
|
||||||
|
if ap_type == 'C':
|
||||||
|
center = Point([point_x, point_y])
|
||||||
|
return center.buffer(self.radius)
|
||||||
|
elif ap_type == 'R':
|
||||||
|
p1 = (point_x - self.half_width, point_y - self.half_height)
|
||||||
|
p2 = (point_x + self.half_width, point_y - self.half_height)
|
||||||
|
p3 = (point_x + self.half_width, point_y + self.half_height)
|
||||||
|
p4 = (point_x - self.half_width, point_y + self.half_height)
|
||||||
|
return Polygon([p1, p2, p3, p4, p1])
|
||||||
|
else:
|
||||||
|
self.draw_app.app.inform.emit(_("Incompatible aperture type. Select an aperture with type 'C' or 'R'."))
|
||||||
return None
|
return None
|
||||||
|
|
||||||
def make(self):
|
def make(self):
|
||||||
p1 = self.points[0]
|
self.draw_app.current_storage = self.storage_obj
|
||||||
p2 = self.points[1]
|
try:
|
||||||
radius = distance(p1, p2)
|
self.geometry = DrawToolShape(self.util_shape(self.points))
|
||||||
self.geometry = DrawToolShape(Point(p1).buffer(radius, int(self.steps_per_circ / 4)))
|
except Exception as e:
|
||||||
|
log.debug("FCPad.make() --> %s" % str(e))
|
||||||
|
|
||||||
|
self.draw_app.in_action = False
|
||||||
self.complete = True
|
self.complete = True
|
||||||
self.draw_app.app.inform.emit(_("[success] Done. Adding Circle completed."))
|
self.draw_app.app.inform.emit(_("[success] Done. Adding Pad completed."))
|
||||||
|
|
||||||
|
|
||||||
class FCRectPad(FCShapeTool):
|
class FCPadArray(FCShapeTool):
|
||||||
"""
|
"""
|
||||||
Resulting type: Polygon
|
Resulting type: Polygon
|
||||||
"""
|
"""
|
||||||
|
|
||||||
def __init__(self, draw_app):
|
def __init__(self, draw_app):
|
||||||
DrawTool.__init__(self, draw_app)
|
DrawTool.__init__(self, draw_app)
|
||||||
self.name = 'rectangle'
|
self.name = 'pad_array'
|
||||||
|
|
||||||
self.start_msg = _("Click on 1st corner ...")
|
self.start_msg = _("Click on 1st corner ...")
|
||||||
|
|
||||||
|
@ -681,7 +681,7 @@ class FlatCAMGUI(QtWidgets.QMainWindow):
|
|||||||
|
|
||||||
### Gerber Editor Toolbar ###
|
### Gerber Editor Toolbar ###
|
||||||
self.grb_select_btn = self.grb_edit_toolbar.addAction(QtGui.QIcon('share/pointer32.png'), _("Select"))
|
self.grb_select_btn = self.grb_edit_toolbar.addAction(QtGui.QIcon('share/pointer32.png'), _("Select"))
|
||||||
self.grb_add_pad_btn = self.grb_edit_toolbar.addAction(QtGui.QIcon('share/aperture16.png'), _("Add Pad"))
|
self.grb_add_pad_btn = self.grb_edit_toolbar.addAction(QtGui.QIcon('share/aperture32.png'), _("Add Pad"))
|
||||||
self.grb_add_track_btn = self.grb_edit_toolbar.addAction(QtGui.QIcon('share/track32.png'), _("Add Track"))
|
self.grb_add_track_btn = self.grb_edit_toolbar.addAction(QtGui.QIcon('share/track32.png'), _("Add Track"))
|
||||||
self.grb_add_region_btn = self.grb_edit_toolbar.addAction(QtGui.QIcon('share/polygon32.png'), _("Add Region"))
|
self.grb_add_region_btn = self.grb_edit_toolbar.addAction(QtGui.QIcon('share/polygon32.png'), _("Add Region"))
|
||||||
self.grb_edit_toolbar.addSeparator()
|
self.grb_edit_toolbar.addSeparator()
|
||||||
@ -1445,7 +1445,7 @@ class FlatCAMGUI(QtWidgets.QMainWindow):
|
|||||||
self.draw_move = self.g_editor_cmenu.addAction(QtGui.QIcon('share/move32.png'), _("Move"))
|
self.draw_move = self.g_editor_cmenu.addAction(QtGui.QIcon('share/move32.png'), _("Move"))
|
||||||
|
|
||||||
self.grb_editor_cmenu = self.popMenu.addMenu(QtGui.QIcon('share/draw32.png'), _("Gerber Editor"))
|
self.grb_editor_cmenu = self.popMenu.addMenu(QtGui.QIcon('share/draw32.png'), _("Gerber Editor"))
|
||||||
self.grb_draw_track = self.grb_editor_cmenu.addAction(QtGui.QIcon('share/aperture16.png'), _("Pad"))
|
self.grb_draw_track = self.grb_editor_cmenu.addAction(QtGui.QIcon('share/aperture32.png'), _("Pad"))
|
||||||
self.grb_draw_track = self.grb_editor_cmenu.addAction(QtGui.QIcon('share/path32.png'), _("Track"))
|
self.grb_draw_track = self.grb_editor_cmenu.addAction(QtGui.QIcon('share/path32.png'), _("Track"))
|
||||||
self.grb_draw_zone = self.grb_editor_cmenu.addAction(QtGui.QIcon('share/polygon32.png'), _("Region"))
|
self.grb_draw_zone = self.grb_editor_cmenu.addAction(QtGui.QIcon('share/polygon32.png'), _("Region"))
|
||||||
self.grb_editor_cmenu.addSeparator()
|
self.grb_editor_cmenu.addSeparator()
|
||||||
@ -1773,7 +1773,7 @@ class FlatCAMGUI(QtWidgets.QMainWindow):
|
|||||||
|
|
||||||
### Gerber Editor Toolbar ###
|
### Gerber Editor Toolbar ###
|
||||||
self.grb_select_btn = self.grb_edit_toolbar.addAction(QtGui.QIcon('share/pointer32.png'), _("Select"))
|
self.grb_select_btn = self.grb_edit_toolbar.addAction(QtGui.QIcon('share/pointer32.png'), _("Select"))
|
||||||
self.grb_add_pad_btn = self.grb_edit_toolbar.addAction(QtGui.QIcon('share/aperture16.png'), _("Add Pad"))
|
self.grb_add_pad_btn = self.grb_edit_toolbar.addAction(QtGui.QIcon('share/aperture32.png'), _("Add Pad"))
|
||||||
self.grb_add_track_btn = self.grb_edit_toolbar.addAction(QtGui.QIcon('share/track32.png'), _("Add Track"))
|
self.grb_add_track_btn = self.grb_edit_toolbar.addAction(QtGui.QIcon('share/track32.png'), _("Add Track"))
|
||||||
self.grb_add_region_btn = self.grb_edit_toolbar.addAction(QtGui.QIcon('share/polygon32.png'), _("Add Region"))
|
self.grb_add_region_btn = self.grb_edit_toolbar.addAction(QtGui.QIcon('share/polygon32.png'), _("Add Region"))
|
||||||
self.grb_edit_toolbar.addSeparator()
|
self.grb_edit_toolbar.addSeparator()
|
||||||
@ -2560,7 +2560,7 @@ class FlatCAMGUI(QtWidgets.QMainWindow):
|
|||||||
if key == QtCore.Qt.Key_P or key == 'P':
|
if key == QtCore.Qt.Key_P or key == 'P':
|
||||||
self.app.grb_editor.launched_from_shortcuts = True
|
self.app.grb_editor.launched_from_shortcuts = True
|
||||||
self.app.inform.emit(_("Click on target point."))
|
self.app.inform.emit(_("Click on target point."))
|
||||||
self.app.ui.add_aperture_btn.setChecked(True)
|
self.app.ui.grb_add_pad_btn.setChecked(True)
|
||||||
|
|
||||||
self.app.grb_editor.x = self.app.mouse[0]
|
self.app.grb_editor.x = self.app.mouse[0]
|
||||||
self.app.grb_editor.y = self.app.mouse[1]
|
self.app.grb_editor.y = self.app.mouse[1]
|
||||||
|
BIN
share/aperture32.png
Normal file
BIN
share/aperture32.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 796 B |
BIN
share/padarray32.png
Normal file
BIN
share/padarray32.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 289 B |
Loading…
Reference in New Issue
Block a user