kotschak/qelectrotech-source-mirror
0
0
Fork 0
mirror of https://github.com/qelectrotech/qelectrotech-source-mirror.git synced 2025-12-17 12:40:35 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Dynamic element text item editor : add entry for edit the rotation of the edited text.

Browse Source 
git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@5125 bfdf4180-ca20-0410-9c96-a3a8aa849046
This commit is contained in:
blacksun
2017-11-29 19:17:02 +00:00
parent 4e440456fc
commit ea5cb340d5
2 changed files with 44 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
sources/ui/dynamicelementtextmodel.cpp
View File

@@ -241,6 +241,19 @@ QList<QStandardItem *> DynamicElementTextModel::itemsForText(DynamicElementTextI
qsi_list.clear();
qsi_list << y_pos << y_pos_a;
qsi->appendRow(qsi_list);
//Rotation
QStandardItem *rot = new QStandardItem(tr("Rotation"));
rot->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled);
QStandardItem *rot_a = new QStandardItem;
rot_a->setData(deti->rotation(), Qt::EditRole);
rot_a->setData(DynamicElementTextModel::rotation, Qt::UserRole+1);
rot_a->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled | Qt::ItemIsEditable);
qsi_list.clear();;
qsi_list << rot << rot_a;
qsi->appendRow(qsi_list);
}
@@ -447,6 +460,17 @@ QUndoCommand *DynamicElementTextModel::undoForEditedText(DynamicElementTextItem
quc->setText(tr("Déplacer un texte d'élément"));
}
}
//When text is in a group, they're isn't item for the rotation of the text
if(text_qsi->child(7,1))
{
qreal rot = text_qsi->child(7,1)->data(Qt::EditRole).toDouble();
rot = QET::correctAngle(rot);
if(rot != deti->rotation())
{
QPropertyUndoCommand *quc = new QPropertyUndoCommand(deti, "rotation", QVariant(deti->rotation()), QVariant(rot), undo);
quc->setText(tr("Pivoter un texte d'élément"));
}
}
return undo;
}
@@ -686,6 +710,7 @@ void DynamicElementTextModel::setConnection(DynamicElementTextItem *deti, bool s
connection_list << connect(deti, &DynamicElementTextItem::xChanged, [deti,this](){this->updateDataFromText(deti, pos);});
connection_list << connect(deti, &DynamicElementTextItem::yChanged, [deti,this](){this->updateDataFromText(deti, pos);});
connection_list << connect(deti, &DynamicElementTextItem::frameChanged, [deti,this](){this->updateDataFromText(deti, frame);});
connection_list << connect(deti, &DynamicElementTextItem::rotationChanged, [deti,this](){this->updateDataFromText(deti, rotation);});
connection_list << connect(deti, &DynamicElementTextItem::compositeTextChanged, [deti, this]() {this->updateDataFromText(deti, compositeText);});
m_hash_text_connect.insert(deti, connection_list);
@@ -775,6 +800,12 @@ void DynamicElementTextModel::updateDataFromText(DynamicElementTextItem *deti, V
qsi->child(4,1)->setCheckState(deti->frame()? Qt::Checked : Qt::Unchecked);
break;
}
case rotation:
{
if(qsi->child(7,1))
qsi->child(7,1)->setData(deti->rotation(), Qt::EditRole);
break;
}
}
m_block_dataForTextChanged = false;
@@ -867,6 +898,16 @@ QWidget *DynamicTextItemDelegate::createEditor(QWidget *parent, const QStyleOpti
sb->setSuffix(" px");
return sb;
}
case DynamicElementTextModel::rotation:
{
QSpinBox *sb = new QSpinBox(parent);
sb->setObjectName("rot_spinbox");
sb->setRange(0, 359);
sb->setWrapping(true);
sb->setFrame(false);
sb->setSuffix(" °");
return sb;
}
}
return QStyledItemDelegate::createEditor(parent, option, index);
}
@@ -942,7 +983,7 @@ bool DynamicTextItemDelegate::eventFilter(QObject *object, QEvent *event)
//in normal behavior, the value is commited when the spinbox lose focus or enter key is pressed
//With this hack the value is commited each time the value change, so the text is moved in live.
//We also use this hack for the font size spinbox
if(object->objectName() == "pos_dialog" || object->objectName() == "font_size")
if(object->objectName() == "pos_dialog" || object->objectName() == "font_size" || object->objectName() == "rot_spinbox")
{
QSpinBox *sb = static_cast<QSpinBox *>(object);
if(event->type() == QEvent::KeyRelease)

3
sources/ui/dynamicelementtextmodel.h
View File

@@ -46,7 +46,8 @@ class DynamicElementTextModel : public QStandardItemModel
tagg,
color,
pos,
frame
frame,
rotation
};
DynamicElementTextModel(Element *element, QObject *parent = nullptr);