- In Excellon Editor, finished updating the Drill Plugin and Slot Plugin
- fixed a bug in the excellon export method, regarding the slots processing
This commit is contained in:
Marius Stanciu
@@ -6,7 +6,7 @@ if '_' not in builtins.__dict__:
|
||||
_ = gettext.gettext
|
||||
|
||||
|
||||
class ExcGenEditorTool(AppTool):
|
||||
class ExcDrillEditorTool(AppTool):
|
||||
"""
|
||||
Simple input for buffer distance.
|
||||
"""
|
||||
@@ -18,7 +18,7 @@ class ExcGenEditorTool(AppTool):
|
||||
self.decimals = app.decimals
|
||||
self.plugin_name = plugin_name
|
||||
|
||||
self.ui = ExcGenEditorUI(layout=self.layout, path_class=self, plugin_name=plugin_name)
|
||||
self.ui = ExcDrillEditorUI(layout=self.layout, path_class=self, plugin_name=plugin_name)
|
||||
|
||||
self.connect_signals_at_init()
|
||||
self.set_tool_ui()
|
||||
@@ -96,7 +96,7 @@ class ExcGenEditorTool(AppTool):
|
||||
self.draw_app.select_tool("select")
|
||||
|
||||
|
||||
class ExcGenEditorUI:
|
||||
class ExcDrillEditorUI:
|
||||
|
||||
def __init__(self, layout, path_class, plugin_name):
|
||||
self.pluginName = plugin_name
|
||||
@@ -123,6 +123,28 @@ class ExcGenEditorUI:
|
||||
self.editor_vbox.setContentsMargins(0, 0, 0, 0)
|
||||
self.path_tool_frame.setLayout(self.editor_vbox)
|
||||
|
||||
# Position
|
||||
self.tool_lbl = FCLabel('%s' % _("Tool Diameter"), bold=True, color='blue')
|
||||
self.editor_vbox.addWidget(self.tool_lbl)
|
||||
# #############################################################################################################
|
||||
# Diameter Frame
|
||||
# #############################################################################################################
|
||||
dia_frame = FCFrame()
|
||||
self.editor_vbox.addWidget(dia_frame)
|
||||
|
||||
dia_grid = GLay(v_spacing=5, h_spacing=3, c_stretch=[0, 1, 0])
|
||||
dia_frame.setLayout(dia_grid)
|
||||
|
||||
# Dia Value
|
||||
self.dia_lbl = FCLabel('%s:' % _("Value"))
|
||||
self.dia_entry = NumericalEvalEntry(border_color='#0069A9')
|
||||
self.dia_entry.setDisabled(True)
|
||||
self.dia_unit = FCLabel('%s' % 'mm')
|
||||
|
||||
dia_grid.addWidget(self.dia_lbl, 0, 0)
|
||||
dia_grid.addWidget(self.dia_entry, 0, 1)
|
||||
dia_grid.addWidget(self.dia_unit, 0, 2)
|
||||
|
||||
# Position
|
||||
self.pos_lbl = FCLabel('%s' % _("Position"), bold=True, color='red')
|
||||
self.editor_vbox.addWidget(self.pos_lbl)
|
||||
@@ -177,5 +199,5 @@ class ExcGenEditorUI:
|
||||
self.add_btn.setIcon(QtGui.QIcon(self.ed_class.app.resource_location + '/plus32.png'))
|
||||
self.editor_vbox.addWidget(self.add_btn)
|
||||
|
||||
GLay.set_common_column_size([pos_grid, pro_grid], 0)
|
||||
GLay.set_common_column_size([dia_grid, pos_grid, pro_grid], 0)
|
||||
self.layout.addStretch(1)
|
||||
279
appEditors/exc_plugins/ExcSlotPlugin.py
Normal file
279
appEditors/exc_plugins/ExcSlotPlugin.py
Normal file
@@ -0,0 +1,279 @@
|
||||
|
||||
from appTool import *
|
||||
|
||||
fcTranslate.apply_language('strings')
|
||||
if '_' not in builtins.__dict__:
|
||||
_ = gettext.gettext
|
||||
|
||||
|
||||
class ExcSlotEditorTool(AppTool):
|
||||
"""
|
||||
Simple input for buffer distance.
|
||||
"""
|
||||
|
||||
def __init__(self, app, draw_app, plugin_name):
|
||||
AppTool.__init__(self, app)
|
||||
|
||||
self.draw_app = draw_app
|
||||
self.decimals = app.decimals
|
||||
self.plugin_name = plugin_name
|
||||
|
||||
self.ui = ExcSlotEditorUI(layout=self.layout, path_class=self, plugin_name=plugin_name)
|
||||
|
||||
self.connect_signals_at_init()
|
||||
self.set_tool_ui()
|
||||
|
||||
def connect_signals_at_init(self):
|
||||
# Signals
|
||||
self.ui.clear_btn.clicked.connect(self.on_clear)
|
||||
|
||||
def disconnect_signals(self):
|
||||
# Signals
|
||||
try:
|
||||
self.ui.clear_btn.clicked.disconnect()
|
||||
except (TypeError, AttributeError):
|
||||
pass
|
||||
|
||||
def run(self):
|
||||
self.app.defaults.report_usage("Geo Editor ToolPath()")
|
||||
AppTool.run(self)
|
||||
|
||||
# if the splitter us hidden, display it
|
||||
if self.app.ui.splitter.sizes()[0] == 0:
|
||||
self.app.ui.splitter.setSizes([1, 1])
|
||||
|
||||
# if the Tool Tab is hidden display it, else hide it but only if the objectName is the same
|
||||
found_idx = None
|
||||
for idx in range(self.app.ui.notebook.count()):
|
||||
if self.app.ui.notebook.widget(idx).objectName() == "plugin_tab":
|
||||
found_idx = idx
|
||||
break
|
||||
# show the Tab
|
||||
if not found_idx:
|
||||
try:
|
||||
self.app.ui.notebook.addTab(self.app.ui.plugin_tab, _("Plugin"))
|
||||
except RuntimeError:
|
||||
self.app.ui.plugin_tab = QtWidgets.QWidget()
|
||||
self.app.ui.plugin_tab.setObjectName("plugin_tab")
|
||||
self.app.ui.plugin_tab_layout = QtWidgets.QVBoxLayout(self.app.ui.plugin_tab)
|
||||
self.app.ui.plugin_tab_layout.setContentsMargins(2, 2, 2, 2)
|
||||
|
||||
self.app.ui.plugin_scroll_area = VerticalScrollArea()
|
||||
self.app.ui.plugin_tab_layout.addWidget(self.app.ui.plugin_scroll_area)
|
||||
self.app.ui.notebook.addTab(self.app.ui.plugin_tab, _("Plugin"))
|
||||
|
||||
# focus on Tool Tab
|
||||
self.app.ui.notebook.setCurrentWidget(self.app.ui.plugin_tab)
|
||||
|
||||
# self.app.ui.notebook.callback_on_close = self.on_tab_close
|
||||
|
||||
self.app.ui.notebook.setTabText(2, self.plugin_name)
|
||||
|
||||
def set_tool_ui(self):
|
||||
# Init appGUI
|
||||
self.length = 0.0
|
||||
|
||||
def on_tab_close(self):
|
||||
self.disconnect_signals()
|
||||
self.hide_tool()
|
||||
# self.app.ui.notebook.callback_on_close = lambda: None
|
||||
|
||||
def on_clear(self):
|
||||
self.set_tool_ui()
|
||||
|
||||
@property
|
||||
def length(self):
|
||||
return self.ui.project_line_entry.get_value()
|
||||
|
||||
@length.setter
|
||||
def length(self, val):
|
||||
self.ui.project_line_entry.set_value(val)
|
||||
|
||||
def hide_tool(self):
|
||||
self.ui.path_tool_frame.hide()
|
||||
self.app.ui.notebook.setCurrentWidget(self.app.ui.properties_tab)
|
||||
if self.draw_app.active_tool.name != 'select':
|
||||
self.draw_app.select_tool("select")
|
||||
|
||||
|
||||
class ExcSlotEditorUI:
|
||||
|
||||
def __init__(self, layout, path_class, plugin_name):
|
||||
self.pluginName = plugin_name
|
||||
self.ed_class = path_class
|
||||
self.decimals = self.ed_class.app.decimals
|
||||
self.layout = layout
|
||||
|
||||
# Title
|
||||
title_label = FCLabel("%s" % ('Editor ' + self.pluginName))
|
||||
title_label.setStyleSheet("""
|
||||
QLabel
|
||||
{
|
||||
font-size: 16px;
|
||||
font-weight: bold;
|
||||
}
|
||||
""")
|
||||
self.layout.addWidget(title_label)
|
||||
|
||||
# this way I can hide/show the frame
|
||||
self.path_tool_frame = QtWidgets.QFrame()
|
||||
self.path_tool_frame.setContentsMargins(0, 0, 0, 0)
|
||||
self.layout.addWidget(self.path_tool_frame)
|
||||
self.editor_vbox = QtWidgets.QVBoxLayout()
|
||||
self.editor_vbox.setContentsMargins(0, 0, 0, 0)
|
||||
self.path_tool_frame.setLayout(self.editor_vbox)
|
||||
|
||||
# Position
|
||||
self.tool_lbl = FCLabel('%s' % _("Tool Diameter"), bold=True, color='blue')
|
||||
self.editor_vbox.addWidget(self.tool_lbl)
|
||||
# #############################################################################################################
|
||||
# Diameter Frame
|
||||
# #############################################################################################################
|
||||
dia_frame = FCFrame()
|
||||
self.editor_vbox.addWidget(dia_frame)
|
||||
|
||||
dia_grid = GLay(v_spacing=5, h_spacing=3, c_stretch=[0, 1, 0])
|
||||
dia_frame.setLayout(dia_grid)
|
||||
|
||||
# Dia Value
|
||||
self.dia_lbl = FCLabel('%s:' % _("Value"))
|
||||
self.dia_entry = NumericalEvalEntry(border_color='#0069A9')
|
||||
self.dia_entry.setDisabled(True)
|
||||
self.dia_unit = FCLabel('%s' % 'mm')
|
||||
|
||||
dia_grid.addWidget(self.dia_lbl, 0, 0)
|
||||
dia_grid.addWidget(self.dia_entry, 0, 1)
|
||||
dia_grid.addWidget(self.dia_unit, 0, 2)
|
||||
|
||||
# Position
|
||||
self.pos_lbl = FCLabel('%s' % _("Position"), bold=True, color='red')
|
||||
self.editor_vbox.addWidget(self.pos_lbl)
|
||||
# #############################################################################################################
|
||||
# Position Frame
|
||||
# #############################################################################################################
|
||||
pos_frame = FCFrame()
|
||||
self.editor_vbox.addWidget(pos_frame)
|
||||
|
||||
pos_grid = GLay(v_spacing=5, h_spacing=3)
|
||||
pos_frame.setLayout(pos_grid)
|
||||
|
||||
# X Pos
|
||||
self.x_lbl = FCLabel('%s:' % _("X"))
|
||||
self.x_entry = FCDoubleSpinner()
|
||||
self.x_entry.set_precision(self.decimals)
|
||||
self.x_entry.set_range(-10000.0000, 10000.0000)
|
||||
pos_grid.addWidget(self.x_lbl, 2, 0)
|
||||
pos_grid.addWidget(self.x_entry, 2, 1)
|
||||
|
||||
# Y Pos
|
||||
self.y_lbl = FCLabel('%s:' % _("Y"))
|
||||
self.y_entry = FCDoubleSpinner()
|
||||
self.y_entry.set_precision(self.decimals)
|
||||
self.y_entry.set_range(-10000.0000, 10000.0000)
|
||||
pos_grid.addWidget(self.y_lbl, 4, 0)
|
||||
pos_grid.addWidget(self.y_entry, 4, 1)
|
||||
|
||||
# Parameters
|
||||
self.slot_label = FCLabel('%s' % _("Parameters"), bold=True, color='purple')
|
||||
self.slot_label.setToolTip(
|
||||
_("Parameters for adding a slot (hole with oval shape)\n"
|
||||
"either single or as an part of an array.")
|
||||
)
|
||||
self.editor_vbox.addWidget(self.slot_label)
|
||||
# #############################################################################################################
|
||||
# ################################### Parameter Frame #########################################################
|
||||
# #############################################################################################################
|
||||
self.par_frame = FCFrame()
|
||||
self.editor_vbox.addWidget(self.par_frame)
|
||||
|
||||
par_grid = GLay(v_spacing=5, h_spacing=3)
|
||||
self.par_frame.setLayout(par_grid)
|
||||
|
||||
# Slot length
|
||||
self.slot_length_label = FCLabel('%s:' % _('Length'))
|
||||
self.slot_length_label.setToolTip(
|
||||
_("Length. The length of the slot.")
|
||||
)
|
||||
|
||||
self.slot_length_entry = FCDoubleSpinner(policy=False)
|
||||
self.slot_length_entry.set_precision(self.decimals)
|
||||
self.slot_length_entry.setSingleStep(0.1)
|
||||
self.slot_length_entry.setRange(0.0000, 10000.0000)
|
||||
|
||||
par_grid.addWidget(self.slot_length_label, 2, 0)
|
||||
par_grid.addWidget(self.slot_length_entry, 2, 1)
|
||||
|
||||
# Slot direction
|
||||
self.slot_axis_label = FCLabel('%s:' % _('Direction'))
|
||||
self.slot_axis_label.setToolTip(
|
||||
_("Direction on which the slot is oriented:\n"
|
||||
"- 'X' - horizontal axis \n"
|
||||
"- 'Y' - vertical axis or \n"
|
||||
"- 'Angle' - a custom angle for the slot inclination")
|
||||
)
|
||||
|
||||
self.slot_axis_radio = RadioSet([{'label': _('X'), 'value': 'X'},
|
||||
{'label': _('Y'), 'value': 'Y'},
|
||||
{'label': _('Angle'), 'value': 'A'}])
|
||||
|
||||
par_grid.addWidget(self.slot_axis_label, 4, 0)
|
||||
par_grid.addWidget(self.slot_axis_radio, 4, 1)
|
||||
|
||||
# Slot custom angle
|
||||
self.slot_angle_label = FCLabel('%s:' % _('Angle'))
|
||||
self.slot_angle_label.setToolTip(
|
||||
_("Angle at which the slot is placed.\n"
|
||||
"The precision is of max 2 decimals.\n"
|
||||
"Min value is: -360.00 degrees.\n"
|
||||
"Max value is: 360.00 degrees.")
|
||||
)
|
||||
|
||||
self.slot_angle_spinner = FCDoubleSpinner(policy=False)
|
||||
self.slot_angle_spinner.set_precision(self.decimals)
|
||||
self.slot_angle_spinner.setWrapping(True)
|
||||
self.slot_angle_spinner.setRange(-360.00, 360.00)
|
||||
self.slot_angle_spinner.setSingleStep(1.0)
|
||||
|
||||
par_grid.addWidget(self.slot_angle_label, 6, 0)
|
||||
par_grid.addWidget(self.slot_angle_spinner, 6, 1)
|
||||
|
||||
# #############################################################################################################
|
||||
# Projection Frame
|
||||
# #############################################################################################################
|
||||
pro_frame = FCFrame()
|
||||
self.editor_vbox.addWidget(pro_frame)
|
||||
|
||||
pro_grid = GLay(v_spacing=5, h_spacing=3, c_stretch=[0, 1, 0])
|
||||
pro_frame.setLayout(pro_grid)
|
||||
|
||||
# Project distance
|
||||
self.project_line_lbl = FCLabel('%s:' % _("Projection"))
|
||||
self.project_line_lbl.setToolTip(
|
||||
_("Length of the current segment/move.")
|
||||
)
|
||||
self.project_line_entry = NumericalEvalEntry(border_color='#0069A9')
|
||||
pro_grid.addWidget(self.project_line_lbl, 0, 0)
|
||||
pro_grid.addWidget(self.project_line_entry, 0, 1)
|
||||
|
||||
self.clear_btn = QtWidgets.QToolButton()
|
||||
self.clear_btn.setIcon(QtGui.QIcon(self.ed_class.app.resource_location + '/trash32.png'))
|
||||
pro_grid.addWidget(self.clear_btn, 0, 2)
|
||||
|
||||
self.add_btn = FCButton(_("Add"))
|
||||
self.add_btn.setIcon(QtGui.QIcon(self.ed_class.app.resource_location + '/plus32.png'))
|
||||
self.editor_vbox.addWidget(self.add_btn)
|
||||
|
||||
GLay.set_common_column_size([dia_grid, par_grid, pos_grid, pro_grid], 0)
|
||||
self.layout.addStretch(1)
|
||||
|
||||
# Signals
|
||||
self.slot_axis_radio.activated_custom.connect(self.on_slot_angle_radio)
|
||||
|
||||
def on_slot_angle_radio(self):
|
||||
val = self.slot_axis_radio.get_value()
|
||||
if val == 'A':
|
||||
self.slot_angle_spinner.setEnabled(True)
|
||||
self.slot_angle_label.setEnabled(True)
|
||||
else:
|
||||
self.slot_angle_spinner.setEnabled(False)
|
||||
self.slot_angle_label.setEnabled(False)
|
||||
Reference in New Issue
Block a user