X-Git-Url: https://git.ucc.asn.au/?p=ipdf%2Fcode.git;a=blobdiff_plain;f=src%2Fdocument.cpp;h=bcf003b02d47c64c634b1ebbdf544018c9c442f3;hp=9b94ba26922a8bbdc01780143ece1abc26650cab;hb=ef0af5fd0129161a9e079bd3cd1298b53f1fe11a;hpb=3917214a11bf76381ddc528e3fe51de9ec038d42

diff --git a/src/document.cpp b/src/document.cpp
index 9b94ba2..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();
@@ -303,6 +303,7 @@ unsigned Document::AddPath(unsigned start_index, unsigned end_index, const Colou
 	unsigned data_index = AddPathData(path);
 	Rect bounds = path.SolveBounds(m_objects);
 	unsigned result = Add(PATH, bounds,data_index);
+	m_objects.paths[data_index].m_index = result;
 	//Debug("Added path %u -> %u (%u objects) colour {%u,%u,%u,%u}, stroke {%u,%u,%u,%u}", start_index, end_index, (end_index - start_index), fill.r, fill.g, fill.b, fill.a, stroke.r, stroke.g, stroke.b, stroke.a);
 	return result;
 }
@@ -1052,19 +1053,51 @@ void Document::TransformObjectBounds(const SVGMatrix & transform)
 	}
 }
 
-void Document::TranslateObjects(const Real & dx, const Real & dy)
+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)
 	{
-		m_objects.bounds[i].x += dx;
-		m_objects.bounds[i].y += dy;
+		if (type == NUMBER_OF_OBJECT_TYPES || m_objects.types[i] == type)
+		{
+			m_objects.bounds[i].x += dx;
+			m_objects.bounds[i].y += dy;
+		}
 	}
 }
 
-void Document::ScaleObjectsAboutPoint(const Real & x, const Real & y, const Real & scale_amount)
+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)
+			continue;
+		
 		m_objects.bounds[i].w /= scale_amount;
 		m_objects.bounds[i].h /= scale_amount;
 		//m_objects.bounds[i].x = x + (m_objects.bounds[i].x-x)/scale_amount;
@@ -1076,7 +1109,8 @@ void Document::ScaleObjectsAboutPoint(const Real & x, const Real & y, const Real
 		m_objects.bounds[i].y -= y;
 		m_objects.bounds[i].y /= scale_amount;
 		m_objects.bounds[i].y += y;
+	}
 
-	}	
-	
 }
+
+