git.ucc.asn.au / ipdf / code.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
All of the things and none of the sleep
[ipdf/code.git] / src / document.cpp
diff --git a/src/document.cpp b/src/document.cpp
index d097600..1558865 100644 (file)
--- a/src/document.cpp
+++ b/src/document.cpp
@@ -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);
@@ -301,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);
+       //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;
 }
 
@@ -389,12 +392,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 = "()[],{}<>;:=")
@@ -457,11 +460,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
@@ -507,7 +510,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];
@@ -515,7 +518,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;
 }
@@ -524,7 +527,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);  
@@ -706,7 +718,7 @@ void Document::LoadSVG(const string & filename, const Rect & bounds)
        
        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);
 }
 
@@ -752,9 +764,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;
@@ -767,25 +779,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;
                        }
@@ -818,12 +830,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 dx = RealFromStr(GetToken(d,token,i,delims));
                        Real dy;
                        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")
                        {
@@ -1008,7 +1020,7 @@ void Document::AddFontGlyphAtPoint(stbtt_fontinfo *font, int character, Real sca
        {
                AddPath(start_index, end_index);
        }
-       Debug("Added Glyph \"%c\" at %f %f, scale %f", (char)character, Float(x), Float(y), Float(scale));
+       //Debug("Added Glyph \"%c\" at %f %f, scale %f", (char)character, Float(x), Float(y), Float(scale));
 
        stbtt_FreeShape(font, instructions);
 }
Infinite Precision Document Formats - Code base

UCC git Repository :: git.ucc.asn.au