X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fdrawingview.cpp;h=957aaf87a56d27b70fb622fccfb45ad07b990d3d;hb=4bc000ba003a53fb11428a2eb71e3b4471a15c7a;hp=58e0979495b3794d2df175ced51453ac6b6a912b;hpb=f507d97c1b1118834a70332f5f79d8479a6964c0;p=architektonas diff --git a/src/drawingview.cpp b/src/drawingview.cpp index 58e0979..957aaf8 100644 --- a/src/drawingview.cpp +++ b/src/drawingview.cpp @@ -45,7 +45,8 @@ DrawingView::DrawingView(QWidget * parent/*= NULL*/): QWidget(parent), // The value in the settings file will override this. - useAntialiasing(true), + 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) @@ -90,7 +91,7 @@ DrawingView::DrawingView(QWidget * parent/*= NULL*/): QWidget(parent), document.objects.push_back(new Arc(Vector(300, 300), 32, PI / 4.0, PI * 1.3)), document.objects.push_back(new Arc(Vector(200, 200), 60, PI / 2.0, PI * 1.5)); document.objects.push_back(new Dimension(Vector(50, 40), Vector(5, 5))); - document.objects.push_back(new Text(Vector(10, 83), "Tyegxt!")); + document.objects.push_back(new Text(Vector(10, 83), "Here is some awesome text!")); #endif /* @@ -511,10 +512,7 @@ void DrawingView::RenderObjects(Painter * painter, Container * c) case OTText: { Text * t = (Text *)obj; - - for(float angle=0; angle<(PI*3.0/2.0); angle+=PI/8.0) - painter->DrawTextObject(t->p1, t->s.c_str(), scaledThickness, angle); - + painter->DrawTextObject(t->p1, t->s.c_str(), scaledThickness); break; } default: @@ -524,6 +522,72 @@ void DrawingView::RenderObjects(Painter * painter, Container * c) } +void DrawingView::DeleteSelectedItems(void) +{ + std::vector::iterator i = document.objects.begin(); + + while (i != document.objects.end()) + { + Object * obj = (Object *)(*i); + + if (obj->selected) + { + delete obj; + document.objects.erase(i); + } + else + i++; + } +} + + +void DrawingView::ClearSelection(void) +{ + std::vector::iterator i; + + for(i=document.objects.begin(); i!=document.objects.end(); i++) + ((Object *)(*i))->selected = false; +} + + +void DrawingView::AddHoveredToSelection(void) +{ + std::vector::iterator i; + + for(i=document.objects.begin(); i!=document.objects.end(); i++) + { + if (((Object *)(*i))->hovered) + ((Object *)(*i))->selected = true; + } +} + + +void DrawingView::GetSelection(std::vector & v) +{ + v.empty(); + std::vector::iterator i; + + for(i=v.begin(); i!=v.end(); i++) + { + if (((Object *)(*i))->selected) + v.push_back(*i); + } +} + + +void DrawingView::GetHovered(std::vector & v) +{ + v.empty(); + std::vector::iterator i; + + for(i=v.begin(); i!=v.end(); i++) + { + if (((Object *)(*i))->hovered) + v.push_back(*i); + } +} + + void DrawingView::resizeEvent(QResizeEvent * /*event*/) { Global::screenSize = Vector(size().width(), size().height()); @@ -542,6 +606,9 @@ void DrawingView::mousePressEvent(QMouseEvent * event) // Do an update if collided with at least *one* object in the document // if (collided) // update(); + // Actually, we already know what we're going to click on as all the collision + // detection already happened in the mouse move function...! +//printf("MouseDown: ctrl=%s, numHovered=%i\n", (ctrlDown ? "DOWN" : "up"), numHovered); #if 0 if (toolAction) @@ -556,11 +623,22 @@ void DrawingView::mousePressEvent(QMouseEvent * event) toolAction->MouseDown(point); } +#else + if (Global::tool) + { + return; + } #endif + if (!ctrlDown) + ClearSelection(); + + if (numHovered > 0) + AddHoveredToSelection(); + #if 1 // Didn't hit any object and not using a tool, so do a selection rectangle - if (!(collided))// || toolAction)) + if (!(numHovered || Global::tool)) { Global::selectionInProgress = true; Global::selection.setTopLeft(QPointF(point.x, point.y)); @@ -625,6 +703,7 @@ void DrawingView::mouseMoveEvent(QMouseEvent * event) { std::vector::iterator i; // QRectF bounds; + numSelected = 0; for(i=document.objects.begin(); i!=document.objects.end(); i++) { @@ -720,6 +799,9 @@ void DrawingView::mouseMoveEvent(QMouseEvent * event) default: break; } + + if (obj->selected) + numSelected++; } } @@ -729,8 +811,11 @@ void DrawingView::mouseMoveEvent(QMouseEvent * event) #if 0 // This returns true if we've moved over an object... - if (document.PointerMoved(point)) + if (document.PointerMoved(point)) // <-- This + // This is where the object would do automagic dragging & shit. Since we don't + // do that anymore, we need a strategy to handle it. { + /* Now objects handle mouse move snapping as well. The code below mainly works only for tools; we need to fix it so that objects work as well... @@ -804,12 +889,12 @@ selected object last and thus fucks up the algorithm. Need to fix this... bool needUpdate = false; // Don't do this kind of checking unless we're not doing a selection rectangle! - // Hmm, lines don't stay selected if globally selected... !!! FIX !!! + // Hmm, lines don't stay selected if globally selected... !!! FIX !!! [DONE] // it's because there were extra state variables, the hit* vars... if (!Global::selectionInProgress) { std::vector::iterator i; - int numHovered = 0; + numHovered = 0; for(i=document.objects.begin(); i!=document.objects.end(); i++) { @@ -872,14 +957,21 @@ selected object last and thus fucks up the algorithm. Need to fix this... default: break; } + + if (obj->hovered) + { + numHovered++; +//printf("MouseMove: OBJECT HOVERED (numHovered = %i)\n", numHovered); + } } } +//printf("MouseMove: numHovered = %i\n", numHovered); // This is used to draw the tool crosshair... oldPoint = point; // if (/*document.NeedsUpdate() ||*/ Global::selectionInProgress /*|| toolAction*/) - if (needUpdate || Global::selectionInProgress) + if (needUpdate || Global::selectionInProgress || Global::tool) update(); } @@ -908,6 +1000,23 @@ void DrawingView::mouseReleaseEvent(QMouseEvent * event) { // Select all the stuff inside of selection Global::selectionInProgress = false; + + // Clear our vectors + select.empty(); + hover.empty(); + + // Scoop 'em up + std::vector::iterator i; + + for(i=document.objects.begin(); i!=document.objects.end(); i++) + { + if (((Object *)(*i))->selected) + select.push_back(*i); + +//hmm, this is no good, too late to do any good :-P +// if ((*i)->hovered) +// hover.push_back(*i); + } } } else if (event->button() == Qt::MiddleButton) @@ -955,6 +1064,10 @@ void DrawingView::keyPressEvent(QKeyEvent * event) if (toolAction) toolAction->KeyDown(event->key()); #endif + if (event->key() == Qt::Key_Shift) + shiftDown = true; + else if (event->key() == Qt::Key_Control) + ctrlDown = true; } @@ -964,6 +1077,10 @@ void DrawingView::keyReleaseEvent(QKeyEvent * event) if (toolAction) toolAction->KeyReleased(event->key()); #endif + if (event->key() == Qt::Key_Shift) + shiftDown = false; + else if (event->key() == Qt::Key_Control) + ctrlDown = false; } //