Mirror tool now works successfully for all object types. :-D

[architektonas] / src / container.cpp

diff --git a/src/container.cpp b/src/container.cpp
index ced7326de4979b91e67d4d16dfe97694101d4837..e8a66e4d3ba040a178c7eadefc6a5c855adc6aa2 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;
@@ -162,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. :-)
@@ -472,6 +476,21 @@ void Container::MoveSelectedContentsTo(Container * newContainer)
 }
 
 
+void Container::CopySelectedContentsTo(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++)
+       {
+               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++)
@@ -489,7 +508,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);
@@ -499,3 +518,46 @@ 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::Mirror(Point p1, Point p2)
+{
+       for(std::vector<Object *>::iterator i=objects.begin(); i!=objects.end(); i++)
+               (*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();
+}
+