MadButterfly: nodejs/svg.js comparison

comparison nodejs/svg.js @ 1384:98ea7146cef3

Fix the parseImage to setup the transform attributes correctly.

author	wycc
date	Fri, 25 Mar 2011 02:03:17 +0800
parents	9a585df24e52
children	2ebb07ee455e

comparison

equal deleted inserted replaced

-:bdacbdeb4447
+:98ea7146cef3
 coord.center.x = 10000;
 coord.center.y = 10000;
 if (trans!=null) {
 	parseTransform(coord, trans.value());
 } else {
-tcoord.sx = 1;
+coord.sx = 1;
-	tcoord.sy = 1;
+	coord.sy = 1;
-	tcoord.r = 0;
+	coord.r = 0;
-	tcoord.tx = 0;
+	coord.tx = 0;
-	tcoord.ty = 0;
+	coord.ty = 0;
 }
 multiply(accu,accu_matrix);
 multiply(accu,coord);
 	        this.parseImage(accu_matrix,coord, id, nodes[k]);
 	    } else if (c == "use") {
 	        this.parseUse(accu_matrix,coord, id, nodes[k]);
 	    }
 	    attr = nodes[k].attr('duplicate-src');
-	        if (attr == null) continue;
+	    if (attr == null) continue;
 	    id = attr.value();
 	    try {
 	        this.mbnames[id].target = coord;
 	    } catch(e) {
 	        sys.puts("id "+id+" is not defined");
 } else {
 }
 var w;
 var h;
 var x,y,nx,ny;
-coord.center= new Object();
+tcoord.center= new Object();
-coord.center.x = 10000;
+tcoord.center.x = 10000;
-coord.center.y = 10000;
+tcoord.center.y = 10000;
 if (trans!=null) {
 	parseTransform(coord, trans.value());
-}
+} else {
+tcoord.sx = 1;
+	tcoord.sy = 1;
+	tcoord.r = 0;
+	tcoord.tx = 0;
+	tcoord.ty = 0;
+}
 w = n.attr("width");
 if (w == null) return;
 w = parseFloat(w.value());
 h = n.attr("height");
 if (x == null) return;
 x = parseFloat(x.value());
 y = n.attr("y");
 if (y == null) return;
 y = parseFloat(y.value());
+tcoord.tx += x;
+tcoord.ty += y;
+attr = n.attr('duplicate-src');
+if (attr) {
+var id = attr.value();
+var orign = this.mb_rt.mbnames[id].node;
+sys.puts("xxxxxxxxxxxxxx");
+var nw = getInteger(orign,'width');
+var nh = getInteger(orign,'height');
+	sys.puts("nw="+nw);
+	sys.puts("nh="+nh);
+	sys.puts("w="+w);
+	sys.puts("h="+h);
+	tcoord.sx *= w/nw;
+	tcoord.sy *= h/nh;
+}
 nx = tcoord[0]*x+tcoord[1]*y+tcoord[2];
 ny = tcoord[3]*x+tcoord[4]*y+tcoord[5];
-if (coord.center.x > nx)
+if (tcoord.center.x > nx)
-	coord.center.x = nx;
+	tcoord.center.x = nx;
-if (coord.center.y > ny)
+if (tcoord.center.y > ny)
-	coord.center.y = ny;
+	tcoord.center.y = ny;
 var img = this.mb_rt.image_new(x,y,w,h);
 var img_data = ldr.load(ref);
-var paint = this.mb_rt.paint_image_new(img_data);
+try {
-paint.fill(img);
+sys.puts('----'+ref);
+var paint = this.mb_rt.paint_image_new(img_data);
+paint.fill(img);
+} catch(e) {
+sys.puts(e);
+sys.puts("Can not load image "+ref);
+}
 tcoord.add_shape(img);
-this._set_bbox(n, img);
+this._set_bbox(n, tcoord);
-make_mbnames(this.mb_rt, n, img);
+make_mbnames(this.mb_rt, n, tcoord);
 };
 function _parse_stops(n) {
 var children;
 var child;