X-Git-Url: https://git.ucc.asn.au/?p=ipdf%2Fcode.git;a=blobdiff_plain;f=src%2Fdocument.cpp;h=8a5635c7bb2aa6d833128fc626870794b12a5039;hp=dab086864e603d641a18c7d27ad8c0a2ea594822;hb=d83560835237d360f6d12776435e91676c8ab45f;hpb=c1b5126edfd81846a0ecf19c6dcb9c0476df2196 diff --git a/src/document.cpp b/src/document.cpp index dab0868..8a5635c 100644 --- a/src/document.cpp +++ b/src/document.cpp @@ -130,6 +130,20 @@ int Document::ClipObjectToQuadChild(int object_id, QuadTreeNodeChildren type) m_objects.data_indices.push_back(m_objects.data_indices[object_id]); return 1; } + 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); + for (size_t i = 0; i < new_curves.size(); ++i) + { + unsigned index = AddBezierData(new_curves[i]); + m_objects.bounds.push_back(obj_bounds); + m_objects.types.push_back(BEZIER); + m_objects.data_indices.push_back(index); + } + return new_curves.size(); + } default: Debug("Adding %s -> %s", m_objects.bounds[object_id].Str().c_str(), TransformToQuadChild(m_objects.bounds[object_id], type).Str().c_str()); m_objects.bounds.push_back(TransformToQuadChild(m_objects.bounds[object_id], type)); @@ -254,6 +268,11 @@ void Document::Load(const string & filename) Debug("Bezier data..."); LoadStructVector(file, chunk_size/sizeof(Bezier), m_objects.beziers); break; + + case CT_OBJGROUPS: + Debug("Group data..."); + Warn("Not handled because lazy"); + break; } } Debug("Successfully loaded %u objects from \"%s\"", ObjectCount(), filename.c_str()); @@ -265,12 +284,52 @@ void Document::Load(const string & filename) #endif } -void Document::Add(ObjectType type, const Rect & bounds, unsigned data_index) +unsigned Document::AddGroup(unsigned start_index, unsigned end_index, const Colour & shading) +{ + 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); + + Group group = {start_index, end_index, shading}; + + unsigned data_index = AddGroupData(group); + unsigned result = Add(GROUP, bounds,data_index); + return result; +} + +/** + * Add a Bezier using Absolute coords + */ +unsigned Document::AddBezier(const Bezier & bezier) +{ + Rect bounds = bezier.SolveBounds(); + Bezier data = bezier.ToRelative(bounds); // Relative + unsigned index = AddBezierData(data); + return Add(BEZIER, bounds, index); +} + +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_count; // Why can't we just use the size of types or something? + return (m_count++); // Why can't we just use the size of types or something? } unsigned Document::AddBezierData(const Bezier & bezier) @@ -279,6 +338,11 @@ unsigned Document::AddBezierData(const Bezier & bezier) return m_objects.beziers.size()-1; } +unsigned Document::AddGroupData(const Group & group) +{ + m_objects.groups.push_back(group); + return m_objects.groups.size()-1; +} void Document::DebugDumpObjects() { @@ -336,6 +400,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); @@ -345,7 +425,7 @@ static void TransformXYPair(Real & x, Real & y, const SVGMatrix & transform) void Document::ParseSVGTransform(const string & s, SVGMatrix & transform) { - Debug("Parsing transform %s", s.c_str()); + //Debug("Parsing transform %s", s.c_str()); string token; string command; unsigned i = 0; @@ -360,7 +440,7 @@ void Document::ParseSVGTransform(const string & s, SVGMatrix & transform) else return; } - Debug("Token is \"%s\"", command.c_str()); + //Debug("Token is \"%s\"", command.c_str()); SVGMatrix delta = {1,0,0,0,1,0}; @@ -399,8 +479,8 @@ void Document::ParseSVGTransform(const string & s, SVGMatrix & transform) Warn("Unrecognised transform \"%s\", using identity", command.c_str()); } - Debug("Old transform is {%f,%f,%f,%f,%f,%f}", transform.a, transform.b, transform.c, transform.d,transform.e,transform.f); - Debug("Delta transform is {%f,%f,%f,%f,%f,%f}", delta.a, delta.b, delta.c, delta.d,delta.e,delta.f); + //Debug("Old transform is {%f,%f,%f,%f,%f,%f}", transform.a, transform.b, transform.c, transform.d,transform.e,transform.f); + //Debug("Delta transform is {%f,%f,%f,%f,%f,%f}", delta.a, delta.b, delta.c, delta.d,delta.e,delta.f); SVGMatrix old(transform); transform.a = old.a * delta.a + old.c * delta.b; @@ -411,13 +491,13 @@ void Document::ParseSVGTransform(const string & s, SVGMatrix & transform) transform.d = old.b * delta.c + old.d * delta.d; transform.f = old.b * delta.e + old.d * delta.f + old.f; - Debug("New transform is {%f,%f,%f,%f,%f,%f}", transform.a, transform.b, transform.c, transform.d,transform.e,transform.f); + //Debug("New transform is {%f,%f,%f,%f,%f,%f}", transform.a, transform.b, transform.c, transform.d,transform.e,transform.f); } } void Document::ParseSVGNode(pugi::xml_node & root, SVGMatrix & parent_transform) { - Debug("Parse node <%s>", root.name()); + //Debug("Parse node <%s>", root.name()); for (pugi::xml_node child = root.first_child(); child; child = child.next_sibling()) @@ -429,6 +509,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) { @@ -439,8 +521,65 @@ 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()); - ParseSVGPathData(d, transform); + //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)); + AddGroup(range.first, range.second, c); + } + } else if (strcmp(child.name(), "line") == 0) { @@ -450,8 +589,7 @@ void Document::ParseSVGNode(pugi::xml_node & root, SVGMatrix & parent_transform) Real y1(child.attribute("y2").as_float()); TransformXYPair(x0,y0,transform); TransformXYPair(x1,y1,transform); - unsigned index = AddBezierData(Bezier(x0,y0,x1,y1,x1,y1,x1,y1)); - Add(BEZIER, Rect(0,0,1,1), index); + AddBezier(Bezier(x0,y0,x1,y1,x1,y1,x1,y1)); } else if (strcmp(child.name(), "rect") == 0) { @@ -498,6 +636,35 @@ 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 + */ +void Document::ParseSVG(const string & input, const Rect & bounds) +{ + using namespace pugi; + + xml_document doc_xml; + xml_parse_result result = doc_xml.load(input.c_str()); + + if (!result) + Error("Couldn't parse SVG input - %s", result.description()); + + Debug("Loaded XML - %s", result.description()); + SVGMatrix transform = {bounds.w, 0,bounds.x, 0,bounds.h,bounds.y}; + ParseSVGNode(doc_xml, transform); +} + /** * Load an SVG into a rectangle */ @@ -510,7 +677,7 @@ void Document::LoadSVG(const string & filename, const Rect & bounds) xml_parse_result result = doc_xml.load(input); if (!result) - Fatal("Couldn't load \"%s\" - %s", filename.c_str(), result.description()); + Error("Couldn't load \"%s\" - %s", filename.c_str(), result.description()); Debug("Loaded XML - %s", result.description()); @@ -524,8 +691,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? -void 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}; @@ -540,7 +708,10 @@ void Document::ParseSVGPathData(const string & d, const SVGMatrix & transform) bool start = false; + static string delims("()[],{}<>;:=LlHhVvmMqQzZcC"); + + pair range(m_count, m_count); while (i < d.size() && GetToken(d, token, i, delims).size() > 0) { @@ -565,6 +736,8 @@ void Document::ParseSVGPathData(const string & d, const SVGMatrix & transform) x[0] = (relative) ? x[0] + dx : dx; y[0] = (relative) ? y[0] + dy : dy; + x0 = x[0]; + y0 = y[0]; //Debug("mmoveto %f,%f", Float(x[0]),Float(y[0])); command = (command == "m") ? "l" : "L"; } @@ -609,9 +782,7 @@ void Document::ParseSVGPathData(const string & d, const SVGMatrix & transform) for (int j = 0; j < 4; ++j) TransformXYPair(x[j],y[j], transform); - unsigned index = AddBezierData(Bezier(x[0],y[0],x[1],y[1],x[2],y[2],x[3],y[3])); - Add(BEZIER,Rect(0,0,1,1),index); - + range.second = AddBezier(Bezier(x[0],y[0],x[1],y[1],x[2],y[2],x[3],y[3])); //Debug("[%u] curveto %f,%f %f,%f %f,%f", index, Float(x[1]),Float(y[1]),Float(x[2]),Float(y[2]),Float(x[3]),Float(y[3])); @@ -622,7 +793,7 @@ void Document::ParseSVGPathData(const string & d, const SVGMatrix & transform) } 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; @@ -654,8 +825,7 @@ void Document::ParseSVGPathData(const string & d, const SVGMatrix & transform) TransformXYPair(x[1],y[1],transform); - unsigned index = AddBezierData(Bezier(x[0],y[0],x[1],y[1],x[1],y[1],x[1],y[1])); - Add(BEZIER,Rect(0,0,1,1),index); + range.second = AddBezier(Bezier(x[0],y[0],x[1],y[1],x[1],y[1],x[1],y[1])); //Debug("[%u] lineto %f,%f %f,%f", index, Float(x[0]),Float(y[0]),Float(x[1]),Float(y[1])); @@ -678,14 +848,13 @@ void Document::ParseSVGPathData(const string & d, const SVGMatrix & transform) for (int j = 0; j < 4; ++j) TransformXYPair(x[j],y[j], transform); - unsigned index = AddBezierData(Bezier(x[0],y[0],x[1],y[1],x[2],y[2],x[3],y[3])); - Add(BEZIER,Rect(0,0,1,1),index); - + range.second = AddBezier(Bezier(x[0],y[0],x[1],y[1],x[2],y[2],x[3],y[3])); //Debug("[%u] returnto %f,%f %f,%f", index, Float(x[0]),Float(y[0]),Float(x[1]),Float(y[1])); x[0] = x3; y[0] = y3; command = "m"; + closed = true; } else { @@ -701,6 +870,7 @@ void Document::ParseSVGPathData(const string & d, const SVGMatrix & transform) } prev_i = i; } + return range; } void Document::SetFont(const string & font_filename) @@ -710,7 +880,7 @@ void Document::SetFont(const string & font_filename) free(m_font_data); } - FILE *font_file = fopen("DejaVuSansMono.ttf", "rb"); + FILE *font_file = fopen(font_filename.c_str(), "rb"); fseek(font_file, 0, SEEK_END); size_t font_file_size = ftell(font_file); fseek(font_file, 0, SEEK_SET); @@ -732,11 +902,11 @@ void Document::AddText(const string & text, Real scale, Real x, Real y) return; } - float font_scale = stbtt_ScaleForPixelHeight(&m_font, scale); Real x0(x); //Real y0(y); int ascent = 0, descent = 0, line_gap = 0; stbtt_GetFontVMetrics(&m_font, &ascent, &descent, &line_gap); + float font_scale = scale / (float)(ascent - descent); Real y_advance = Real(font_scale) * Real(ascent - descent + line_gap); for (unsigned i = 0; i < text.size(); ++i) { @@ -750,11 +920,11 @@ void Document::AddText(const string & text, Real scale, Real x, Real y) int advance_width = 0, left_side_bearing = 0, kerning = 0; stbtt_GetCodepointHMetrics(&m_font, text[i], &advance_width, &left_side_bearing); - if (i > 1) + if (i >= 1) { kerning = stbtt_GetCodepointKernAdvance(&m_font, text[i-1], text[i]); } - x += Real(font_scale) * Real(left_side_bearing + kerning); + x += Real(font_scale) * Real(kerning); AddFontGlyphAtPoint(&m_font, text[i], font_scale, x, y); x += Real(font_scale) * Real(advance_width); } @@ -774,7 +944,8 @@ void Document::AddFontGlyphAtPoint(stbtt_fontinfo *font, int character, Real sca int num_instructions = stbtt_GetGlyphShape(font, glyph_index, &instructions); Real current_x(0), current_y(0); - + unsigned start_index = m_count; + unsigned end_index = m_count; for (int i = 0; i < num_instructions; ++i) { // TTF uses 16-bit signed ints for coordinates: @@ -787,7 +958,7 @@ void Document::AddFontGlyphAtPoint(stbtt_fontinfo *font, int character, Real sca Real old_x(current_x), old_y(current_y); current_x = inst_x; current_y = inst_y; - unsigned bezier_index; + switch(instructions[i].type) { // Move To @@ -795,8 +966,7 @@ void Document::AddFontGlyphAtPoint(stbtt_fontinfo *font, int character, Real sca break; // Line To case STBTT_vline: - bezier_index = AddBezierData(Bezier(old_x + x, old_y + y, old_x + x, old_y + y, current_x + x, current_y + y, current_x + x, current_y + y)); - Add(BEZIER,Rect(0,0,1,1),bezier_index); + end_index = AddBezier(Bezier(old_x + x, old_y + y, old_x + x, old_y + y, current_x + x, current_y + y, current_x + x, current_y + y)); break; // Quadratic Bezier To: case STBTT_vcurve: @@ -804,12 +974,17 @@ void Document::AddFontGlyphAtPoint(stbtt_fontinfo *font, int character, Real sca // - Endpoints are the same. // - cubic1 = quad0+(2/3)*(quad1-quad0) // - cubic2 = quad2+(2/3)*(quad1-quad2) - bezier_index = AddBezierData(Bezier(old_x + x, old_y + y, old_x + Real(2)*(inst_cx-old_x)/Real(3) + x, old_y + Real(2)*(inst_cy-old_y)/Real(3) + y, + end_index = AddBezier(Bezier(old_x + x, old_y + y, old_x + Real(2)*(inst_cx-old_x)/Real(3) + x, old_y + Real(2)*(inst_cy-old_y)/Real(3) + y, current_x + Real(2)*(inst_cx-current_x)/Real(3) + x, current_y + Real(2)*(inst_cy-current_y)/Real(3) + y, current_x + x, current_y + y)); - Add(BEZIER,Rect(0,0,1,1),bezier_index); break; } } + + if (start_index < m_count && end_index < m_count) + { + AddGroup(start_index, end_index); + } + Debug("Added Glyph \"%c\" at %f %f, scale %f", (char)character, Float(x), Float(y), Float(scale)); stbtt_FreeShape(font, instructions); }