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

Minor : remove a signal in diagram and use directly a signal of qetproject

Browse Source 
git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@4904 bfdf4180-ca20-0410-9c96-a3a8aa849046
This commit is contained in:
blacksun
2017-02-09 11:07:45 +00:00
parent 4b56501d1e
commit 9792e95e6f
6 changed files with 27 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
sources/qetgraphicsitem/reportelement.cpp
View File

@@ -41,7 +41,7 @@ ReportElement::ReportElement(const ElementsLocation &location, QString link_type
m_text_field -> setNoEditable();
link_type == "next_report"? link_type_=NextReport : link_type_=PreviousReport;
link_type == "next_report"? inverse_report=PreviousReport : inverse_report=NextReport;
link_type == "next_report"? m_inverse_report=PreviousReport : m_inverse_report=NextReport;
//We make these connections, to be always aware about the conductor properties
if (terminals().size())
@@ -84,14 +84,14 @@ void ReportElement::linkToElement(Element * elmt)
i = false;
//ensure elmt is an inverse report of this element
if ((elmt->linkType() == inverse_report) && i)
if ((elmt->linkType() == m_inverse_report) && i)
{
unlinkAllElements();
connected_elements << elmt;
connect(elmt, SIGNAL( xChanged() ), this, SLOT( updateLabel() ));
connect(elmt, SIGNAL( yChanged() ), this, SLOT( updateLabel() ));
connect(diagram(), SIGNAL( reportPropertiesChanged(QString) ), this, SLOT( setLabel(QString) ));
connect(diagram()->project(), &QETProject::reportPropertiesChanged, this, &ReportElement::reportPropertiesChange);
connect(diagram() -> project(), SIGNAL( projectDiagramsOrderChanged(QETProject*,int,int) ), this, SLOT( updateLabel() ));
if (elmt->terminals().size())
{
@@ -99,7 +99,7 @@ void ReportElement::linkToElement(Element * elmt)
connect(elmt->terminals().first(), &Terminal::conductorWasRemoved, this, &ReportElement::conductorWasRemoved);
}
label_ = diagram() -> defaultReportProperties();
m_label = diagram() -> defaultReportProperties();
if (!m_watched_conductor && elmt->conductors().size())
conductorWasAdded(elmt->conductors().first());
@@ -126,6 +126,7 @@ void ReportElement::unlinkAllElements()
{
disconnect(elmt, SIGNAL(xChanged()), this, SLOT(updateLabel()));
disconnect(elmt, SIGNAL(yChanged()), this, SLOT(updateLabel()));
disconnect(diagram()->project(), &QETProject::reportPropertiesChanged, this, &ReportElement::reportPropertiesChange);
disconnect(diagram()->project(), SIGNAL(projectDiagramsOrderChanged(QETProject*,int,int)), this, SLOT(updateLabel()));
if (elmt->terminals().size())
{
@@ -202,7 +203,7 @@ void ReportElement::conductorWasRemoved(Conductor *conductor)
* @param label new label
*/
void ReportElement::setLabel(QString label) {
label_ = label;
m_label = label;
updateLabel();
}
@@ -218,7 +219,7 @@ void ReportElement::updateLabel()
if (!connected_elements.isEmpty())
{
Element *elmt = connected_elements.at(0);
QString label = label_;
QString label = m_label;
label = autonum::AssignVariables::formulaToLabel(label, elmt->rSequenceStruct(), elmt->diagram(), elmt);
m_text_field -> setPlainText(label);
}
@@ -228,3 +229,9 @@ void ReportElement::updateLabel()
setTaggedText("function", (m_watched_conductor? m_watched_conductor->properties().m_function : ""));
setTaggedText("tension-protocol", (m_watched_conductor? m_watched_conductor->properties().m_tension_protocol : ""));
}
void ReportElement::reportPropertiesChange(const QString &old_str, const QString &new_str)
{
Q_UNUSED(old_str);
setLabel(new_str);
}