From fc4625fc0f8e1a0ab74788c0ba56851da09d7871 Mon Sep 17 00:00:00 2001 From: damianCaceres Date: Thu, 13 Aug 2020 12:26:50 +0100 Subject: [PATCH] ElementEditor: partdynamictextfield.cpp code style --- .../graphicspart/partdynamictextfield.cpp | 337 ++++++++---------- 1 file changed, 153 insertions(+), 184 deletions(-) diff --git a/sources/editor/graphicspart/partdynamictextfield.cpp b/sources/editor/graphicspart/partdynamictextfield.cpp index a9f368ca9..20c745ff7 100644 --- a/sources/editor/graphicspart/partdynamictextfield.cpp +++ b/sources/editor/graphicspart/partdynamictextfield.cpp @@ -36,23 +36,22 @@ PartDynamicTextField::PartDynamicTextField(QETElementEditor *editor, QGraphicsIt setTextWidth(settings.value("diagrameditor/dynamic_text_width", -1).toInt()); setText("_"); setTextFrom(DynamicElementTextItem::UserText); - setFlags(QGraphicsItem::ItemIsSelectable | QGraphicsItem::ItemSendsGeometryChanges | QGraphicsItem::ItemIsMovable); - - + setFlags(QGraphicsItem::ItemIsSelectable | + QGraphicsItem::ItemSendsGeometryChanges | + QGraphicsItem::ItemIsMovable); + //Option when text is displayed in multiple line - QTextOption option = document()->defaultTextOption(); + QTextOption option = document() -> defaultTextOption(); option.setAlignment(Qt::AlignHCenter); option.setWrapMode(QTextOption::WordWrap); - document()->setDefaultTextOption(option); + document() -> setDefaultTextOption(option); } -QString PartDynamicTextField::name() const -{ +QString PartDynamicTextField::name() const { return tr("Champ de texte dynamique", "element part name"); } -QString PartDynamicTextField::xmlName() const -{ +QString PartDynamicTextField::xmlName() const { return QString("dynamic_text"); } @@ -62,8 +61,7 @@ QString PartDynamicTextField::xmlName() const * Start the user-induced transformation, provided this primitive is contained * within the initial_selection_rect bounding rectangle. */ -void PartDynamicTextField::startUserTransformation(const QRectF &initial_selection_rect) -{ +void PartDynamicTextField::startUserTransformation(const QRectF &initial_selection_rect) { Q_UNUSED(initial_selection_rect) m_saved_point = pos(); // scene coordinates, no need to mapFromScene() } @@ -74,9 +72,12 @@ void PartDynamicTextField::startUserTransformation(const QRectF &initial_selecti * @param new_selection_rect * Handle the user-induced transformation from initial_selection_rect to new_selection_rect */ -void PartDynamicTextField::handleUserTransformation(const QRectF &initial_selection_rect, const QRectF &new_selection_rect) +void PartDynamicTextField::handleUserTransformation( + const QRectF &initial_selection_rect, + const QRectF &new_selection_rect) { - QPointF new_pos = mapPoints(initial_selection_rect, new_selection_rect, QList() << m_saved_point).first(); + QPointF new_pos = mapPoints( + initial_selection_rect, new_selection_rect, QList() << m_saved_point).first(); setPos(new_pos); } @@ -85,10 +86,9 @@ void PartDynamicTextField::handleUserTransformation(const QRectF &initial_select * @param document * @return */ -const QDomElement PartDynamicTextField::toXml(QDomDocument &dom_doc) const -{ +const QDomElement PartDynamicTextField::toXml(QDomDocument &dom_doc) const { QDomElement root_element = dom_doc.createElement(xmlName()); - + root_element.setAttribute("x", QString::number(pos().x())); root_element.setAttribute("y", QString::number(pos().y())); root_element.setAttribute("z", QString::number(zValue())); @@ -97,110 +97,108 @@ const QDomElement PartDynamicTextField::toXml(QDomDocument &dom_doc) const root_element.setAttribute("uuid", m_uuid.toString()); root_element.setAttribute("frame", m_frame? "true" : "false"); root_element.setAttribute("text_width", QString::number(m_text_width)); - QMetaEnum me = DynamicElementTextItem::textFromMetaEnum(); root_element.setAttribute("text_from", me.valueToKey(m_text_from)); - + me = QMetaEnum::fromType(); - if(this->alignment() &Qt::AlignRight) + if(this -> alignment() &Qt::AlignRight) root_element.setAttribute("Halignment", me.valueToKey(Qt::AlignRight)); - else if(this->alignment() &Qt::AlignLeft) + else if(this -> alignment() &Qt::AlignLeft) root_element.setAttribute("Halignment", me.valueToKey(Qt::AlignLeft)); - else if(this->alignment() &Qt::AlignHCenter) + else if(this -> alignment() &Qt::AlignHCenter) root_element.setAttribute("Halignment", me.valueToKey(Qt::AlignHCenter)); - - if(this->alignment() &Qt::AlignBottom) + + if(this -> alignment() &Qt::AlignBottom) root_element.setAttribute("Valignment", me.valueToKey(Qt::AlignBottom)); - else if(this->alignment() & Qt::AlignTop) + else if(this -> alignment() & Qt::AlignTop) root_element.setAttribute("Valignment", me.valueToKey(Qt::AlignTop)); - else if(this->alignment() &Qt::AlignVCenter) + else if(this -> alignment() &Qt::AlignVCenter) root_element.setAttribute("Valignment", me.valueToKey(Qt::AlignVCenter)); - - QDomElement dom_text = dom_doc.createElement("text"); - dom_text.appendChild(dom_doc.createTextNode(toPlainText())); - root_element.appendChild(dom_text); - + + QDomElement dom_text = dom_doc.createElement("text"); + dom_text.appendChild(dom_doc.createTextNode(toPlainText())); + root_element.appendChild(dom_text); + //Info name - if(!m_info_name.isEmpty()) - { + if(!m_info_name.isEmpty()) { QDomElement dom_info_name = dom_doc.createElement("info_name"); dom_info_name.appendChild(dom_doc.createTextNode(m_info_name)); root_element.appendChild(dom_info_name); } - + //Composite text - if(!m_composite_text.isEmpty()) - { + if(!m_composite_text.isEmpty()) { QDomElement dom_comp_text = dom_doc.createElement("composite_text"); dom_comp_text.appendChild(dom_doc.createTextNode(m_composite_text)); root_element.appendChild(dom_comp_text); } - + //Color - if(color() != QColor(Qt::black)) - { + if(color() != QColor(Qt::black)) { QDomElement dom_color = dom_doc.createElement("color"); dom_color.appendChild(dom_doc.createTextNode(color().name())); root_element.appendChild(dom_color); } - - return root_element; + + return root_element; } /** * @brief PartDynamicTextField::fromXml * @param element */ -void PartDynamicTextField::fromXml(const QDomElement &dom_elmt) -{ +void PartDynamicTextField::fromXml(const QDomElement &dom_elmt) { if (dom_elmt.tagName() != xmlName()) { qDebug() << "PartDynamicTextField::fromXml : Wrong tagg name"; return; } - + QGraphicsTextItem::setPos(dom_elmt.attribute("x", QString::number(0)).toDouble(), - dom_elmt.attribute("y", QString::number(0)).toDouble()); + dom_elmt.attribute("y", QString::number(0)).toDouble()); setZValue(dom_elmt.attribute("z", QString::number(zValue())).toDouble()); QGraphicsTextItem::setRotation(dom_elmt.attribute("rotation", QString::number(0)).toDouble()); - if (dom_elmt.hasAttribute("font")) - { + if (dom_elmt.hasAttribute("font")) { QFont font_; font_.fromString(dom_elmt.attribute("font")); setFont(font_); - } else { //Keep compatibility TODO remove in futur + } + else { + //Keep compatibility TODO remove in futur setFont(QETApp::dynamicTextsItemFont(9)); } m_uuid = QUuid(dom_elmt.attribute("uuid", QUuid::createUuid().toString())); setFrame(dom_elmt.attribute("frame", "false") == "true"? true : false); setTextWidth(dom_elmt.attribute("text_width", QString::number(-1)).toDouble()); - + QMetaEnum me = DynamicElementTextItem::textFromMetaEnum(); - m_text_from = DynamicElementTextItem::TextFrom(me.keyToValue(dom_elmt.attribute("text_from").toStdString().data())); - + m_text_from = DynamicElementTextItem::TextFrom( + me.keyToValue(dom_elmt.attribute("text_from").toStdString().data())); + me = QMetaEnum::fromType(); if(dom_elmt.hasAttribute("Halignment")) - setAlignment(Qt::Alignment(me.keyToValue(dom_elmt.attribute("Halignment").toStdString().data()))); + setAlignment(Qt::Alignment( + me.keyToValue(dom_elmt.attribute("Halignment").toStdString().data()))); if(dom_elmt.hasAttribute(("Valignment"))) - setAlignment(Qt::Alignment(me.keyToValue(dom_elmt.attribute("Valignment").toStdString().data())) | this->alignment()); + setAlignment(Qt::Alignment( + me.keyToValue(dom_elmt.attribute("Valignment").toStdString().data())) | this -> alignment()); //Text - QDomElement dom_text = dom_elmt.firstChildElement("text"); - if (!dom_text.isNull()) - { + QDomElement dom_text = dom_elmt.firstChildElement("text"); + if (!dom_text.isNull()) { m_text = dom_text.text(); m_block_alignment = true; setPlainText(m_text); m_block_alignment = false; } - + //Info name QDomElement dom_info_name = dom_elmt.firstChildElement("info_name"); if(!dom_info_name.isNull()) m_info_name = dom_info_name.text(); - + //Composite text QDomElement dom_comp_text = dom_elmt.firstChildElement("composite_text"); if(!dom_comp_text.isNull()) @@ -221,22 +219,20 @@ void PartDynamicTextField::fromTextFieldXml(const QDomElement &dom_element) { if(dom_element.tagName() != "input") return; - + setFont(QETApp::diagramTextsFont(dom_element.attribute("size", QString::number(9)).toInt())); - - if(dom_element.attribute("tagg", "none") == "none") - { + + if(dom_element.attribute("tagg", "none") == "none") { setTextFrom(DynamicElementTextItem::UserText); setText(dom_element.attribute("text", "_")); } - else - { + else { setTextFrom(DynamicElementTextItem::ElementInfo); setInfoName(dom_element.attribute("tagg", "label")); } - + QGraphicsTextItem::setRotation(dom_element.attribute("rotation", "0").toDouble()); - + //the origin transformation point of PartDynamicTextField is the top left corner, no matter the font size //The origin transformation point of PartTextField is the middle of left edge, and so by definition, change with the size of the font //We need to use a QTransform to find the pos of this text from the saved pos of text item @@ -247,7 +243,7 @@ void PartDynamicTextField::fromTextFieldXml(const QDomElement &dom_element) transform.reset(); //Second translate to the pos transform.translate(dom_element.attribute("x", QString::number(0)).toDouble(), - dom_element.attribute("y", QString::number(0)).toDouble()); + dom_element.attribute("y", QString::number(0)).toDouble()); QGraphicsTextItem::setPos(transform.map(pos)); } @@ -264,11 +260,9 @@ DynamicElementTextItem::TextFrom PartDynamicTextField::textFrom() const { * Set the final text is created from. * @param text_from */ -void PartDynamicTextField::setTextFrom(DynamicElementTextItem::TextFrom text_from) -{ +void PartDynamicTextField::setTextFrom(DynamicElementTextItem::TextFrom text_from) { m_text_from = text_from; - switch (m_text_from) - { + switch (m_text_from) { case DynamicElementTextItem::UserText: setPlainText(m_text); break; @@ -297,18 +291,16 @@ QString PartDynamicTextField::text() const { * Set the text of this text * @param text */ -void PartDynamicTextField::setText(const QString &text) -{ +void PartDynamicTextField::setText(const QString &text) { m_text = text; setPlainText(m_text); emit textChanged(m_text); } -void PartDynamicTextField::setInfoName(const QString &info_name) -{ +void PartDynamicTextField::setInfoName(const QString &info_name) { m_info_name = info_name; if(m_text_from == DynamicElementTextItem::ElementInfo && elementScene()) - setPlainText(elementScene()->elementInformation().value(m_info_name).toString()); + setPlainText(elementScene() -> elementInformation().value(m_info_name).toString()); emit infoNameChanged(m_info_name); } @@ -325,11 +317,10 @@ QString PartDynamicTextField::infoName() const{ * Set the composite text of this text item to @text * @param text */ -void PartDynamicTextField::setCompositeText(const QString &text) -{ +void PartDynamicTextField::setCompositeText(const QString &text) { m_composite_text = text; if(m_text_from == DynamicElementTextItem::CompositeText && elementScene()) - setPlainText(autonum::AssignVariables::replaceVariable(m_composite_text, elementScene()->elementInformation())); + setPlainText(autonum::AssignVariables::replaceVariable(m_composite_text, elementScene() -> elementInformation())); emit compositeTextChanged(m_composite_text); } @@ -337,7 +328,7 @@ void PartDynamicTextField::setCompositeText(const QString &text) * @brief PartDynamicTextField::compositeText * @return the composite text of this text */ -QString PartDynamicTextField::compositeText() const{ +QString PartDynamicTextField::compositeText() const { return m_composite_text; } @@ -345,8 +336,7 @@ QString PartDynamicTextField::compositeText() const{ * @brief PartDynamicTextField::setColor * @param color set text color to color */ -void PartDynamicTextField::setColor(const QColor& color) -{ +void PartDynamicTextField::setColor(const QColor& color) { setDefaultTextColor(color); emit colorChanged(color); } @@ -359,55 +349,47 @@ QColor PartDynamicTextField::color() const { return defaultTextColor(); } -void PartDynamicTextField::setFrame(bool frame) -{ +void PartDynamicTextField::setFrame(bool frame) { m_frame = frame; update(); emit frameChanged(m_frame); } -bool PartDynamicTextField::frame() const -{ +bool PartDynamicTextField::frame() const { return m_frame; } -void PartDynamicTextField::setTextWidth(qreal width) -{ - this->document()->setTextWidth(width); - - //Adjust the width, to ideal width if needed - if(width > 0 && document()->size().width() > width) - document()->setTextWidth(document()->idealWidth()); +void PartDynamicTextField::setTextWidth(qreal width) { + this -> document() -> setTextWidth(width); - m_text_width = document()->textWidth(); + //Adjust the width, to ideal width if needed + if(width > 0 && document() -> size().width() > width) + document() -> setTextWidth(document() -> idealWidth()); + + m_text_width = document() -> textWidth(); emit textWidthChanged(m_text_width); } -void PartDynamicTextField::setPlainText(const QString &text) -{ +void PartDynamicTextField::setPlainText(const QString &text) { if(toPlainText() == text) return; - + prepareAlignment(); QGraphicsTextItem::setPlainText(text); //User define a text width - if(m_text_width > 0) - { - if(document()->size().width() > m_text_width) - { - document()->setTextWidth(m_text_width); - if(document()->size().width() > m_text_width) - { - document()->setTextWidth(document()->idealWidth()); + if(m_text_width > 0) { + if(document() -> size().width() > m_text_width) { + document() -> setTextWidth(m_text_width); + if(document() -> size().width() > m_text_width) { + document() -> setTextWidth(document() -> idealWidth()); } } } finishAlignment(); } -void PartDynamicTextField::setAlignment(Qt::Alignment alignment) -{ +void PartDynamicTextField::setAlignment(Qt::Alignment alignment) { m_alignment = alignment; emit alignmentChanged(m_alignment); } @@ -416,9 +398,8 @@ Qt::Alignment PartDynamicTextField::alignment() const { return m_alignment; } -void PartDynamicTextField::setFont(const QFont &font) -{ - if (font == this->font()) { +void PartDynamicTextField::setFont(const QFont &font) { + if (font == this -> font()) { return; } prepareAlignment(); @@ -431,14 +412,12 @@ void PartDynamicTextField::setFont(const QFont &font) * @brief PartDynamicTextField::mouseMoveEvent * @param event */ -void PartDynamicTextField::mouseMoveEvent(QGraphicsSceneMouseEvent *event) -{ - if((event->buttons() & Qt::LeftButton) && (flags() & QGraphicsItem::ItemIsMovable)) - { - QPointF pos = event->scenePos() + (m_origine_pos - event->buttonDownScenePos(Qt::LeftButton)); - event->modifiers() == Qt::ControlModifier ? setPos(pos) : setPos(elementScene()->snapToGrid(pos)); - } - else +void PartDynamicTextField::mouseMoveEvent(QGraphicsSceneMouseEvent *event) { + if((event -> buttons() & Qt::LeftButton) && (flags() & QGraphicsItem::ItemIsMovable)) { + QPointF pos = event -> scenePos() + (m_origine_pos - event -> buttonDownScenePos(Qt::LeftButton)); + event -> modifiers() == Qt::ControlModifier ? setPos(pos) : setPos(elementScene() -> snapToGrid(pos)); + } + else QGraphicsObject::mouseMoveEvent(event); } @@ -446,10 +425,9 @@ void PartDynamicTextField::mouseMoveEvent(QGraphicsSceneMouseEvent *event) * @brief PartDynamicTextField::mousePressEvent * @param event */ -void PartDynamicTextField::mousePressEvent(QGraphicsSceneMouseEvent *event) -{ - if(event->button() == Qt::LeftButton) - m_origine_pos = this->pos(); +void PartDynamicTextField::mousePressEvent(QGraphicsSceneMouseEvent *event) { + if(event -> button() == Qt::LeftButton) + m_origine_pos = this -> pos(); QGraphicsObject::mousePressEvent(event); } @@ -458,15 +436,16 @@ void PartDynamicTextField::mousePressEvent(QGraphicsSceneMouseEvent *event) * @brief PartDynamicTextField::mouseReleaseEvent * @param event */ -void PartDynamicTextField::mouseReleaseEvent(QGraphicsSceneMouseEvent *event) -{ - if((event->button() & Qt::LeftButton) && (flags() & QGraphicsItem::ItemIsMovable) && m_origine_pos != pos()) - { - QPropertyUndoCommand *undo = new QPropertyUndoCommand(this, "pos", QVariant(m_origine_pos), QVariant(pos())); - undo->setText(tr("Déplacer un champ texte")); - undo->enableAnimation(); - elementScene()->undoStack().push(undo); - } +void PartDynamicTextField::mouseReleaseEvent(QGraphicsSceneMouseEvent *event) { + if((event -> button() & Qt::LeftButton) && + (flags() & QGraphicsItem::ItemIsMovable) && + m_origine_pos != pos()) { + QPropertyUndoCommand *undo =\ + new QPropertyUndoCommand(this, "pos", QVariant(m_origine_pos), QVariant(pos())); + undo -> setText(tr("Déplacer un champ texte")); + undo -> enableAnimation(); + elementScene() -> undoStack().push(undo); + } QGraphicsObject::mouseReleaseEvent(event); } @@ -477,39 +456,35 @@ void PartDynamicTextField::mouseReleaseEvent(QGraphicsSceneMouseEvent *event) * @param value * @return */ -QVariant PartDynamicTextField::itemChange(QGraphicsItem::GraphicsItemChange change, const QVariant &value) -{ - if (change == QGraphicsItem::ItemPositionHasChanged || change == QGraphicsItem::ItemSceneHasChanged) - { +QVariant PartDynamicTextField::itemChange(QGraphicsItem::GraphicsItemChange change, const QVariant &value) { + if (change == QGraphicsItem::ItemPositionHasChanged || change == QGraphicsItem::ItemSceneHasChanged) { updateCurrentPartEditor(); - if(change == QGraphicsItem::ItemSceneHasChanged && - m_first_add && - elementScene() != nullptr) + if(change == QGraphicsItem::ItemSceneHasChanged && + m_first_add && + elementScene() != nullptr) { - connect(elementScene(), &ElementScene::elementInfoChanged, this, &PartDynamicTextField::elementInfoChanged); + connect(elementScene(), &ElementScene::elementInfoChanged, + this, &PartDynamicTextField::elementInfoChanged); m_first_add = false; } } else if ((change == QGraphicsItem::ItemSelectedHasChanged) && (value.toBool() == true)) updateCurrentPartEditor(); - + return(QGraphicsTextItem::itemChange(change, value)); } -void PartDynamicTextField::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) -{ +void PartDynamicTextField::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) { QGraphicsTextItem::paint(painter, option, widget); - - if (m_frame) - { - painter->save(); - painter->setFont(this->font()); - + + if (m_frame) { + painter -> save(); + painter -> setFont(this -> font()); + //Adjust the thickness according to the font size, qreal w=0.3; - if(this->font().pointSize() >= 5) - { - w = this->font().pointSizeF()*0.1; + if(this -> font().pointSize() >= 5) { + w = this -> font().pointSizeF()*0.1; if(w > 2.5) w = 2.5; } @@ -517,29 +492,29 @@ void PartDynamicTextField::paint(QPainter *painter, const QStyleOptionGraphicsIt QPen pen; pen.setColor(color()); pen.setWidthF(w); - painter->setPen(pen); - painter->setRenderHint(QPainter::Antialiasing); - + painter -> setPen(pen); + painter -> setRenderHint(QPainter::Antialiasing); + //Get the bounding rectangle of the text - QSizeF size = document()->size(); - size.setWidth(document()->idealWidth()); + QSizeF size = document() -> size(); + size.setWidth(document() -> idealWidth()); //Remove the margin. Size is exactly the bounding rect of the text - size.rheight() -= document()->documentMargin()*2; - size.rwidth() -= document()->documentMargin()*2; + size.rheight() -= document() -> documentMargin()*2; + size.rwidth() -= document() -> documentMargin()*2; //Add a little margin only for a better visual; size.rheight() += 2; size.rwidth() += 2; - + //The pos of the rect QPointF pos = boundingRect().center(); pos.rx() -= size.width()/2; pos.ry() -= size.height()/2; - + //Adjust the rounding of the rectangle according to the size of the font - qreal ro = this->font().pointSizeF()/3; - painter->drawRoundedRect(QRectF(pos, size), ro, ro); - - painter->restore(); + qreal ro = this -> font().pointSizeF()/3; + painter -> drawRoundedRect(QRectF(pos, size), ro, ro); + + painter -> restore(); } } @@ -547,51 +522,45 @@ void PartDynamicTextField::paint(QPainter *painter, const QStyleOptionGraphicsIt * @brief PartDynamicTextField::elementInfoChanged * Used to up to date this text field, when the element information (see elementScene) changed */ -void PartDynamicTextField::elementInfoChanged() -{ +void PartDynamicTextField::elementInfoChanged() { if(!elementScene()) return; - + if(m_text_from == DynamicElementTextItem::ElementInfo) - setPlainText(elementScene()->elementInformation().value(m_info_name).toString()); + setPlainText(elementScene() -> elementInformation().value(m_info_name).toString()); else if (m_text_from == DynamicElementTextItem::CompositeText && elementScene()) - setPlainText(autonum::AssignVariables::replaceVariable(m_composite_text, elementScene()->elementInformation())); + setPlainText(autonum::AssignVariables::replaceVariable( + m_composite_text, elementScene() -> elementInformation())); } -void PartDynamicTextField::prepareAlignment() -{ +void PartDynamicTextField::prepareAlignment() { m_alignment_rect = boundingRect(); } -void PartDynamicTextField::finishAlignment() -{ +void PartDynamicTextField::finishAlignment() { if(m_block_alignment) return; - + QTransform transform; - transform.rotate(this->rotation()); + transform.rotate(this -> rotation()); qreal x,xa, y,ya; x=xa=0; y=ya=0; - if(m_alignment &Qt::AlignRight) - { + if(m_alignment &Qt::AlignRight) { x = m_alignment_rect.right(); xa = boundingRect().right(); } - else if(m_alignment &Qt::AlignHCenter) - { + else if(m_alignment &Qt::AlignHCenter) { x = m_alignment_rect.center().x(); xa = boundingRect().center().x(); } - - if(m_alignment &Qt::AlignBottom) - { + + if(m_alignment &Qt::AlignBottom) { y = m_alignment_rect.bottom(); ya = boundingRect().bottom(); } - else if(m_alignment &Qt::AlignVCenter) - { + else if(m_alignment &Qt::AlignVCenter) { y = m_alignment_rect.center().y(); ya = boundingRect().center().y(); } @@ -600,5 +569,5 @@ void PartDynamicTextField::finishAlignment() QPointF pa = transform.map(QPointF(xa,ya)); QPointF diff = pa-p; - setPos(this->pos() - diff); + setPos(this -> pos() - diff); }