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

diff --git a/src/document.cpp b/src/document.cpp
index d825914..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"
 
@@ -94,9 +95,8 @@ void Document::Save(const string & filename)
 
 void Document::GenBaseQuadtree()
 {
-	m_quadtree.nodes.push_back(QuadTreeNode{QUADTREE_EMPTY, QUADTREE_EMPTY, QUADTREE_EMPTY, QUADTREE_EMPTY, QUADTREE_EMPTY, QTC_UNKNOWN, 0, ObjectCount()});
+	m_quadtree.nodes.push_back(QuadTreeNode{QUADTREE_EMPTY, QUADTREE_EMPTY, QUADTREE_EMPTY, QUADTREE_EMPTY, QUADTREE_EMPTY, QTC_UNKNOWN, 0, ObjectCount(), -1});
 	m_quadtree.root_id = 0;
-	GenQuadChild(0, QTC_TOP_LEFT);
 }
 
 int Document::ClipObjectToQuadChild(int object_id, QuadTreeNodeChildren type)
@@ -105,6 +105,7 @@ int Document::ClipObjectToQuadChild(int object_id, QuadTreeNodeChildren type)
 	{
 	case RECT_FILLED:
 	case RECT_OUTLINE:
+	case PATH:
 		{
 		Rect obj_bounds = TransformToQuadChild(m_objects.bounds[object_id], type);
 		if (obj_bounds.x < 0)
@@ -147,6 +148,7 @@ int Document::ClipObjectToQuadChild(int object_id, QuadTreeNodeChildren type)
 			Rect new_bounds = TransformToQuadChild(m_objects.bounds[object_id], type);
 			Bezier new_curve_data = new_curves[i].ToAbsolute(TransformToQuadChild(m_objects.bounds[object_id],type));
 			new_bounds = new_curve_data.SolveBounds();
+			Debug("New bounds: %s", new_bounds.Str().c_str());
 			new_curve_data = new_curve_data.ToRelative(new_bounds);
 			unsigned index = AddBezierData(new_curve_data);
 			m_objects.bounds.push_back(new_bounds);
@@ -167,7 +169,8 @@ int Document::ClipObjectToQuadChild(int object_id, QuadTreeNodeChildren type)
 QuadTreeIndex Document::GenQuadChild(QuadTreeIndex parent, QuadTreeNodeChildren type)
 {
 	QuadTreeIndex new_index = m_quadtree.nodes.size();
-	m_quadtree.nodes.push_back(QuadTreeNode{QUADTREE_EMPTY, QUADTREE_EMPTY, QUADTREE_EMPTY, QUADTREE_EMPTY, parent, type, 0, 0});
+	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();
 	for (unsigned i = m_quadtree.nodes[parent].object_begin; i < m_quadtree.nodes[parent].object_end; ++i)
@@ -202,7 +205,7 @@ QuadTreeIndex Document::GenQuadChild(QuadTreeIndex parent, QuadTreeNodeChildren
 QuadTreeIndex Document::GenQuadParent(QuadTreeIndex child, QuadTreeNodeChildren type)
 {
 	QuadTreeIndex new_index = m_quadtree.nodes.size();
-	m_quadtree.nodes.push_back(QuadTreeNode{QUADTREE_EMPTY, QUADTREE_EMPTY, QUADTREE_EMPTY, QUADTREE_EMPTY, -1, QTC_UNKNOWN, 0, 0});
+	m_quadtree.nodes.push_back(QuadTreeNode{QUADTREE_EMPTY, QUADTREE_EMPTY, QUADTREE_EMPTY, QUADTREE_EMPTY, -1, QTC_UNKNOWN, 0, 0, -1});
 
 	m_quadtree.nodes[new_index].object_begin = m_objects.bounds.size();
 	for (unsigned i = m_quadtree.nodes[child].object_begin; i < m_quadtree.nodes[child].object_end; ++i)
@@ -301,6 +304,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;
 }
@@ -314,7 +318,7 @@ unsigned Document::AddBezier(const Bezier & bezier)
 	Bezier data = bezier.ToRelative(bounds); // Relative
 	if (data.ToAbsolute(bounds) != bezier)
 	{
-		Warn("%s != %s", data.ToAbsolute(Rect(0,0,1,1)).Str().c_str(),
+		Warn("%s != %s", data.ToAbsolute(bounds).Str().c_str(),
 			bezier.Str().c_str());
 		Warn("ToAbsolute on ToRelative does not give original Bezier");
 	}
@@ -322,11 +326,28 @@ unsigned Document::AddBezier(const Bezier & bezier)
 	return Add(BEZIER, bounds, index);
 }
 
-unsigned Document::Add(ObjectType type, const Rect & bounds, unsigned data_index)
+unsigned Document::Add(ObjectType type, const Rect & bounds, unsigned data_index, QuadTreeIndex qti)
 {
 	m_objects.types.push_back(type);
 	m_objects.bounds.push_back(bounds);
 	m_objects.data_indices.push_back(data_index);
+#ifndef QUADTREE_DISABLED
+	if (qti != -1)
+	{
+		if (m_count == m_quadtree.nodes[qti].object_end+1)
+		{
+			m_quadtree.nodes[qti].object_end++;
+		}
+		else
+		{
+			QuadTreeIndex overlay = m_quadtree.nodes.size();
+			m_quadtree.nodes.push_back(m_quadtree.nodes[qti]);
+			m_quadtree.nodes[overlay].object_begin = m_count;
+			m_quadtree.nodes[overlay].object_end = m_count+1;
+			m_quadtree.nodes[qti].next_overlay = overlay;
+		}
+	}
+#endif
 	return (m_count++); // Why can't we just use the size of types or something?
 }
 
@@ -390,12 +411,12 @@ static void GetXYPair(const string & d, Real & x, Real & y, unsigned & i,const s
 {
 	string token("");
 	while (GetToken(d, token, i, delims) == ",");
-	x = strtod(token.c_str(),NULL);
+	x = RealFromStr(token);
 	if (GetToken(d, token, i, delims) != ",")
 	{
 		Fatal("Expected \",\" seperating x,y pair");
 	}
-	y = strtod(GetToken(d, token, i, delims).c_str(),NULL);
+	y = RealFromStr(GetToken(d,token,i,delims));
 }
 
 static bool GetKeyValuePair(const string & d, string & key, string & value, unsigned & i, const string & delims = "()[],{}<>;:=")
@@ -458,11 +479,11 @@ void Document::ParseSVGTransform(const string & s, SVGMatrix & transform)
 		}
 		else if (command == "scale")
 		{
-			delta.a = (strtod(GetToken(s,token,i).c_str(), NULL));
+			delta.a = RealFromStr(GetToken(s,token,i));
 			GetToken(s, token, i);
 			if (token == ",")
 			{
-				delta.d = (strtod(GetToken(s,token,i).c_str(), NULL));
+				delta.d = RealFromStr(GetToken(s,token,i));
 				assert(GetToken(s, token, i) == ")");
 			}
 			else
@@ -508,7 +529,7 @@ inline Colour ParseColourString(const string & colour_str)
 		c = {255,255,255,255};
 	else if (colour_str.size() == 7 && colour_str[0] == '#')
 	{
-		Debug("Parse colour string: \"%s\"", colour_str.c_str());
+		//Debug("Parse colour string: \"%s\"", colour_str.c_str());
 		char comp[3] = {colour_str[1], colour_str[2], '\0'};
 		c.r = strtoul(comp, NULL, 16);
 		comp[0] = colour_str[3]; comp[1] = colour_str[4];
@@ -516,7 +537,7 @@ inline Colour ParseColourString(const string & colour_str)
 		comp[0] = colour_str[5]; comp[1] = colour_str[6];
 		c.b = strtoul(comp, NULL, 16);
 		c.a = 255;
-		Debug("Colour is: %u, %u, %u, %u", c.r, c.g, c.b, c.a);
+		//Debug("Colour is: %u, %u, %u, %u", c.r, c.g, c.b, c.a);
 	}
 	return c;
 }
@@ -525,7 +546,16 @@ void Document::ParseSVGNode(pugi::xml_node & root, SVGMatrix & parent_transform)
 {
 	//Debug("Parse node <%s>", root.name());
 
-		
+	
+	// Centre the SVGs
+	if (strcmp(root.name(),"svg") == 0)
+	{
+		Real ww = RealFromStr(root.attribute("width").as_string());
+		Real hh = RealFromStr(root.attribute("height").as_string());
+		parent_transform.e -= parent_transform.a * ww/Real(2);
+		parent_transform.f -= parent_transform.d * hh/Real(2);
+	}
+	
 	for (pugi::xml_node child = root.first_child(); child; child = child.next_sibling())
 	{
 		SVGMatrix transform(parent_transform);	
@@ -550,7 +580,7 @@ void Document::ParseSVGNode(pugi::xml_node & root, SVGMatrix & parent_transform)
 			//Debug("Path data attribute is \"%s\"", d.c_str());
 			bool closed = false;
 			pair<unsigned, unsigned> range = ParseSVGPathData(d, transform, closed);
-			if (true)//(closed)
+			if (true && range.first < m_count && range.second < m_count)//(closed)
 			{
 				
 				string colour_str("");
@@ -703,11 +733,11 @@ void Document::LoadSVG(const string & filename, const Rect & bounds)
 	if (!result)
 		Error("Couldn't load \"%s\" - %s", filename.c_str(), result.description());
 		
-	Debug("Loaded XML - %s", result.description());
+	Debug("Loaded XML from \"%s\" - %s", filename.c_str(), result.description());
 	
 	input.close();
 						// a c e, b d f
-	SVGMatrix transform = {bounds.w, 0,bounds.x, 0,bounds.h,bounds.y};
+	SVGMatrix transform = {bounds.w,0 ,bounds.x, 0,bounds.h,bounds.y};
 	ParseSVGNode(doc_xml, transform);
 }
 
@@ -753,9 +783,9 @@ pair<unsigned, unsigned> Document::ParseSVGPathData(const string & d, const SVGM
 		if (command == "m" || command == "M")
 		{
 			//Debug("Construct moveto command");
-			Real dx = Real(strtod(GetToken(d,token,i,delims).c_str(),NULL));
+			Real dx = RealFromStr(GetToken(d,token,i,delims));
 			assert(GetToken(d,token,i,delims) == ",");
-			Real dy = Real(strtod(GetToken(d,token,i,delims).c_str(),NULL));
+			Real dy = RealFromStr(GetToken(d,token,i,delims));
 			
 			x[0] = (relative) ? x[0] + dx : dx;
 			y[0] = (relative) ? y[0] + dy : dy;
@@ -768,25 +798,25 @@ pair<unsigned, unsigned> Document::ParseSVGPathData(const string & d, const SVGM
 		else if (command == "c" || command == "C" || command == "q" || command == "Q")
 		{
 			//Debug("Construct curveto command");
-			Real dx = Real(strtod(GetToken(d,token,i,delims).c_str(),NULL));
+			Real dx = RealFromStr(GetToken(d,token,i,delims));
 			assert(GetToken(d,token,i,delims) == ",");
-			Real dy = Real(strtod(GetToken(d,token,i,delims).c_str(),NULL));
+			Real dy = RealFromStr(GetToken(d,token,i,delims));
 			
 			x[1] = (relative) ? x[0] + dx : dx;
 			y[1] = (relative) ? y[0] + dy : dy;
 			
-			dx = Real(strtod(GetToken(d,token,i,delims).c_str(),NULL));
+			dx = RealFromStr(GetToken(d,token,i,delims));
 			assert(GetToken(d,token,i,delims) == ",");
-			dy = Real(strtod(GetToken(d,token,i,delims).c_str(),NULL));
+			dy = RealFromStr(GetToken(d,token,i,delims));
 			
 			x[2] = (relative) ? x[0] + dx : dx;
 			y[2] = (relative) ? y[0] + dy : dy;
 			
 			if (command != "q" && command != "Q")
 			{
-				dx = Real(strtod(GetToken(d,token,i,delims).c_str(),NULL));
+				dx = RealFromStr(GetToken(d,token,i,delims));
 				assert(GetToken(d,token,i,delims) == ",");
-				dy = Real(strtod(GetToken(d,token,i,delims).c_str(),NULL));
+				dy = RealFromStr(GetToken(d,token,i,delims));
 				x[3] = (relative) ? x[0] + dx : dx;
 				y[3] = (relative) ? y[0] + dy : dy;
 			}
@@ -819,12 +849,12 @@ pair<unsigned, unsigned> Document::ParseSVGPathData(const string & d, const SVGM
 		{
 			//Debug("Construct lineto command, relative %d", relative);
 		
-			Real dx = Real(strtod(GetToken(d,token,i,delims).c_str(),NULL));
-			Real dy;
+			Real dx = RealFromStr(GetToken(d,token,i,delims));
+			Real dy = 0;
 			if (command == "l" || command == "L")
 			{
 				assert(GetToken(d,token,i,delims) == ",");
-				dy = Real(strtod(GetToken(d,token,i,delims).c_str(),NULL));
+				dy = RealFromStr(GetToken(d,token,i,delims));
 			}
 			else if (command == "v" || command == "V")
 			{
@@ -1013,3 +1043,75 @@ void Document::AddFontGlyphAtPoint(stbtt_fontinfo *font, int character, Real sca
 
 	stbtt_FreeShape(font, instructions);
 }
+
+void Document::TransformObjectBounds(const SVGMatrix & transform)
+{
+	for (unsigned i = 0; i < m_count; ++i)
+	{
+		TransformXYPair(m_objects.bounds[i].x, m_objects.bounds[i].y, transform);
+		m_objects.bounds[i].w *= transform.a;
+		m_objects.bounds[i].h *= transform.d;
+	}
+}
+
+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)
+		{
+			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, 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)
+			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;
+		//m_objects.bounds[i].y = y + (m_objects.bounds[i].y-x)/scale_amount;
+		m_objects.bounds[i].x -= x;
+		m_objects.bounds[i].x /= scale_amount;
+		m_objects.bounds[i].x += x;
+		
+		m_objects.bounds[i].y -= y;
+		m_objects.bounds[i].y /= scale_amount;
+		m_objects.bounds[i].y += y;
+	}
+
+}
+
+