ElementEditor: partdynamictextfield.cpp code style

This commit is contained in:
damianCaceres
2020-08-13 12:26:50 +01:00
committed by Laurent Trinques
parent 943aa469c6
commit fc4625fc0f

View File

@@ -36,8 +36,9 @@ PartDynamicTextField::PartDynamicTextField(QETElementEditor *editor, QGraphicsIt
setTextWidth(settings.value("diagrameditor/dynamic_text_width", -1).toInt()); setTextWidth(settings.value("diagrameditor/dynamic_text_width", -1).toInt());
setText("_"); setText("_");
setTextFrom(DynamicElementTextItem::UserText); 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 //Option when text is displayed in multiple line
QTextOption option = document() -> defaultTextOption(); QTextOption option = document() -> defaultTextOption();
@@ -46,13 +47,11 @@ PartDynamicTextField::PartDynamicTextField(QETElementEditor *editor, QGraphicsIt
document() -> setDefaultTextOption(option); document() -> setDefaultTextOption(option);
} }
QString PartDynamicTextField::name() const QString PartDynamicTextField::name() const {
{
return tr("Champ de texte dynamique", "element part name"); return tr("Champ de texte dynamique", "element part name");
} }
QString PartDynamicTextField::xmlName() const QString PartDynamicTextField::xmlName() const {
{
return QString("dynamic_text"); return QString("dynamic_text");
} }
@@ -62,8 +61,7 @@ QString PartDynamicTextField::xmlName() const
* Start the user-induced transformation, provided this primitive is contained * Start the user-induced transformation, provided this primitive is contained
* within the initial_selection_rect bounding rectangle. * 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) Q_UNUSED(initial_selection_rect)
m_saved_point = pos(); // scene coordinates, no need to mapFromScene() 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 * @param new_selection_rect
* Handle the user-induced transformation from initial_selection_rect to 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<QPointF>() << m_saved_point).first(); QPointF new_pos = mapPoints(
initial_selection_rect, new_selection_rect, QList<QPointF>() << m_saved_point).first();
setPos(new_pos); setPos(new_pos);
} }
@@ -85,8 +86,7 @@ void PartDynamicTextField::handleUserTransformation(const QRectF &initial_select
* @param document * @param document
* @return * @return
*/ */
const QDomElement PartDynamicTextField::toXml(QDomDocument &dom_doc) const const QDomElement PartDynamicTextField::toXml(QDomDocument &dom_doc) const {
{
QDomElement root_element = dom_doc.createElement(xmlName()); QDomElement root_element = dom_doc.createElement(xmlName());
root_element.setAttribute("x", QString::number(pos().x())); root_element.setAttribute("x", QString::number(pos().x()));
@@ -98,7 +98,6 @@ const QDomElement PartDynamicTextField::toXml(QDomDocument &dom_doc) const
root_element.setAttribute("frame", m_frame? "true" : "false"); root_element.setAttribute("frame", m_frame? "true" : "false");
root_element.setAttribute("text_width", QString::number(m_text_width)); root_element.setAttribute("text_width", QString::number(m_text_width));
QMetaEnum me = DynamicElementTextItem::textFromMetaEnum(); QMetaEnum me = DynamicElementTextItem::textFromMetaEnum();
root_element.setAttribute("text_from", me.valueToKey(m_text_from)); root_element.setAttribute("text_from", me.valueToKey(m_text_from));
@@ -122,24 +121,21 @@ const QDomElement PartDynamicTextField::toXml(QDomDocument &dom_doc) const
root_element.appendChild(dom_text); root_element.appendChild(dom_text);
//Info name //Info name
if(!m_info_name.isEmpty()) if(!m_info_name.isEmpty()) {
{
QDomElement dom_info_name = dom_doc.createElement("info_name"); QDomElement dom_info_name = dom_doc.createElement("info_name");
dom_info_name.appendChild(dom_doc.createTextNode(m_info_name)); dom_info_name.appendChild(dom_doc.createTextNode(m_info_name));
root_element.appendChild(dom_info_name); root_element.appendChild(dom_info_name);
} }
//Composite text //Composite text
if(!m_composite_text.isEmpty()) if(!m_composite_text.isEmpty()) {
{
QDomElement dom_comp_text = dom_doc.createElement("composite_text"); QDomElement dom_comp_text = dom_doc.createElement("composite_text");
dom_comp_text.appendChild(dom_doc.createTextNode(m_composite_text)); dom_comp_text.appendChild(dom_doc.createTextNode(m_composite_text));
root_element.appendChild(dom_comp_text); root_element.appendChild(dom_comp_text);
} }
//Color //Color
if(color() != QColor(Qt::black)) if(color() != QColor(Qt::black)) {
{
QDomElement dom_color = dom_doc.createElement("color"); QDomElement dom_color = dom_doc.createElement("color");
dom_color.appendChild(dom_doc.createTextNode(color().name())); dom_color.appendChild(dom_doc.createTextNode(color().name()));
root_element.appendChild(dom_color); root_element.appendChild(dom_color);
@@ -152,8 +148,7 @@ const QDomElement PartDynamicTextField::toXml(QDomDocument &dom_doc) const
* @brief PartDynamicTextField::fromXml * @brief PartDynamicTextField::fromXml
* @param element * @param element
*/ */
void PartDynamicTextField::fromXml(const QDomElement &dom_elmt) void PartDynamicTextField::fromXml(const QDomElement &dom_elmt) {
{
if (dom_elmt.tagName() != xmlName()) { if (dom_elmt.tagName() != xmlName()) {
qDebug() << "PartDynamicTextField::fromXml : Wrong tagg name"; qDebug() << "PartDynamicTextField::fromXml : Wrong tagg name";
return; return;
@@ -164,12 +159,13 @@ void PartDynamicTextField::fromXml(const QDomElement &dom_elmt)
setZValue(dom_elmt.attribute("z", QString::number(zValue())).toDouble()); setZValue(dom_elmt.attribute("z", QString::number(zValue())).toDouble());
QGraphicsTextItem::setRotation(dom_elmt.attribute("rotation", QString::number(0)).toDouble()); QGraphicsTextItem::setRotation(dom_elmt.attribute("rotation", QString::number(0)).toDouble());
if (dom_elmt.hasAttribute("font")) if (dom_elmt.hasAttribute("font")) {
{
QFont font_; QFont font_;
font_.fromString(dom_elmt.attribute("font")); font_.fromString(dom_elmt.attribute("font"));
setFont(font_); setFont(font_);
} else { //Keep compatibility TODO remove in futur }
else {
//Keep compatibility TODO remove in futur
setFont(QETApp::dynamicTextsItemFont(9)); setFont(QETApp::dynamicTextsItemFont(9));
} }
@@ -178,18 +174,20 @@ void PartDynamicTextField::fromXml(const QDomElement &dom_elmt)
setTextWidth(dom_elmt.attribute("text_width", QString::number(-1)).toDouble()); setTextWidth(dom_elmt.attribute("text_width", QString::number(-1)).toDouble());
QMetaEnum me = DynamicElementTextItem::textFromMetaEnum(); 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<Qt::Alignment>(); me = QMetaEnum::fromType<Qt::Alignment>();
if(dom_elmt.hasAttribute("Halignment")) 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"))) 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 //Text
QDomElement dom_text = dom_elmt.firstChildElement("text"); QDomElement dom_text = dom_elmt.firstChildElement("text");
if (!dom_text.isNull()) if (!dom_text.isNull()) {
{
m_text = dom_text.text(); m_text = dom_text.text();
m_block_alignment = true; m_block_alignment = true;
setPlainText(m_text); setPlainText(m_text);
@@ -224,13 +222,11 @@ void PartDynamicTextField::fromTextFieldXml(const QDomElement &dom_element)
setFont(QETApp::diagramTextsFont(dom_element.attribute("size", QString::number(9)).toInt())); 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); setTextFrom(DynamicElementTextItem::UserText);
setText(dom_element.attribute("text", "_")); setText(dom_element.attribute("text", "_"));
} }
else else {
{
setTextFrom(DynamicElementTextItem::ElementInfo); setTextFrom(DynamicElementTextItem::ElementInfo);
setInfoName(dom_element.attribute("tagg", "label")); setInfoName(dom_element.attribute("tagg", "label"));
} }
@@ -264,11 +260,9 @@ DynamicElementTextItem::TextFrom PartDynamicTextField::textFrom() const {
* Set the final text is created from. * Set the final text is created from.
* @param text_from * @param text_from
*/ */
void PartDynamicTextField::setTextFrom(DynamicElementTextItem::TextFrom text_from) void PartDynamicTextField::setTextFrom(DynamicElementTextItem::TextFrom text_from) {
{
m_text_from = text_from; m_text_from = text_from;
switch (m_text_from) switch (m_text_from) {
{
case DynamicElementTextItem::UserText: case DynamicElementTextItem::UserText:
setPlainText(m_text); setPlainText(m_text);
break; break;
@@ -297,15 +291,13 @@ QString PartDynamicTextField::text() const {
* Set the text of this text * Set the text of this text
* @param text * @param text
*/ */
void PartDynamicTextField::setText(const QString &text) void PartDynamicTextField::setText(const QString &text) {
{
m_text = text; m_text = text;
setPlainText(m_text); setPlainText(m_text);
emit textChanged(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; m_info_name = info_name;
if(m_text_from == DynamicElementTextItem::ElementInfo && elementScene()) if(m_text_from == DynamicElementTextItem::ElementInfo && elementScene())
setPlainText(elementScene() -> elementInformation().value(m_info_name).toString()); setPlainText(elementScene() -> elementInformation().value(m_info_name).toString());
@@ -325,8 +317,7 @@ QString PartDynamicTextField::infoName() const{
* Set the composite text of this text item to @text * Set the composite text of this text item to @text
* @param text * @param text
*/ */
void PartDynamicTextField::setCompositeText(const QString &text) void PartDynamicTextField::setCompositeText(const QString &text) {
{
m_composite_text = text; m_composite_text = text;
if(m_text_from == DynamicElementTextItem::CompositeText && elementScene()) 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()));
@@ -345,8 +336,7 @@ QString PartDynamicTextField::compositeText() const{
* @brief PartDynamicTextField::setColor * @brief PartDynamicTextField::setColor
* @param color set text color to color * @param color set text color to color
*/ */
void PartDynamicTextField::setColor(const QColor& color) void PartDynamicTextField::setColor(const QColor& color) {
{
setDefaultTextColor(color); setDefaultTextColor(color);
emit colorChanged(color); emit colorChanged(color);
} }
@@ -359,20 +349,17 @@ QColor PartDynamicTextField::color() const {
return defaultTextColor(); return defaultTextColor();
} }
void PartDynamicTextField::setFrame(bool frame) void PartDynamicTextField::setFrame(bool frame) {
{
m_frame = frame; m_frame = frame;
update(); update();
emit frameChanged(m_frame); emit frameChanged(m_frame);
} }
bool PartDynamicTextField::frame() const bool PartDynamicTextField::frame() const {
{
return m_frame; return m_frame;
} }
void PartDynamicTextField::setTextWidth(qreal width) void PartDynamicTextField::setTextWidth(qreal width) {
{
this -> document() -> setTextWidth(width); this -> document() -> setTextWidth(width);
//Adjust the width, to ideal width if needed //Adjust the width, to ideal width if needed
@@ -383,8 +370,7 @@ void PartDynamicTextField::setTextWidth(qreal width)
emit textWidthChanged(m_text_width); emit textWidthChanged(m_text_width);
} }
void PartDynamicTextField::setPlainText(const QString &text) void PartDynamicTextField::setPlainText(const QString &text) {
{
if(toPlainText() == text) if(toPlainText() == text)
return; return;
@@ -392,13 +378,10 @@ void PartDynamicTextField::setPlainText(const QString &text)
QGraphicsTextItem::setPlainText(text); QGraphicsTextItem::setPlainText(text);
//User define a text width //User define a text width
if(m_text_width > 0) if(m_text_width > 0) {
{ if(document() -> size().width() > m_text_width) {
if(document()->size().width() > m_text_width)
{
document() -> setTextWidth(m_text_width); document() -> setTextWidth(m_text_width);
if(document()->size().width() > m_text_width) if(document() -> size().width() > m_text_width) {
{
document() -> setTextWidth(document() -> idealWidth()); document() -> setTextWidth(document() -> idealWidth());
} }
} }
@@ -406,8 +389,7 @@ void PartDynamicTextField::setPlainText(const QString &text)
finishAlignment(); finishAlignment();
} }
void PartDynamicTextField::setAlignment(Qt::Alignment alignment) void PartDynamicTextField::setAlignment(Qt::Alignment alignment) {
{
m_alignment = alignment; m_alignment = alignment;
emit alignmentChanged(m_alignment); emit alignmentChanged(m_alignment);
} }
@@ -416,8 +398,7 @@ Qt::Alignment PartDynamicTextField::alignment() const {
return m_alignment; return m_alignment;
} }
void PartDynamicTextField::setFont(const QFont &font) void PartDynamicTextField::setFont(const QFont &font) {
{
if (font == this -> font()) { if (font == this -> font()) {
return; return;
} }
@@ -431,10 +412,8 @@ void PartDynamicTextField::setFont(const QFont &font)
* @brief PartDynamicTextField::mouseMoveEvent * @brief PartDynamicTextField::mouseMoveEvent
* @param event * @param event
*/ */
void PartDynamicTextField::mouseMoveEvent(QGraphicsSceneMouseEvent *event) void PartDynamicTextField::mouseMoveEvent(QGraphicsSceneMouseEvent *event) {
{ if((event -> buttons() & Qt::LeftButton) && (flags() & QGraphicsItem::ItemIsMovable)) {
if((event->buttons() & Qt::LeftButton) && (flags() & QGraphicsItem::ItemIsMovable))
{
QPointF pos = event -> scenePos() + (m_origine_pos - event -> buttonDownScenePos(Qt::LeftButton)); QPointF pos = event -> scenePos() + (m_origine_pos - event -> buttonDownScenePos(Qt::LeftButton));
event -> modifiers() == Qt::ControlModifier ? setPos(pos) : setPos(elementScene() -> snapToGrid(pos)); event -> modifiers() == Qt::ControlModifier ? setPos(pos) : setPos(elementScene() -> snapToGrid(pos));
} }
@@ -446,8 +425,7 @@ void PartDynamicTextField::mouseMoveEvent(QGraphicsSceneMouseEvent *event)
* @brief PartDynamicTextField::mousePressEvent * @brief PartDynamicTextField::mousePressEvent
* @param event * @param event
*/ */
void PartDynamicTextField::mousePressEvent(QGraphicsSceneMouseEvent *event) void PartDynamicTextField::mousePressEvent(QGraphicsSceneMouseEvent *event) {
{
if(event -> button() == Qt::LeftButton) if(event -> button() == Qt::LeftButton)
m_origine_pos = this -> pos(); m_origine_pos = this -> pos();
@@ -458,11 +436,12 @@ void PartDynamicTextField::mousePressEvent(QGraphicsSceneMouseEvent *event)
* @brief PartDynamicTextField::mouseReleaseEvent * @brief PartDynamicTextField::mouseReleaseEvent
* @param event * @param event
*/ */
void PartDynamicTextField::mouseReleaseEvent(QGraphicsSceneMouseEvent *event) void PartDynamicTextField::mouseReleaseEvent(QGraphicsSceneMouseEvent *event) {
{ if((event -> button() & Qt::LeftButton) &&
if((event->button() & Qt::LeftButton) && (flags() & QGraphicsItem::ItemIsMovable) && m_origine_pos != pos()) (flags() & QGraphicsItem::ItemIsMovable) &&
{ m_origine_pos != pos()) {
QPropertyUndoCommand *undo = new QPropertyUndoCommand(this, "pos", QVariant(m_origine_pos), QVariant(pos())); QPropertyUndoCommand *undo =\
new QPropertyUndoCommand(this, "pos", QVariant(m_origine_pos), QVariant(pos()));
undo -> setText(tr("Déplacer un champ texte")); undo -> setText(tr("Déplacer un champ texte"));
undo -> enableAnimation(); undo -> enableAnimation();
elementScene() -> undoStack().push(undo); elementScene() -> undoStack().push(undo);
@@ -477,16 +456,15 @@ void PartDynamicTextField::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
* @param value * @param value
* @return * @return
*/ */
QVariant PartDynamicTextField::itemChange(QGraphicsItem::GraphicsItemChange change, const QVariant &value) QVariant PartDynamicTextField::itemChange(QGraphicsItem::GraphicsItemChange change, const QVariant &value) {
{ if (change == QGraphicsItem::ItemPositionHasChanged || change == QGraphicsItem::ItemSceneHasChanged) {
if (change == QGraphicsItem::ItemPositionHasChanged || change == QGraphicsItem::ItemSceneHasChanged)
{
updateCurrentPartEditor(); updateCurrentPartEditor();
if(change == QGraphicsItem::ItemSceneHasChanged && if(change == QGraphicsItem::ItemSceneHasChanged &&
m_first_add && m_first_add &&
elementScene() != nullptr) elementScene() != nullptr)
{ {
connect(elementScene(), &ElementScene::elementInfoChanged, this, &PartDynamicTextField::elementInfoChanged); connect(elementScene(), &ElementScene::elementInfoChanged,
this, &PartDynamicTextField::elementInfoChanged);
m_first_add = false; m_first_add = false;
} }
} }
@@ -496,19 +474,16 @@ QVariant PartDynamicTextField::itemChange(QGraphicsItem::GraphicsItemChange chan
return(QGraphicsTextItem::itemChange(change, value)); 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); QGraphicsTextItem::paint(painter, option, widget);
if (m_frame) if (m_frame) {
{
painter -> save(); painter -> save();
painter -> setFont(this -> font()); painter -> setFont(this -> font());
//Adjust the thickness according to the font size, //Adjust the thickness according to the font size,
qreal w=0.3; qreal w=0.3;
if(this->font().pointSize() >= 5) if(this -> font().pointSize() >= 5) {
{
w = this -> font().pointSizeF()*0.1; w = this -> font().pointSizeF()*0.1;
if(w > 2.5) if(w > 2.5)
w = 2.5; w = 2.5;
@@ -547,24 +522,22 @@ void PartDynamicTextField::paint(QPainter *painter, const QStyleOptionGraphicsIt
* @brief PartDynamicTextField::elementInfoChanged * @brief PartDynamicTextField::elementInfoChanged
* Used to up to date this text field, when the element information (see elementScene) changed * Used to up to date this text field, when the element information (see elementScene) changed
*/ */
void PartDynamicTextField::elementInfoChanged() void PartDynamicTextField::elementInfoChanged() {
{
if(!elementScene()) if(!elementScene())
return; return;
if(m_text_from == DynamicElementTextItem::ElementInfo) 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()) 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(); m_alignment_rect = boundingRect();
} }
void PartDynamicTextField::finishAlignment() void PartDynamicTextField::finishAlignment() {
{
if(m_block_alignment) if(m_block_alignment)
return; return;
@@ -574,24 +547,20 @@ void PartDynamicTextField::finishAlignment()
x=xa=0; x=xa=0;
y=ya=0; y=ya=0;
if(m_alignment &Qt::AlignRight) if(m_alignment &Qt::AlignRight) {
{
x = m_alignment_rect.right(); x = m_alignment_rect.right();
xa = boundingRect().right(); xa = boundingRect().right();
} }
else if(m_alignment &Qt::AlignHCenter) else if(m_alignment &Qt::AlignHCenter) {
{
x = m_alignment_rect.center().x(); x = m_alignment_rect.center().x();
xa = boundingRect().center().x(); xa = boundingRect().center().x();
} }
if(m_alignment &Qt::AlignBottom) if(m_alignment &Qt::AlignBottom) {
{
y = m_alignment_rect.bottom(); y = m_alignment_rect.bottom();
ya = boundingRect().bottom(); ya = boundingRect().bottom();
} }
else if(m_alignment &Qt::AlignVCenter) else if(m_alignment &Qt::AlignVCenter) {
{
y = m_alignment_rect.center().y(); y = m_alignment_rect.center().y();
ya = boundingRect().center().y(); ya = boundingRect().center().y();
} }