kotschak/qelectrotech-source-mirror
0
0
Fork 0
mirror of https://github.com/qelectrotech/qelectrotech-source-mirror.git synced 2026-08-13 10:04:13 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #694 from IBSYSLevi/feature/center-rotation-option-for-textfields

Browse Source 
Feature added: Rotation point center property for dynamic text fields
This commit is contained in:
Laurent Trinques
2026-08-09 21:09:19 +02:00
committed by GitHub
parent cdf5cad1e5 a3d348fdcd
commit 7f75500023
9 changed files with 83 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sources/editor/graphicspart/partdynamictextfield.cpp
+16
View File
@@ -148,6 +148,7 @@ const QDomElement PartDynamicTextField::toXml(QDomDocument &dom_doc) const
root_element.setAttribute("frame", m_frame? "true" : "false");
root_element.setAttribute("text_width", QString::number(m_text_width));
root_element.setAttribute("keep_visual_rotation", m_keep_visual_rotation ? "true" : "false");
root_element.setAttribute("rotation_point_center", m_rotation_point_center ? "true" : "false");
QMetaEnum me = DynamicElementTextItem::textFromMetaEnum();
root_element.setAttribute("text_from", me.valueToKey(m_text_from));
@@ -212,6 +213,7 @@ void PartDynamicTextField::fromXml(const QDomElement &dom_elmt) {
setZValue(dom_elmt.attribute("z", QString::number(zValue())).toDouble());
QGraphicsObject::setRotation(QET::correctAngle(dom_elmt.attribute("rotation", QString::number(0)).toDouble()));
setKeepVisualRotation(dom_elmt.attribute("keep_visual_rotation", "true") == "true"? true : false);
setRotationPointCenter(dom_elmt.attribute("rotation_point_center", "false") == "true"? true : false);
if (dom_elmt.hasAttribute("font")) {
QFont font_;
@@ -492,6 +494,20 @@ bool PartDynamicTextField::keepVisualRotation() const {
return m_keep_visual_rotation;
}
void PartDynamicTextField::setRotationPointCenter(const bool &center)
{
if (center == this->m_rotation_point_center) {
return;
}
m_rotation_point_center = center;
emit rotationPointCenterChanged(center);
}
bool PartDynamicTextField::rotationPointCenter() const {
return m_rotation_point_center;
}
/**
@brief PartDynamicTextField::mouseMoveEvent
@param event
sources/editor/graphicspart/partdynamictextfield.h
+6 -1
View File
@@ -44,6 +44,7 @@ class PartDynamicTextField : public QGraphicsTextItem, public CustomElementPart
Q_PROPERTY(Qt::Alignment alignment READ alignment WRITE setAlignment NOTIFY alignmentChanged)
Q_PROPERTY(QFont font READ font WRITE setFont NOTIFY fontChanged)
Q_PROPERTY(bool keepVisualRotation READ keepVisualRotation WRITE setKeepVisualRotation NOTIFY keepVisualRotationChanged)
Q_PROPERTY(bool rotationPointCenter READ rotationPointCenter WRITE setRotationPointCenter NOTIFY rotationPointCenterChanged)
public:
///PROPERTY
@@ -62,6 +63,7 @@ class PartDynamicTextField : public QGraphicsTextItem, public CustomElementPart
void alignmentChanged(Qt::Alignment alignment);
void fontChanged(QFont font);
void keepVisualRotationChanged(bool keep);
void rotationPointCenterChanged(bool center);
public:
PartDynamicTextField(QETElementEditor *editor, QGraphicsItem *parent = nullptr);
@@ -100,6 +102,8 @@ class PartDynamicTextField : public QGraphicsTextItem, public CustomElementPart
void setFont(const QFont &font);
void setKeepVisualRotation(const bool &keep);
bool keepVisualRotation() const;
void setRotationPointCenter(const bool &center);
bool rotationPointCenter() const;
void setRotation(qreal angle);
void mirror();
@@ -129,7 +133,8 @@ class PartDynamicTextField : public QGraphicsTextItem, public CustomElementPart
bool m_frame = false,
m_first_add = true,
m_block_alignment = false,
m_keep_visual_rotation = false;
m_keep_visual_rotation = false,
m_rotation_point_center = false;
qreal m_text_width = -1;
Qt::Alignment m_alignment = Qt::AlignTop|Qt::AlignLeft;
QRectF m_alignment_rect;
sources/editor/ui/dynamictextfieldeditor.cpp
+17 -2
View File
@@ -140,6 +140,7 @@ void DynamicTextFieldEditor::updateForm()
ui -> m_user_text_le -> setText(m_text_field.data() -> text());
ui -> m_size_sb -> setValue(m_text_field.data() -> font().pointSize());
ui->m_keep_visual_rotation_cb->setChecked(m_text_field.data()->keepVisualRotation());
ui->m_rotation_point_center_cb->setChecked(m_text_field.data()->rotationPointCenter());
#ifdef BUILD_WITHOUT_KF5
#else
m_color_kpb -> setColor(m_text_field.data() -> color());
@@ -197,6 +198,7 @@ void DynamicTextFieldEditor::setUpConnections()
m_connection_list << connect(m_text_field.data(), &PartDynamicTextField::textWidthChanged, this, [=](){this -> updateForm();});
m_connection_list << connect(m_text_field.data(), &PartDynamicTextField::compositeTextChanged,this, [=](){this -> updateForm();});
m_connection_list << connect(m_text_field.data(), &PartDynamicTextField::keepVisualRotationChanged, this, [=](){this -> updateForm();});
m_connection_list << connect(m_text_field.data(), &PartDynamicTextField::rotationPointCenterChanged, this, [=](){this -> updateForm();});
// Refresh info combo when element data changes (e.g. type switched to PLC-Slave)
m_connection_list << connect(elementEditor()->elementScene(), &ElementScene::elementInfoChanged,
@@ -347,8 +349,8 @@ void DynamicTextFieldEditor::on_m_width_sb_editingFinished()
}
}
void DynamicTextFieldEditor::on_m_elmt_info_cb_activated(const QString &arg1) {
Q_UNUSED(arg1)
void DynamicTextFieldEditor::on_m_elmt_info_cb_activated(int index) {
Q_UNUSED(index)
QString info = ui -> m_elmt_info_cb -> currentData().toString();
for (int i = 0; i < m_parts.length(); i++) {
@@ -489,3 +491,16 @@ void DynamicTextFieldEditor::on_m_keep_visual_rotation_cb_clicked()
}
}
}
void DynamicTextFieldEditor::on_m_rotation_point_center_cb_clicked()
{
bool center = ui->m_rotation_point_center_cb->isChecked();
for (int i = 0; i < m_parts.length(); i++) {
if (center != m_parts[i]->rotationPointCenter()) {
QPropertyUndoCommand *undo = new QPropertyUndoCommand(m_parts[i], "rotationPointCenter", m_parts[i]->rotationPointCenter(), center);
undo->setText(tr("Modifier le point de rotation d'un champ texte"));
undoStack().push(undo);
}
}
}
sources/editor/ui/dynamictextfieldeditor.h
+2 -1
View File
@@ -62,7 +62,7 @@ class DynamicTextFieldEditor : public ElementItemEditor {
void on_m_size_sb_editingFinished();
void on_m_frame_cb_clicked();
void on_m_width_sb_editingFinished();
void on_m_elmt_info_cb_activated(const QString &arg1);
void on_m_elmt_info_cb_activated(int index);
void on_m_text_from_cb_activated(int index);
void on_m_composite_text_pb_clicked();
void on_m_alignment_pb_clicked();
@@ -71,6 +71,7 @@ class DynamicTextFieldEditor : public ElementItemEditor {
void m_color_kpb_changed(QColor newColor);
void on_m_keep_visual_rotation_cb_clicked();
void on_m_rotation_point_center_cb_clicked();
private:
Ui::DynamicTextFieldEditor *ui;
sources/editor/ui/dynamictextfieldeditor.ui
+11 -3
View File
@@ -37,7 +37,7 @@
</property>
</spacer>
</item>
<item row="3" column="0">
<item row="4" column="0">
<widget class="QLabel" name="label_2">
<property name="text">
<string>Largeur</string>
@@ -73,6 +73,13 @@
</property>
</widget>
</item>
<item row="3" column="2">
<widget class="QCheckBox" name="m_rotation_point_center_cb">
<property name="text">
<string>Tourner autour de son propre centre</string>
</property>
</widget>
</item>
<item row="11" column="1" colspan="2">
<widget class="QComboBox" name="m_elmt_info_cb"/>
</item>
@@ -92,7 +99,7 @@
</property>
</spacer>
</item>
<item row="3" column="1">
<item row="4" column="1">
<widget class="QSpinBox" name="m_width_sb">
<property name="minimum">
<number>-1</number>
@@ -149,7 +156,7 @@
</property>
</widget>
</item>
<item row="3" column="2">
<item row="4" column="2">
<widget class="QPushButton" name="m_alignment_pb">
<property name="text">
<string>Alignement</string>
@@ -236,6 +243,7 @@
<tabstop>m_y_sb</tabstop>
<tabstop>m_rotation_sb</tabstop>
<tabstop>m_keep_visual_rotation_cb</tabstop>
<tabstop>m_rotation_point_center_cb</tabstop>
<tabstop>m_width_sb</tabstop>
<tabstop>m_alignment_pb</tabstop>
<tabstop>m_size_sb</tabstop>