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

Master element: improve how the comment is displayed when there isn't linked to a slave

Browse Source 
git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@3426 bfdf4180-ca20-0410-9c96-a3a8aa849046
This commit is contained in:
blacksun
2014-10-31 10:22:46 +00:00
parent eb2d3fcaa9
commit f071fc8d09
3 changed files with 51 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
sources/qetgraphicsitem/crossrefitem.cpp
View File

@@ -56,15 +56,7 @@ CrossRefItem::CrossRefItem(Element *elmt) :
* @brief CrossRefItem::~CrossRefItem
* Default destructor
*/
CrossRefItem::~CrossRefItem() {
if(m_properties.snapTo() == XRefProperties::Bottom) {
disconnect(m_element, SIGNAL(yChanged()), this, SLOT(autoPos()));
disconnect(m_element, SIGNAL(rotationChanged()), this, SLOT(autoPos()));
}
disconnect(m_element, SIGNAL(elementInfoChange(DiagramContext)), this, SLOT(updateLabel()));
disconnect(m_element -> diagram() -> project(), SIGNAL(projectDiagramsOrderChanged(QETProject*,int,int)), this, SLOT(updateLabel()));
disconnect(m_element -> diagram(), SIGNAL(XRefPropertiesChanged()), this, SLOT(updateProperties()));
}
CrossRefItem::~CrossRefItem() {}
/**
* @brief CrossRefItem::boundingRect
@@ -163,8 +155,10 @@ void CrossRefItem::updateProperties() {
* Update the content of the item
*/
void CrossRefItem::updateLabel() {
//init the shape
m_shape_path= QPainterPath();
//init the shape and bounding rect
m_shape_path = QPainterPath();
m_bounding_rect = QRectF();
//init the painter
QPainter qp;
qp.begin(&m_drawing);
@@ -173,12 +167,14 @@ void CrossRefItem::updateLabel() {
qp.setPen(pen_);
qp.setFont(QETApp::diagramTextsFont(5));
XRefProperties::DisplayHas dh = m_properties.displayHas();
if (dh == XRefProperties::Cross) {
drawHasCross(qp);
}
else if (dh == XRefProperties::Contacts) {
drawHasContacts(qp);
//Draw cross or contact, only if master element is linked.
if (! m_element->linkedElements().isEmpty()) {
XRefProperties::DisplayHas dh = m_properties.displayHas();
if (dh == XRefProperties::Cross)
drawHasCross(qp);
else if (dh == XRefProperties::Contacts)
drawHasContacts(qp);
}
AddExtraInfo(qp);
@@ -371,8 +367,8 @@ void CrossRefItem::drawHasContacts(QPainter &painter) {
else if (state == "SW") option = SW;
QString type = info["type"].toString();
if (type == "power") option += Power;
else if (type == "delayOn") option += DelayOn;
if (type == "power") option += Power;
else if (type == "delayOn") option += DelayOn;
else if (type == "delayOff") option += DelayOff;
drawContact(painter, option, elementPositionText(elmt));