kotschak/qelectrotech-source-mirror
0
0
Fork 0
mirror of https://github.com/qelectrotech/qelectrotech-source-mirror.git synced 2026-01-07 22:22:33 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Element editor : text field can now have a composite text as source of text

Browse Source 
git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@5265 bfdf4180-ca20-0410-9c96-a3a8aa849046
This commit is contained in:
blacksun
2018-03-11 16:00:58 +00:00
parent 9b3c496fc5
commit 7f8c5ef2b5
5 changed files with 69 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
sources/editor/graphicspart/partdynamictextfield.cpp
View File

@@ -277,6 +277,8 @@ QString PartDynamicTextField::infoName() const{
void PartDynamicTextField::setCompositeText(const QString &text)
{
m_composite_text = text;
if(elementScene())
setPlainText(autonum::AssignVariables::replaceVariable(m_composite_text, elementScene()->elementInformation()));
emit compositeTextChanged(m_composite_text);
}
@@ -483,9 +485,11 @@ void PartDynamicTextField::paint(QPainter *painter, const QStyleOptionGraphicsIt
*/
void PartDynamicTextField::elementInfoChanged()
{
if(!elementScene())
return;
if(m_text_from == DynamicElementTextItem::ElementInfo)
{
DiagramContext dc = elementScene()->elementInformation();
setPlainText(dc.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()));
}

15
sources/editor/ui/dynamictextfieldeditor.cpp
View File

@@ -22,6 +22,7 @@
#include "QPropertyUndoCommand/qpropertyundocommand.h"
#include "qetelementeditor.h"
#include "qetapp.h"
#include "compositetexteditdialog.h"
#include <QPointer>
#include <QGraphicsItem>
@@ -277,3 +278,17 @@ void DynamicTextFieldEditor::on_m_text_from_cb_activated(int index)
undoStack().push(undo);
}
}
void DynamicTextFieldEditor::on_m_composite_text_pb_clicked()
{
CompositeTextEditDialog ctd(m_text_field.data()->compositeText(), this);
if(ctd.exec())
{
QString ct = ctd.plainText();
if(ct != m_text_field.data()->compositeText())
{
QPropertyUndoCommand *undo = new QPropertyUndoCommand(m_text_field.data(), "compositeText", m_text_field.data()->compositeText(), ctd.plainText());
undoStack().push(undo);
}
}
}

2
sources/editor/ui/dynamictextfieldeditor.h
View File

@@ -57,6 +57,8 @@ class DynamicTextFieldEditor : public ElementItemEditor
void on_m_elmt_info_cb_activated(const QString &arg1);
void on_m_text_from_cb_activated(int index);
void on_m_composite_text_pb_clicked();
private:
Ui::DynamicTextFieldEditor *ui;
QPointer<PartDynamicTextField> m_text_field;