summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMateusz Piekos <mateuszpiekos@gmail.com>2012-07-26 15:46:45 (GMT)
committerMateusz Piekos <mateuszpiekos@gmail.com>2012-07-26 15:46:45 (GMT)
commit2e9ba0fb5a68abd8fa44d9996ea321a77876af14 (patch)
tree23a1bdf024045ad619af906bf2438dd05fa3c8fe /Swift/QtUI/Whiteboard/GView.cpp
parent833e544490a0e3ff5eeebe44fae2b9a8f98d4a78 (diff)
downloadswift-contrib-2e9ba0fb5a68abd8fa44d9996ea321a77876af14.zip
swift-contrib-2e9ba0fb5a68abd8fa44d9996ea321a77876af14.tar.bz2
Improved handling of operations IDs and transformations
Diffstat (limited to 'Swift/QtUI/Whiteboard/GView.cpp')
-rw-r--r--Swift/QtUI/Whiteboard/GView.cpp13
1 files changed, 8 insertions, 5 deletions
diff --git a/Swift/QtUI/Whiteboard/GView.cpp b/Swift/QtUI/Whiteboard/GView.cpp
index 5f10329..163cab0 100644
--- a/Swift/QtUI/Whiteboard/GView.cpp
+++ b/Swift/QtUI/Whiteboard/GView.cpp
@@ -75,11 +75,11 @@ namespace Swift {
item->stackBefore(temp);
items_.insert(pos-1, item);
}
- std::cout << "items in:" << std::endl;
+ /*std::cout << "items in:" << std::endl;
for (QList<QGraphicsItem*>::const_iterator it = items_.begin(); it != items_.end(); ++it) {
std::cout << (*it)->data(100).toString().toStdString() << std::endl;
}
- std::cout << std::endl;
+ std::cout << std::endl;*/
}
void GView::setIDPrefix(QString prefix) {
@@ -90,6 +90,8 @@ namespace Swift {
scene()->clear();
items_.clear();
itemsMap_.clear();
+ lastItem = 0;
+ selectionRect = 0;
}
QGraphicsItem* GView::getItem(QString id) {
@@ -249,8 +251,9 @@ namespace Swift {
{
QGraphicsItem* item = scene()->items(rect).first();
QString id = item->data(100).toString();
+ int pos = items_.indexOf(item)+1;
+ itemDeleted(id, pos);
deleteItem(id);
- itemDeleted(id, items_.indexOf(item)+1);
}
}
else if (mode == Circle) {
@@ -354,11 +357,11 @@ namespace Swift {
lastItem->setZValue(zValue++);
items_.append(lastItem);
itemsMap_.insert(lastItem->data(100).toString(), lastItem);
- std::cout << "items out:" << std::endl;
+ /*std::cout << "items out:" << std::endl;
for (QList<QGraphicsItem*>::const_iterator it = items_.begin(); it != items_.end(); ++it) {
std::cout << (*it)->data(100).toString().toStdString() << std::endl;
}
- std::cout << std::endl;
+ std::cout << std::endl;*/
lastItemChanged(lastItem, items_.size(), New);
} else if (selectionRect){