Mercurial > MadButterfly

changeset 876:e6936110c48f abs_n_rel_center

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix bug of parsing linear and radial gradient
author Thinker K.F. Li <thinker@codemud.net>
date Sat, 25 Sep 2010 12:09:35 +0800
parents 5d7c3c681851
children deadcca6e213
files nodejs/svg.js
diffstat 1 files changed, 25 insertions(+), 27 deletions(-) [+]
line wrap: on
line diff
--- a/nodejs/svg.js	Fri Sep 24 23:55:02 2010 +0800
+++ b/nodejs/svg.js	Sat Sep 25 12:09:35 2010 +0800
@@ -575,7 +575,6 @@
     var orig;
     
     a = node.attr("bbox-x");
-    sys.puts("a="+a);
     if(!a)
 	return 0;
     
@@ -728,7 +727,6 @@
 	} else {
 	}
     }
-    sys.puts(y);
     this._set_bbox(n, tcoord);
 	
     make_mbnames(this.mb_rt, n, tcoord);
@@ -983,15 +981,15 @@
 		a = parseFloat(opacity);
 	    else
 		a = 1;
+	    
+	    offset_attr = child.attr("offset");
+	    if(offset_attr)
+		offset = parseFloat(offset_attr.value());
+	    else
+		offset = 0;
+	    
+	    stops.push([offset, r, g, b, a]);
 	}
-
-	offset_attr = child.attr("offset");
-	if(offset_attr)
-	    offset = parseFloat(offset_attr.value());
-	else
-	    offset = 0;
-
-	stops.push([offset, r, g, b, a]);
     }
 
     return stops;
@@ -1004,6 +1002,8 @@
     var nodes = n.childNodes();
 
     if (id == null) return;
+    id = id.value();
+
     var x1 = n.attr("x1");
     var y1 = n.attr("y1");
     var x2 = n.attr("x2");
@@ -1013,37 +1013,35 @@
     var stops;
     var r,g,b;
     
+    if(x1)
+	x1 = parseFloat(x1.value());
+    if(x2)
+	x2 = parseFloat(x2.value());
+    if(y1)
+	y1 = parseFloat(y1.value());
+    if(y2)
+	y2 = parseFloat(y2.value());
+    
     stops = _parse_stops(n);
     
     var href = n.attr('href');
-    if (href != null) {
+    if(href != null) {
 	href = href.value();
 	var hrefid = href.substring(1);
 	pstops = this.stop_ref[hrefid];
 	stops = pstops.concat(stops);
 	
 	var hrefgr = this.gradients[hrefid];
-	if (typeof x1 == "undefined")
+	if(typeof x1 == "undefined")
 	    x1 = hrefgr[0];
-	if (typeof x2 == "undefined")
+	if(typeof y1 == "undefined")
+	    y1 = hrefgr[1];
+	if(typeof x2 == "undefined")
 	    x2 = hrefgr[2];
-	if (typeof y1 == "undefined")
-	    y1 = hrefgr[1];
-	if (typeof y2 == "undefined")
+	if(typeof y2 == "undefined")
 	    y2 = hrefgr[3];
-	sys.puts(hrefid);
-	sys.puts([x1, y1, x2, y2]);
     }
-    id = id.value();
     this.stop_ref[id] = stops;
-    if (x1)
-	x1 = parseFloat(x1.value());
-    if (x2)
-	x2 = parseFloat(x2.value());
-    if (y1)
-	y1 = parseFloat(y1.value());
-    if (y2)
-	y2 = parseFloat(y2.value());
     this.gradients[id] = [x1,y1,x2,y2];
 };