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

Light, rename all LEDOS to SHS

Browse Source 
git-svn-id: svn://db.shs.com.ru/libs@15 a8b55f48-bf90-11e4-a774-851b48703e85
This commit is contained in:
Пелипенко Иван
2015-05-08 09:20:52 +00:00
parent f40dff56ab
commit 3bd8997ee3
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
qad_blockview/blockview.cpp
View File

@@ -223,15 +223,18 @@ bool BlockView::eventFilter(QObject * o, QEvent * e) {
unmarkPins(true); unmarkPins(true);
reconnectAll(); reconnectAll();
tmp_bus.hide(); tmp_bus.hide();
tmp_bus.clear();
} }
if (new_branch && mm_cancel) { if (new_branch && mm_cancel) {
new_branch = false; new_branch = false;
tmp_bus.hide(); tmp_bus.hide();
tmp_bus.clear();
} }
if (moved && mm_cancel) { if (moved && mm_cancel) {
moved = false; moved = false;
restoreSelState(); restoreSelState();
tmp_bus.hide(); tmp_bus.hide();
tmp_bus.clear();
} }
if (mm_cancel) return true; if (mm_cancel) return true;
mm_mods = me->modifiers(); mm_mods = me->modifiers();
@@ -481,6 +484,7 @@ bool BlockView::eventFilter(QObject * o, QEvent * e) {
} }
unmarkPins(); unmarkPins();
tmp_bus.hide(); tmp_bus.hide();
tmp_bus.clear();
reconnectAll(); reconnectAll();
} }
clearBusStates(); clearBusStates();
@@ -1098,6 +1102,7 @@ bool BlockView::connectTmpToBus(BlockBusItem * bus) {
bus->segments << QPair<int, int>(lp + i, lp + i + 1); bus->segments << QPair<int, int>(lp + i, lp + i + 1);
bus->segments << QPair<int, int>(np, lp + tmp_bus.pol.size() - 1); bus->segments << QPair<int, int>(np, lp + tmp_bus.pol.size() - 1);
bus->updateGeometry(); bus->updateGeometry();
tmp_bus.clear();
return true; return true;
} }
@@ -1256,6 +1261,7 @@ void BlockView::newBranchAccept(BlockBusItem * item) {
item->updateGeometry(); item->updateGeometry();
emit actionEvent(BlockItemBase::BusAdd, QList<QGraphicsItem*>() << item); emit actionEvent(BlockItemBase::BusAdd, QList<QGraphicsItem*>() << item);
emit connectionsChanged(); emit connectionsChanged();
tmp_bus.clear();
} }
@@ -1264,6 +1270,7 @@ void BlockView::newBranchCancel() {
//qDebug() << "cancel"; //qDebug() << "cancel";
new_branch = false; new_branch = false;
tmp_bus.hide(); tmp_bus.hide();
tmp_bus.clear();
} }