X-Git-Url: https://git.ucc.asn.au/?p=ipdf%2Fcode.git;a=blobdiff_plain;f=src%2Fdocument.h;h=d67b0b20f6e1bf907fc4b011bfd789cdfaed175d;hp=529e4abb0fca15999f15b97ddf54bef745a1c9f9;hb=326f04a375ce3120f7e8957e3d7cd5f296f513e3;hpb=33d1adb60806e13863aa3b6c5e1dee9836cd3d04

diff --git a/src/document.h b/src/document.h
index 529e4ab..d67b0b2 100644
--- a/src/document.h
+++ b/src/document.h
@@ -4,6 +4,8 @@
 #include "ipdf.h"
 #include "quadtree.h"
 
+#include <map>
+
 #include "../contrib/pugixml-1.4/src/pugixml.hpp"
 #include "stb_truetype.h"
 
@@ -27,7 +29,7 @@ namespace IPDF
 	class Document
 	{
 		public:
-			Document(const std::string & filename = "", const std::string & font_filename = "DejaVuSansMono.ttf") : m_objects(), m_count(0), m_font_data(NULL), m_font()
+			Document(const std::string & filename = "", const std::string & font_filename = "fonts/DejaVuSansMono.ttf") : m_objects(), m_count(0), m_font_data(NULL), m_font()
 			{
 				Load(filename);
 				if (font_filename != "")
@@ -50,40 +52,55 @@ namespace IPDF
 			bool operator==(const Document & equ) const;
 			bool operator!=(const Document & equ) const {return !(this->operator==(equ));}
 
-			void Add(ObjectType type, const Rect & bounds, unsigned data_index = 0);
+			unsigned AddPath(unsigned start_index, unsigned end_index, const Colour & shading=Colour(0.6,0.6,0.6,1), const Colour & stroke=Colour(0,0,0,0));
+			unsigned AddBezier(const Bezier & bezier);
+			unsigned Add(ObjectType type, const Rect & bounds, unsigned data_index = 0, QuadTreeIndex qtnode = 0);
 			unsigned AddBezierData(const Bezier & bezier);
-			
+			unsigned AddPathData(const Path & path);
 
 
-			
-
-			
-			
 			/** SVG Related functions **/
 			
 			/** Load an SVG text file and add to the document **/
 			void LoadSVG(const std::string & filename, const Rect & bounds = Rect(0,0,1,1));
+			void ParseSVG(const std::string & svg, const Rect & bounds = Rect(0,0,1,1));
 			
 			/** Parse an SVG node or SVG-group node, adding children to the document **/
 			void ParseSVGNode(pugi::xml_node & root, SVGMatrix & transform);
 			/** Parse an SVG path with string **/
-			void ParseSVGPathData(const std::string & d, const SVGMatrix & transform);
+			std::pair<unsigned, unsigned> ParseSVGPathData(const std::string & d, const SVGMatrix & transform, bool & closed);
 			
 			/** Modify an SVG transformation matrix **/
 			static void ParseSVGTransform(const std::string & s, SVGMatrix & transform);
+			
+			/** Extract CSS values (shudder) from style **/
+			static void ParseSVGStyleData(const std::string & style, std::map<std::string, std::string> & results);
 
 			/** Font related functions **/
 			void SetFont(const std::string & font_filename);
 			void AddText(const std::string & text, Real scale, Real x, Real y);
 			
 			void AddFontGlyphAtPoint(stbtt_fontinfo *font, int character, Real scale, Real x, Real y);
-
+			
+			void TransformObjectBounds(const SVGMatrix & transform);
+			void TranslateObjects(const Real & x, const Real & y, ObjectType type = NUMBER_OF_OBJECT_TYPES);
+			void ScaleObjectsAboutPoint(const Real & x, const Real & y, const Real & scale_amount, ObjectType type = NUMBER_OF_OBJECT_TYPES);
+			
 #ifndef QUADTREE_DISABLED
 			inline const QuadTree& GetQuadTree() { if (m_quadtree.root_id == QUADTREE_EMPTY) { GenBaseQuadtree(); } return m_quadtree; }
 			QuadTreeIndex GenQuadChild(QuadTreeIndex parent, QuadTreeNodeChildren type);
 			QuadTreeIndex GenQuadParent(QuadTreeIndex child, QuadTreeNodeChildren mytype);
+			// Returns the number of objects the current object formed when clipped, the objects in question are added to the end of the document.
+			int ClipObjectToQuadChild(int object_id, QuadTreeNodeChildren type);
 #endif
 
+			void ClearObjects()
+			{
+				m_count = 0;
+				m_objects.Clear();
+			}
+
+
 		private:
 			friend class View;
 			Objects m_objects;