X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fcontainer.cpp;h=e8a66e4d3ba040a178c7eadefc6a5c855adc6aa2;hb=67fbc130b4b6b4d253f69a9c32980d3d3306def5;hp=e909c04ae14b1ba8f9a7e6c0af4b2464cf76aff0;hpb=3047a65eb459ddb4a85e1a694aa2b2491437472e;p=architektonas diff --git a/src/container.cpp b/src/container.cpp index e909c04..e8a66e4 100644 --- a/src/container.cpp +++ b/src/container.cpp @@ -22,9 +22,11 @@ Container::Container(Vector p1, Object * p/*= NULL*/): Object(p1, p), isTopLevelContainer(false), - dragging(false), draggingHandle1(false), draggingHandle2(false)//, needUpdate(false) + dragging(false), draggingHandle1(false), draggingHandle2(false), + hit(false)//, needUpdate(false) { type = OTContainer; + state = OSInactive; } @@ -34,6 +36,7 @@ Container::Container(const Container & copy): Object(copy.position, copy.parent) // Use overloaded assignment operator *this = copy; type = OTContainer; + state = OSInactive; } @@ -54,11 +57,18 @@ Container & Container::operator=(const Container & from) // Small problem with this approach: if the copied object goes out of scope, // all of the objects we copied in here will be deleted. D'oh! - for(uint i=0; i::const_iterator i; + +// for(uint i=0; iCopy(); - // Need to copy the object here... + // Need to actually COPY the object here, not copy the pointer only!! + // (which we do now, above :-P) objects.push_back(object); } @@ -71,24 +81,23 @@ Container & Container::operator=(const Container & from) { QRectF boundary; +//int a=1; for(std::vector::iterator i=objects.begin(); i!=objects.end(); i++) -// for(int i=0; i<(int)objects.size(); i++) { -#if 0 -//printf("Container: About to draw (object = $%X)\n", objects[i]); - objects[i]->Draw(painter); - bounds = bounds.united(objects[i].RectangularExtents()); -#else +//printf("Containter::Draw item #%i [%X]...\n", a++, *i); (*i)->Draw(painter); boundary = boundary.united((*i)->Extents()); -#endif } - if (state == OSSelected) + if ((state == OSSelected) || hit) { - painter->SetPen(QPen(Qt::magenta, 2.0, Qt::DashLine)); + if (hit) + painter->SetPen(QPen(Qt::magenta, 1.0, Qt::DashLine)); + else + painter->SetPen(QPen(Qt::blue, 2.0, Qt::DashLine)); + painter->SetBrush(QBrush(Qt::NoBrush)); - painter->DrawRect(boundary); + painter->DrawPaddedRect(boundary); } } @@ -98,6 +107,7 @@ Container & Container::operator=(const Container & from) return position; } + /* We need at least *three* handles for this object: - one for moving @@ -153,6 +163,9 @@ printf("Container::Collided: Deleting object ($%X)\n", *i); } } + if (snapToGrid) + point = SnapPointToGrid(point); + // We check to see if the container we're trying to access is the // DrawingView's document. If so, we ignore the state of the container. // Otherwise, we care about the state of the container. :-) @@ -163,7 +176,11 @@ printf("Container::Collided: Deleting object ($%X)\n", *i); state = (collision ? OSSelected : OSInactive); if (state == OSSelected) + { DeselectAll(); + dragging = true; + oldPoint = point; + } } return collision; @@ -191,34 +208,62 @@ class so that we can leverage that stuff here as well. // every object for collision. /*virtual*/ void Container::PointerMoved(Vector point) { + std::vector::iterator i; + if (!isTopLevelContainer) { // check for selection rectangle too + if (selectionInProgress) + { + if (selection.contains(Extents())) + state = OSSelected; + else + state = OSInactive; + + return; + } + // No need to do any checking if we're already selected... +// if (state == OSSelected) +// return; - needUpdate = true; +// oldState = state; +// needUpdate = true; +// if (dragging && + bool oldHit = hit; + hit = false; - for(std::vector::iterator i=objects.begin(); i!=objects.end(); i++) + for(i=objects.begin(); i!=objects.end(); i++) { if ((*i)->HitTest(point)) { - state = OSSelected; - return; +// state = OSSelected; +// return; + hit = true; + break; } } - state = OSInactive; + needUpdate = (oldHit != hit ? true : false); +// state = oldState; + + if (dragging) + { + Vector delta = point - oldPoint; + + for(i=objects.begin(); i!=objects.end(); i++) + (*i)->Translate(delta); + + oldPoint = point; + needUpdate = true; + } + return; } -// objectWasDragged = true; -//printf("CONTAINER: PointerMoved()\n"); - for(std::vector::iterator i=objects.begin(); i!=objects.end(); i++) -// for(int i=0; i<(int)objects.size(); i++) { -//// if (objects[i]->GetState() == OSSelected) -// objects[i]->PointerMoved(point); +// if (objects[i]->GetState() == OSSelected) (*i)->PointerMoved(point); } @@ -229,6 +274,12 @@ class so that we can leverage that stuff here as well. /*virtual*/ void Container::PointerReleased(void) { + if (!isTopLevelContainer) + { + dragging = false; + return; + } +#if 0 dragging = false; draggingHandle1 = false; draggingHandle2 = false; @@ -236,15 +287,19 @@ class so that we can leverage that stuff here as well. // Here we check for just a click: If object was clicked and dragged, then // revert to the old state (OSInactive). Otherwise, keep the new state that // we set. -/*Maybe it would be better to just check for "object was dragged" state and not have to worry -about keeping track of old states... +/* +Maybe it would be better to just check for "object was dragged" state and not +have to worry about keeping track of old states... */ if (objectWasDragged) state = oldState; //Note that the preceeding is unnecessary for a generic container! +#endif - for(int i=0; i<(int)objects.size(); i++) - objects[i]->PointerReleased(); +// for(int i=0; i<(int)objects.size(); i++) +// objects[i]->PointerReleased(); + for(std::vector::iterator i=objects.begin(); i!=objects.end(); i++) + (*i)->PointerReleased(); } @@ -421,21 +476,29 @@ void Container::MoveSelectedContentsTo(Container * newContainer) } -void Container::ResizeAllDimensions(double newSize) +void Container::CopySelectedContentsTo(Container * newContainer) { + // Sanity check + if (newContainer == NULL) + return; + + // Shuffle the contents of this container to the new one for(std::vector::iterator i=objects.begin(); i!=objects.end(); i++) { -// Object * object = *i; + if ((*i)->state == OSSelected) + newContainer->Add((*i)->Copy()); + } +} + +void Container::ResizeAllDimensions(double newSize) +{ + for(std::vector::iterator i=objects.begin(); i!=objects.end(); i++) + { if ((*i)->type == OTDimension) -// if (object->type == OTDimension) - { ((Dimension *)(*i))->size = newSize; - } if ((*i)->type == OTContainer) - { ((Container *)(*i))->ResizeAllDimensions(newSize); - } } } @@ -443,13 +506,58 @@ void Container::ResizeAllDimensions(double newSize) /*virtual*/ void Container::Enumerate(FILE * file) { // Only put "CONTAINER" markers if *not* the top level container - if (parent != NULL) - fprintf(file, "CONTAINER\n"); +// if (parent != NULL) + if (!isTopLevelContainer) + fprintf(file, "CONTAINER %i\n", layer); for(uint i=0; iEnumerate(file); - if (parent != NULL) +// if (parent != NULL) + if (!isTopLevelContainer) fprintf(file, "ENDCONTAINER\n"); } + +/*virtual*/ Object * Container::Copy(void) +{ +#warning "!!! This doesn't take care of attached Dimensions !!!" +/* +This is a real problem. While having a pointer in the Dimension to this line's points +is fast & easy, it creates a huge problem when trying to replicate an object like this. + +Maybe a way to fix that then, is to have reference numbers instead of pointers. That +way, if you copy them, ... you might still have problems. Because you can't be sure if +a copy will be persistant or not, you then *definitely* do not want them to have the +same reference number. +*/ + Container * c = new Container(position, parent); + *c = *this; + return c; +} + + +/*virtual*/ void Container::Mirror(Point p1, Point p2) +{ + for(std::vector::iterator i=objects.begin(); i!=objects.end(); i++) + (*i)->Mirror(p1, p2); +} + + +/*virtual*/ void Container::Save(void) +{ + Object::Save(); + + for(std::vector::iterator i=objects.begin(); i!=objects.end(); i++) + (*i)->Save(); +} + + +/*virtual*/ void Container::Restore(void) +{ + Object::Restore(); + + for(std::vector::iterator i=objects.begin(); i!=objects.end(); i++) + (*i)->Restore(); +} +