X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Factions%2Factiondrawcircle3p.cpp;h=a20d8f49d533a6fc5269bf5f329d684dbabc6458;hb=e1d1cacbb43055988d0d9db632fdf05c0bea9543;hp=eacd6d89b02b8fdbdd9a0dc33f4b380fbc6727f3;hpb=16354e0421b316a62c6b9f7b0b4f3b8cf6f06284;p=architektonas diff --git a/src/actions/actiondrawcircle3p.cpp b/src/actions/actiondrawcircle3p.cpp index eacd6d8..a20d8f4 100644 --- a/src/actions/actiondrawcircle3p.cpp +++ b/src/actions/actiondrawcircle3p.cpp @@ -12,6 +12,7 @@ // Who When What // --- ---------- ----------------------------------------------------------- // JLH 06/03/2010 Added this text. :-) +// JLH 09/11/2010 Fixed preview/snapper rendering. // #include "actiondrawcircle3p.h" @@ -22,8 +23,8 @@ #include "preview.h" ActionDrawCircle3P::ActionDrawCircle3P(EntityContainer & container, - GraphicView & graphicView): ActionInterface("Draw circles", - container, graphicView) + GraphicView & graphicView): + ActionInterface("Draw circles", container, graphicView) { reset(); } @@ -50,7 +51,6 @@ void ActionDrawCircle3P::init(int status) void ActionDrawCircle3P::trigger() { ActionInterface::trigger(); - preparePreview(); if (data.isValid()) @@ -68,12 +68,14 @@ void ActionDrawCircle3P::trigger() document->endUndoCycle(); } - deleteSnapper(); - Vector rz = graphicView->getRelativeZero(); - graphicView->moveRelativeZero(Vector(0.0, 0.0)); - graphicView->drawEntity(circle); - graphicView->moveRelativeZero(rz); - drawSnapper(); +// deleteSnapper(); +// Vector rz = graphicView->getRelativeZero(); +// graphicView->moveRelativeZero(Vector(0.0, 0.0)); +// graphicView->drawEntity(circle); +// graphicView->moveRelativeZero(rz); +// drawSnapper(); + graphicView->preview.clear(); // hm. + graphicView->redraw(); setStatus(SetPoint1); reset(); @@ -117,14 +119,18 @@ void ActionDrawCircle3P::mouseMoveEvent(QMouseEvent * e) if (data.isValid()) { // Circle * circle = new Circle(preview, data); -// // deletePreview(); // clearPreview(); // preview->addEntity(circle); // drawPreview(); + graphicView->preview.clear(); + graphicView->preview.addEntity(new Circle(&(graphicView->preview), data)); } + break; } + + graphicView->redraw(); } void ActionDrawCircle3P::mouseReleaseEvent(QMouseEvent * e) @@ -136,9 +142,10 @@ void ActionDrawCircle3P::mouseReleaseEvent(QMouseEvent * e) } else if (e->button() == Qt::RightButton) { - deletePreview(); - deleteSnapper(); +// deletePreview(); +// deleteSnapper(); init(getStatus() - 1); + graphicView->redraw(); // hm. } }