X-Git-Url: https://git.ucc.asn.au/?p=ipdf%2Fcode.git;a=blobdiff_plain;f=src%2Fdocument.cpp;h=bcf003b02d47c64c634b1ebbdf544018c9c442f3;hp=4be3ee0a648c1a1a353960e798b7e7f6b2a6e974;hb=ef0af5fd0129161a9e079bd3cd1298b53f1fe11a;hpb=2d12d37f1657d6aef9bb80d735b6c7022aecba6e diff --git a/src/document.cpp b/src/document.cpp index 4be3ee0..bcf003b 100644 --- a/src/document.cpp +++ b/src/document.cpp @@ -168,7 +168,7 @@ int Document::ClipObjectToQuadChild(int object_id, QuadTreeNodeChildren type) QuadTreeIndex Document::GenQuadChild(QuadTreeIndex parent, QuadTreeNodeChildren type) { QuadTreeIndex new_index = m_quadtree.nodes.size(); - Debug("-------------- Generating Quadtree Node %d (parent %d) ----------------------", new_index, parent); + Debug("-------------- Generating Quadtree Node %d (parent %d, type %d) ----------------------", new_index, parent, type); m_quadtree.nodes.push_back(QuadTreeNode{QUADTREE_EMPTY, QUADTREE_EMPTY, QUADTREE_EMPTY, QUADTREE_EMPTY, parent, type, 0, 0, -1}); m_quadtree.nodes[new_index].object_begin = m_objects.bounds.size(); @@ -1055,6 +1055,16 @@ void Document::TransformObjectBounds(const SVGMatrix & transform) void Document::TranslateObjects(const Real & dx, const Real & dy, ObjectType type) { + #ifdef TRANSFORM_BEZIERS_TO_PATH + for (unsigned i = 0; i < m_objects.paths.size(); ++i) + { + Path & p = m_objects.paths[i]; + p.x += dx; + p.y += dy; + } + return; + #endif + for (unsigned i = 0; i < m_count; ++i) { if (type == NUMBER_OF_OBJECT_TYPES || m_objects.types[i] == type) @@ -1067,6 +1077,22 @@ void Document::TranslateObjects(const Real & dx, const Real & dy, ObjectType typ void Document::ScaleObjectsAboutPoint(const Real & x, const Real & y, const Real & scale_amount, ObjectType type) { + #ifdef TRANSFORM_BEZIERS_TO_PATH + for (unsigned i = 0; i < m_objects.paths.size(); ++i) + { + Path & p = m_objects.paths[i]; + p.w /= scale_amount; + p.h /= scale_amount; + p.x -= x; + p.x /= scale_amount; + p.x += x; + p.y -= y; + p.y /= scale_amount; + p.y += y; + } + return; + #endif + for (unsigned i = 0; i < m_count; ++i) { if (type != NUMBER_OF_OBJECT_TYPES && m_objects.types[i] != type) @@ -1084,6 +1110,7 @@ void Document::ScaleObjectsAboutPoint(const Real & x, const Real & y, const Real m_objects.bounds[i].y /= scale_amount; m_objects.bounds[i].y += y; } + }