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;i<sizeof(bad_chars);i++){
unsigned int pos=x.find_first_of(bad_chars[i]);
parser_canvas(node);
}else if(nodename.compare("defs")==0){
parser_defs (node);
- }else if(nodename.compare("g")==0){
- if(set_canvas==0) parser_canvas (node);
- parser_layer (node,nodeRoot->add_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){
//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<const xmlpp::Element*>(node)){
width =etl::strprintf("%f",getDimension(nodeElement->get_attribute_value("width")));
height =etl::strprintf("%f",getDimension(nodeElement->get_attribute_value("height")));
}
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<const xmlpp::Element*>(node)){
if(width.compare("")==0){
width=nodeElement->get_attribute_value("width","");
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
+
+//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
+//All Paths: convert objects to paths
+// 1: when necessary
+// 2: when necessary, including for linking
+// 3: always
+#define SVG_SEP_TRANSFORMS 1
+#define SVG_RESOLVE_BLINE 1
+#define SVG_CONVERT_PATHS 1
void
-Svg_parser::parser_rect(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<const xmlpp::Element*>(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
+ Glib::ustring nodename = node->get_name();
+ if(nodename.compare("g")==0 || nodename.compare("rect")==0 || nodename.compare("polygon")==0 || nodename.compare("path")==0){
+ //load sub-attributes
+ Glib::ustring id =nodeElement->get_attribute_value("id");
+ Glib::ustring transform =nodeElement->get_attribute_value("transform");
+
+ //resolve transformations
+ Matrix* mtx=NULL;
+ if(!transform.empty())
+ mtx=build_transform (transform);
+ if (SVG_SEP_TRANSFORMS)
+ {
+ if(mtx_parent){
+ if(mtx)
+ composeMatrix(&mtx,mtx_parent,mtx);
+ else
+ mtx=newMatrix(mtx_parent);
+ }
+ }
+ if(nodename.compare("g")==0){
+ parser_layer (node,root->add_child("layer"),parent_style,mtx);
+ return;
+ }
- //build
+ Glib::ustring obj_style =nodeElement->get_attribute_value("style");
+ Glib::ustring obj_fill =nodeElement->get_attribute_value("fill");
- 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);
+ //style
+ String fill =loadAttribute("fill",obj_style,parent_style,"none");
+ 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");
+
+
+ //Fill
+ int typeFill=0; //nothing
+
+ if(fill.compare("none")!=0){
+ typeFill=1; //simple
+ }
+ if(typeFill==1 && fill.compare(0,3,"url")==0){
+ 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
+ }
+
+ xmlpp::Element *root_layer = root;
+ if(typeFill!=0 && typeStroke!=0){
+ root_layer=nodeStartBasicLayer(root->add_child("layer"));
+ }
+ /*if ((SVG_CONVERT_PATHS == 1 && typeFill!=0) || (SVG_CONVERT_PATHS == 2 && typeFill!=0 && typeStroke==0)) {
+ //make simple fills
+ if(nodename.compare("rect")==0){
+ rect_simple(nodeElement,root_layer,fill,fill_opacity,opacity);
+ }
+
+ if(typeFill==2){
+ build_url (root_layer->add_child("layer"),fill,mtx);
+ }
+ }*/
+
+ if(nodename.compare("rect")==0){
+ parser_rect(nodeElement,root,parent_style,mtx);
+ }else if(nodename.compare("polygon")==0){
+ parser_polygon(nodeElement,root,parent_style,mtx);
+ }else if(nodename.compare("path")==0){
+ parser_path (nodeElement,root,parent_style,mtx);
+ }
}
}
}
+
void
-Svg_parser::parser_layer(const xmlpp::Node* node,xmlpp::Element* root,String parent_style,Matrix* mtx_parent){
+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_rect(const xmlpp::Element* nodeElement,xmlpp::Element* root,String parent_style,Matrix* mtx){
+ 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
+
+ int typeFill=0;
+ if(fill.compare(0,3,"url")==0){
+ typeFill=2;
+ root=nodeStartBasicLayer(root->add_child("layer"));
+ }
+ xmlpp::Element *child_layer;
+ if(typeFill==2){
+ child_layer=root->add_child("layer");
+ }else{
+ child_layer=root;
+ }
+ xmlpp::Element *child_rect=child_layer->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 (child_layer->add_child("layer"),fill,mtx);
+ }
+
+}
+void
+Svg_parser::parser_layer(const xmlpp::Node* node,xmlpp::Element* root,String parent_style,Matrix* mtx){
if(const xmlpp::Element* nodeElement = dynamic_cast<const xmlpp::Element*>(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 transform =nodeElement->get_attribute_value("transform");
String layer_style;
if(!style.empty()){
}else if(!parent_style.empty()){
layer_style=parent_style;
}
- 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");
+ else root->set_attribute("desc","unknown 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 ");
+ //printf(" canvas attributes ");
//canvas
xmlpp::Element *child_canvas=root->add_child("param");
child_canvas->set_attribute("name","canvas");
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);
- }
+ parser_graphics (*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<const xmlpp::Element*>(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);
- }
- //points
- if(polygon_points.empty())
- return;
- std::list<Vertice*> k;
- std::vector<String> tokens=get_tokens_path (polygon_points);
- unsigned int i;
- float ax,ay; ax=ay=0;
- for(i=0;i<tokens.size();i++){
- ax=atof(tokens.at(i).data());
- i++; if(tokens.at(i).compare(",")==0) i++;
- ay=atof(tokens.at(i).data());
- //mtx
- if(mtx) transformPoint2D(mtx,&ax,&ay);
- //adjust
- coor2vect(&ax,&ay);
- //save
- k.push_back(nuevoVertice(ax,ay));
- }
- //escritura
- xmlpp::Element *child_polygon;
-
- //gradient
- int typeFill=0;
- if(fill.compare(0,3,"url")==0){
- typeFill=2;//gradient
- root=nodeStartBasicLayer(root->add_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);
- }
+Svg_parser::parser_polygon(const xmlpp::Element* nodeElement,xmlpp::Element* root,String parent_style,Matrix* mtx){
+ //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_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");
+
+
+ //points
+ if(polygon_points.empty())
+ return;
+ std::list<Vertice*> k;
+ std::vector<String> tokens=get_tokens_path (polygon_points);
+ unsigned int i;
+ float ax,ay; ax=ay=0;
+ for(i=0;i<tokens.size();i++){
+ ax=atof(tokens.at(i).data());
+ i++; if(tokens.at(i).compare(",")==0) i++;
+ ay=atof(tokens.at(i).data());
+ //mtx
+ if(mtx) transformPoint2D(mtx,&ax,&ay);
+ //adjust
+ coor2vect(&ax,&ay);
+ //save
+ k.push_back(newVertice(ax,ay));
+ }
+ //escritura
+ xmlpp::Element *child_polygon;
+
+ //gradient
+ int typeFill=0;
+ if(fill.compare(0,3,"url")==0){
+ typeFill=2;//gradient
+ root=nodeStartBasicLayer(root->add_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<const xmlpp::Element*>(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");
-
- //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<std::list<Vertice*> > k;
- k=parser_path_d (path_d,mtx);
-
- //escribir
- int typeFill=0; //nothing
- int typeStroke=0;//nothing
- //Fill
- if(fill.compare("none")!=0){
- typeFill=1; //simple
- }
- if(typeFill==1 && fill.compare(0,3,"url")==0){
- typeFill=2; //gradient
- }
- //Stroke
- 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"));
+Svg_parser::parser_path(const xmlpp::Element* nodeElement,xmlpp::Element* root,String parent_style,Matrix* mtx){
+ //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");
+
+ //parser path_d attribute, this is obviously important
+ std::list<std::list<Vertice*> > k;
+ k=parser_path_d (path_d,mtx);
+
+ //Fill
+ int typeFill=0; //nothing
+
+ if(fill.compare("none")!=0){
+ typeFill=1; //simple
+ }
+ if(typeFill==1 && fill.compare(0,3,"url")==0){
+ 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"));
+ }
+ std::list<std::list<Vertice*> >::iterator aux = k.begin();
+ for (; aux!=k.end(); aux++){
+ if(typeFill!=0 && typeStroke!=0){
+ bline_id=new_guid();
+ offset_id=new_guid();
}
- std::list<std::list<Vertice*> >::iterator aux = k.begin();
- for (; aux!=k.end(); aux++){
- if(typeFill!=0 && typeStroke!=0){
- bline_id=new_guid();
- offset_id=new_guid();
+ 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"));
}
- 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"));
- }
- 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);
- 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_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");
- build_param (child_region->add_child("param"),"blurtype","integer","1");
- 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);
- }
+ 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);
+ 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_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");
+ build_param (child_region->add_child("param"),"blurtype","integer","1");
+ 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);
}
+ }
- 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"));
- }
- 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);
- 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_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");
- build_param (child_outline->add_child("param"),"blurtype","integer","1");
- //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);
-
- stroke_width=etl::strprintf("%f",getDimension(stroke_width)/kux);
- build_param (child_outline->add_child("param"),"width","real",stroke_width);
- build_param (child_outline->add_child("param"),"expand","real","0.0000000000");
- if(stroke_linejoin.compare("miter")==0) build_param (child_outline->add_child("param"),"sharp_cusps","bool","true");
- else build_param (child_outline->add_child("param"),"sharp_cusps","bool","false");
- if(stroke_linecap.compare("butt")==0){
- build_param (child_outline->add_child("param"),"round_tip[0]","bool","false");
- build_param (child_outline->add_child("param"),"round_tip[1]","bool","false");
- }else{
- build_param (child_outline->add_child("param"),"round_tip[0]","bool","true");
- build_param (child_outline->add_child("param"),"round_tip[1]","bool","true");
- }
- build_param (child_outline->add_child("param"),"loopyness","real","1.0000000000");
- build_param (child_outline->add_child("param"),"homogeneous_width","bool","true");
+ 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"));
+ }
+ 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);
+ 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_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");
+ build_param (child_outline->add_child("param"),"blurtype","integer","1");
+ //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);
+
+ stroke_width=etl::strprintf("%f",getDimension(stroke_width)/kux);
+ build_param (child_outline->add_child("param"),"width","real",stroke_width);
+ build_param (child_outline->add_child("param"),"expand","real","0.0000000000");
+ if(stroke_linejoin.compare("miter")==0) build_param (child_outline->add_child("param"),"sharp_cusps","bool","true");
+ else build_param (child_outline->add_child("param"),"sharp_cusps","bool","false");
+ if(stroke_linecap.compare("butt")==0){
+ build_param (child_outline->add_child("param"),"round_tip[0]","bool","false");
+ build_param (child_outline->add_child("param"),"round_tip[1]","bool","false");
+ }else{
+ build_param (child_outline->add_child("param"),"round_tip[0]","bool","true");
+ build_param (child_outline->add_child("param"),"round_tip[1]","bool","true");
+ }
+ 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);
- }
+ if(n==1 && typeStroke==2){ //gradient in onto mode (stroke)
+ build_url(child_stroke->add_child("layer"),stroke,mtx);
}
}
- if(n!=1){//only fill for several canvas in one path
- if(typeFill==2){
- build_url(root->add_child("layer"),fill,mtx);
- }
+ }
+ if(n!=1){//only fill for several canvas in one path
+ if(typeFill==2){
+ build_url(root->add_child("layer"),fill,mtx);
}
}
}
//operate and save
if(mtx) transformPoint2D(mtx,&ax,&ay);
coor2vect(&ax,&ay);
- k1.push_back(nuevoVertice (ax,ay)); //first element
+ k1.push_back(newVertice (ax,ay)); //first element
setSplit(k1.back(),TRUE);
}else if(tokens.at(i).compare("C")==0){ //absolute curve
//tg2
transformPoint2D(mtx,&ax,&ay);
transformPoint2D(mtx,&tgx,&tgy);
}
- //ajust
+ //adjust
coor2vect(&tgx2,&tgy2);
coor2vect(&ax,&ay);
coor2vect(&tgx,&tgy);
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);
}
//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
//point
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("l")==0){//relative line to
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("H")==0){//absolute horizontal move
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("h")==0){//horizontal relative
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
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
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
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);
}
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);
}
//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));
+ 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
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);
}
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<LinearGradient*>::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++;
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<LinearGradient*>::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<RadialGradient*>::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);
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);
}
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");
return child->add_child("canvas");
}
-//metodos extras
+//extra methods
void
Svg_parser::coor2vect(float *x,float *y){
float sx, sy;
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){
}
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<String> tokens=tokenize(str,";");
std::vector<String>::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){
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;
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;
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;
(*mtx1)->f=aux->f;
}
bool
-Svg_parser::matrixVacia(Matrix *mtx){
+Svg_parser::matrixIsNull(Matrix *mtx){
if(mtx == NULL) return true;
return false;
}
projects / synfig.git / blobdiff