Use Gmprat for Path bounds with TRANSFORM_BEZIERS_TO_PATH

[ipdf/code.git] / src / document.cpp

diff --git a/src/document.cpp b/src/document.cpp
index 6b1e473..1e768bd 100644 (file)
--- a/src/document.cpp
+++ b/src/document.cpp
@@ -94,9 +94,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)
@@ -169,7 +168,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) ----------------------", new_index, parent);
+       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)
@@ -204,7 +204,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)
@@ -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;
 }
@@ -316,7 +317,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");
        }
@@ -324,11 +325,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?
 }
 
@@ -561,7 +579,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("");
@@ -714,7 +732,7 @@ 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
@@ -1024,3 +1042,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.x += dx;
+                       p.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.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;
+               //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;
+       }
+
+}
+
+