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 new feature

Browse Source 
Add feature keep visual rotation.
When parent is rotated, the text rotation is changed to keep the same
visual rotation.
This commit is contained in:
Claveau Joshua
2020-11-20 20:52:19 +01:00
parent f7e12e5e87
commit 8fec6dabef
6 changed files with 90 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
sources/ui/dynamicelementtextmodel.cpp
View File

@@ -49,7 +49,8 @@ static int width_txt_row = 8;
static int x_txt_row = 9;
static int y_txt_row = 10;
static int rot_txt_row = 11;
static int align_txt_row = 12;
static int keep_rot_row = 12;
static int align_txt_row = 13;
static int align_grp_row = 0;
static int x_grp_row = 1;
@@ -335,10 +336,24 @@ QList<QStandardItem *> DynamicElementTextModel::itemsForText(
| Qt::ItemIsEnabled
| Qt::ItemIsEditable);
qsi_list.clear();;
qsi_list.clear();
qsi_list << rot << rot_a;
qsi->appendRow(qsi_list);
//keep visual rotation
auto keep_rotation = new QStandardItem(tr("Conserver la rotation visuel"));
keep_rotation->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled);
auto keep_rotation_a = new QStandardItem;
keep_rotation_a->setCheckable(true);
keep_rotation_a->setCheckState(deti->keepVisualRotation() ? Qt::Checked : Qt::Unchecked);
keep_rotation_a->setData(DynamicElementTextModel::keepVisualRotation, Qt::UserRole+1);
keep_rotation_a->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled | Qt::ItemIsUserCheckable);
qsi_list.clear();
qsi_list << keep_rotation << keep_rotation_a;
qsi->appendRow(qsi_list);
//Alignment
QStandardItem *alignment = new QStandardItem(tr("Alignement"));
alignment->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled);
@@ -600,6 +615,16 @@ QUndoCommand *DynamicElementTextModel::undoForEditedText(
quc->setText(tr("Pivoter un texte d'élément"));
}
}
if (text_qsi->child(keep_rot_row,1))
{
bool keep_rot = text_qsi->child(keep_rot_row, 1)->checkState() == Qt::Checked? true : false;
if (keep_rot != deti->keepVisualRotation())
{
auto qpuc = new QPropertyUndoCommand(deti, "keepVisualRotation", QVariant(deti->keepVisualRotation()), QVariant(keep_rot), undo);
qpuc->setText(tr("Modifier le maintient de la rotation d'un texte d'élément"));
}
}
//When text is in a groupe, they're isn't item for alignment of the text
if(text_qsi->child(align_txt_row, 1))