Added pen and dropper tools, and printing support.

[architektonas] / src / utils.cpp

diff --git a/src/utils.cpp b/src/utils.cpp
index b9ca463bbc948bda5ba79bcfeaa220af0588d0c3..7428fbe6a5bdb4f200e8d45a1014ffc8b8d22bef 100644 (file)
--- a/src/utils.cpp
+++ b/src/utils.cpp
@@ -16,7 +16,6 @@
 #include <string.h>            // For memcpy()
 #include "geometry.h"
 
-
 //
 // Copy objects in one vector to another, creating copies and placing them in
 // the other vector. Clearing & etc. of vectors is responsibility of the caller!
@@ -31,7 +30,6 @@ void CopyObjects(VPVector & from, VPVector & to)
        }
 }
 
-
 VPVector CopyObjects(VPVector & src)
 {
        VPVector copy;
@@ -45,7 +43,6 @@ VPVector CopyObjects(VPVector & src)
        return copy;
 }
 
-
 //
 // Create a copy of the passed in object.
 //
@@ -104,7 +101,6 @@ Object * CopyObject(Object * obj)
        return (Object *)newObject;
 }
 
-
 //
 // Create a copy of the passed in object.  This version calls the second
 // version of CopyObjects() (with one parameter and a vector return value).
@@ -167,7 +163,6 @@ Object * CopyObject2(Object * obj)
        return (Object *)newObject;
 }
 
-
 void MoveSelectedObjectsTo(VPVector & dest, VPVector & from)
 {
        VPVectorIter i = from.begin();
@@ -186,7 +181,6 @@ void MoveSelectedObjectsTo(VPVector & dest, VPVector & from)
        }
 }
 
-
 VPVector MoveSelectedObjectsFrom(VPVector & from)
 {
        VPVector objects;
@@ -208,7 +202,6 @@ VPVector MoveSelectedObjectsFrom(VPVector & from)
        return objects;
 }
 
-
 //hmm, this won't work, as these are just pointers...
 //[should work now]
 void CopySelectedObjectsTo(VPVector & dest, VPVector & from)
@@ -222,7 +215,6 @@ void CopySelectedObjectsTo(VPVector & dest, VPVector & from)
        }
 }
 
-
 VPVector CopySelectedObjects(VPVector & src)
 {
        VPVector copy;
@@ -238,21 +230,18 @@ VPVector CopySelectedObjects(VPVector & src)
        return copy;
 }
 
-
 void AddObjectsTo(VPVector & dest, VPVector & from)
 {
        for(VPVectorIter i=from.begin(); i!=from.end(); i++)
                dest.push_back(*i);
 }
 
-
 void ClearSelected(VPVector & v)
 {
        for(VPVectorIter i=v.begin(); i!=v.end(); i++)
                ((Object *)(*i))->selected = false;
 }
 
-
 //
 // Select all *visible* objects.  If an object's layer is invisible, skip it.
 //
@@ -266,7 +255,6 @@ void SelectAll(VPVector & v)
        }
 }
 
-
 //
 // Recursively go down thru the Container's vectors, deleting all the objects
 // contained therein.  Once that is done, the main Container can be deleted.
@@ -290,7 +278,6 @@ void DeleteContents(VPVector & v)
        v.clear();
 }
 
-
 void DeleteSelectedObjects(VPVector & v)
 {
        VPVectorIter i = v.begin();
@@ -309,7 +296,6 @@ void DeleteSelectedObjects(VPVector & v)
        }
 }
 
-
 //
 // This is used to remove selected objects from one container in order to move
 // them to a different container.
@@ -329,7 +315,6 @@ void RemoveSelectedObjects(VPVector & v)
        }
 }
 
-
 void SavePointsFrom(VPVector & v, std::vector<Object> & save)
 {
        save.clear();
@@ -342,7 +327,6 @@ void SavePointsFrom(VPVector & v, std::vector<Object> & save)
        }
 }
 
-
 void RestorePointsTo(VPVector & v, std::vector<Object> & s)
 {
        std::vector<Object>::iterator i;
@@ -360,7 +344,6 @@ void RestorePointsTo(VPVector & v, std::vector<Object> & s)
        }
 }
 
-
 void RestorePointsTo(VPVector & v, VPVector & s)
 {
        for(VPVectorIter i=s.begin(), j=v.begin(); i!=s.end(); i++, j++)
@@ -383,7 +366,6 @@ void RestorePointsTo(VPVector & v, VPVector & s)
        }
 }
 
-
 //
 // Translate a single object; it it's a Container, translate all its contents,
 // including subcontainers.
@@ -402,7 +384,6 @@ void TranslateObject(Object * obj, Point delta)
        obj->p[1] += delta;
 }
 
-
 /*
 So we need to make it so that we pick the container's point clicked on, and translate all the other parts *not* clicked on.
 */
@@ -464,7 +445,6 @@ void TranslateContainer(Container * c, Point point, Point delta)
        TranslateObject((Object *)c, clickedDelta);
 }
 
-
 //
 // Translate all objects in the passed in vector, including Containers and all
 // the objects they contain.
@@ -485,7 +465,6 @@ void TranslateObjects(VPVector & v, Point delta)
        }
 }
 
-
 //
 // This does not *copy* the objects, it simply flattens out the pointers in the
 // Container and all sub-Containers.
@@ -510,7 +489,6 @@ VPVector Flatten(Container * src)
        return flat;
 }
 
-
 //
 // This does not *copy* the objects, it simply flattens out the pointers in the
 // vector and all sub-Containers in the vector.
@@ -534,4 +512,3 @@ VPVector Flatten(VPVector src)
 
        return flat;
 }
-