MadButterfly: nodejs/svg.js comparison

comparison nodejs/svg.js @ 861:e69f551e4a37 abs_n_rel_center

Move initial values of bbox and center to bbox.orig and center.orig

author	Thinker K.F. Li <thinker@codemud.net>
date	Tue, 21 Sep 2010 00:28:44 +0800
parents	ea1e88c40548
children	881efcd8a18f

comparison

equal deleted inserted replaced

-:9303fb45a958
+:e69f551e4a37
 /*! \brief Update x, y, width, and height of the bbox.
 */
 update: function() {
 	var mtx;
-	this.x = this._svg_saved_x;
+	this.x = this.orig.x;
-	this.y = this._svg_saved_y;
+	this.y = this.orig.y;
-	this.width = this._svg_saved_width;
+	this.width = this.orig.width;
-	this.height = this._svg_saved_height;
+	this.height = this.orig.height;
 	mtx = this._saved_to_current();
 	_transform_bbox(this, mtx);
 },
 };
 update: function() {
 	var mtx;
 	var xy;
 	mtx = this._saved_to_current();
-	xy = _pnt_transform(this._svg_saved_x, this._svg_saved_y, mtx);
+	xy = _pnt_transform(this.orig.x, this.orig.y, mtx);
 	this._x = xy[0];
 	this._y = xy[1];
 },
 get rel() {
 	var rev;
 	var xy;
 	rev = this._get_ac_rev();
-	xy = _pnt_transform(this._svg_saved_x, this._svg_saved_y, rev);
+	xy = _pnt_transform(this.orig.x, this.orig.y, rev);
 	return {x: xy[0], y: xy[1]};
 },
 };
 loadSVG.prototype._set_bbox = function(node, tgt) {
 var a;
 var vstr;
 var bbox, center;
+var orig;
 a = node.attr("bbox-x");
 sys.puts("a="+a);
 if(!a)
 	return 0;
+/* bbox.orig is initial values of bbox.  The bbox is recomputed
+* according bbox.orig and current matrix.  See bbox.update().
+*/
 tgt.bbox = bbox = new Object();
+bbox.orig = orig = new Object();
 bbox.owner = tgt;
 bbox.__proto__ = _bbox_proto;
 vstr = a.value();
-bbox._svg_saved_x = parseFloat(vstr);
+orig.x = parseFloat(vstr);
 a = node.attr("bbox-y");
 vstr = a.value();
-bbox._svg_saved_y = this.height - parseFloat(vstr);
+orig.y = this.height - parseFloat(vstr);
 a = node.attr("bbox-width");
 vstr = a.value();
-bbox._svg_saved_width = parseFloat(vstr);
+orig.width = parseFloat(vstr);
 a = node.attr("bbox-height");
 vstr = a.value();
-bbox._svg_saved_height = parseFloat(vstr);
+orig.height = parseFloat(vstr);
-bbox._svg_saved_y -= bbox._svg_saved_height;
+orig.y -= orig.height;
 bbox.update();
+/* center.orig is initial values of center.  The center is
+* recomputed according center.orig and current matrix.  See
+* center.update().
+*/
 tgt.center = center = new Object();
+center.orig = orig = new Object();
-center._svg_saved_x = bbox._svg_saved_width / 2 + bbox._svg_saved_x;
-center._svg_saved_y = bbox._svg_saved_height / 2 + bbox._svg_saved_y;
+orig.x = bbox.orig.width / 2 + bbox.orig.x;
+orig.y = bbox.orig.height / 2 + bbox.orig.y;
 a = node.attr("transform-center-x");
 if(a) {
 	vstr = a.value();
-	center._svg_saved_x += parseFloat(vstr);
+	orig.x += parseFloat(vstr);
 	a = node.attr("transform-center-y");
 	vstr = a.value();
-	center._svg_saved_y -= parseFloat(vstr);
+	orig.y -= parseFloat(vstr);
 }
 center.__proto__ = _center_proto;
 center.owner = tgt;
 center.update();