diff --git a/sources/TerminalStrip/GraphicsItem/properties/terminalstriplayoutpattern.h b/sources/TerminalStrip/GraphicsItem/properties/terminalstriplayoutpattern.h index 96ebaeb14..bba900d09 100644 --- a/sources/TerminalStrip/GraphicsItem/properties/terminalstriplayoutpattern.h +++ b/sources/TerminalStrip/GraphicsItem/properties/terminalstriplayoutpattern.h @@ -68,15 +68,10 @@ class TerminalStripLayoutPattern void setTerminalsTextAlignment(const QVector &alignment); QVector terminalsTextAlignment() const; - QVector terminalsTextOption() const; + QVector terminalsTextOption() const; + int m_terminals_text_height{50}; + int m_terminals_text_y{35}; - QVector m_terminals_text_rect - { - QRect{0,35,20,50}, - QRect{0,35,20,50}, - QRect{0,35,20,50}, - QRect{0,35,20,50} - }; QVector m_terminals_text_orientation { Qt::Vertical, diff --git a/sources/TerminalStrip/GraphicsItem/terminalstripdrawer.cpp b/sources/TerminalStrip/GraphicsItem/terminalstripdrawer.cpp index b0f16493f..522073437 100644 --- a/sources/TerminalStrip/GraphicsItem/terminalstripdrawer.cpp +++ b/sources/TerminalStrip/GraphicsItem/terminalstripdrawer.cpp @@ -105,9 +105,10 @@ void TerminalStripDrawer::paint(QPainter *painter) //Draw terminals - const auto terminals_text_rect{m_pattern->m_terminals_text_rect}; const auto terminals_text_orientation{m_pattern->m_terminals_text_orientation}; const auto terminals_text_option{m_pattern->terminalsTextOption()}; + const auto terminals_text_height{m_pattern->m_terminals_text_height}; + const auto terminals_text_y{m_pattern->m_terminals_text_y}; QRect terminal_rect; QHash> bridges_anchor_points; @@ -160,16 +161,12 @@ void TerminalStripDrawer::paint(QPainter *painter) //Draw text painter->save(); - if (terminals_text_orientation[index_] == Qt::Horizontal) + text_rect.setRect(0, terminals_text_y, terminal_rect.width(), terminals_text_height); + if (terminals_text_orientation[index_] == Qt::Vertical) { - text_rect = terminals_text_rect[index_]; - } - else - { - const auto rect_{terminals_text_rect[index_]}; - painter->translate(rect_.bottomLeft()); + painter->translate(text_rect.bottomLeft()); painter->rotate(270); - text_rect.setRect(0, 0, rect_.height(), terminal_rect.width()); + text_rect.setRect(0, 0, text_rect.height(), text_rect.width()); } const auto shared_real_terminal{real_terminal_vector[i]}; diff --git a/sources/TerminalStrip/ui/terminalstriplayouteditor.cpp b/sources/TerminalStrip/ui/terminalstriplayouteditor.cpp index 630d672fc..c630ed500 100644 --- a/sources/TerminalStrip/ui/terminalstriplayouteditor.cpp +++ b/sources/TerminalStrip/ui/terminalstriplayouteditor.cpp @@ -20,7 +20,6 @@ #include "terminalstriplayouteditor.h" #include "ui_terminalstriplayouteditor.h" #include "../GraphicsItem/properties/terminalstriplayoutpattern.h" -#include "../../utils/qetutils.h" TerminalStripLayoutEditor::TerminalStripLayoutEditor(QSharedPointer layout, QWidget *parent) : @@ -137,6 +136,9 @@ void TerminalStripLayoutEditor::valueEdited() break; } + m_layout.data()->m_terminals_text_y = ui->m_terminal_text_y_sb->value(); + m_layout.data()->m_terminals_text_height = ui->m_terminal_text_height_sb->value(); + updateUi(); m_preview_strip_item.update(); } @@ -219,6 +221,9 @@ void TerminalStripLayoutEditor::updateUi() ui->m_terminal_text_alignment_cb->setCurrentIndex(2); } + ui->m_terminal_text_y_sb->setValue(data->m_terminals_text_y); + ui->m_terminal_text_height_sb->setValue(data->m_terminals_text_height); + m_ui_updating = false; updatePreview(); } diff --git a/sources/TerminalStrip/ui/terminalstriplayouteditor.ui b/sources/TerminalStrip/ui/terminalstriplayouteditor.ui index 1d5b73ba6..f8f74789a 100644 --- a/sources/TerminalStrip/ui/terminalstriplayouteditor.ui +++ b/sources/TerminalStrip/ui/terminalstriplayouteditor.ui @@ -6,8 +6,8 @@ 0 0 - 892 - 555 + 683 + 589 @@ -144,6 +144,9 @@ Afficher l'aide + + false + @@ -210,7 +213,14 @@ 0 - + + + + Longueur maximal du texte de borne + + + + @@ -224,42 +234,7 @@ - - - - Orientation du texte d'en tête : - - - - - - - - Horizontal - - - - - Vertical - - - - - - - - Alignement du texte d'en tête : - - - - - - - Orientation du texte de borne : - - - - + @@ -278,29 +253,38 @@ - - + + - Gauche + Horizontal - Centre - - - - - Droite + Vertical - - + + - Alignement du texte de borne : + Orientation du texte d'en tête : + + + + + + + Alignement du texte d'en tête : + + + + + + + Origine vertical du texte de borne : @@ -359,6 +343,52 @@ + + + + + Gauche + + + + + Centre + + + + + Droite + + + + + + + + 30 + + + 1000 + + + + + + + Orientation du texte de borne : + + + + + + + + + + Alignement du texte de borne : + + + @@ -898,6 +928,38 @@ + + m_terminal_text_y_sb + valueChanged(int) + TerminalStripLayoutEditor + valueEdited() + + + 207 + 383 + + + 445 + 277 + + + + + m_terminal_text_height_sb + valueChanged(int) + TerminalStripLayoutEditor + valueEdited() + + + 430 + 383 + + + 445 + 277 + + + valueEdited()