SHS/qad
4
1
Fork 0
Code Issues 5 Pull Requests Releases Wiki Activity

git-svn-id: svn://db.shs.com.ru/libs@80 a8b55f48-bf90-11e4-a774-851b48703e85

Browse Source
This commit is contained in:
Пелипенко Иван
2016-02-11 21:25:09 +00:00
parent f20fc99f25
commit 84e62087a1
2 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
qad_blockview/blockbusitem.cpp
View File

@@ -368,10 +368,21 @@ void BlockBusItem::hoverMoveEvent(QGraphicsSceneHoverEvent * e) {
return; return;
} }
setToolTip(QString()); setToolTip(QString());
QList<QGraphicsItem * > il = scene()->items(Qt::DescendingOrder); QList<QGraphicsItem * > il = scene()->items(sp, Qt::ContainsItemBoundingRect, Qt::DescendingOrder), bil;
for (int i = 0; i < il.size(); ++i) bil << this;
if (il[i]->data(1005) == "connection" && il[i] != this) for (int i = 0; i < il.size(); ++i) {
{stackBefore(il[i]);} QGraphicsItem * b = il[i];
if (b->data(1005) == "connection" && b != this) {
int tp = -1, ts = -1;
((BlockBusItem*)b)->testPoint(sp, &tp, &ts);
if (tp >= 0 || ts >= 0) {
foreach (QGraphicsItem * b2, bil)
b2->stackBefore(b);
break;
}
bil << b;
}
}
update(); update();
} }

2
qad_blockview/blockview.cpp
View File

@@ -1151,7 +1151,7 @@ void BlockView::moveBuses(const QList<QGraphicsItem * > & items, QPointF dp) {
buses << qgraphicsitem_cast<BlockBusItem*>(i); buses << qgraphicsitem_cast<BlockBusItem*>(i);
foreach (BlockBusItem * b, buses) { foreach (BlockBusItem * b, buses) {
QList<BlockItemPin * > bpins = b->connections_.values(); QList<BlockItemPin * > bpins = b->connections_.values();
if (bpins.size() == b->endpointCount()) { if (!bpins.isEmpty()) {
foreach (BlockItemPin * p, pins) foreach (BlockItemPin * p, pins)
bpins.removeAll(p); bpins.removeAll(p);
if (bpins.isEmpty()) { if (bpins.isEmpty()) {