X-Git-Url: https://git.ucc.asn.au/?p=ipdf%2Fcode.git;a=blobdiff_plain;f=src%2Fdocument.cpp;h=0428aa9c21d26b59a6ab00e272f7a50d6c6d7c5a;hp=0b43cfcd0a795b02af6fe9f7128f0bbf9d0f1763;hb=b04b227b04626afb2a8bf665dbcbf035bfa1cef8;hpb=101df292750d2fe8ed1de541db197dd792232458 diff --git a/src/document.cpp b/src/document.cpp index 0b43cfc..0428aa9 100644 --- a/src/document.cpp +++ b/src/document.cpp @@ -132,13 +132,35 @@ int Document::ClipObjectToQuadChild(int object_id, QuadTreeNodeChildren type) } case BEZIER: { - Rect child_node_bounds = TransformFromQuadChild({0,0,1,1}, type); - std::vector new_curves = m_objects.beziers[m_objects.data_indices[object_id]].ClipToRectangle(child_node_bounds); Rect obj_bounds = TransformToQuadChild(m_objects.bounds[object_id], type); + if (obj_bounds.x < 0) + { + obj_bounds.w += obj_bounds.x; + obj_bounds.x = 0; + } + if (obj_bounds.y < 0) + { + obj_bounds.h += obj_bounds.y; + obj_bounds.y = 0; + } + if (obj_bounds.x + obj_bounds.w > 1) + { + obj_bounds.w += (1 - (obj_bounds.x + obj_bounds.w)); + } + if (obj_bounds.y + obj_bounds.h > 1) + { + obj_bounds.h += (1 - (obj_bounds.y + obj_bounds.h)); + } + Rect child_node_bounds = TransformFromQuadChild(obj_bounds, type); + Rect clip_bezier_bounds = TransformRectCoordinates(m_objects.bounds[object_id], child_node_bounds); + std::vector new_curves = Bezier(m_objects.beziers[m_objects.data_indices[object_id]], child_node_bounds).ClipToRectangle(clip_bezier_bounds); for (size_t i = 0; i < new_curves.size(); ++i) { + Rect new_bounds = TransformToQuadChild(m_objects.bounds[object_id], type); + //new_bounds = TransformToQuadChild(new_curves[i].SolveBounds(), type); + //Bezier new_curve_data = new_curves[i].ToRelative(new_bounds); unsigned index = AddBezierData(new_curves[i]); - m_objects.bounds.push_back(obj_bounds); + m_objects.bounds.push_back(new_bounds); m_objects.types.push_back(BEZIER); m_objects.data_indices.push_back(index); } @@ -269,8 +291,8 @@ void Document::Load(const string & filename) LoadStructVector(file, chunk_size/sizeof(Bezier), m_objects.beziers); break; - case CT_OBJGROUPS: - Debug("Group data..."); + case CT_OBJPATHS: + Debug("Path data..."); Warn("Not handled because lazy"); break; } @@ -284,30 +306,12 @@ void Document::Load(const string & filename) #endif } -unsigned Document::AddGroup(unsigned start_index, unsigned end_index) +unsigned Document::AddPath(unsigned start_index, unsigned end_index, const Colour & fill) { - Real xmin = 0; Real ymin = 0; - Real xmax = 0; Real ymax = 0; - - for (unsigned i = start_index; i <= end_index; ++i) - { - Rect & objb = m_objects.bounds[i]; - - if (i == start_index || objb.x < xmin) - xmin = objb.x; - if (i == start_index || (objb.x+objb.w) > xmax) - xmax = (objb.x+objb.w); - - if (i == start_index || objb.y < ymin) - ymin = objb.y; - if (i == start_index || (objb.y+objb.h) > ymax) - ymax = (objb.y+objb.h); - } - - Rect bounds(xmin,ymin, xmax-xmin, ymax-ymin); - unsigned result = Add(GROUP, bounds,0); - m_objects.groups[m_count-1].first = start_index; - m_objects.groups[m_count-1].second = end_index; + Path path(m_objects, start_index, end_index, fill); + unsigned data_index = AddPathData(path); + Rect bounds = path.SolveBounds(m_objects); + unsigned result = Add(PATH, bounds,data_index); return result; } @@ -318,6 +322,12 @@ unsigned Document::AddBezier(const Bezier & bezier) { Rect bounds = bezier.SolveBounds(); Bezier data = bezier.ToRelative(bounds); // Relative + if (data.ToAbsolute(bounds) != bezier) + { + Error("%s != %s", data.ToAbsolute(Rect(0,0,1,1)).Str().c_str(), + bezier.Str().c_str()); + Fatal("ToAbsolute on ToRelative does not give original Bezier"); + } unsigned index = AddBezierData(data); return Add(BEZIER, bounds, index); } @@ -327,7 +337,6 @@ unsigned Document::Add(ObjectType type, const Rect & bounds, unsigned data_index m_objects.types.push_back(type); m_objects.bounds.push_back(bounds); m_objects.data_indices.push_back(data_index); - m_objects.groups.push_back(pair(data_index, data_index)); return (m_count++); // Why can't we just use the size of types or something? } @@ -337,6 +346,11 @@ unsigned Document::AddBezierData(const Bezier & bezier) return m_objects.beziers.size()-1; } +unsigned Document::AddPathData(const Path & path) +{ + m_objects.paths.push_back(path); + return m_objects.paths.size()-1; +} void Document::DebugDumpObjects() { @@ -394,6 +408,22 @@ static void GetXYPair(const string & d, Real & x, Real & y, unsigned & i,const s y = strtod(GetToken(d, token, i, delims).c_str(),NULL); } +static bool GetKeyValuePair(const string & d, string & key, string & value, unsigned & i, const string & delims = "()[],{}<>;:=") +{ + key = ""; + string token; + while (GetToken(d, token, i, delims) == ":" || token == ";"); + key = token; + if (GetToken(d, token, i, delims) != ":") + { + Error("Expected \":\" seperating key:value pair"); + return false; + } + value = ""; + GetToken(d, value, i, delims); + return true; +} + static void TransformXYPair(Real & x, Real & y, const SVGMatrix & transform) { Real x0(x); @@ -487,6 +517,8 @@ void Document::ParseSVGNode(pugi::xml_node & root, SVGMatrix & parent_transform) ParseSVGTransform(attrib_trans.as_string(), transform); } + + if (strcmp(child.name(), "svg") == 0 || strcmp(child.name(),"g") == 0 || strcmp(child.name(), "group") == 0) { @@ -497,9 +529,64 @@ void Document::ParseSVGNode(pugi::xml_node & root, SVGMatrix & parent_transform) else if (strcmp(child.name(), "path") == 0) { string d = child.attribute("d").as_string(); - Debug("Path data attribute is \"%s\"", d.c_str()); - pair range = ParseSVGPathData(d, transform); - AddGroup(range.first, range.second); + //Debug("Path data attribute is \"%s\"", d.c_str()); + bool closed = false; + pair range = ParseSVGPathData(d, transform, closed); + if (closed) + { + Colour c(0,0,0,0); + string colour_str(""); + map style; + if (child.attribute("style")) + { + ParseSVGStyleData(child.attribute("style").as_string(), style); + } + + // Determine shading colour + if (child.attribute("fill")) + { + colour_str = child.attribute("fill").as_string(); + } + else if (style.find("fill") != style.end()) + { + colour_str = style["fill"]; + } + if (colour_str == "red") + c = {1,0,0,1}; + else if (colour_str == "blue") + c = {0,0,1,1}; + else if (colour_str == "green") + c = {0,1,0,1}; + else if (colour_str == "black") + c = {0,0,0,1}; + else if (colour_str == "white") + c = {1,1,1,1}; + else if (colour_str.size() == 7 && colour_str[0] == '#') + { + Debug("Parse colour string: \"%s\"", colour_str.c_str()); + char comp[2] = {colour_str[1], colour_str[2]}; + c.r = Real(strtoul(comp, NULL, 16))/Real(255); + comp[0] = colour_str[3]; comp[1] = colour_str[4]; + c.g = Real(strtoul(comp, NULL, 16))/Real(255); + comp[0] = colour_str[5]; comp[1] = colour_str[6]; + c.b = Real(strtoul(comp, NULL, 16))/Real(255); + c.a = 1; + Debug("Colour is: %f, %f, %f, %f", Float(c.r), Float(c.g), Float(c.b), Float(c.a)); + } + + // Determin shading alpha + if (child.attribute("fill-opacity")) + { + c.a = child.attribute("fill-opacity").as_float(); + } + else if (style.find("fill-opacity") != style.end()) + { + c.a = strtod(style["fill-opacity"].c_str(), NULL); + } + + Debug("fill-opacity is %f", Float(c.a)); + AddPath(range.first, range.second, c); + } } else if (strcmp(child.name(), "line") == 0) @@ -557,6 +644,17 @@ void Document::ParseSVGNode(pugi::xml_node & root, SVGMatrix & parent_transform) } } +void Document::ParseSVGStyleData(const string & style, map & results) +{ + unsigned i = 0; + string key; + string value; + while (i < style.size() && GetKeyValuePair(style, key, value, i)) + { + results[key] = value; + } +} + /** * Parse an SVG string into a rectangle */ @@ -601,8 +699,9 @@ void Document::LoadSVG(const string & filename, const Rect & bounds) // Fear the wrath of the tokenizing svg data // Seriously this isn't really very DOM-like at all is it? -pair Document::ParseSVGPathData(const string & d, const SVGMatrix & transform) +pair Document::ParseSVGPathData(const string & d, const SVGMatrix & transform, bool & closed) { + closed = false; Real x[4] = {0,0,0,0}; Real y[4] = {0,0,0,0}; @@ -702,7 +801,7 @@ pair Document::ParseSVGPathData(const string & d, const SVGM } else if (command == "l" || command == "L" || command == "h" || command == "H" || command == "v" || command == "V") { - Debug("Construct lineto command, relative %d", relative); + //Debug("Construct lineto command, relative %d", relative); Real dx = Real(strtod(GetToken(d,token,i,delims).c_str(),NULL)); Real dy; @@ -763,6 +862,7 @@ pair Document::ParseSVGPathData(const string & d, const SVGM x[0] = x3; y[0] = y3; command = "m"; + closed = true; } else { @@ -890,7 +990,7 @@ void Document::AddFontGlyphAtPoint(stbtt_fontinfo *font, int character, Real sca if (start_index < m_count && end_index < m_count) { - AddGroup(start_index, end_index); + AddPath(start_index, end_index); } Debug("Added Glyph \"%c\" at %f %f, scale %f", (char)character, Float(x), Float(y), Float(scale));