- 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
@@ -12,8 +12,6 @@ class TextInputTool(AppTool):
|
||||
Simple input for buffer distance.
|
||||
"""
|
||||
|
||||
pluginName = _("Text Input Tool")
|
||||
|
||||
def __init__(self, app, draw_app):
|
||||
AppTool.__init__(self, app)
|
||||
|
||||
@@ -24,30 +22,58 @@ class TextInputTool(AppTool):
|
||||
|
||||
self.f_parse = ParseFont(self.app)
|
||||
self.f_parse.get_fonts_by_types()
|
||||
self.font_name = None
|
||||
self.font_bold = False
|
||||
self.font_italic = False
|
||||
|
||||
# this way I can hide/show the frame
|
||||
self.text_tool_frame = QtWidgets.QFrame()
|
||||
self.text_tool_frame.setContentsMargins(0, 0, 0, 0)
|
||||
self.layout.addWidget(self.text_tool_frame)
|
||||
self.text_tools_box = QtWidgets.QVBoxLayout()
|
||||
self.text_tools_box.setContentsMargins(0, 0, 0, 0)
|
||||
self.text_tool_frame.setLayout(self.text_tools_box)
|
||||
self.ui = TextEditorUI(layout=self.layout, text_class=self)
|
||||
|
||||
# Title
|
||||
title_label = FCLabel("%s" % self.pluginName)
|
||||
title_label.setStyleSheet("""
|
||||
QLabel
|
||||
{
|
||||
font-size: 16px;
|
||||
font-weight: bold;
|
||||
}
|
||||
""")
|
||||
self.text_tools_box.addWidget(title_label)
|
||||
self.connect_signals_at_init()
|
||||
self.set_tool_ui()
|
||||
|
||||
# Grid Layout
|
||||
self.grid_text = GLay(v_spacing=5, h_spacing=3)
|
||||
self.text_tools_box.addLayout(self.grid_text)
|
||||
def run(self):
|
||||
self.app.defaults.report_usage("Geo Editor TextInputTool()")
|
||||
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, _("Text Tool"))
|
||||
|
||||
def connect_signals_at_init(self):
|
||||
# Signals
|
||||
self.ui.apply_button.clicked.connect(self.on_apply_button)
|
||||
self.ui.font_type_cb.currentFontChanged.connect(self.font_family)
|
||||
self.ui.font_size_cb.activated.connect(self.font_size)
|
||||
self.ui.font_bold_tb.clicked.connect(self.on_bold_button)
|
||||
self.ui.font_italic_tb.clicked.connect(self.on_italic_button)
|
||||
|
||||
def set_tool_ui(self):
|
||||
# Font type
|
||||
if sys.platform == "win32":
|
||||
f_current = QtGui.QFont("Arial")
|
||||
@@ -57,16 +83,15 @@ class TextInputTool(AppTool):
|
||||
f_current = QtGui.QFont("Helvetica Neue")
|
||||
|
||||
self.font_name = f_current.family()
|
||||
|
||||
self.font_type_cb = QtWidgets.QFontComboBox(self)
|
||||
self.font_type_cb.setCurrentFont(f_current)
|
||||
self.grid_text.addWidget(FCLabel('%s:' % _("Font")), 0, 0)
|
||||
self.grid_text.addWidget(self.font_type_cb, 0, 1)
|
||||
self.ui.font_type_cb.setCurrentFont(f_current)
|
||||
|
||||
# Flag variables to show if font is bold, italic, both or none (regular)
|
||||
self.font_bold = False
|
||||
self.font_italic = False
|
||||
|
||||
self.ui.text_input_entry.setCurrentFont(f_current)
|
||||
self.ui.text_input_entry.setFontPointSize(10)
|
||||
|
||||
# # Create dictionaries with the filenames of the fonts
|
||||
# # Key: Fontname
|
||||
# # Value: Font File Name.ttf
|
||||
@@ -104,8 +129,105 @@ class TextInputTool(AppTool):
|
||||
# except WindowsError:
|
||||
# pass
|
||||
|
||||
# Font size
|
||||
def on_tab_close(self):
|
||||
self.draw_app.select_tool("select")
|
||||
self.app.ui.notebook.callback_on_close = lambda: None
|
||||
|
||||
def on_apply_button(self):
|
||||
font_to_geo_type = ""
|
||||
|
||||
if self.font_bold is True:
|
||||
font_to_geo_type = 'bold'
|
||||
elif self.font_italic is True:
|
||||
font_to_geo_type = 'italic'
|
||||
elif self.font_bold is True and self.font_italic is True:
|
||||
font_to_geo_type = 'bi'
|
||||
elif self.font_bold is False and self.font_italic is False:
|
||||
font_to_geo_type = 'regular'
|
||||
|
||||
string_to_geo = self.ui.text_input_entry.get_value()
|
||||
font_to_geo_size = self.ui.font_size_cb.get_value()
|
||||
|
||||
self.text_path = self.f_parse.font_to_geometry(char_string=string_to_geo, font_name=self.font_name,
|
||||
font_size=font_to_geo_size,
|
||||
font_type=font_to_geo_type,
|
||||
units=self.app.app_units.upper())
|
||||
|
||||
def font_family(self, font):
|
||||
self.ui.text_input_entry.selectAll()
|
||||
font.setPointSize(int(self.ui.font_size_cb.get_value()))
|
||||
self.ui.text_input_entry.setCurrentFont(font)
|
||||
self.font_name = self.ui.font_type_cb.currentFont().family()
|
||||
|
||||
def font_size(self):
|
||||
self.ui.text_input_entry.selectAll()
|
||||
self.ui.text_input_entry.setFontPointSize(float(self.ui.font_size_cb.get_value()))
|
||||
|
||||
def on_bold_button(self):
|
||||
if self.ui.font_bold_tb.isChecked():
|
||||
self.ui.text_input_entry.selectAll()
|
||||
self.ui.text_input_entry.setFontWeight(QtGui.QFont.Weight.Bold)
|
||||
self.font_bold = True
|
||||
else:
|
||||
self.ui.text_input_entry.selectAll()
|
||||
self.ui.text_input_entry.setFontWeight(QtGui.QFont.Weight.Normal)
|
||||
self.font_bold = False
|
||||
|
||||
def on_italic_button(self):
|
||||
if self.ui.font_italic_tb.isChecked():
|
||||
self.ui.text_input_entry.selectAll()
|
||||
self.ui.text_input_entry.setFontItalic(True)
|
||||
self.font_italic = True
|
||||
else:
|
||||
self.ui.text_input_entry.selectAll()
|
||||
self.ui.text_input_entry.setFontItalic(False)
|
||||
self.font_italic = False
|
||||
|
||||
def hide_tool(self):
|
||||
self.ui.text_tool_frame.hide()
|
||||
self.app.ui.notebook.setCurrentWidget(self.app.ui.properties_tab)
|
||||
# self.app.ui.splitter.setSizes([0, 1])
|
||||
# self.app.ui.notebook.setTabText(2, _("Tool"))
|
||||
self.app.ui.notebook.removeTab(2)
|
||||
|
||||
|
||||
class TextEditorUI:
|
||||
pluginName = _("Text")
|
||||
|
||||
def __init__(self, layout, text_class):
|
||||
self.text_class = text_class
|
||||
self.decimals = self.text_class.app.decimals
|
||||
self.layout = layout
|
||||
self.app = self.text_class.app
|
||||
|
||||
# this way I can hide/show the frame
|
||||
self.text_tool_frame = QtWidgets.QFrame()
|
||||
self.text_tool_frame.setContentsMargins(0, 0, 0, 0)
|
||||
self.layout.addWidget(self.text_tool_frame)
|
||||
self.text_tools_box = QtWidgets.QVBoxLayout()
|
||||
self.text_tools_box.setContentsMargins(0, 0, 0, 0)
|
||||
self.text_tool_frame.setLayout(self.text_tools_box)
|
||||
|
||||
# Title
|
||||
title_label = FCLabel("%s" % self.pluginName)
|
||||
title_label.setStyleSheet("""
|
||||
QLabel
|
||||
{
|
||||
font-size: 16px;
|
||||
font-weight: bold;
|
||||
}
|
||||
""")
|
||||
self.text_tools_box.addWidget(title_label)
|
||||
|
||||
# Grid Layout
|
||||
self.grid_text = GLay(v_spacing=5, h_spacing=3)
|
||||
self.text_tools_box.addLayout(self.grid_text)
|
||||
|
||||
self.font_type_cb = QtWidgets.QFontComboBox()
|
||||
self.grid_text.addWidget(FCLabel('%s:' % _("Font")), 0, 0)
|
||||
self.grid_text.addWidget(self.font_type_cb, 0, 1)
|
||||
|
||||
# Font size
|
||||
hlay = QtWidgets.QHBoxLayout()
|
||||
|
||||
self.font_size_cb = FCComboBox(policy=False)
|
||||
@@ -144,8 +266,7 @@ class TextInputTool(AppTool):
|
||||
self.text_input_entry.setTabStopDistance(12)
|
||||
self.text_input_entry.setMinimumHeight(200)
|
||||
# self.text_input_entry.setMaximumHeight(150)
|
||||
self.text_input_entry.setCurrentFont(f_current)
|
||||
self.text_input_entry.setFontPointSize(10)
|
||||
|
||||
self.grid_text.addWidget(self.text_input_entry, 6, 0, 1, 2)
|
||||
|
||||
# Buttons
|
||||
@@ -153,104 +274,3 @@ class TextInputTool(AppTool):
|
||||
self.grid_text.addWidget(self.apply_button, 8, 0, 1, 2)
|
||||
|
||||
# self.layout.addStretch()
|
||||
|
||||
# Signals
|
||||
self.apply_button.clicked.connect(self.on_apply_button)
|
||||
self.font_type_cb.currentFontChanged.connect(self.font_family)
|
||||
self.font_size_cb.activated.connect(self.font_size)
|
||||
self.font_bold_tb.clicked.connect(self.on_bold_button)
|
||||
self.font_italic_tb.clicked.connect(self.on_italic_button)
|
||||
|
||||
def run(self):
|
||||
self.app.defaults.report_usage("Geo Editor TextInputTool()")
|
||||
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, _("Text Tool"))
|
||||
|
||||
def on_tab_close(self):
|
||||
self.draw_app.select_tool("select")
|
||||
self.app.ui.notebook.callback_on_close = lambda: None
|
||||
|
||||
def on_apply_button(self):
|
||||
font_to_geo_type = ""
|
||||
|
||||
if self.font_bold is True:
|
||||
font_to_geo_type = 'bold'
|
||||
elif self.font_italic is True:
|
||||
font_to_geo_type = 'italic'
|
||||
elif self.font_bold is True and self.font_italic is True:
|
||||
font_to_geo_type = 'bi'
|
||||
elif self.font_bold is False and self.font_italic is False:
|
||||
font_to_geo_type = 'regular'
|
||||
|
||||
string_to_geo = self.text_input_entry.get_value()
|
||||
font_to_geo_size = self.font_size_cb.get_value()
|
||||
|
||||
self.text_path = self.f_parse.font_to_geometry(char_string=string_to_geo, font_name=self.font_name,
|
||||
font_size=font_to_geo_size,
|
||||
font_type=font_to_geo_type,
|
||||
units=self.app.app_units.upper())
|
||||
|
||||
def font_family(self, font):
|
||||
self.text_input_entry.selectAll()
|
||||
font.setPointSize(float(self.font_size_cb.get_value()))
|
||||
self.text_input_entry.setCurrentFont(font)
|
||||
self.font_name = self.font_type_cb.currentFont().family()
|
||||
|
||||
def font_size(self):
|
||||
self.text_input_entry.selectAll()
|
||||
self.text_input_entry.setFontPointSize(float(self.font_size_cb.get_value()))
|
||||
|
||||
def on_bold_button(self):
|
||||
if self.font_bold_tb.isChecked():
|
||||
self.text_input_entry.selectAll()
|
||||
self.text_input_entry.setFontWeight(QtGui.QFont.Weight.Bold)
|
||||
self.font_bold = True
|
||||
else:
|
||||
self.text_input_entry.selectAll()
|
||||
self.text_input_entry.setFontWeight(QtGui.QFont.Weight.Normal)
|
||||
self.font_bold = False
|
||||
|
||||
def on_italic_button(self):
|
||||
if self.font_italic_tb.isChecked():
|
||||
self.text_input_entry.selectAll()
|
||||
self.text_input_entry.setFontItalic(True)
|
||||
self.font_italic = True
|
||||
else:
|
||||
self.text_input_entry.selectAll()
|
||||
self.text_input_entry.setFontItalic(False)
|
||||
self.font_italic = False
|
||||
|
||||
def hide_tool(self):
|
||||
self.text_tool_frame.hide()
|
||||
self.app.ui.notebook.setCurrentWidget(self.app.ui.properties_tab)
|
||||
# self.app.ui.splitter.setSizes([0, 1])
|
||||
self.app.ui.notebook.setTabText(2, _("Tool"))
|
||||
|
||||
Reference in New Issue
Block a user