Swiftdiff options
| author | Mateusz Piekos <mateuszpiekos@gmail.com> | 2012-06-26 12:23:47 (GMT) |
|---|---|---|
| committer | Mateusz Piekos <mateuszpiekos@gmail.com> | 2012-06-26 12:23:47 (GMT) |
| commit | 60076b8e5dc557716e82d7588ff9a99247e485bf (patch) | |
| tree | 9d8cc54bed7036f93098cf60b76288217c1f06e3 /Swift/QtUI/Whiteboard/GView.cpp | |
| parent | 99bc38e1d21b0081618485e49b0ab1bcd5bef22f (diff) | |
| download | swift-contrib-60076b8e5dc557716e82d7588ff9a99247e485bf.zip swift-contrib-60076b8e5dc557716e82d7588ff9a99247e485bf.tar.bz2 | |
Added handling of text elements
Diffstat (limited to 'Swift/QtUI/Whiteboard/GView.cpp')
| -rw-r--r-- | Swift/QtUI/Whiteboard/GView.cpp | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/Swift/QtUI/Whiteboard/GView.cpp b/Swift/QtUI/Whiteboard/GView.cpp index badbb8e..a450808 100644 --- a/Swift/QtUI/Whiteboard/GView.cpp +++ b/Swift/QtUI/Whiteboard/GView.cpp @@ -5,6 +5,7 @@ */ #include "GView.h" +#include <QtSwiftUtil.h> namespace Swift { GView::GView(QGraphicsScene* scene, QWidget* parent) : QGraphicsView(scene, parent), brush(QColor(Qt::white)) @@ -162,7 +163,7 @@ namespace Swift { if (mode == Line) { QPointF point = this->mapToScene(event->pos()); QGraphicsItem* item = scene()->addLine(point.x(), point.y(), point.x(), point.y(), pen); - QString id = QString::fromStdString(idGenerator.generateID()); + QString id = P2QSTRING(idGenerator.generateID()); items_.insert(id, item); item->setZValue(zValue++); item->setData(0, id); @@ -171,7 +172,7 @@ namespace Swift { else if (mode == Rect) { QPointF point = this->mapToScene(event->pos()); QGraphicsRectItem* item = scene()->addRect(point.x(), point.y(), 0, 0, pen, brush); - QString id = QString::fromStdString(idGenerator.generateID()); + QString id = P2QSTRING(idGenerator.generateID()); items_.insert(id, item); item->setZValue(zValue++); item->setData(0, point); @@ -193,7 +194,7 @@ namespace Swift { else if (mode == Circle) { QPointF point = this->mapToScene(event->pos()); QGraphicsEllipseItem* item = scene()->addEllipse(point.x(), point.y(), 0, 0, pen, brush); - QString id = QString::fromStdString(idGenerator.generateID()); + QString id = P2QSTRING(idGenerator.generateID()); items_.insert(id, item); item->setZValue(zValue++); item->setData(0, point); @@ -203,7 +204,7 @@ namespace Swift { else if (mode == HandLine) { QPointF point = this->mapToScene(event->pos()); FreehandLineItem* item = new FreehandLineItem; - QString id = QString::fromStdString(idGenerator.generateID()); + QString id = P2QSTRING(idGenerator.generateID()); items_.insert(id, item); item->setPen(pen); item->setStartPoint(point); @@ -216,7 +217,7 @@ namespace Swift { QPointF point = this->mapToScene(event->pos()); QPainterPath path; QGraphicsPathItem* item = scene()->addPath(path, pen, brush); - QString id = QString::fromStdString(idGenerator.generateID()); + QString id = P2QSTRING(idGenerator.generateID()); items_.insert(id, item); item->setZValue(zValue++); item->setData(0, point); @@ -226,13 +227,13 @@ namespace Swift { else if (mode == Text) { QPointF point = this->mapToScene(event->pos()); QGraphicsTextItem* item = scene()->addText(""); - QString id = QString::fromStdString(idGenerator.generateID()); + QString id = P2QSTRING(idGenerator.generateID()); items_.insert(id, item); item->setZValue(zValue++); item->setData(0, id); item->setDefaultTextColor(pen.color()); textDialog = new TextDialog(item, this); - connect(textDialog, SIGNAL(accepted()), this, SIGNAL(lastItemChanged(textDialog))); + connect(textDialog, SIGNAL(accepted(QGraphicsItem*)), this, SIGNAL(lastItemChanged(QGraphicsItem*))); textDialog->setAttribute(Qt::WA_DeleteOnClose); textDialog->show(); item->setPos(point); @@ -246,7 +247,7 @@ namespace Swift { polygon.append(point); polygon.append(point); item = scene()->addPolygon(polygon, pen, brush); - QString id = QString::fromStdString(idGenerator.generateID()); + QString id = P2QSTRING(idGenerator.generateID()); items_.insert(id, item); item->setZValue(zValue++); item->setData(0, id); |