MadButterfly: nodejs/svg.js comparison

comparison nodejs/svg.js @ 877:deadcca6e213 abs_n_rel_center

Refactory loadSVG._set_paint()

author	Thinker K.F. Li <thinker@codemud.net>
date	Sat, 25 Sep 2010 15:31:28 +0800
parents	e6936110c48f
children	818e5bed913d

comparison

equal deleted inserted replaced

-:e6936110c48f
+:deadcca6e213
 return 1;
 }
 loadSVG.prototype._set_paint = function(node, tgt) {
-var style = node.attr('style');
+var style;
 var paint;
 var fill_alpha = 1;
 var stroke_alpha = 1;
+var alpha = 1;
 var fill_color;
 var stroke_color;
 var black_paint;
 var i;
-if(style != null) {
+style = parse_style(node);
-	var items = style.value().split(';');
+if(style) {
-	var alpha;
+	if('opacity' in style)
+	    alpha = parseFloat(style['opacity']);
-	for(i in items) {
+	if('fill' in style)
-	    var f = items[i].split(':');
+	    fill_color = style['fill'];
-	    if (f[0] == 'opacity') {
+	if('fill-opacity' in style)
-		alpha = f[1];
+	    fill_alpha = parseFloat(style['fill-opacity']);
-	    } else if (f[0] == 'fill') {
+	if('stroke' in style)
-		fill_color = f[1];
+	    stroke_color = style['stroke'];
-	    } else if (f[0] == 'fill-opacity') {
+	if('stroke-width' in style)
-		fill_alpha = parseFloat(f[1]);
+	    stroke_width = parseFloat(style['stroke-width']);
-	    } else if (f[0] == 'stroke') {
+	if('stroke-opacity' in style)
-		stroke_color = f[1];
+	    stroke_alpha = parseFloat(style['stroke-opacity']);
-	    } else if (f[0] == 'stroke-width') {
+	if('display' in style && style['display'] == 'none')
-		tgt.stroke_width = parseFloat(f[1]);
+	    return;
-	    } else if (f[0] == 'stroke-opacity') {
-		stroke_alpha = parseFloat(f[1]);
-	    } else if (f[0] == 'display') {
-		if(f[1] == 'none')
-		    return;
-	    }
-	}
 }
 if(!fill_color || !stroke_color)
 	black_paint = this.mb_rt.paint_color_new(0, 0, 0, 1);