Added mouse wheel zoom.

[architektonas] / src / container.cpp

diff --git a/src/container.cpp b/src/container.cpp
index da491f617b8366ff71bacf1bba6b0ebda26a3bef..6050f3217b73ecea8f7bb33ef63df8ec77d740d4 100644 (file)
--- a/src/container.cpp
+++ b/src/container.cpp
@@ -22,7 +22,8 @@
 
 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;
@@ -53,15 +54,12 @@ Container & Container::operator=(const Container & from)
                return *this;
 
        Clear();
+       std::vector<Object *>::const_iterator i;
 
-       // 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<from.objects.size(); i++)
+       for(i=from.objects.begin(); i!=from.objects.end(); i++)
        {
-               Object * object = from.objects[i];
-
-               // Need to copy the object here...
-
+printf("Container: Copying object $%08X...\n", *i);
+               Object * object = (*i)->Copy();
                objects.push_back(object);
        }
 
@@ -73,8 +71,10 @@ Container & Container::operator=(const Container & from)
 {
        QRectF boundary;
 
+//int a=1;
        for(std::vector<Object *>::iterator i=objects.begin(); i!=objects.end(); i++)
        {
+//printf("Containter::Draw item #%i [%X]...\n", a++, *i);
                (*i)->Draw(painter);
                boundary = boundary.united((*i)->Extents());
        }
@@ -153,6 +153,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. :-)
@@ -429,7 +432,6 @@ void Container::MoveContentsTo(Container * newContainer)
                return;
 
        // Shuffle the contents of this container to the new one
-//     for(unsigned int i=0; i<objects.size(); i++)
        for(std::vector<Object *>::iterator i=objects.begin(); i!=objects.end(); i++)
        {
                newContainer->Add(*i);
@@ -441,6 +443,18 @@ void Container::MoveContentsTo(Container * newContainer)
 }
 
 
+void Container::CopyContentsTo(Container * newContainer)
+{
+       // Sanity check
+       if (newContainer == NULL)
+               return;
+
+       // Shuffle the contents of this container to the new one
+       for(std::vector<Object *>::iterator i=objects.begin(); i!=objects.end(); i++)
+               newContainer->Add((*i)->Copy());
+}
+
+
 void Container::MoveSelectedContentsTo(Container * newContainer)
 {
        // Sanity check
@@ -463,6 +477,21 @@ void Container::MoveSelectedContentsTo(Container * newContainer)
 }
 
 
+void Container::CopySelectedContentsTo(Container * newContainer)
+{
+       // Sanity check
+       if (newContainer == NULL)
+               return;
+
+       // Copy the contents of this container to the new one
+       for(std::vector<Object *>::iterator i=objects.begin(); i!=objects.end(); i++)
+       {
+               if ((*i)->state == OSSelected)
+                       newContainer->Add((*i)->Copy());
+       }
+}
+
+
 void Container::ResizeAllDimensions(double newSize)
 {
        for(std::vector<Object *>::iterator i=objects.begin(); i!=objects.end(); i++)
@@ -480,7 +509,7 @@ void Container::ResizeAllDimensions(double newSize)
        // Only put "CONTAINER" markers if *not* the top level container
 //     if (parent != NULL)
        if (!isTopLevelContainer)
-               fprintf(file, "CONTAINER\n");
+               fprintf(file, "CONTAINER %i\n", layer);
 
        for(uint i=0; i<objects.size(); i++)
                objects[i]->Enumerate(file);
@@ -490,3 +519,73 @@ void Container::ResizeAllDimensions(double newSize)
                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::Rotate(Point point, double angle)
+{
+       for(std::vector<Object *>::iterator i=objects.begin(); i!=objects.end(); i++)
+               (*i)->Rotate(point, angle);
+}
+
+
+/*virtual*/ void Container::RotateSelected(Point point, double angle)
+{
+       for(std::vector<Object *>::iterator i=objects.begin(); i!=objects.end(); i++)
+       {
+               if ((*i)->state == OSSelected)
+                       (*i)->Rotate(point, angle);
+       }
+}
+
+
+/*virtual*/ void Container::Mirror(Point p1, Point p2)
+{
+       for(std::vector<Object *>::iterator i=objects.begin(); i!=objects.end(); i++)
+               (*i)->Mirror(p1, p2);
+}
+
+
+/*virtual*/ void Container::MirrorSelected(Point p1, Point p2)
+{
+       for(std::vector<Object *>::iterator i=objects.begin(); i!=objects.end(); i++)
+       {
+               if ((*i)->state == OSSelected)
+                       (*i)->Mirror(p1, p2);
+       }
+}
+
+
+/*virtual*/ void Container::Save(void)
+{
+       Object::Save();
+
+       for(std::vector<Object *>::iterator i=objects.begin(); i!=objects.end(); i++)
+               (*i)->Save();
+}
+
+
+/*virtual*/ void Container::Restore(void)
+{
+       Object::Restore();
+
+       for(std::vector<Object *>::iterator i=objects.begin(); i!=objects.end(); i++)
+               (*i)->Restore();
+}
+