realAscot/qelectrotech-source-mirror
realAscot/qelectrotech-source-mirror
1
0
Fork 0
mirror of https://github.com/qelectrotech/qelectrotech-source-mirror.git synced 2025-09-13 20:23:04 +02:00
Code Packages Releases 1 Activity

Dynamic element text item : when the source of text is label or composite text with variable %{label}, and the label of the element is created from a formula,

Browse Source 
the displayed text of the dynamic text item is up to date according to the formula 


git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@5086 bfdf4180-ca20-0410-9c96-a3a8aa849046
This commit is contained in:
blacksun 2017-10-26 17:12:49 +00:00
parent 7e2134e0db
commit e2a49e4872
4 changed files with 149 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
sources/diagram.cpp
View File

@ -1014,13 +1014,18 @@ void Diagram::folioSequentialsFromXml(const QDomElement &root, QHash<QString, QS
* refresh all content of diagram.
* - refresh conductor text.
* - linking the elements waiting to be linked
* - Refresh the connection of the dynamic element text item (use for text with source of text label)
*/
void Diagram::refreshContents() {
foreach (Element *elmt, elements())
void Diagram::refreshContents()
{
for (Element *elmt : elements())
{
elmt->initLink(project());
for (DynamicElementTextItem *deti : elmt->dynamicTextItems())
deti->refreshLabelConnection();
}
foreach (Conductor *conductor, conductors())
for (Conductor *conductor : conductors())
conductor->refreshText();
}

131
sources/qetgraphicsitem/dynamicelementtextitem.cpp
View File

@ -266,6 +266,21 @@ Element *DynamicElementTextItem::elementUseForInfo() const
}
}
/**
* @brief DynamicElementTextItem::refreshLabelConnection
* Refresh the connection of this text when the source of text is label,
* or composite text, with a variable %{label}
*/
void DynamicElementTextItem::refreshLabelConnection()
{
if ((m_text_from == ElementInfo && m_info_name == "label") ||
(m_text_from == CompositeText && m_composite_text.contains("%{label}")))
{
setupFormulaConnection();
updateLabel();
}
}
/**
* @brief DynamicElementTextItem::textFrom
* @return what the final text is created from.
@ -282,6 +297,7 @@ DynamicElementTextItem::TextFrom DynamicElementTextItem::textFrom() const {
void DynamicElementTextItem::setTextFrom(DynamicElementTextItem::TextFrom text_from)
{
setNoEditable(text_from == UserText? false : true);
clearFormulaConnection();
if(text_from == UserText)
{
@ -290,6 +306,12 @@ void DynamicElementTextItem::setTextFrom(DynamicElementTextItem::TextFrom text_f
}
else if (text_from == ElementInfo && elementUseForInfo())
{
if(m_info_name == "label")
{
setupFormulaConnection();
updateLabel();
}
else
setPlainText(elementUseForInfo()->elementInformations().value(m_info_name).toString());
if(m_text_from == UserText)
@ -297,7 +319,14 @@ void DynamicElementTextItem::setTextFrom(DynamicElementTextItem::TextFrom text_f
}
else if (text_from == CompositeText && elementUseForInfo())
{
if(m_composite_text.contains("%{label}"))
{
setupFormulaConnection();
updateLabel();
}
else
setPlainText(autonum::AssignVariables::replaceVariable(m_composite_text, elementUseForInfo()->elementInformations()));
if(m_text_from == UserText)
connect(elementUseForInfo(), &Element::elementInfoChange, this, &DynamicElementTextItem::elementInfoChanged);
}
@ -358,6 +387,9 @@ void DynamicElementTextItem::setInfoName(const QString &info_name)
QString old_info_name = m_info_name;
m_info_name = info_name;
if(old_info_name == "label")
clearFormulaConnection();
if (m_parent_element && (m_parent_element.data()->linkType() & Element::AllReport)) //special treatment for report
{
if(old_info_name != info_name)
@ -374,6 +406,11 @@ void DynamicElementTextItem::setInfoName(const QString &info_name)
conductorPropertiesChanged();
}
}
else if (m_info_name == "label" && elementUseForInfo())
{
setupFormulaConnection();
updateLabel();
}
else if(elementUseForInfo()) {
setPlainText(elementUseForInfo()->elementInformations().value(info_name).toString());
}
@ -399,6 +436,9 @@ void DynamicElementTextItem::setCompositeText(const QString &text)
QString old_composite_text = m_composite_text;
m_composite_text = text;
if(old_composite_text.contains("%{label}"))
clearFormulaConnection();
if (m_parent_element && (m_parent_element.data()->linkType() & Element::AllReport)) //special treatment for report
{
/*
@ -414,6 +454,11 @@ void DynamicElementTextItem::setCompositeText(const QString &text)
updateReportText();
}
else if (m_composite_text.contains("%{label}") && elementUseForInfo())
{
setupFormulaConnection();
updateLabel();
}
else
{
DiagramContext dc;
@ -615,11 +660,33 @@ void DynamicElementTextItem::elementInfoChanged()
dc = elementUseForInfo()->elementInformations();
QString final_text;
Element *element = elementUseForInfo();
if (m_text_from == ElementInfo)
{
//If the info is the label, then we must to make some connection
//if the label is created from a formula
if(m_info_name == "label")
{
setupFormulaConnection();
if (dc.value("formula").toString().isEmpty())
final_text = dc.value(m_info_name).toString();
else
final_text = autonum::AssignVariables::formulaToLabel(dc.value("formula").toString(), element->rSequenceStruct(), element->diagram(), element);
}
else
final_text = dc.value(m_info_name).toString();
}
else if (m_text_from == CompositeText)
{
//If the composite have the label variable, we must to make some
//connection if the label is created from a formula
if (m_composite_text.contains("%{label}"))
setupFormulaConnection();
final_text = autonum::AssignVariables::replaceVariable(m_composite_text, dc);
}
else if (m_text_from == UserText)
final_text = m_text;
@ -758,6 +825,52 @@ void DynamicElementTextItem::removeConnectionForReportFormula(const QString &for
}
/**
* @brief DynamicElementTextItem::setupFormulaConnection
* Setup the required connection for the formula of the label.
*/
void DynamicElementTextItem::setupFormulaConnection()
{
if ((m_text_from == ElementInfo && m_info_name == "label") ||
(m_text_from == CompositeText && m_composite_text.contains("%{label}")))
{
clearFormulaConnection();
Element *element = elementUseForInfo();
if (!element)
return;
Diagram *diagram = element->diagram();
QString formula = element->elementInformations().value("formula").toString();
//Label is frozen, so we don't update it.
if (element->isFreezeLabel())
return;
if (diagram && formula.contains("%F"))
{
m_F_str = diagram->border_and_titleblock.folio();
formula.replace("%F", m_F_str);
m_formula_connection << connect(&diagram->border_and_titleblock, &BorderTitleBlock::titleBlockFolioChanged, this, &DynamicElementTextItem::updateLabel);
}
if (diagram && (formula.contains("%f") || formula.contains("%id")))
m_formula_connection << connect(diagram->project(), &QETProject::projectDiagramsOrderChanged, this, &DynamicElementTextItem::updateLabel);
if (formula.contains("%l"))
m_formula_connection << connect(element, &Element::yChanged, this, &DynamicElementTextItem::updateLabel);
if (formula.contains("%c"))
m_formula_connection << connect(element, &Element::xChanged, this, &DynamicElementTextItem::updateLabel);
}
}
void DynamicElementTextItem::clearFormulaConnection()
{
for (QMetaObject::Connection con : m_formula_connection)
disconnect(con);
m_formula_connection.clear();
}
void DynamicElementTextItem::updateReportFormulaConnection()
{
removeConnectionForReportFormula(m_report_formula);
@ -783,6 +896,24 @@ void DynamicElementTextItem::updateReportText()
}
}
void DynamicElementTextItem::updateLabel()
{
if ((m_text_from == ElementInfo && m_info_name == "label") ||
(m_text_from == CompositeText && m_composite_text.contains("%{label}")))
{
DiagramContext dc;
if(elementUseForInfo())
dc = elementUseForInfo()->elementInformations();
Element *element = elementUseForInfo();
if(m_text_from == ElementInfo)
setPlainText(autonum::AssignVariables::formulaToLabel(dc.value("formula").toString(), element->rSequenceStruct(), element->diagram(), element));
else if (m_text_from == CompositeText)
setPlainText(autonum::AssignVariables::replaceVariable(m_composite_text, dc));
}
}
/**
* @brief DynamicElementTextItem::conductorWasAdded
* Function only use when parent element is a folio report

5
sources/qetgraphicsitem/dynamicelementtextitem.h
View File

@ -76,6 +76,7 @@ class DynamicElementTextItem : public DiagramTextItem
Element *parentElement() const;
Element *elementUseForInfo() const;
void refreshLabelConnection();
DynamicElementTextItem::TextFrom textFrom() const;
void setTextFrom (DynamicElementTextItem::TextFrom text_from);
@ -104,8 +105,11 @@ class DynamicElementTextItem : public DiagramTextItem
void reportFormulaChanged();
void setConnectionForReportFormula(const QString &formula);
void removeConnectionForReportFormula(const QString &formula);
void setupFormulaConnection();
void clearFormulaConnection();
void updateReportFormulaConnection();
void updateReportText();
void updateLabel();
void conductorWasAdded(Conductor *conductor);
void conductorWasRemoved(Conductor *conductor);
void setPotentialConductor();
@ -126,6 +130,7 @@ class DynamicElementTextItem : public DiagramTextItem
DynamicElementTextItem::TextFrom m_text_from = UserText;
QUuid m_uuid;
QMetaObject::Connection m_report_formula_con;
QList<QMetaObject::Connection> m_formula_connection;
QColor m_user_color;
};

1
sources/qetgraphicsitem/element.h
View File

@ -149,6 +149,7 @@ class Element : public QetGraphicsItem
void setPrefix(QString);
QString getPrefix() const;
void freezeLabel(bool freeze);
bool isFreezeLabel() const {return m_freeze_label;}
void freezeNewAddedElement();
protected: