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

Added Cross Reference Labels for Master and Slave Element. Removed View Mode

Browse Source 
git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@4511 bfdf4180-ca20-0410-9c96-a3a8aa849046
This commit is contained in:
dfochi
2016-05-23 22:01:22 +00:00
parent 7229109ff4
commit ada71484e8
8 changed files with 122 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
sources/qetgraphicsitem/crossrefitem.cpp
View File

@@ -91,16 +91,13 @@ QPainterPath CrossRefItem::shape() const{
QString CrossRefItem::elementPositionText(const Element *elmt, const bool &add_prefix) const{
QString txt;
XRefProperties::ViewMode vw = m_properties.viewMode();
if (vw == XRefProperties::Index)
{
txt += QString::number(elmt->diagram()->folioIndex() + 1);
}
else if (vw == XRefProperties::FolioLabel){
txt += elmt->diagram()->border_and_titleblock.folio();
}
txt += "-";
txt += elmt->diagram()->convertPosition(elmt -> scenePos()).toString();
XRefProperties xrp = m_element->diagram()->defaultXRefProperties(m_element->kindInformations()["type"].toString());
txt = xrp.masterLabel();
txt.replace("%f", QString::number(elmt->diagram()->folioIndex()+1));
txt.replace("%F", elmt->diagram() -> border_and_titleblock.folio());
txt.replace("%c", QString::number(elmt->diagram() -> convertPosition(elmt -> scenePos()).number()));
txt.replace("%l", elmt->diagram() -> convertPosition(elmt -> scenePos()).letter());
if (add_prefix) {
if (elmt->kindInformations()["type"].toString() == "power") txt.prepend(m_properties.prefix("power"));
else if (elmt->kindInformations()["type"].toString().contains("delay")) txt.prepend(m_properties.prefix("delay"));

2
sources/qetgraphicsitem/crossrefitem.h
View File

@@ -62,6 +62,8 @@ class CrossRefItem : public QGraphicsObject
virtual QPainterPath shape () const;
QString elementPositionText (const Element *elmt, const bool &add_prefix = false) const;
void allElementsPositionText (QString &no_str, QString &nc_str,const bool &add_prefix = false) const;
void setTextLabel(QString label);
signals:

20
sources/qetgraphicsitem/slaveelement.cpp
View File

@@ -122,6 +122,7 @@ void SlaveElement::unlinkElement(Element *elmt)
* and add a qgraphicstextitem for show the position of the master
*/
void SlaveElement::updateLabel() {
QString label("_");
QString Xreflabel;
bool no_editable = false;
@@ -131,19 +132,12 @@ void SlaveElement::updateLabel() {
no_editable = true;
Element *elmt = linkedElements().first();
label = elmt -> elementInformations()["label"].toString();
XRefProperties m_properties = elmt->diagram()->defaultXRefProperties(elmt->kindInformations()["type"].toString());
Xreflabel = "(";
XRefProperties::ViewMode vw = m_properties.viewMode();
if (vw == XRefProperties::Index)
{
Xreflabel += QString::number(elmt->diagram()->folioIndex()+1);
}
else if (vw == XRefProperties::FolioLabel){
Xreflabel += elmt->diagram()->border_and_titleblock.folio();
}
Xreflabel += "-";
Xreflabel += elmt->diagram() -> convertPosition(elmt -> scenePos()).toString();
Xreflabel += ")";
XRefProperties xrp = elmt->diagram()->defaultXRefProperties(elmt->kindInformations()["type"].toString());
Xreflabel = xrp.slaveLabel();
Xreflabel.replace("%f", QString::number(elmt->diagram()->folioIndex()+1));
Xreflabel.replace("%F", elmt->diagram() -> border_and_titleblock.folio());
Xreflabel.replace("%c", QString::number(elmt->diagram() -> convertPosition(elmt -> scenePos()).number()));
Xreflabel.replace("%l", elmt->diagram() -> convertPosition(elmt -> scenePos()).letter());
}
// set the new label

2
sources/qetgraphicsitem/slaveelement.h
View File

@@ -38,8 +38,6 @@ class SlaveElement : public CustomElement
private:
QGraphicsTextItem *Xref_item;
//XRefProperties m_properties;
};
#endif // SLAVEELEMENT_H