- in Geometry Editor - fixed the Explode tool to work on the result of adding Text geometry
- all the Geometry Editor plugins are moved inside another folder and the UI's are moved into their own class
This commit is contained in:
Marius Stanciu
@@ -11,82 +11,22 @@ class BufferSelectionTool(AppTool):
|
||||
Simple input for buffer distance.
|
||||
"""
|
||||
|
||||
pluginName = _("Buffer Selection")
|
||||
|
||||
def __init__(self, app, draw_app):
|
||||
AppTool.__init__(self, app)
|
||||
|
||||
self.draw_app = draw_app
|
||||
self.decimals = app.decimals
|
||||
|
||||
# Title
|
||||
title_label = FCLabel("%s" % ('Editor ' + self.pluginName))
|
||||
title_label.setStyleSheet("""
|
||||
QLabel
|
||||
{
|
||||
font-size: 16px;
|
||||
font-weight: bold;
|
||||
}
|
||||
""")
|
||||
self.layout.addWidget(title_label)
|
||||
self.ui = BufferEditorUI(layout=self.layout, buffer_class=self)
|
||||
|
||||
# this way I can hide/show the frame
|
||||
self.buffer_tool_frame = QtWidgets.QFrame()
|
||||
self.buffer_tool_frame.setContentsMargins(0, 0, 0, 0)
|
||||
self.layout.addWidget(self.buffer_tool_frame)
|
||||
self.buffer_tools_box = QtWidgets.QVBoxLayout()
|
||||
self.buffer_tools_box.setContentsMargins(0, 0, 0, 0)
|
||||
self.buffer_tool_frame.setLayout(self.buffer_tools_box)
|
||||
|
||||
# Grid Layout
|
||||
grid_buffer = GLay(v_spacing=5, h_spacing=3)
|
||||
self.buffer_tools_box.addLayout(grid_buffer)
|
||||
|
||||
# Buffer distance
|
||||
self.buffer_distance_entry = FCDoubleSpinner()
|
||||
self.buffer_distance_entry.set_precision(self.decimals)
|
||||
self.buffer_distance_entry.set_range(0.0000, 9910000.0000)
|
||||
grid_buffer.addWidget(FCLabel('%s:' % _("Buffer distance")), 0, 0)
|
||||
grid_buffer.addWidget(self.buffer_distance_entry, 0, 1)
|
||||
|
||||
self.buffer_corner_lbl = FCLabel('%s:' % _("Buffer corner"))
|
||||
self.buffer_corner_lbl.setToolTip(
|
||||
_("There are 3 types of corners:\n"
|
||||
" - 'Round': the corner is rounded for exterior buffer.\n"
|
||||
" - 'Square': the corner is met in a sharp angle for exterior buffer.\n"
|
||||
" - 'Beveled': the corner is a line that directly connects the features meeting in the corner")
|
||||
)
|
||||
self.buffer_corner_cb = FCComboBox()
|
||||
self.buffer_corner_cb.addItem(_("Round"))
|
||||
self.buffer_corner_cb.addItem(_("Square"))
|
||||
self.buffer_corner_cb.addItem(_("Beveled"))
|
||||
grid_buffer.addWidget(self.buffer_corner_lbl, 2, 0)
|
||||
grid_buffer.addWidget(self.buffer_corner_cb, 2, 1)
|
||||
|
||||
# Buttons
|
||||
hlay = QtWidgets.QHBoxLayout()
|
||||
grid_buffer.addLayout(hlay, 4, 0, 1, 2)
|
||||
|
||||
self.buffer_int_button = FCButton(_("Buffer Interior"))
|
||||
hlay.addWidget(self.buffer_int_button)
|
||||
self.buffer_ext_button = FCButton(_("Buffer Exterior"))
|
||||
hlay.addWidget(self.buffer_ext_button)
|
||||
|
||||
hlay1 = QtWidgets.QHBoxLayout()
|
||||
grid_buffer.addLayout(hlay1, 6, 0, 1, 2)
|
||||
|
||||
self.buffer_button = FCButton(_("Full Buffer"))
|
||||
hlay1.addWidget(self.buffer_button)
|
||||
|
||||
self.layout.addStretch(1)
|
||||
self.connect_signals_at_init()
|
||||
self.set_tool_ui()
|
||||
|
||||
def connect_signals_at_init(self):
|
||||
# Signals
|
||||
self.buffer_button.clicked.connect(self.on_buffer)
|
||||
self.buffer_int_button.clicked.connect(self.on_buffer_int)
|
||||
self.buffer_ext_button.clicked.connect(self.on_buffer_ext)
|
||||
|
||||
# Init appGUI
|
||||
self.buffer_distance_entry.set_value(0.01)
|
||||
self.ui.buffer_button.clicked.connect(self.on_buffer)
|
||||
self.ui.buffer_int_button.clicked.connect(self.on_buffer_int)
|
||||
self.ui.buffer_ext_button.clicked.connect(self.on_buffer_ext)
|
||||
|
||||
def run(self):
|
||||
self.app.defaults.report_usage("Geo Editor ToolBuffer()")
|
||||
@@ -123,59 +63,63 @@ class BufferSelectionTool(AppTool):
|
||||
|
||||
self.app.ui.notebook.setTabText(2, _("Buffer Tool"))
|
||||
|
||||
def set_tool_ui(self):
|
||||
# Init appGUI
|
||||
self.ui.buffer_distance_entry.set_value(0.01)
|
||||
|
||||
def on_tab_close(self):
|
||||
self.draw_app.select_tool("select")
|
||||
self.app.ui.notebook.callback_on_close = lambda: None
|
||||
|
||||
def on_buffer(self):
|
||||
try:
|
||||
buffer_distance = float(self.buffer_distance_entry.get_value())
|
||||
buffer_distance = float(self.ui.buffer_distance_entry.get_value())
|
||||
except ValueError:
|
||||
# try to convert comma to decimal point. if it's still not working error message and return
|
||||
try:
|
||||
buffer_distance = float(self.buffer_distance_entry.get_value().replace(',', '.'))
|
||||
self.buffer_distance_entry.set_value(buffer_distance)
|
||||
buffer_distance = float(self.ui.buffer_distance_entry.get_value().replace(',', '.'))
|
||||
self.ui.buffer_distance_entry.set_value(buffer_distance)
|
||||
except ValueError:
|
||||
self.app.inform.emit('[WARNING_NOTCL] %s' %
|
||||
_("Buffer distance value is missing or wrong format. Add it and retry."))
|
||||
return
|
||||
# the cb index start from 0 but the join styles for the buffer start from 1 therefore the adjustment
|
||||
# I populated the combobox such that the index coincide with the join styles value (which is really an INT)
|
||||
join_style = self.buffer_corner_cb.currentIndex() + 1
|
||||
join_style = self.ui.buffer_corner_cb.currentIndex() + 1
|
||||
self.buffer(buffer_distance, join_style)
|
||||
|
||||
def on_buffer_int(self):
|
||||
try:
|
||||
buffer_distance = float(self.buffer_distance_entry.get_value())
|
||||
buffer_distance = float(self.ui.buffer_distance_entry.get_value())
|
||||
except ValueError:
|
||||
# try to convert comma to decimal point. if it's still not working error message and return
|
||||
try:
|
||||
buffer_distance = float(self.buffer_distance_entry.get_value().replace(',', '.'))
|
||||
self.buffer_distance_entry.set_value(buffer_distance)
|
||||
buffer_distance = float(self.ui.buffer_distance_entry.get_value().replace(',', '.'))
|
||||
self.ui.buffer_distance_entry.set_value(buffer_distance)
|
||||
except ValueError:
|
||||
self.app.inform.emit('[WARNING_NOTCL] %s' %
|
||||
_("Buffer distance value is missing or wrong format. Add it and retry."))
|
||||
return
|
||||
# the cb index start from 0 but the join styles for the buffer start from 1 therefore the adjustment
|
||||
# I populated the combobox such that the index coincide with the join styles value (which is really an INT)
|
||||
join_style = self.buffer_corner_cb.currentIndex() + 1
|
||||
join_style = self.ui.buffer_corner_cb.currentIndex() + 1
|
||||
self.buffer_int(buffer_distance, join_style)
|
||||
|
||||
def on_buffer_ext(self):
|
||||
try:
|
||||
buffer_distance = float(self.buffer_distance_entry.get_value())
|
||||
buffer_distance = float(self.ui.buffer_distance_entry.get_value())
|
||||
except ValueError:
|
||||
# try to convert comma to decimal point. if it's still not working error message and return
|
||||
try:
|
||||
buffer_distance = float(self.buffer_distance_entry.get_value().replace(',', '.'))
|
||||
self.buffer_distance_entry.set_value(buffer_distance)
|
||||
buffer_distance = float(self.ui.buffer_distance_entry.get_value().replace(',', '.'))
|
||||
self.ui.buffer_distance_entry.set_value(buffer_distance)
|
||||
except ValueError:
|
||||
self.app.inform.emit('[WARNING_NOTCL] %s' %
|
||||
_("Buffer distance value is missing or wrong format. Add it and retry."))
|
||||
return
|
||||
# the cb index start from 0 but the join styles for the buffer start from 1 therefore the adjustment
|
||||
# I populated the combobox such that the index coincide with the join styles value (which is really an INT)
|
||||
join_style = self.buffer_corner_cb.currentIndex() + 1
|
||||
join_style = self.ui.buffer_corner_cb.currentIndex() + 1
|
||||
self.buffer_ext(buffer_distance, join_style)
|
||||
|
||||
def buffer(self, buf_distance, join_style):
|
||||
@@ -393,5 +337,75 @@ class BufferSelectionTool(AppTool):
|
||||
self.app.worker_task.emit({'fcn': work_task, 'params': [self]})
|
||||
|
||||
def hide_tool(self):
|
||||
self.buffer_tool_frame.hide()
|
||||
self.ui.buffer_tool_frame.hide()
|
||||
self.app.ui.notebook.setCurrentWidget(self.app.ui.project_tab)
|
||||
|
||||
|
||||
class BufferEditorUI:
|
||||
pluginName = _("Buffer")
|
||||
|
||||
def __init__(self, layout, buffer_class):
|
||||
self.buffer_class = buffer_class
|
||||
self.decimals = self.buffer_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.buffer_tool_frame = QtWidgets.QFrame()
|
||||
self.buffer_tool_frame.setContentsMargins(0, 0, 0, 0)
|
||||
self.layout.addWidget(self.buffer_tool_frame)
|
||||
self.buffer_tools_box = QtWidgets.QVBoxLayout()
|
||||
self.buffer_tools_box.setContentsMargins(0, 0, 0, 0)
|
||||
self.buffer_tool_frame.setLayout(self.buffer_tools_box)
|
||||
|
||||
# Grid Layout
|
||||
grid_buffer = GLay(v_spacing=5, h_spacing=3)
|
||||
self.buffer_tools_box.addLayout(grid_buffer)
|
||||
|
||||
# Buffer distance
|
||||
self.buffer_distance_entry = FCDoubleSpinner()
|
||||
self.buffer_distance_entry.set_precision(self.decimals)
|
||||
self.buffer_distance_entry.set_range(0.0000, 9910000.0000)
|
||||
grid_buffer.addWidget(FCLabel('%s:' % _("Buffer distance")), 0, 0)
|
||||
grid_buffer.addWidget(self.buffer_distance_entry, 0, 1)
|
||||
|
||||
self.buffer_corner_lbl = FCLabel('%s:' % _("Buffer corner"))
|
||||
self.buffer_corner_lbl.setToolTip(
|
||||
_("There are 3 types of corners:\n"
|
||||
" - 'Round': the corner is rounded for exterior buffer.\n"
|
||||
" - 'Square': the corner is met in a sharp angle for exterior buffer.\n"
|
||||
" - 'Beveled': the corner is a line that directly connects the features meeting in the corner")
|
||||
)
|
||||
self.buffer_corner_cb = FCComboBox()
|
||||
self.buffer_corner_cb.addItem(_("Round"))
|
||||
self.buffer_corner_cb.addItem(_("Square"))
|
||||
self.buffer_corner_cb.addItem(_("Beveled"))
|
||||
grid_buffer.addWidget(self.buffer_corner_lbl, 2, 0)
|
||||
grid_buffer.addWidget(self.buffer_corner_cb, 2, 1)
|
||||
|
||||
# Buttons
|
||||
hlay = QtWidgets.QHBoxLayout()
|
||||
grid_buffer.addLayout(hlay, 4, 0, 1, 2)
|
||||
|
||||
self.buffer_int_button = FCButton(_("Buffer Interior"))
|
||||
hlay.addWidget(self.buffer_int_button)
|
||||
self.buffer_ext_button = FCButton(_("Buffer Exterior"))
|
||||
hlay.addWidget(self.buffer_ext_button)
|
||||
|
||||
hlay1 = QtWidgets.QHBoxLayout()
|
||||
grid_buffer.addLayout(hlay1, 6, 0, 1, 2)
|
||||
|
||||
self.buffer_button = FCButton(_("Full Buffer"))
|
||||
hlay1.addWidget(self.buffer_button)
|
||||
|
||||
self.layout.addStretch(1)
|
||||
|
||||
Reference in New Issue
Block a user