Mercurial > MadButterfly

changeset 717:b822b1912d67

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Paint with black for unspecified, not "none", fill and stroke.
author Thinker K.F. Li <thinker@branda.to>
date Sat, 14 Aug 2010 23:52:43 +0800
parents 72abb4154936
children 0cd59ce76e67
files nodejs/svg.js
diffstat 1 files changed, 25 insertions(+), 22 deletions(-) [+]
line wrap: on
line diff
--- a/nodejs/svg.js	Sat Aug 14 00:06:00 2010 +0800
+++ b/nodejs/svg.js	Sat Aug 14 23:52:43 2010 +0800
@@ -127,9 +127,9 @@
     
     if (color[0]=='#') {
 	var r,g,b;
-	r = parseInt(color.substring(1,3),16)/256;
-	g = parseInt(color.substring(3,5),16)/256;
-	b = parseInt(color.substring(5,7),16)/256;
+	r = parseInt(color.substring(1,3),16)/255;
+	g = parseInt(color.substring(3,5),16)/255;
+	b = parseInt(color.substring(5,7),16)/255;
 	paint = this.mb_rt.paint_color_new(r, g, b, alpha);
     } else if(_std_colors[color]) {
 	c = _std_colors[color];
@@ -146,16 +146,14 @@
     var style = n.attr('style');
     var path = this.mb_rt.path_new(d);
     var paint;
+    var fill_alpha = 1;
+    var stroke_alpha = 1;
+    var fill_color;
+    var stroke_color;
+    var black_paint;
     
-    if (style==null) {
-	paint = this.mb_rt.paint_color_new(0,0,0,1);
-	paint.fill(path);
-    } else {
+    if(style != null) {
 	var items = style.value().split(';');
-	var fill_alpha = 1;
-	var stroke_alpha = 1;
-	var fill_color;
-	var stroke_color;
 	var alpha;
 	
 	for(i in items) {
@@ -164,13 +162,11 @@
 	    if (f[0] == 'opacity') {
 		alpha = f[1];
 	    } else if (f[0] == 'fill') {
-		if(f[1] != "none")
-		    fill_color = f[1];
+		fill_color = f[1];
 	    } else if (f[0] == 'fill-opacity') {
 		fill_alpha = parseFloat(f[1]);
 	    } else if (f[0] == 'stroke') {
-		if(f[1] != "none")
-		    stroke_color = f[1];
+		stroke_color = f[1];
 	    } else if (f[0] == 'stroke-width') {
 		path.stroke_width = parseFloat(f[1]);
 	    } else if (f[0] == 'stroke-opacity') {
@@ -178,19 +174,26 @@
 	    }
 	}
 
-	if(fill_color) {
+    }
+
+    if(!fill_color || !stroke_color)
+	black_paint = this.mb_rt.paint_color_new(0, 0, 0, 1);
+    
+    if(fill_color) {
+	if(fill_color != "none") {
 	    paint = this._prepare_paint_color(fill_color, fill_alpha);
 	    paint.fill(path);
 	}
-	if(stroke_color) {
+    } else {
+	black_paint.fill(path);
+    }
+    if(stroke_color) {
+	if(stroke_color != "none") {
 	    paint = this._prepare_paint_color(stroke_color, stroke_alpha);
 	    paint.stroke(path);
 	}
-	if(!stroke_color && !fill_color) {
-	    paint = this.mb_rt.paint_color_new(0, 0, 0, 1);
-	    paint.fill(path);
-	}
-
+    } else {
+	black_paint.stroke(path);
     }
     coord.add_shape(path);
 }