From 9792e95e6ffd10c46e2f08480069805592ce11c2 Mon Sep 17 00:00:00 2001 From: blacksun Date: Thu, 9 Feb 2017 11:07:45 +0000 Subject: [PATCH] Minor : remove a signal in diagram and use directly a signal of qetproject git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@4904 bfdf4180-ca20-0410-9c96-a3a8aa849046 --- sources/diagram.cpp | 6 +----- sources/diagram.h | 1 - sources/qetgraphicsitem/reportelement.cpp | 19 +++++++++++++------ sources/qetgraphicsitem/reportelement.h | 5 +++-- sources/qetproject.cpp | 13 ++++++++----- sources/qetproject.h | 4 ++-- 6 files changed, 27 insertions(+), 21 deletions(-) diff --git a/sources/diagram.cpp b/sources/diagram.cpp index 9b99928c3..20ebabb09 100644 --- a/sources/diagram.cpp +++ b/sources/diagram.cpp @@ -1697,15 +1697,11 @@ void Diagram::setProject(QETProject *project) if (m_project == project) return; if (m_project) - { - disconnect (m_project, SIGNAL(reportPropertiesChanged(QString)), this, SIGNAL(reportPropertiesChanged(QString))); disconnect (m_project, SIGNAL(XRefPropertiesChanged()), this, SIGNAL(XRefPropertiesChanged())); - } m_project = project; setParent (project); - - connect (m_project, SIGNAL(reportPropertiesChanged(QString)), this, SIGNAL(reportPropertiesChanged(QString))); + connect (m_project, SIGNAL(XRefPropertiesChanged()), this, SIGNAL(XRefPropertiesChanged())); } diff --git a/sources/diagram.h b/sources/diagram.h index 62957ac40..1bf4f4c34 100644 --- a/sources/diagram.h +++ b/sources/diagram.h @@ -255,7 +255,6 @@ class Diagram : public QGraphicsScene void diagramTitleChanged(Diagram *, const QString &); void findElementRequired(const ElementsLocation &); /// Signal emitted when users wish to locate an element from the diagram within elements collection void editElementRequired(const ElementsLocation &); /// Signal emitted when users wish to edit an element from the diagram - void reportPropertiesChanged(QString); void XRefPropertiesChanged(); void diagramActivated(); }; diff --git a/sources/qetgraphicsitem/reportelement.cpp b/sources/qetgraphicsitem/reportelement.cpp index 61effaeb6..de4d11c32 100644 --- a/sources/qetgraphicsitem/reportelement.cpp +++ b/sources/qetgraphicsitem/reportelement.cpp @@ -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); +} diff --git a/sources/qetgraphicsitem/reportelement.h b/sources/qetgraphicsitem/reportelement.h index ebf4945da..995559131 100644 --- a/sources/qetgraphicsitem/reportelement.h +++ b/sources/qetgraphicsitem/reportelement.h @@ -39,8 +39,8 @@ class ReportElement : public CustomElement virtual void unlinkElement(Element *elmt); private: - int inverse_report; - QString label_; + int m_inverse_report; + QString m_label; ElementTextItem *m_text_field; Conductor *m_watched_conductor; @@ -51,6 +51,7 @@ class ReportElement : public CustomElement private slots: void setLabel (QString label); void updateLabel(); + void reportPropertiesChange(const QString &old_str, const QString &new_str); }; #endif // REPORTELEMENT_H diff --git a/sources/qetproject.cpp b/sources/qetproject.cpp index beb3c2613..0806bd16c 100644 --- a/sources/qetproject.cpp +++ b/sources/qetproject.cpp @@ -383,12 +383,15 @@ void QETProject::setDefaultConductorProperties(const ConductorProperties &conduc } QString QETProject::defaultReportProperties() const { - return default_report_properties_; + return m_default_report_properties; } -void QETProject::setDefaultReportProperties(const QString &properties) { - default_report_properties_ = properties; - emit reportPropertiesChanged(properties); +void QETProject::setDefaultReportProperties(const QString &properties) +{ + QString old = m_default_report_properties; + m_default_report_properties = properties; + + emit reportPropertiesChanged(old, properties); } void QETProject::setDefaultXRefProperties(const QString type, const XRefProperties &properties) { @@ -1345,7 +1348,7 @@ void QETProject::readDefaultPropertiesXml(QDomDocument &xml_project) default_border_properties_ = BorderProperties:: defaultProperties(); default_titleblock_properties_ = TitleBlockProperties::defaultProperties(); default_conductor_properties_ = ConductorProperties:: defaultProperties(); - default_report_properties_ = ReportProperties:: defaultProperties(); + m_default_report_properties = ReportProperties:: defaultProperties(); m_default_xref_properties = XRefProperties:: defaultProperties(); //Read values indicate in project diff --git a/sources/qetproject.h b/sources/qetproject.h index 8ef805e0d..aafd5a282 100644 --- a/sources/qetproject.h +++ b/sources/qetproject.h @@ -183,7 +183,7 @@ class QETProject : public QObject void projectDiagramsOrderChanged(QETProject *, int, int); void diagramUsedTemplate(TitleBlockTemplatesCollection *, const QString &); void readOnlyChanged(QETProject *, bool); - void reportPropertiesChanged(QString); + void reportPropertiesChanged(const QString &old_str, const QString &new_str); void XRefPropertiesChanged (); void addAutoNumDiagram(); void elementAutoNumAdded(QString name); @@ -242,7 +242,7 @@ class QETProject : public QObject /// Default title block properties for new diagrams created within the project TitleBlockProperties default_titleblock_properties_; /// Default report properties - QString default_report_properties_; + QString m_default_report_properties; /// Default xref properties QHash m_default_xref_properties; /// Embedded title block templates collection