5 files changed, 117 insertions, 46 deletions
diff --git a/Swift/QtUI/Whiteboard/GView.cpp b/Swift/QtUI/Whiteboard/GView.cpp
index 27197d0..92339ce 100644
--- a/Swift/QtUI/Whiteboard/GView.cpp
+++ b/Swift/QtUI/Whiteboard/GView.cpp
@@ -46,13 +46,35 @@ namespace Swift {
 		lastItem = 0;
 	}
 
-	QGraphicsItem* GView::getItem(const QString id) const {
-		return items_.value(id);
-	}
+	void GView::addItem(QGraphicsItem* item, QString id, int pos) {
+//		QList<QGraphicsItem*> items = scene()->items();
+//		std::cout << "pos: " << pos << " size: " << items.size() << std::endl;
+//		if (mousePressed && pos >= items_.size()) {
+//			pos++;
+//		}
+		if (pos > items_.size()) {
+			item->setZValue(zValue++);
+			scene()->addItem(item);
+			items_.append(item);
+		} else {
+			QList<QGraphicsItem*>::iterator it = items_.begin();
+			for (int i = 1; i < pos; i++) {
+				++it;
+			}
+			//	std::cout << id.toStdString() << " before: " << (*it)->data(100).toString().toStdString() << std::endl;
+			item->setZValue((*it)->zValue());
+			scene()->addItem(item);
+			item->stackBefore(*it);
+			//		--it;
+			items_.insert(it, item);
+		}
 
-	void GView::addItem(QGraphicsItem* item, QString id) {
-		scene()->addItem(item);
-		items_.insert(id, item);
+//		items = scene()->items();
+		std::cout << "items:" << 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;
 	}
 
 	void GView::setIDPrefix(QString prefix) {
@@ -182,19 +204,23 @@ namespace Swift {
 			QPointF point = this->mapToScene(event->pos());
 			QGraphicsItem* item = scene()->addLine(point.x(), point.y(), point.x(), point.y(), pen);
 			QString id = getNewID();
-			items_.insert(id, item);
-			item->setZValue(zValue++);
+//			items_.append(item);
+//			item->setZValue(zValue++);
+			item->setZValue(10000000);
 			item->setData(100, id);
+			item->setData(101, items_.size());
 			lastItem = item;
 		}
 		else if (mode == Rect) {
 			QPointF point = this->mapToScene(event->pos());
 			QGraphicsRectItem* item = scene()->addRect(point.x(), point.y(), 0, 0, pen, brush);
 			QString id = getNewID();
-			items_.insert(id, item);
-			item->setZValue(zValue++);
+//			items_.append(item);
+//			item->setZValue(zValue++);
+			item->setZValue(10000000);
 			item->setData(0, point);
 			item->setData(100, id);
+			item->setData(101, items_.size());
 			lastItem = item;
 		}
 		else if (mode == Rubber) {
@@ -213,21 +239,25 @@ namespace Swift {
 			QPointF point = this->mapToScene(event->pos());
 			QGraphicsEllipseItem* item = scene()->addEllipse(point.x(), point.y(), 0, 0, pen, brush);
 			QString id = getNewID();
-			items_.insert(id, item);
-			item->setZValue(zValue++);
+//			items_.append(item);
+//			item->setZValue(zValue++);
+			item->setZValue(10000000);
 			item->setData(0, point);
 			item->setData(100, id);
+			item->setData(101, items_.size());
 			lastItem = item;
 		}
 		else if (mode == HandLine) {
 			QPointF point = this->mapToScene(event->pos());
 			FreehandLineItem* item = new FreehandLineItem;
 			QString id = getNewID();
-			items_.insert(id, item);
+//			items_.append(item);
 			item->setPen(pen);
 			item->setStartPoint(point);
-			item->setZValue(zValue++);
+//			item->setZValue(zValue++);
+			item->setZValue(10000000);
 			item->setData(100, id);
+			item->setData(101, items_.size());
 			scene()->addItem(item);
 			lastItem = item;
 		}
@@ -236,19 +266,22 @@ namespace Swift {
 			QPainterPath path;
 			QGraphicsPathItem* item = scene()->addPath(path, pen, brush);
 			QString id = getNewID();
-			items_.insert(id, item);
-			item->setZValue(zValue++);
+//			items_.append(item);
+//			item->setZValue(zValue++);
+			item->setZValue(10000000);
 			item->setData(0, point);
 			item->setData(100, id);
+			item->setData(101, items_.size());
 			lastItem = item;
 		}
 		else if (mode == Text) {
 			QPointF point = this->mapToScene(event->pos());
 			QGraphicsTextItem* item = scene()->addText("");
 			QString id = getNewID();
-			items_.insert(id, item);
+			items_.append(item);
 			item->setZValue(zValue++);
 			item->setData(100, id);
+			item->setData(101, items_.size());
 			item->setDefaultTextColor(pen.color());
 			textDialog = new TextDialog(item, this);
 			connect(textDialog, SIGNAL(accepted(QGraphicsItem*)), this, SIGNAL(lastItemChanged(QGraphicsItem*)));
@@ -266,9 +299,11 @@ namespace Swift {
 				polygon.append(point);
 				item = scene()->addPolygon(polygon, pen, brush);
 				QString id = getNewID();
-				items_.insert(id, item);
-				item->setZValue(zValue++);
+//				items_.append(item);
+//				item->setZValue(zValue++);
+				item->setZValue(10000000);
 				item->setData(100, id);
+				item->setData(101, items_.size());
 				lastItem = item;
 			}
 			else {
@@ -302,7 +337,17 @@ namespace Swift {
 	void GView::mouseReleaseEvent(QMouseEvent *event)
 	{
 		mousePressed = false;
-		lastItemChanged(lastItem);
+		zValue++;
+		lastItem->setZValue(zValue++);
+		items_.append(lastItem);
+//		lastItemChanged(lastItem, lastItem->data(101).toInt());
+		std::cout << "items:" << 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;
+
+		lastItemChanged(lastItem, items_.size());
 	}
 
 
diff --git a/Swift/QtUI/Whiteboard/GView.h b/Swift/QtUI/Whiteboard/GView.h
index 0069fb5..9428f3d 100644
--- a/Swift/QtUI/Whiteboard/GView.h
+++ b/Swift/QtUI/Whiteboard/GView.h
@@ -31,8 +31,7 @@ namespace Swift {
 		void mouseMoveEvent(QMouseEvent* event);
 		void mousePressEvent(QMouseEvent* event);
 		void mouseReleaseEvent(QMouseEvent* event);
-		QGraphicsItem* getItem(const QString id) const;
-		void addItem(QGraphicsItem* item, QString id);
+		void addItem(QGraphicsItem* item, QString id, int pos);
 		void setIDPrefix(QString prefix);
 		void clear();
 
@@ -51,11 +50,12 @@ namespace Swift {
 		QGraphicsItem* lastItem;
 		QGraphicsRectItem* selectionRect;
 		TextDialog* textDialog;
-		QMap<QString, QGraphicsItem*> items_;
+//		QMap<QString, QGraphicsItem*> items_;
+		QList<QGraphicsItem*> items_;
 		SimpleIDGenerator idGenerator;
 		QString idPrefix;
 
 	signals:
-		void lastItemChanged(QGraphicsItem* item);
+		void lastItemChanged(QGraphicsItem* item, int pos);
 	};
 }
diff --git a/Swift/QtUI/Whiteboard/QtWhiteboardWindow.cpp b/Swift/QtUI/Whiteboard/QtWhiteboardWindow.cpp
index 5afc382..5743d80 100644
--- a/Swift/QtUI/Whiteboard/QtWhiteboardWindow.cpp
+++ b/Swift/QtUI/Whiteboard/QtWhiteboardWindow.cpp
@@ -15,6 +15,7 @@
 #include <Swiften/Elements/WhiteboardPayload.h>
 #include <Swiften/Whiteboard/Elements/WhiteboardLineElement.h>
 #include <Swiften/Whiteboard/Elements/WhiteboardRectElement.h>
+#include <Swiften/Whiteboard/Operations/WhiteboardInsertOperation.h>
 #include <Swift/QtUI/Whiteboard/WhiteboardElementDrawingVisitor.h>
 
 #include <QMessageBox>
@@ -35,7 +36,7 @@ namespace Swift {
 
 		graphicsView = new GView(scene, this);
 		graphicsView->setMode(GView::Line);
-		connect(graphicsView, SIGNAL(lastItemChanged(QGraphicsItem*)), this, SLOT(handleLastItemChanged(QGraphicsItem*)));
+		connect(graphicsView, SIGNAL(lastItemChanged(QGraphicsItem*, int)), this, SLOT(handleLastItemChanged(QGraphicsItem*, int)));
 
 		widthBox = new QSpinBox(this);
 		connect(widthBox, SIGNAL(valueChanged(int)), this, SLOT(changeLineWidth(int)));
@@ -132,8 +133,17 @@ namespace Swift {
 	}
 
 	void QtWhiteboardWindow::handleWhiteboardElementReceive(const WhiteboardElement::ref element) {
-		WhiteboardElementDrawingVisitor visitor(graphicsView);
-		element->accept(visitor);
+//		WhiteboardElementDrawingVisitor visitor(graphicsView);
+//		element->accept(visitor);
+	}
+
+	void QtWhiteboardWindow::handleWhiteboardOperationReceive(const WhiteboardOperation::ref operation) {
+		WhiteboardElementDrawingVisitor visitor(graphicsView, operation->getPos());
+		WhiteboardInsertOperation::ref insertOp = boost::dynamic_pointer_cast<WhiteboardInsertOperation>(operation);
+		if (insertOp) {
+			insertOp->getElement()->accept(visitor);
+			lastOpID = insertOp->getID();
+		}
 	}
 
 	void QtWhiteboardWindow::changeLineWidth(int i)
@@ -210,6 +220,7 @@ namespace Swift {
 		whiteboardSession_ = session;
 		graphicsView->setIDPrefix(P2QSTRING(whiteboardSession_->getClientID()));
 		whiteboardSession_->onElementReceived.connect(boost::bind(&QtWhiteboardWindow::handleWhiteboardElementReceive, this, _1));
+		whiteboardSession_->onOperationReceived.connect(boost::bind(&QtWhiteboardWindow::handleWhiteboardOperationReceive, this, _1));
 		whiteboardSession_->onRequestAccepted.connect(boost::bind(&QWidget::show, this));
 		whiteboardSession_->onSessionTerminateReceived.connect(boost::bind(&QtWhiteboardWindow::handleSessionTerminate, this));
 	}
@@ -218,8 +229,8 @@ namespace Swift {
 		QWidget::activateWindow();
 	}
 
-	void QtWhiteboardWindow::handleLastItemChanged(QGraphicsItem* item) {
-		std::string serialized;
+	void QtWhiteboardWindow::handleLastItemChanged(QGraphicsItem* item, int pos) {
+		WhiteboardElement::ref el;
 		QGraphicsLineItem* lineItem = qgraphicsitem_cast<QGraphicsLineItem*>(item);
 		if (lineItem != 0) {
 			QLine line = lineItem->line().toLine();
@@ -229,8 +240,8 @@ namespace Swift {
 			element->setPenWidth(lineItem->pen().width());
 
 			element->setID(lineItem->data(100).toString().toStdString());
-			whiteboardSession_->sendElement(element);
-
+//			whiteboardSession_->sendElement(element);
+			el = element;
 		}
 		FreehandLineItem* freehandLineItem = qgraphicsitem_cast<FreehandLineItem*>(item);
 		if (freehandLineItem != 0) {
@@ -247,7 +258,8 @@ namespace Swift {
 			element->setPoints(points);
 
 			element->setID(freehandLineItem->data(100).toString().toStdString());
-			whiteboardSession_->sendElement(element);
+//			whiteboardSession_->sendElement(element);
+			el = element;
 		}
 
 		QGraphicsRectItem* rectItem = qgraphicsitem_cast<QGraphicsRectItem*>(item);
@@ -262,7 +274,8 @@ namespace Swift {
 			element->setPenWidth(rectItem->pen().width());
 
 			element->setID(rectItem->data(100).toString().toStdString());
-			whiteboardSession_->sendElement(element);
+//			whiteboardSession_->sendElement(element);
+			el = element;
 		}
 
 		QGraphicsTextItem* textItem = qgraphicsitem_cast<QGraphicsTextItem*>(item);
@@ -275,7 +288,8 @@ namespace Swift {
 			element->setColor(Color(color.red(), color.green(), color.blue(), color.alpha()));
 
 			element->setID(rectItem->data(100).toString().toStdString());
-			whiteboardSession_->sendElement(element);
+//			whiteboardSession_->sendElement(element);
+			el = element;
 		}
 
 		QGraphicsPolygonItem* polygonItem = qgraphicsitem_cast<QGraphicsPolygonItem*>(item);
@@ -297,7 +311,8 @@ namespace Swift {
 			element->setPenWidth(polygonItem->pen().width());
 
 			element->setID(polygonItem->data(100).toString().toStdString());
-			whiteboardSession_->sendElement(element);
+//			whiteboardSession_->sendElement(element);
+			el = element;
 		}
 
 		QGraphicsEllipseItem* ellipseItem = qgraphicsitem_cast<QGraphicsEllipseItem*>(item);
@@ -316,8 +331,16 @@ namespace Swift {
 			element->setPenWidth(ellipseItem->pen().width());
 
 			element->setID(ellipseItem->data(100).toString().toStdString());
-			whiteboardSession_->sendElement(element);
+//			whiteboardSession_->sendElement(element);
+			el = element;
 		}
+		WhiteboardInsertOperation::ref insertOp = boost::make_shared<WhiteboardInsertOperation>();
+		insertOp->setID(el->getID());
+		insertOp->setPos(pos);
+		insertOp->setElement(el);
+		insertOp->setParentID(lastOpID);
+		lastOpID = el->getID();
+		whiteboardSession_->sendOperation(insertOp);
 	}
 
 	void QtWhiteboardWindow::handleSessionTerminate() {
diff --git a/Swift/QtUI/Whiteboard/QtWhiteboardWindow.h b/Swift/QtUI/Whiteboard/QtWhiteboardWindow.h
index fc55495..fbe98a7 100644
--- a/Swift/QtUI/Whiteboard/QtWhiteboardWindow.h
+++ b/Swift/QtUI/Whiteboard/QtWhiteboardWindow.h
@@ -49,11 +49,12 @@ namespace Swift {
 		void setTextMode();
 		void setPolygonMode();
 		void setSelectMode();
-		void handleLastItemChanged(QGraphicsItem* item);
+		void handleLastItemChanged(QGraphicsItem* item, int pos);
 
 	private:
 		void handleSessionTerminate();
 		void handleWhiteboardElementReceive(const WhiteboardElement::ref element);
+		void handleWhiteboardOperationReceive(const WhiteboardOperation::ref operation);
 		void closeEvent(QCloseEvent* event);
 
 	private:
@@ -79,6 +80,7 @@ namespace Swift {
 		QToolButton* polygonButton;
 		QToolButton* selectButton;
 
+		std::string lastOpID;
 		WhiteboardSession::ref whiteboardSession_;
 	};
 }
diff --git a/Swift/QtUI/Whiteboard/WhiteboardElementDrawingVisitor.h b/Swift/QtUI/Whiteboard/WhiteboardElementDrawingVisitor.h
index 38ed676..d9809b5 100644
--- a/Swift/QtUI/Whiteboard/WhiteboardElementDrawingVisitor.h
+++ b/Swift/QtUI/Whiteboard/WhiteboardElementDrawingVisitor.h
@@ -18,7 +18,7 @@
 namespace Swift {
 	class WhiteboardElementDrawingVisitor : public WhiteboardElementVisitor {
 	public:
-		WhiteboardElementDrawingVisitor(GView* graphicsView) : graphicsView_(graphicsView) {}
+		WhiteboardElementDrawingVisitor(GView* graphicsView, int pos) : graphicsView_(graphicsView), pos_(pos) {}
 
 		void visit(WhiteboardLineElement& element) {
 			QGraphicsLineItem *item = new QGraphicsLineItem(element.x1(), element.y1(), element.x2(), element.y2());
@@ -29,7 +29,7 @@ namespace Swift {
 			item->setPen(pen);
 			QString id = P2QSTRING(element.getID());
 			item->setData(100, id);
-			graphicsView_->addItem(item, id);
+			graphicsView_->addItem(item, id, pos_);
 		}
 
 		void visit(WhiteboardFreehandPathElement& element) {
@@ -48,7 +48,7 @@ namespace Swift {
 
 			QString id = P2QSTRING(element.getID());
 			item->setData(100, id);
-			graphicsView_->addItem(item, id);
+			graphicsView_->addItem(item, id, pos_);
 		}
 
 		void visit(WhiteboardRectElement& element) {
@@ -64,11 +64,11 @@ namespace Swift {
 			item->setBrush(brush);
 			QString id = P2QSTRING(element.getID());
 			item->setData(100, id);
-			graphicsView_->addItem(item, id);
+			graphicsView_->addItem(item, id, pos_);
 		}
 
 		void visit(WhiteboardPolygonElement& element) {
-			QGraphicsPolygonItem* item = qgraphicsitem_cast<QGraphicsPolygonItem*>(graphicsView_->getItem(P2QSTRING(element.getID())));
+			/*	QGraphicsPolygonItem* item = qgraphicsitem_cast<QGraphicsPolygonItem*>(graphicsView_->getItem(P2QSTRING(element.getID())));
 			if (item == 0) {
 				item = new QGraphicsPolygonItem();
 				QPen pen;
@@ -82,14 +82,14 @@ namespace Swift {
 				item->setBrush(brush);
 				QString id = P2QSTRING(element.getID());
 				item->setData(100, id);
-				graphicsView_->addItem(item, id);
+				graphicsView_->addItem(item, id, pos_);
 			}
 			QPolygonF polygon;
 			std::vector<std::pair<int, int> >::const_iterator it = element.getPoints().begin();
 			for (; it != element.getPoints().end(); ++it) {
 				polygon.append(QPointF(it->first, it->second));
 			}
-			item->setPolygon(polygon);
+			item->setPolygon(polygon);*/
 		}
 
 		void visit(WhiteboardTextElement& element) {
@@ -103,7 +103,7 @@ namespace Swift {
 
 			QString id = P2QSTRING(element.getID());
 			item->setData(100, id);
-			graphicsView_->addItem(item, id);
+			graphicsView_->addItem(item, id, pos_);
 		}
 
 		void visit(WhiteboardEllipseElement& element) {
@@ -124,10 +124,11 @@ namespace Swift {
 			item->setBrush(brush);
 			QString id = P2QSTRING(element.getID());
 			item->setData(100, id);
-			graphicsView_->addItem(item, id);
+			graphicsView_->addItem(item, id, pos_);
 		}
 
 	private:
 		GView* graphicsView_;
+		int pos_;
 	};
 }