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

cross ref item: don't show postion of element 'power'.

Browse Source 
git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@2959 bfdf4180-ca20-0410-9c96-a3a8aa849046
This commit is contained in:
blacksun
2014-04-02 17:36:40 +00:00
parent e686dc4405
commit 1ce608e7df
2 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
sources/qetgraphicsitem/crossrefitem.cpp
View File

@@ -89,7 +89,7 @@ void CrossRefItem::updateLabel() {
//draw the cross //draw the cross
QRectF br = boundingRect(); QRectF br = boundingRect();
qp.drawLine(br.width()/2, 0, br.width()/2, br.height() - text_rect_.height()); //vertical line qp.drawLine(br.width()/2, 0, br.width()/2, br.height() - text_rect_.height()); //vertical line
qp.drawLine(br.width()/2-25, header, br.width()/2+25, header); //horizontal line qp.drawLine(br.width()/2-(crossWidth/2), header, br.width()/2+(crossWidth/2), header); //horizontal line
//draw the symbolic NO //draw the symbolic NO
qreal xoffset = br.width()/2 - 25; qreal xoffset = br.width()/2 - 25;
@@ -277,6 +277,7 @@ void CrossRefItem::fillCrossRef(QPainter &painter) {
//find each no and nc of connected element to element_ //find each no and nc of connected element to element_
foreach (Element *elmt, element_->linkedElements()) { foreach (Element *elmt, element_->linkedElements()) {
if (elmt->kindInformations()["type"].toString() == "power") continue;
QString state = elmt->kindInformations()["state"].toString(); QString state = elmt->kindInformations()["state"].toString();
if (state == "NO") NO_list << elmt; if (state == "NO") NO_list << elmt;
else if (state == "NC") NC_list << elmt; else if (state == "NC") NC_list << elmt;

13
sources/qetgraphicsitem/masterelement.cpp
View File

@@ -53,11 +53,13 @@ void MasterElement::linkToElement(Element *elmt) {
if (elmt->linkType() == Slave && !connected_elements.contains(elmt)) { if (elmt->linkType() == Slave && !connected_elements.contains(elmt)) {
connected_elements << elmt; connected_elements << elmt;
elmt->linkToElement(this); elmt->linkToElement(this);
//create cross ref item if not yet
if (!cri_) cri_ = new CrossRefItem(this, this); if (elmt->kindInformations()["type"].toString() != "power") {
if (!cri_) cri_ = new CrossRefItem(this, this); //create cross ref item if not yet
connect(elmt, SIGNAL(positionChange(QPointF)), cri_, SLOT(updateLabel())); connect(elmt, SIGNAL(positionChange(QPointF)), cri_, SLOT(updateLabel()));
cri_->updateLabel(); cri_->updateLabel();
} }
}
} }
/** /**
@@ -85,7 +87,12 @@ void MasterElement::unlinkElement(Element *elmt) {
elmt->unlinkElement(this); elmt->unlinkElement(this);
//update the graphics cross ref //update the graphics cross ref
disconnect(elmt, SIGNAL(positionChange(QPointF)), cri_, SLOT(updateLabel())); disconnect(elmt, SIGNAL(positionChange(QPointF)), cri_, SLOT(updateLabel()));
if (isFree()) {
bool delete_cri = true;
foreach(Element *elmt, linkedElements())
if (elmt->kindInformations()["type"].toString() != "power") delete_cri = false;
if (delete_cri) {
delete cri_; delete cri_;
cri_ = 0; cri_ = 0;
} }