X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Fsrc%2Fmodules%2Fmod_svg%2Fsvg_parser.cpp;h=6a5d12cfaf9d576a071d1bff56a7d3dddd377ba1;hb=9e2225fa6926e20e833ce1c495332b38a4938cb8;hp=2897d642d173ee29b35e7a93669a2eecaaf48c9c;hpb=adfc80c126f482d7ea2bac38001a2c4a7c7df88c;p=synfig.git diff --git a/synfig-core/src/modules/mod_svg/svg_parser.cpp b/synfig-core/src/modules/mod_svg/svg_parser.cpp index 2897d64..6a5d12c 100644 --- a/synfig-core/src/modules/mod_svg/svg_parser.cpp +++ b/synfig-core/src/modules/mod_svg/svg_parser.cpp @@ -93,14 +93,14 @@ Svg_parser::Svg_parser(){ String Svg_parser::get_id(){ if(!id_name.empty()) return id_name; - return "id_arbitrario"; + return "random_id"; } void Svg_parser::set_id(String source){ const char bad_chars[]=" :#@$^&()*"; - int inicio= source.find_last_of('/')+1; - int fin= source.find_last_of('.'); - String x=source.substr(inicio,fin-inicio); + int start= source.find_last_of('/')+1; + int end= source.find_last_of('.'); + String x=source.substr(start,end-start); if(!x.empty()){ for(unsigned int i=0;iadd_child("layer"),"",NULL); - return; - }else if(nodename.compare("rect")==0){ - if(set_canvas==0) parser_canvas (node); - parser_rect(node,nodeRoot,"",NULL); - }else if(nodename.compare("polygon")==0){ - if(set_canvas==0) parser_canvas (node); - parser_polygon(node,nodeRoot,"",NULL); - }else if(nodename.compare("path")==0){ + }else{ if(set_canvas==0) parser_canvas (node); - parser_path (node,nodeRoot,"",NULL); + parser_graphics(node,nodeRoot,"",NULL); + if(nodename.compare("g")==0) return; } } if(!nodeContent){ @@ -160,7 +151,6 @@ Svg_parser::parser_node(const xmlpp::Node* node){ //parser elements void Svg_parser::parser_svg (const xmlpp::Node* node){ - //printf("un dia en algun lugar de la tierra media\n"); if(const xmlpp::Element* nodeElement = dynamic_cast(node)){ width =etl::strprintf("%f",getDimension(nodeElement->get_attribute_value("width"))); height =etl::strprintf("%f",getDimension(nodeElement->get_attribute_value("height"))); @@ -169,7 +159,6 @@ Svg_parser::parser_svg (const xmlpp::Node* node){ } void Svg_parser::parser_canvas (const xmlpp::Node* node){ - //printf("el campo de batalla parecia un lienzo de pintura\n"); if(const xmlpp::Element* nodeElement = dynamic_cast(node)){ if(width.compare("")==0){ width=nodeElement->get_attribute_value("width",""); @@ -210,236 +199,66 @@ Svg_parser::parser_canvas (const xmlpp::Node* node){ nodeRoot->set_attribute("begin-time","0f"); nodeRoot->set_attribute("end-time","5s"); nodeRoot->set_attribute("bgcolor","0.500000 0.500000 0.500000 1.000000"); - //nodeRoot->add_child("name")->set_child_text("Synfig Animation 1"); if(!id_name.empty()) nodeRoot->add_child("name")->set_child_text(id_name); else nodeRoot->add_child("name")->set_child_text("Synfig Animation 1"); } set_canvas=1; AdjustPointUrl (); } +//Toplevel parser -void -Svg_parser::parser_rect(const xmlpp::Node* node,xmlpp::Element* root,String parent_style,Matrix* mtx_parent){ - if(const xmlpp::Element* nodeElement = dynamic_cast(node)){ - Glib::ustring rect_id =nodeElement->get_attribute_value("id"); - Glib::ustring rect_style =nodeElement->get_attribute_value("style"); - Glib::ustring rect_x =nodeElement->get_attribute_value("x"); - Glib::ustring rect_y =nodeElement->get_attribute_value("y"); - Glib::ustring rect_width =nodeElement->get_attribute_value("width"); - Glib::ustring rect_height =nodeElement->get_attribute_value("height"); - //style - String fill =loadAttribute("fill",rect_style,parent_style,"none"); - String fill_opacity =loadAttribute("fill-opacity",rect_style,parent_style,"1"); - String opacity =loadAttribute("opacity",rect_style,parent_style,"1"); - //matrix - //it's some complicated - - //build +//parser preferences +//Seperate transformations: apply transformations on a per-layer basis, rather than on canvases +//Resolve BLine transformations: resolve transformations instead of creating transformation layers +#define SVG_SEP_TRANSFORMS 1 +#define SVG_RESOLVE_BLINE 1 - int typeFill=0; - if(fill.compare(0,3,"url")==0){ - typeFill=2; - root=nodeStartBasicLayer(root->add_child("layer")); - } - xmlpp::Element *child_rect=root->add_child("layer"); - child_rect->set_attribute("type","rectangle"); - child_rect->set_attribute("active","true"); - child_rect->set_attribute("version","0.2"); - child_rect->set_attribute("desc",rect_id); - - build_real(child_rect->add_child("param"),"z_depth",0.0); - build_real(child_rect->add_child("param"),"amount",1.0); - build_integer(child_rect->add_child("param"),"blend_method",0); - build_color (child_rect->add_child("param"),getRed (fill),getGreen (fill),getBlue(fill),atof(opacity.data())*atof(fill_opacity.data())); - - float auxx=atof(rect_x.c_str()); - float auxy=atof(rect_y.c_str()); - coor2vect(&auxx,&auxy); - build_vector (child_rect->add_child("param"),"point1",auxx,auxy); - auxx= atof(rect_x.c_str()) + atof(rect_width.c_str()); - auxy= atof(rect_y.c_str()) + atof(rect_height.c_str()); - coor2vect(&auxx,&auxy); - build_vector (child_rect->add_child("param"),"point2",auxx,auxy); - if(typeFill==2){ - build_url (root->add_child("layer"),fill,mtx_parent); - } - } -} void -Svg_parser::parser_layer(const xmlpp::Node* node,xmlpp::Element* root,String parent_style,Matrix* mtx_parent){ +Svg_parser::parser_graphics(const xmlpp::Node* node,xmlpp::Element* root,String parent_style,Matrix* mtx_parent){ if(const xmlpp::Element* nodeElement = dynamic_cast(node)){ - Glib::ustring label =nodeElement->get_attribute_value("label"); - Glib::ustring style =nodeElement->get_attribute_value("style"); - Glib::ustring fill =nodeElement->get_attribute_value("fill"); + Glib::ustring nodename = node->get_name(); + if (nodename.compare("g")==0 || nodename.compare("path")==0 || nodename.compare("polygon")==0 || nodename.compare("rect")==0){} else return; + + //load sub-attributes + Glib::ustring id =nodeElement->get_attribute_value("id"); Glib::ustring transform =nodeElement->get_attribute_value("transform"); - String layer_style; - if(!style.empty()){ - layer_style=style; - }else if(!fill.empty()){ - layer_style.append("fill:"); - layer_style.append(fill); - }else if(!parent_style.empty()){ - layer_style=parent_style; - } + //resolve transformations Matrix* mtx=NULL; if(!transform.empty()) mtx=build_transform (transform); - if(mtx_parent){ - if(mtx) - composeMatrix(&mtx,mtx_parent,mtx); - else - mtx=newMatrix (mtx_parent); - } - //build - root->set_attribute("type","PasteCanvas"); - root->set_attribute("active","true"); - root->set_attribute("version","0.1"); - if(!label.empty()) root->set_attribute("desc",label); - else root->set_attribute("desc","unknow layer"); - - build_real(root->add_child("param"),"z_depth",0.0); - build_real(root->add_child("param"),"amount",1.0); - build_integer(root->add_child("param"),"blend_method",0); - build_vector (root->add_child("param"),"origin",0,0); - - //printf(" atributos canvas "); - //canvas - xmlpp::Element *child_canvas=root->add_child("param"); - child_canvas->set_attribute("name","canvas"); - child_canvas=child_canvas->add_child("canvas"); - const xmlpp::ContentNode* nodeContent = dynamic_cast(node); - if(!nodeContent){ - xmlpp::Node::NodeList list = node->get_children(); - for(xmlpp::Node::NodeList::iterator iter = list.begin(); iter != list.end(); ++iter){ - Glib::ustring name =(*iter)->get_name(); - if(name.compare("g")==0){ - parser_layer (*iter,child_canvas->add_child("layer"),layer_style,mtx); - }else if(name.compare("path")==0){ - parser_path (*iter,child_canvas,layer_style,mtx); - }else if(name.compare("polygon")==0){ - parser_polygon (*iter,child_canvas,layer_style,mtx); - }else if(name.compare("rect")==0){ - parser_rect (*iter,child_canvas,layer_style,mtx); - } - } - } - } -} -void -Svg_parser::parser_polygon(const xmlpp::Node* node,xmlpp::Element* root,String parent_style,Matrix* mtx_parent){ - //printf("sus escudos parecian rombos y sus naves unos triangulos\n"); - if(const xmlpp::Element* nodeElement = dynamic_cast(node)){ - //load sub-attributes - Glib::ustring polygon_style =nodeElement->get_attribute_value("style"); - Glib::ustring polygon_id =nodeElement->get_attribute_value("id"); - Glib::ustring polygon_points =nodeElement->get_attribute_value("points"); - Glib::ustring polygon_transform =nodeElement->get_attribute_value("transform"); - Glib::ustring polygon_fill =nodeElement->get_attribute_value("fill"); - String fill =loadAttribute("fill",polygon_style,parent_style,polygon_fill,"none"); - String fill_rule =loadAttribute("fill-rule",polygon_style,parent_style,"evenodd"); - String fill_opacity =loadAttribute("fill-opacity",polygon_style,parent_style,"1"); - String opacity =loadAttribute("opacity",polygon_style,parent_style,"1"); - - //transforms - Matrix* mtx=NULL; - if(!polygon_transform.empty()) - mtx=build_transform (polygon_transform); - if(mtx_parent){ - if(mtx) - composeMatrix(&mtx,mtx_parent,mtx); - else - mtx=newMatrix (mtx_parent); + if (SVG_SEP_TRANSFORMS) + { + if(mtx_parent){ + if(mtx) + composeMatrix(&mtx,mtx_parent,mtx); + else + mtx=newMatrix(mtx_parent); + } } - //points - if(polygon_points.empty()) + if(nodename.compare("g")==0){ + parser_layer (node,root->add_child("layer"),parent_style,mtx); return; - std::list k; - std::vector tokens=get_tokens_path (polygon_points); - unsigned int i; - float ax,ay; ax=ay=0; - for(i=0;iadd_child("layer")); - } - child_polygon=root->add_child("layer"); - child_polygon->set_attribute("type","polygon"); - child_polygon->set_attribute("active","true"); - child_polygon->set_attribute("version","0.1"); - child_polygon->set_attribute("desc",polygon_id); - build_param (child_polygon->add_child("param"),"z_depth","real","0.0000000000"); - build_param (child_polygon->add_child("param"),"amount","real","1.0000000000"); - build_param (child_polygon->add_child("param"),"blend_method","integer","0"); - build_color (child_polygon->add_child("param"),getRed(fill),getGreen(fill),getBlue(fill),atof(fill_opacity.data())*atof(opacity.data())); - build_vector(child_polygon->add_child("param"),"offset",0,0); - build_param (child_polygon->add_child("param"),"invert","bool","false"); - build_param (child_polygon->add_child("param"),"antialias","bool","true"); - build_param (child_polygon->add_child("param"),"feather","real","0.0000000000"); - build_param (child_polygon->add_child("param"),"blurtype","integer","1"); - if(fill_rule.compare("evenodd")==0) build_param (child_polygon->add_child("param"),"winding_style","integer","1"); - else build_param (child_polygon->add_child("param"),"winding_style","integer","0"); - build_points (child_polygon->add_child("param"),k); - if(typeFill==2){ - build_url(root->add_child("layer"),fill,mtx); - } - } -} -void -Svg_parser::parser_path(const xmlpp::Node* node,xmlpp::Element* root,String parent_style,Matrix* mtx_parent){ - //printf("pensamos que atacarian de frente pero hicieron una curva\n"); - if(const xmlpp::Element* nodeElement = dynamic_cast(node)){ - //load sub-attributes - Glib::ustring path_style =nodeElement->get_attribute_value("style"); - Glib::ustring path_id =nodeElement->get_attribute_value("id"); - Glib::ustring path_d =nodeElement->get_attribute_value("d"); - Glib::ustring path_transform =nodeElement->get_attribute_value("transform"); - Glib::ustring path_fill =nodeElement->get_attribute_value("fill"); - - String fill =loadAttribute("fill",path_style,parent_style,path_fill,"none"); - String fill_rule =loadAttribute("fill-rule",path_style,parent_style,"evenodd"); - String stroke =loadAttribute("stroke",path_style,parent_style,"none"); - String stroke_width =loadAttribute("stroke-width",path_style,parent_style,"1px"); - String stroke_linecap =loadAttribute("stroke-linecap",path_style,parent_style,"butt"); - String stroke_linejoin =loadAttribute("stroke-linejoin",path_style,parent_style,"miter"); - String stroke_opacity =loadAttribute("stroke-opacity",path_style,parent_style,"1"); - String fill_opacity =loadAttribute("fill-opacity",path_style,parent_style,"1"); - String opacity =loadAttribute("opacity",path_style,parent_style,"1"); + Glib::ustring obj_style =nodeElement->get_attribute_value("style"); + Glib::ustring obj_fill =nodeElement->get_attribute_value("fill"); + + //style + String fill =loadAttribute("fill",obj_style,parent_style,obj_fill,"none"); + String fill_rule =loadAttribute("fill-rule",obj_style,parent_style,"evenodd"); + String stroke =loadAttribute("stroke",obj_style,parent_style,"none"); + String stroke_width =loadAttribute("stroke-width",obj_style,parent_style,"1px"); + String stroke_linecap =loadAttribute("stroke-linecap",obj_style,parent_style,"butt"); + String stroke_linejoin =loadAttribute("stroke-linejoin",obj_style,parent_style,"miter"); + String stroke_opacity =loadAttribute("stroke-opacity",obj_style,parent_style,"1"); + String fill_opacity =loadAttribute("fill-opacity",obj_style,parent_style,"1"); + String opacity =loadAttribute("opacity",obj_style,parent_style,"1"); - //resolve transformations - Matrix* mtx=NULL; - if(!path_transform.empty()) - mtx=build_transform (path_transform); - if(mtx_parent){ - if(mtx) - composeMatrix(&mtx,mtx_parent,mtx); - else - mtx=newMatrix(mtx_parent); - } - //parser path_d attribute, this is obviously important - std::list > k; - k=parser_path_d (path_d,mtx); - //escribir - int typeFill=0; //nothing - int typeStroke=0;//nothing //Fill + int typeFill=0; //nothing + if(fill.compare("none")!=0){ typeFill=1; //simple } @@ -447,40 +266,76 @@ Svg_parser::parser_path(const xmlpp::Node* node,xmlpp::Element* root,String pare typeFill=2; //gradient } //Stroke + int typeStroke=0;//nothing + if(stroke.compare("none")!=0){ typeStroke=1; //simple } if(typeStroke==1 && stroke.compare(0,3,"url")==0){ typeStroke=2; //gradient } - String bline_id; - String offset_id; - int n=k.size(); - if(n!=1){ //if n is > than 1 then we must create a paste canvas for all paths - root=nodeStartBasicLayer(root->add_child("layer")); + + xmlpp::Element* child_layer = nodeStartBasicLayer(root->add_child("layer")); + xmlpp::Element* child_fill = child_layer; + xmlpp::Element* child_stroke = child_layer; + if(typeFill==2){ + child_fill=nodeStartBasicLayer(child_fill->add_child("layer")); } - std::list >::iterator aux = k.begin(); - for (; aux!=k.end(); aux++){ - if(typeFill!=0 && typeStroke!=0){ - bline_id=new_guid(); - offset_id=new_guid(); + if(typeStroke==2){ + child_stroke=nodeStartBasicLayer(child_stroke->add_child("layer")); + } + + //make simple fills + if(nodename.compare("rect")==0 && typeFill!=0){ + rect_simple(nodeElement,child_fill,fill,fill_opacity,opacity); + if(typeFill==2){ + build_url (child_fill->add_child("layer"),fill,NULL); } - if(typeFill==1 || typeFill==2){//region layer - xmlpp::Element *child_fill=root; - if(n==1 && typeFill==2){//open gradient or url (fill) - child_fill=nodeStartBasicLayer(root->add_child("layer")); - } + parser_effects(nodeElement,child_layer,parent_style,mtx); + return; + } + + + //======================================================================= + std::list > k; + //if we are creating a bline + + //First, create the list of vertices + if (SVG_RESOLVE_BLINE) { + if(nodename.compare("path")==0){ + k=parser_path_d (nodeElement->get_attribute_value("d"),mtx); + } else if(nodename.compare("polygon")==0){ + k=parser_polygon_path (nodeElement->get_attribute_value("points"),mtx); + } + } else { + if(nodename.compare("path")==0){ + k=parser_path_d (nodeElement->get_attribute_value("d"),NULL); + } else if(nodename.compare("polygon")==0){ + k=parser_polygon_path (nodeElement->get_attribute_value("points"),NULL); + } + } + + int n = k.size(); + String bline_id[n]; + String offset_id[n]; + for (int i=0;i >::iterator aux = k.begin(); + if(typeFill!=0){//region layer + for (int i=0; aux!=k.end(); aux++){ xmlpp::Element *child_region=child_fill->add_child("layer"); child_region->set_attribute("type","region"); child_region->set_attribute("active","true"); child_region->set_attribute("version","0.1"); - child_region->set_attribute("desc",path_id); + child_region->set_attribute("desc",id); build_param (child_region->add_child("param"),"z_depth","real","0.0000000000"); build_param (child_region->add_child("param"),"amount","real","1.0000000000"); build_param (child_region->add_child("param"),"blend_method","integer","0"); build_color (child_region->add_child("param"),getRed(fill),getGreen(fill),getBlue(fill),atof(fill_opacity.data())*atof(opacity.data())); - if(offset_id.empty()) build_vector (child_region->add_child("param"),"offset",0,0); - else build_vector (child_region->add_child("param"),"offset",0,0,offset_id); + build_vector (child_region->add_child("param"),"offset",0,0,offset_id[i]); build_param (child_region->add_child("param"),"invert","bool","false"); build_param (child_region->add_child("param"),"antialias","bool","true"); build_param (child_region->add_child("param"),"feather","real","0.0000000000"); @@ -488,29 +343,30 @@ Svg_parser::parser_path(const xmlpp::Node* node,xmlpp::Element* root,String pare if(fill_rule.compare("evenodd")==0) build_param (child_region->add_child("param"),"winding_style","integer","1"); else build_param (child_region->add_child("param"),"winding_style","integer","0"); - build_bline (child_region->add_child("param"),*aux,loop,bline_id); - - if(n==1 && typeFill==2){ //gradient in onto mode (fill) - build_url(child_fill->add_child("layer"),fill,mtx); - } + build_bline (child_region->add_child("param"),*aux,loop,bline_id[i]); + i++; } + } + if(typeFill==2){ //gradient in onto mode (fill) + if (SVG_RESOLVE_BLINE) + build_url(child_fill->add_child("layer"),fill,mtx); + else + build_url(child_fill->add_child("layer"),fill,NULL); + } - if(typeStroke==1 || typeStroke==2){ //layer outline - xmlpp::Element *child_stroke=root; - if(n==1 && typeStroke==2){//open gradient in straigth onto (stroke) - child_stroke=nodeStartBasicLayer(root->add_child("layer")); - } + if(typeStroke!=0){//outline layer + int i=0; + for (aux=k.begin(); aux!=k.end(); aux++){ xmlpp::Element *child_outline=child_stroke->add_child("layer"); child_outline->set_attribute("type","outline"); child_outline->set_attribute("active","true"); child_outline->set_attribute("version","0.2"); - child_outline->set_attribute("desc",path_id); + child_outline->set_attribute("desc",id); build_param (child_outline->add_child("param"),"z_depth","real","0.0000000000"); build_param (child_outline->add_child("param"),"amount","real","1.0000000000"); build_param (child_outline->add_child("param"),"blend_method","integer","0"); build_color (child_outline->add_child("param"),getRed(stroke),getGreen(stroke),getBlue(stroke),atof(stroke_opacity.data())*atof(opacity.data())); - if(offset_id.empty()) build_vector (child_outline->add_child("param"),"offset",0,0); - else build_vector (child_outline->add_child("param"),"offset",0,0,offset_id); + build_vector (child_outline->add_child("param"),"offset",0,0,offset_id[i]); build_param (child_outline->add_child("param"),"invert","bool","false"); build_param (child_outline->add_child("param"),"antialias","bool","true"); build_param (child_outline->add_child("param"),"feather","real","0.0000000000"); @@ -518,7 +374,7 @@ Svg_parser::parser_path(const xmlpp::Node* node,xmlpp::Element* root,String pare //outline in nonzero build_param (child_outline->add_child("param"),"winding_style","integer","0"); - build_bline (child_outline->add_child("param"),*aux,loop,bline_id); + build_bline (child_outline->add_child("param"),*aux,loop,bline_id[i]); stroke_width=etl::strprintf("%f",getDimension(stroke_width)/kux); build_param (child_outline->add_child("param"),"width","real",stroke_width); @@ -535,19 +391,125 @@ Svg_parser::parser_path(const xmlpp::Node* node,xmlpp::Element* root,String pare build_param (child_outline->add_child("param"),"loopyness","real","1.0000000000"); build_param (child_outline->add_child("param"),"homogeneous_width","bool","true"); - if(n==1 && typeStroke==2){ //gradient in onto mode (stroke) - build_url(child_stroke->add_child("layer"),stroke,mtx); - } + + i++; } - } - if(n!=1){//only fill for several canvas in one path - if(typeFill==2){ - build_url(root->add_child("layer"),fill,mtx); + + if(typeStroke==2){ //gradient in onto mode (stroke) + if (SVG_RESOLVE_BLINE) + build_url(child_stroke->add_child("layer"),fill,mtx); + else + build_url(child_stroke->add_child("layer"),fill,NULL); } + if (SVG_RESOLVE_BLINE) + parser_effects(nodeElement,child_layer,parent_style,NULL); + else + parser_effects(nodeElement,child_layer,parent_style,mtx); + } } } +void +Svg_parser::rect_simple(const xmlpp::Element* nodeElement,xmlpp::Element* root,String fill, String fill_opacity, String opacity){ + Glib::ustring rect_id =nodeElement->get_attribute_value("id"); + Glib::ustring rect_x =nodeElement->get_attribute_value("x"); + Glib::ustring rect_y =nodeElement->get_attribute_value("y"); + Glib::ustring rect_width =nodeElement->get_attribute_value("width"); + Glib::ustring rect_height =nodeElement->get_attribute_value("height"); + + xmlpp::Element *child_rect=root->add_child("layer"); + child_rect->set_attribute("type","rectangle"); + child_rect->set_attribute("active","true"); + child_rect->set_attribute("version","0.2"); + child_rect->set_attribute("desc",rect_id); + + build_real(child_rect->add_child("param"),"z_depth",0.0); + build_real(child_rect->add_child("param"),"amount",1.0); + build_integer(child_rect->add_child("param"),"blend_method",0); + build_color (child_rect->add_child("param"),getRed (fill),getGreen (fill),getBlue(fill),atof(opacity.data())*atof(fill_opacity.data())); + + float auxx=atof(rect_x.c_str()); + float auxy=atof(rect_y.c_str()); + coor2vect(&auxx,&auxy); + build_vector (child_rect->add_child("param"),"point1",auxx,auxy); + auxx= atof(rect_x.c_str()) + atof(rect_width.c_str()); + auxy= atof(rect_y.c_str()) + atof(rect_height.c_str()); + coor2vect(&auxx,&auxy); + build_vector (child_rect->add_child("param"),"point2",auxx,auxy); + + +} + +void +Svg_parser::parser_layer(const xmlpp::Node* node,xmlpp::Element* root,String parent_style,Matrix* mtx){ + if(const xmlpp::Element* nodeElement = dynamic_cast(node)){ + Glib::ustring label =nodeElement->get_attribute_value("label"); + Glib::ustring style =nodeElement->get_attribute_value("style"); + Glib::ustring fill =nodeElement->get_attribute_value("fill"); + + String layer_style; + if(!style.empty()){ + layer_style=style; + }else if(!fill.empty()){ + layer_style.append("fill:"); + layer_style.append(fill); + }else if(!parent_style.empty()){ + layer_style=parent_style; + } + //build + root->set_attribute("type","PasteCanvas"); + root->set_attribute("active","true"); + root->set_attribute("version","0.1"); + if(!label.empty()) root->set_attribute("desc",label); + else root->set_attribute("desc","Inline Canvas"); + + build_real(root->add_child("param"),"z_depth",0.0); + build_real(root->add_child("param"),"amount",1.0); + build_integer(root->add_child("param"),"blend_method",0); + build_vector (root->add_child("param"),"origin",0,0); + + //printf(" canvas attributes "); + //canvas + xmlpp::Element *child_canvas=root->add_child("param"); + child_canvas->set_attribute("name","canvas"); + child_canvas=child_canvas->add_child("canvas"); + const xmlpp::ContentNode* nodeContent = dynamic_cast(node); + if(!nodeContent){ + xmlpp::Node::NodeList list = node->get_children(); + for(xmlpp::Node::NodeList::iterator iter = list.begin(); iter != list.end(); ++iter){ + Glib::ustring name =(*iter)->get_name(); + parser_graphics (*iter,child_canvas,layer_style,mtx); + } + } + if (! SVG_SEP_TRANSFORMS) parser_effects(nodeElement,child_canvas,parent_style,mtx); + } +} + +std::list > +Svg_parser::parser_polygon_path(Glib::ustring polygon_points, Matrix* mtx){ + std::list > k0; + if(polygon_points.empty()) + return k0; + std::list k; + std::vector tokens=get_tokens_path (polygon_points); + unsigned int i; + float ax,ay; ax=ay=0; + for(i=0;i Svg_parser::get_tokens_path(String path){ //mini path lexico-parser std::vector tokens; @@ -643,49 +605,78 @@ std::list > Svg_parser::parser_path_d(String path_d,Matrix* mtx){ std::list > k; std::list k1; + std::vector tokens=get_tokens_path(path_d); + String command="M"; //the current command float ax,ay,tgx,tgy,tgx2,tgy2;//each method - float actual_x=0,actual_y=0;//for relative methods; + ax=ay=0; + float actual_x=0,actual_y=0; //in svg coordinate space + float old_x=0,old_y=0; //needed in rare cases + float init_x=0,init_y=0; //for closepath commands loop=false; - unsigned int i; - std::vector tokens=get_tokens_path(path_d); - for(i=0;ix,k1.front()->y,tgx,tgy); }else{ - k1.push_back(nuevoVertice (ax,ay)); + k1.push_back(newVertice (ax,ay)); setTg1(k1.back(),k1.back()->x,k1.back()->y,tgx,tgy); setSplit(k1.back(),TRUE); } - }else if(tokens.at(i).compare("Q")==0){ //absolute quadractic curve + }else if(command.compare("Q")==0 || command.compare("q")==0){ //quadractic curve //tg1 and tg2 - i++; tgx=ax=atof(tokens.at(i).data()); + tgx=actual_x+atof(tokens.at(i).data()); i++; if(tokens.at(i).compare(",")==0) i++; - tgy=ay=atof(tokens.at(i).data()); + tgy=actual_y+atof(tokens.at(i).data()); //point - i++; ax=atof(tokens.at(i).data()); + i++; actual_x+=atof(tokens.at(i).data()); i++; if(tokens.at(i).compare(",")==0) i++; - ay=atof(tokens.at(i).data()); - actual_x=ax; - actual_y=ay; + actual_y+=atof(tokens.at(i).data()); + + ax=actual_x; + ay=actual_y; //mtx if(mtx){ transformPoint2D(mtx,&ax,&ay); @@ -720,74 +712,16 @@ Svg_parser::parser_path_d(String path_d,Matrix* mtx){ //save setTg1(k1.back(),k1.back()->x,k1.back()->y,tgx,tgy); setSplit(k1.back(),FALSE); - k1.push_back(nuevoVertice (ax,ay)); + k1.push_back(newVertice (ax,ay)); setTg1(k1.back(),k1.back()->x,k1.back()->y,tgx,tgy); - }else if(tokens.at(i).compare("L")==0){ //absolute line to + }else if(command.compare("L")==0 || command.compare("l")==0){ //line to //point - i++; ax=atof(tokens.at(i).data()); - i++; if(tokens.at(i).compare(",")==0) i++; - ay=atof(tokens.at(i).data()); - actual_x=ax; - actual_y=ay; - //mtx - if(mtx) transformPoint2D(mtx,&ax,&ay); - //adjust - coor2vect(&ax,&ay); - //save - setTg2(k1.back(),k1.back()->x,k1.back()->y,k1.back()->x,k1.back()->y); - if(isFirst(k1.front(),ax,ay)){ - setTg1(k1.front(),k1.front()->x,k1.front()->y,k1.front()->x,k1.front()->y); - }else{ - k1.push_back(nuevoVertice(ax,ay)); - setTg1(k1.back(),k1.back()->x,k1.back()->y,k1.back()->x,k1.back()->y); - } - }else if(tokens.at(i).compare("l")==0){//relative line to - //point read - i++; ax=atof(tokens.at(i).data()); + actual_x+=atof(tokens.at(i).data()); i++; if(tokens.at(i).compare(",")==0) i++; - ay=atof(tokens.at(i).data()); - //relative - ax=actual_x+ax; - ay=actual_y+ay; - actual_x=ax; - actual_y=ay; - //mtx - if(mtx) transformPoint2D(mtx,&ax,&ay); - //adjust - coor2vect(&ax,&ay); - //save - setTg2(k1.back(),k1.back()->x,k1.back()->y,k1.back()->x,k1.back()->y); - if(isFirst(k1.front(),ax,ay)){ - setTg1(k1.front(),k1.front()->x,k1.front()->y,k1.front()->x,k1.front()->y); - }else{ - k1.push_back(nuevoVertice(ax,ay)); - setTg1(k1.back(),k1.back()->x,k1.back()->y,k1.back()->x,k1.back()->y); - } - }else if(tokens.at(i).compare("H")==0){//absolute horizontal move - //the same that L but only Horizontal movement - //point - i++; ax=atof(tokens.at(i).data()); - ay=actual_y; - actual_x=ax; - actual_y=ay; - //mtx - if(mtx) transformPoint2D(mtx,&ax,&ay); - //adjust - coor2vect(&ax,&ay); - //save - setTg2(k1.back(),k1.back()->x,k1.back()->y,k1.back()->x,k1.back()->y); - if(isFirst(k1.front(),ax,ay)){ - setTg1(k1.front(),k1.front()->x,k1.front()->y,k1.front()->x,k1.front()->y); - }else{ - k1.push_back(nuevoVertice(ax,ay)); - setTg1(k1.back(),k1.back()->x,k1.back()->y,k1.back()->x,k1.back()->y); - } - }else if(tokens.at(i).compare("h")==0){//horizontal relative - i++; ax=atof(tokens.at(i).data()); - ax=actual_x+ax; + actual_y+=atof(tokens.at(i).data()); + + ax=actual_x; ay=actual_y; - actual_x=ax; - actual_y=ay; //mtx if(mtx) transformPoint2D(mtx,&ax,&ay); //adjust @@ -797,15 +731,16 @@ Svg_parser::parser_path_d(String path_d,Matrix* mtx){ if(isFirst(k1.front(),ax,ay)){ setTg1(k1.front(),k1.front()->x,k1.front()->y,k1.front()->x,k1.front()->y); }else{ - k1.push_back(nuevoVertice(ax,ay)); + k1.push_back(newVertice(ax,ay)); setTg1(k1.back(),k1.back()->x,k1.back()->y,k1.back()->x,k1.back()->y); } - }else if(tokens.at(i).compare("V")==0){//vertical absolute + }else if(command.compare("H")==0 || command.compare("h")==0){// horizontal move + //the same that L but only Horizontal movement //point - i++; ay=atof(tokens.at(i).data()); + actual_x+=atof(tokens.at(i).data()); + ax=actual_x; - actual_x=ax; - actual_y=ay; + ay=old_y; //mtx if(mtx) transformPoint2D(mtx,&ax,&ay); //adjust @@ -815,16 +750,15 @@ Svg_parser::parser_path_d(String path_d,Matrix* mtx){ if(isFirst(k1.front(),ax,ay)){ setTg1(k1.front(),k1.front()->x,k1.front()->y,k1.front()->x,k1.front()->y); }else{ - k1.push_back(nuevoVertice(ax,ay)); + k1.push_back(newVertice(ax,ay)); setTg1(k1.back(),k1.back()->x,k1.back()->y,k1.back()->x,k1.back()->y); } - }else if(tokens.at(i).compare("v")==0){//relative + }else if(command.compare("V")==0 || command.compare("v")==0){//vertical //point - i++; ay=atof(tokens.at(i).data()); - ax=actual_x; - ay=actual_y+ay; - actual_x=ax; - actual_y=ay; + actual_y+=atof(tokens.at(i).data()); + + ax=old_x; + ay=actual_y; //mtx if(mtx) transformPoint2D(mtx,&ax,&ay); //adjust @@ -834,11 +768,14 @@ Svg_parser::parser_path_d(String path_d,Matrix* mtx){ if(isFirst(k1.front(),ax,ay)){ setTg1(k1.front(),k1.front()->x,k1.front()->y,k1.front()->x,k1.front()->y); }else{ - k1.push_back(nuevoVertice(ax,ay)); + k1.push_back(newVertice(ax,ay)); setTg1(k1.back(),k1.back()->x,k1.back()->y,k1.back()->x,k1.back()->y); } - }else if(tokens.at(i).compare("T")==0){// I don't know what does it - }else if(tokens.at(i).compare("A")==0){//elliptic arc + }else if(command.compare("T")==0 || command.compare("t")==0){// I don't know what does it + actual_x+=atof(tokens.at(i).data()); + i++; if(tokens.at(i).compare(",")==0) i++; + actual_y+=atof(tokens.at(i).data()); + }else if(command.compare("A")==0 || command.compare("a")==0){//elliptic arc //isn't complete support, is only for circles @@ -848,7 +785,7 @@ Svg_parser::parser_path_d(String path_d,Matrix* mtx){ float angle; bool sweep,large; //radio - i++; radio_x=atof(tokens.at(i).data()); + radio_x=atof(tokens.at(i).data()); i++; if(tokens.at(i).compare(",")==0) i++; radio_y=atof(tokens.at(i).data()); //angle @@ -857,18 +794,19 @@ Svg_parser::parser_path_d(String path_d,Matrix* mtx){ i++; large=atoi(tokens.at(i).data()); i++; sweep=atoi(tokens.at(i).data()); //point - i++; ax=atof(tokens.at(i).data()); + i++; actual_x+=atof(tokens.at(i).data()); i++; if(tokens.at(i).compare(",")==0) i++; - ay=atof(tokens.at(i).data()); + actual_y+=atof(tokens.at(i).data()); //how to draw? if(!large && !sweep){ //points - tgx2 = actual_x + radio_x*0.5; - tgy2 = actual_y ; - tgx = ax; - tgy = ay + radio_y*0.5; - actual_x=ax; - actual_y=ay; + tgx2 = old_x + radio_x*0.5; + tgy2 = old_y ; + tgx = actual_x; + tgy = actual_y + radio_y*0.5; + + ax=actual_x; + ay=actual_y; //transformations if(mtx){ transformPoint2D(mtx,&tgx2,&tgy2); @@ -884,18 +822,19 @@ Svg_parser::parser_path_d(String path_d,Matrix* mtx){ if(isFirst(k1.front(),ax,ay)){ setTg1(k1.front(),k1.front()->x,k1.front()->y,tgx,tgy); }else{ - k1.push_back(nuevoVertice (ax,ay)); + k1.push_back(newVertice (ax,ay)); setTg1(k1.back(),k1.back()->x,k1.back()->y,tgx,tgy); setSplit(k1.back(),TRUE); } }else if(!large && sweep){ //points - tgx2 = actual_x; - tgy2 = actual_y + radio_y*0.5; - tgx = ax + radio_x*0.5; - tgy = ay ; - actual_x=ax; - actual_y=ay; + tgx2 = old_x; + tgy2 = old_y + radio_y*0.5; + tgx = actual_x + radio_x*0.5; + tgy = actual_y ; + + ax=actual_x; + ay=actual_y; //transformations if(mtx){ transformPoint2D(mtx,&tgx2,&tgy2); @@ -911,72 +850,86 @@ Svg_parser::parser_path_d(String path_d,Matrix* mtx){ if(isFirst(k1.front(),ax,ay)){ setTg1(k1.front(),k1.front()->x,k1.front()->y,tgx,tgy); }else{ - k1.push_back(nuevoVertice (ax,ay)); + k1.push_back(newVertice (ax,ay)); setTg1(k1.back(),k1.back()->x,k1.back()->y,tgx,tgy); setSplit(k1.back(),TRUE); } }else if( large && !sweep){//rare //this need more than one vertex }else if( large && sweep){//circles in inkscape are made with this kind of arc - if(actual_y==ay){//circles - //intermediate point - int sense=1; - if(actual_x>ax) sense =-1; - float in_x,in_y,in_tgx1,in_tgy1,in_tgx2,in_tgy2; - in_x = (actual_x+ax)/2; - in_y = actual_y - sense*radio_y; - in_tgx1 = in_x - sense*(radio_x*0.5); - in_tgx2 = in_x + sense*(radio_x*0.5); - in_tgy1 = in_y; - in_tgy2 = in_y; - //start/end points - tgx2=actual_x; - tgy2=ay - sense*(radio_y*0.5); - tgx =ax; - tgy =ay - sense*(radio_y*0.5); - - actual_x=ax; - actual_y=ay; - //transformations - if(mtx){ - transformPoint2D(mtx,&tgx2,&tgy2); - transformPoint2D(mtx,&tgx ,&tgy ); - transformPoint2D(mtx,&ax,&ay); - - transformPoint2D(mtx,&in_tgx2,&in_tgy2); - transformPoint2D(mtx,&in_tgx1,&in_tgy1); - transformPoint2D(mtx,&in_x,&in_y); - } - //adjust - coor2vect(&tgx2 , &tgy2); - coor2vect(&ax , &ay ); - coor2vect(&tgx , &tgy ); - - coor2vect(&in_tgx2 , &in_tgy2); - coor2vect(&in_tgx1 , &in_tgy1); - coor2vect(&in_x , &in_y ); - - //save the last tg2 - setTg2(k1.back(),k1.back()->x,k1.back()->y,tgx2,tgy2); - //save the intermediate point - k1.push_back(nuevoVertice (in_x,in_y)); - setTg1(k1.back(),k1.back()->x,k1.back()->y, in_tgx1 , in_tgy1); - setTg2(k1.back(),k1.back()->x,k1.back()->y, in_tgx2 , in_tgy2); - setSplit(k1.back(),TRUE); //this could be changed - //save the new point - if(isFirst(k1.front(),ax,ay)){ - setTg1(k1.front(),k1.front()->x,k1.front()->y,tgx,tgy); - }else{ - k1.push_back(nuevoVertice (ax,ay)); - setTg1(k1.back(),k1.back()->x,k1.back()->y,tgx,tgy); - setSplit(k1.back(),TRUE); - } + //intermediate point + int sense=1; + if(old_x>actual_x) sense =-1; + float in_x,in_y,in_tgx1,in_tgy1,in_tgx2,in_tgy2; + in_x = (old_x+actual_x)/2; + in_y = old_y - sense*radio_y; + in_tgx1 = in_x - sense*(radio_x*0.5); + in_tgx2 = in_x + sense*(radio_x*0.5); + in_tgy1 = in_y; + in_tgy2 = in_y; + //start/end points + tgx2=old_x; + tgy2=actual_y - sense*(radio_y*0.5); + tgx =actual_x; + tgy =actual_y - sense*(radio_y*0.5); + + ax=actual_x; + ay=actual_y; + //transformations + if(mtx){ + transformPoint2D(mtx,&tgx2,&tgy2); + transformPoint2D(mtx,&tgx ,&tgy ); + transformPoint2D(mtx,&ax,&ay); + + transformPoint2D(mtx,&in_tgx2,&in_tgy2); + transformPoint2D(mtx,&in_tgx1,&in_tgy1); + transformPoint2D(mtx,&in_x,&in_y); + } + //adjust + coor2vect(&tgx2 , &tgy2); + coor2vect(&ax , &ay ); + coor2vect(&tgx , &tgy ); + + coor2vect(&in_tgx2 , &in_tgy2); + coor2vect(&in_tgx1 , &in_tgy1); + coor2vect(&in_x , &in_y ); + + //save the last tg2 + setTg2(k1.back(),k1.back()->x,k1.back()->y,tgx2,tgy2); + //save the intermediate point + k1.push_back(newVertice (in_x,in_y)); + setTg1(k1.back(),k1.back()->x,k1.back()->y, in_tgx1 , in_tgy1); + setTg2(k1.back(),k1.back()->x,k1.back()->y, in_tgx2 , in_tgy2); + setSplit(k1.back(),TRUE); //this could be changed + //save the new point + if(isFirst(k1.front(),ax,ay)){ + setTg1(k1.front(),k1.front()->x,k1.front()->y,tgx,tgy); + }else{ + k1.push_back(newVertice (ax,ay)); + setTg1(k1.back(),k1.back()->x,k1.back()->y,tgx,tgy); + setSplit(k1.back(),TRUE); } } - }else if(tokens.at(i).compare("z")==0){ + }else if(command.compare("z")==0){ loop=true; + if(!k1.empty()) + k.push_front(k1); + k1.clear(); + if (iadd_child("layer"); + child_transform->set_attribute("type","warp"); + child_transform->set_attribute("active","true"); + child_transform->set_attribute("version","0.1"); + child_transform->set_attribute("desc","Transform"); + + float x,y; + x=100;y=100;coor2vect(&x,&y); + build_vector (child_transform->add_child("param"),"src_tl",x,y); + + x=200;y=200;coor2vect(&x,&y); + build_vector (child_transform->add_child("param"),"src_br",x,y); + + + x=100;y=100; + transformPoint2D(mtx,&x,&y);coor2vect(&x,&y); + build_vector (child_transform->add_child("param"),"dest_tl",x,y); + + x=200;y=100; + transformPoint2D(mtx,&x,&y);coor2vect(&x,&y); + build_vector (child_transform->add_child("param"),"dest_tr",x,y); + + x=200;y=200; + transformPoint2D(mtx,&x,&y);coor2vect(&x,&y); + build_vector (child_transform->add_child("param"),"dest_br",x,y); + + x=100;y=200; + transformPoint2D(mtx,&x,&y);coor2vect(&x,&y); + build_vector (child_transform->add_child("param"),"dest_bl",x,y); + + build_param (child_transform->add_child("param"),"clip","bool","false"); + build_param (child_transform->add_child("param"),"horizon","real","4.0"); + } +} + + +void Svg_parser::parser_defs(const xmlpp::Node* node){ const xmlpp::ContentNode* nodeContent = dynamic_cast(node); if(!nodeContent){ @@ -999,6 +991,7 @@ Svg_parser::parser_defs(const xmlpp::Node* node){ } } } + void Svg_parser::AdjustPointUrl(){ /* @@ -1028,12 +1021,12 @@ Svg_parser::find_colorStop(String name){ if(lg.empty()&& rg.empty()) return NULL; - String buscar= name; - if(buscar.at(0)=='#') buscar.erase(0,1); + String find= name; + if(find.at(0)=='#') find.erase(0,1); else return NULL; std::list::iterator aux=lg.begin(); while(aux!=lg.end()){//only find into linear gradients - if(buscar.compare((*aux)->name)==0){ + if(find.compare((*aux)->name)==0){ return (*aux)->stops; } aux++; @@ -1047,31 +1040,31 @@ Svg_parser::build_url(xmlpp::Element* root, String name,Matrix *mtx){ if(lg.empty()&& rg.empty()) root->get_parent()->remove_child(root); - int inicio=name.find_first_of("#")+1; - int fin=name.find_first_of(")"); - String buscar= name.substr(inicio,fin-inicio); - bool encontro=false; + int start=name.find_first_of("#")+1; + int end=name.find_first_of(")"); + String find= name.substr(start,end-start); + bool encounter=false; if(!lg.empty()){ std::list::iterator aux=lg.begin(); while(aux!=lg.end()){ - if(buscar.compare((*aux)->name)==0){ + if(find.compare((*aux)->name)==0){ build_linearGradient (root,*aux,mtx); - encontro=true; + encounter=true; } aux++; } } - if(!encontro && !rg.empty()){ + if(!encounter && !rg.empty()){ std::list::iterator aux=rg.begin(); while(aux!=rg.end()){ - if(buscar.compare((*aux)->name)==0){ + if(find.compare((*aux)->name)==0){ build_radialGradient (root,*aux,mtx); - encontro=true; + encounter=true; } aux++; } } - if(!encontro) + if(!encounter) root->get_parent()->remove_child(root); }else{ root->get_parent()->remove_child(root); @@ -1300,39 +1293,39 @@ Svg_parser::build_transform(const String transform){ while(aux!=tokens.end()){ if((*aux).compare(0,9,"translate")==0){ float dx,dy; - int inicio,fin; - inicio =(*aux).find_first_of("(")+1; - fin =(*aux).find_first_of(","); - dx =atof((*aux).substr(inicio,fin-inicio).data()); - inicio =(*aux).find_first_of(",")+1; - fin =(*aux).size()-1; - dy =atof((*aux).substr(inicio,fin-inicio).data()); - if(matrixVacia(a)) + int start,end; + start =(*aux).find_first_of("(")+1; + end =(*aux).find_first_of(","); + dx =atof((*aux).substr(start,end-start).data()); + start =(*aux).find_first_of(",")+1; + end =(*aux).size()-1; + dy =atof((*aux).substr(start,end-start).data()); + if(matrixIsNull(a)) a=newMatrix(1,0,0,1,dx,dy); else multiplyMatrix(&a,newMatrix(1,0,0,1,dx,dy)); }else if((*aux).compare(0,5,"scale")==0){ - if(matrixVacia(a)) + if(matrixIsNull(a)) a=newMatrix(1,0,0,1,0,0); }else if((*aux).compare(0,6,"rotate")==0){ float angle,seno,coseno; - int inicio,fin; - inicio =(*aux).find_first_of("(")+1; - fin =(*aux).size()-1; - angle=getRadian (atof((*aux).substr(inicio,fin-inicio).data())); + int start,end; + start =(*aux).find_first_of("(")+1; + end =(*aux).size()-1; + angle=getRadian (atof((*aux).substr(start,end-start).data())); seno =sin(angle); coseno =cos(angle); - if(matrixVacia(a)) + if(matrixIsNull(a)) a=newMatrix(coseno,seno,-1*seno,coseno,0,0); else multiplyMatrix(&a,newMatrix(coseno,seno,-1*seno,coseno,0,0)); }else if((*aux).compare(0,6,"matrix")==0){ - int inicio =(*aux).find_first_of('(')+1; - int fin =(*aux).find_first_of(')'); - if(matrixVacia(a)) - a=newMatrix((*aux).substr(inicio,fin-inicio)); + int start =(*aux).find_first_of('(')+1; + int end =(*aux).find_first_of(')'); + if(matrixIsNull(a)) + a=newMatrix((*aux).substr(start,end-start)); else - multiplyMatrix(&a,newMatrix((*aux).substr(inicio,fin-inicio))); + multiplyMatrix(&a,newMatrix((*aux).substr(start,end-start))); }else{ a=newMatrix(1,0,0,1,0,0); } @@ -1379,13 +1372,13 @@ Svg_parser::build_vertice(xmlpp::Element* root , Vertice *p){ build_param (child_comp->add_child("origin"),"","real","0.5000000000"); if(p->split) build_param (child_comp->add_child("split"),"","bool","true"); else build_param (child_comp->add_child("split"),"","bool","false"); - //tangente 1 + //tangent 1 xmlpp::Element *child_t1=child_comp->add_child("t1"); xmlpp::Element *child_rc=child_t1->add_child("radial_composite"); child_rc->set_attribute("type","vector"); build_param (child_rc->add_child("radius"),"","real",p->radio1); build_param (child_rc->add_child("theta"),"","angle",p->angle1); - //tangente 2 + //tangent 2 xmlpp::Element *child_t2=child_comp->add_child("t2"); xmlpp::Element *child_rc2=child_t2->add_child("radial_composite"); child_rc2->set_attribute("type","vector"); @@ -1510,7 +1503,7 @@ Svg_parser::nodeStartBasicLayer(xmlpp::Element* root){ return child->add_child("canvas"); } -//metodos extras +//extra methods void Svg_parser::coor2vect(float *x,float *y){ float sx, sy; @@ -1580,16 +1573,16 @@ Svg_parser::setTg2(Vertice* p,float p1x,float p1y,float p2x,float p2y){ rd=sqrt(dx*dx + dy*dy); if(dx>0 && dy>0){ ag=PI + atan(dy/dx); - // printf("caso 180-270\n"); + // printf("case 180-270\n"); }else if(dx>0 && dy<0){ ag=PI + atan(dy/dx); - // printf("caso 90-180\n"); + // printf("case 90-180\n"); }else if(dx<0 && dy<0){ ag=atan(dy/dx); - // printf("caso 0-90\n"); + // printf("case 0-90\n"); }else if(dx<0 && dy>0){ ag= 2*PI+atan(dy/dx); - // printf("caso 270-360\n"); + // printf("case 270-360\n"); }else if(dx==0 && dy>0){ ag=-1*PI/2; }else if(dx==0 && dy<0){ @@ -1621,34 +1614,34 @@ Svg_parser::isFirst(Vertice* nodo,float a, float b){ } Vertice* -Svg_parser::nuevoVertice(float x,float y){ - Vertice* nuevo; - nuevo=(Vertice*)malloc(sizeof(Vertice)); - nuevo->x=x; - nuevo->y=y; - nuevo->radio1=nuevo->radio2=nuevo->angle1=nuevo->angle2=0; - return nuevo; +Svg_parser::newVertice(float x,float y){ + Vertice* vert; + vert=(Vertice*)malloc(sizeof(Vertice)); + vert->x=x; + vert->y=y; + vert->radio1=vert->radio2=vert->angle1=vert->angle2=0; + return vert; } int Svg_parser::extractSubAttribute(const String attribute, String name,String* value){ - int encontro=0; + int encounter=0; if(!attribute.empty()){ String str(attribute); removeS(&str); std::vector tokens=tokenize(str,";"); std::vector::iterator aux=tokens.begin(); while(aux!=tokens.end()){ - int medio= (*aux).find_first_of(":"); - if((*aux).substr(0,medio).compare(name)==0){ - int fin=(*aux).size(); - *value=(*aux).substr(medio+1,fin-medio); + int mid= (*aux).find_first_of(":"); + if((*aux).substr(0,mid).compare(name)==0){ + int end=(*aux).size(); + *value=(*aux).substr(mid+1,end-mid); return 1; } aux++; } } - return encontro; + return encounter; } String Svg_parser::loadAttribute(String name,const String path_style,const String master_style,const String defaultVal){ @@ -1693,9 +1686,9 @@ Svg_parser::getRed(String hex){ if(hex.at(0)=='#'){ return hextodec(hex.substr(1,2)); }else if(hex.compare(0,3,"rgb")==0 || hex.compare(0,3,"RGB")==0){ - int inicio=hex.find_first_of("(")+1; - int fin =hex.find_last_of(")"); - String aux=tokenize(hex.substr(inicio,fin-inicio),",").at(0); + int start=hex.find_first_of("(")+1; + int end =hex.find_last_of(")"); + String aux=tokenize(hex.substr(start,end-start),",").at(0); return atoi(aux.data()); } return 0; @@ -1705,9 +1698,9 @@ Svg_parser::getGreen(String hex){ if(hex.at(0)=='#'){ return hextodec(hex.substr(3,2)); }else if(hex.compare(0,3,"rgb")==0 || hex.compare(0,3,"RGB")==0){ - int inicio=hex.find_first_of("(")+1; - int fin =hex.find_last_of(")"); - String aux=tokenize(hex.substr(inicio,fin-inicio),",").at(1); + int start=hex.find_first_of("(")+1; + int end =hex.find_last_of(")"); + String aux=tokenize(hex.substr(start,end-start),",").at(1); return atoi(aux.data()); } return 0; @@ -1717,9 +1710,9 @@ Svg_parser::getBlue(String hex){ if(hex.at(0)=='#'){ return hextodec(hex.substr(5,2)); }else if(hex.compare(0,3,"rgb")==0 || hex.compare(0,3,"RGB")==0){ - int inicio=hex.find_first_of("(")+1; - int fin =hex.find_last_of(")"); - String aux=tokenize(hex.substr(inicio,fin-inicio),",").at(2); + int start=hex.find_first_of("(")+1; + int end =hex.find_last_of(")"); + String aux=tokenize(hex.substr(start,end-start),",").at(2); return atoi(aux.data()); } return 0; @@ -1884,7 +1877,7 @@ Svg_parser::multiplyMatrix(Matrix **mtx1,Matrix *mtx2){ (*mtx1)->f=aux->f; } bool -Svg_parser::matrixVacia(Matrix *mtx){ +Svg_parser::matrixIsNull(Matrix *mtx){ if(mtx == NULL) return true; return false; }