X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fdrawingview.cpp;h=5ae9c9a9081e5ccf121c82958eac22e6634d6400;hb=6a7baa2814a8b4d0b93df776a4c99689bcfb3ffa;hp=8c581bfc1df8e904ccb41bd2b724b26b3c3ae7d5;hpb=4a979ddae8aa6b3556f24e8b961f7787c4b40cbe;p=architektonas diff --git a/src/drawingview.cpp b/src/drawingview.cpp index 8c581bf..5ae9c9a 100644 --- a/src/drawingview.cpp +++ b/src/drawingview.cpp @@ -20,6 +20,7 @@ // STILL TO BE DONE: // // - Lots of stuff +// - Layer locking (hiding works) // // Uncomment this for debugging... @@ -49,8 +50,8 @@ DrawingView::DrawingView(QWidget * parent/*= NULL*/): QWidget(parent), useAntialiasing(true), numSelected(0), numHovered(0), shiftDown(false), ctrlDown(false), gridBackground(BACKGROUND_MAX_SIZE, BACKGROUND_MAX_SIZE), - scale(1.0), offsetX(-10), offsetY(-10),// document(Vector(0, 0)), - gridPixels(0), collided(false)//, toolAction(NULL) + scale(1.0), offsetX(-10), offsetY(-10), + gridPixels(0), collided(false), hoveringIntersection(false) { // document.isTopLevelContainer = true; //wtf? doesn't work except in c++11??? document = { 0 }; @@ -84,6 +85,7 @@ DrawingView::DrawingView(QWidget * parent/*= NULL*/): QWidget(parent), line->thickness = 2.0; line->style = LSDash; line->color = 0xFF7F00; + line->layer = 0; document.objects.push_back(line); document.objects.push_back(new Line(Vector(50, 40), Vector(10, 83))); document.objects.push_back(new Line(Vector(10, 83), Vector(17, 2))); @@ -265,13 +267,77 @@ zero; so we do another modulus operation on the result to achieve this. } -void DrawingView::SetCurrentLayer(int layer) +void DrawingView::SetCurrentLayer(int /*layer*/) { - Global::currentLayer = layer; +//Not needed anymore... +// Global::currentLayer = layer; //printf("DrawingView::CurrentLayer = %i\n", layer); } +// +// Basically, we just make a single pass through the Container. If the layer # +// is less than the layer # being deleted, then do nothing. If the layer # is +// equal to the layer # being deleted, then delete the object. If the layer # +// is greater than the layer # being deleted, then set the layer # to its layer +// # - 1. +// +void DrawingView::DeleteCurrentLayer(int layer) +{ +//printf("DrawingView::DeleteCurrentLayer(): currentLayer = %i\n", layer); + std::vector::iterator i = document.objects.begin(); + + while (i != document.objects.end()) + { + Object * obj = (Object *)(*i); + + if (obj->layer < layer) + i++; + else if (obj->layer == layer) + { + document.objects.erase(i); + delete obj; + } + else + { + obj->layer--; + i++; + } + } + + // We've just done a destructive action, so update the screen! + update(); +} + + +void DrawingView::HandleLayerToggle(void) +{ + // A layer's visibility was toggled, so update the screen... + update(); +} + + +// +// A layer was moved up or down in the layer list, so we have to swap the +// document's object's layer numbers in the layers that were swapped. +// +void DrawingView::HandleLayerSwap(int layer1, int layer2) +{ +//printf("DrawingView: Swapping layers %i and %i.\n", layer1, layer2); + std::vector::iterator i; + + for(i=document.objects.begin(); i!=document.objects.end(); i++) + { + Object * obj = (Object *)(*i); + + if (obj->layer == layer1) + obj->layer = layer2; + else if (obj->layer == layer2) + obj->layer = layer1; + } +} + + QPoint DrawingView::GetAdjustedMousePosition(QMouseEvent * event) { // This is undoing the transform, e.g. going from client coords to local coords. @@ -306,7 +372,11 @@ void DrawingView::paintEvent(QPaintEvent * /*event*/) painter.DrawLine(-16384, 0, 16384, 0); // Do object rendering... - RenderObjects(&painter, document.objects); + for(int i=0; i & v) +void DrawingView::RenderObjects(Painter * painter, std::vector & v, int layer) { std::vector::iterator i; @@ -341,6 +414,10 @@ void DrawingView::RenderObjects(Painter * painter, std::vector & v) Object * obj = (Object *)(*i); float scaledThickness = Global::scale * obj->thickness; + // If the object isn't on the current layer being drawn, skip it + if (obj->layer != layer) + continue; + if ((Global::tool == TTRotate) && ctrlDown && obj->selected) { painter->SetPen(0x00FF00, 2.0, LSSolid); @@ -786,6 +863,7 @@ void DrawingView::LineHandler(int mode, Point p) else { Line * l = new Line(toolPoint[0], toolPoint[1]); + l->layer = Global::activeLayer; document.objects.push_back(l); toolPoint[0] = toolPoint[1]; } @@ -828,6 +906,7 @@ void DrawingView::CircleHandler(int mode, Point p) { double length = Vector::Magnitude(toolPoint[0], toolPoint[1]); Circle * c = new Circle(toolPoint[0], length); + c->layer = Global::activeLayer; document.objects.push_back(c); toolPoint[0] = toolPoint[1]; Global::toolState = TSNone; @@ -898,6 +977,7 @@ void DrawingView::ArcHandler(int mode, Point p) span += PI_TIMES_2; Arc * arc = new Arc(toolPoint[0], toolPoint[1].x, toolPoint[2].x, span); + arc->layer = Global::activeLayer; document.objects.push_back(arc); Global::toolState = TSNone; } @@ -1174,6 +1254,7 @@ void DrawingView::mouseMoveEvent(QMouseEvent * event) Global::selection.setBottomRight(QPointF(point.x, point.y)); // Only needs to be done here, as mouse down is always preceded by movement Global::snapPointIsValid = false; + hoveringIntersection = false; // Scrolling... if (event->buttons() & Qt::MiddleButton) @@ -1221,13 +1302,34 @@ void DrawingView::mouseMoveEvent(QMouseEvent * event) { GetHovered(hover); - double t, u; - int numIntersecting = Geometry::Intersects((Object *)hover[0], (Object *)hover[1], &t, &u); +// double t, u; +// int numIntersecting = Geometry::Intersects((Object *)hover[0], (Object *)hover[1], &t, &u); + Geometry::Intersects((Object *)hover[0], (Object *)hover[1]); + int numIntersecting = Global::numIntersectParams; + double t = Global::intersectParam[0]; + double u = Global::intersectParam[1]; if (numIntersecting > 0) { - QString text = tr("Intersection t=%1, u=%2"); - informativeText = text.arg(t).arg(u); + Vector v1 = Geometry::GetPointForParameter((Object *)hover[0], t); + Vector v2 = Geometry::GetPointForParameter((Object *)hover[1], u); + QString text = tr("Intersection t=%1 (%3, %4), u=%2 (%5, %6)"); + informativeText = text.arg(t).arg(u).arg(v1.x).arg(v1.y).arg(v2.x).arg(v2.y); + + hoveringIntersection = true; + intersectionPoint = v1; + } + + numIntersecting = Global::numIntersectPoints; + + if (numIntersecting > 0) + { + Vector v1 = Global::intersectPoint[0]; + QString text = tr("Intersection <%1, %2>"); + informativeText = text.arg(v1.x).arg(v1.y); + + hoveringIntersection = true; + intersectionPoint = v1; } }