X-Git-Url: https://git.ucc.asn.au/?p=ipdf%2Fcode.git;a=blobdiff_plain;f=src%2Fdocument.cpp;h=c41c848d3f289f213473ba3ec92ffd0eb4de2e4c;hp=4be3ee0a648c1a1a353960e798b7e7f6b2a6e974;hb=326f04a375ce3120f7e8957e3d7cd5f296f513e3;hpb=2d12d37f1657d6aef9bb80d735b6c7022aecba6e;ds=sidebyside

diff --git a/src/document.cpp b/src/document.cpp
index 4be3ee0..c41c848 100644
--- a/src/document.cpp
+++ b/src/document.cpp
@@ -4,6 +4,7 @@
 #include <fstream>
 
 #include "../contrib/pugixml-1.4/src/pugixml.cpp"
+#include "transformationtype.h"
 
 #include "stb_truetype.h"
 
@@ -168,7 +169,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 +1056,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.m_bounds.x += dx;
+			p.m_bounds.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 +1078,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.m_bounds.w /= scale_amount;
+			p.m_bounds.h /= scale_amount;
+			p.m_bounds.x -= x;
+			p.m_bounds.x /= scale_amount;
+			p.m_bounds.x += x;
+			p.m_bounds.y -= y;
+			p.m_bounds.y /= scale_amount;
+			p.m_bounds.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 +1111,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;
 	}
+
 }