svnno****@sourc*****
svnno****@sourc*****
2009年 9月 16日 (水) 23:02:27 JST
ForkRevision: 1257
http://sourceforge.jp/projects/sie/svn/view?view=rev&revision=1257
Author: dhrname
Date: 2009-09-16 23:02:27 +0900 (Wed, 16 Sep 2009)
Log Message:
-----------
重複していたエラー番号を修正
Modified Paths:
--------------
branches/05x/051/sie.js
Modified: branches/05x/051/sie.js
===================================================================
--- branches/05x/051/sie.js 2009-09-16 12:24:45 UTC (rev 1256)
+++ branches/05x/051/sie.js 2009-09-16 14:02:27 UTC (rev 1257)
@@ -218,7 +218,6 @@
}
}
}
- CollectGarbage(); //IEの非公式なやりかた
} catch(e) {stlog.add(e,138);}
}
SVGtoVML.prototype.setObject = function stvsetob( /*SVGElement*/ arr, /*float*/ sw, /*float*/ sh) {
@@ -340,7 +339,6 @@
function STGroupElement( /*element*/ g, /*Matrix*/ matrix, /*float*/w, h) {
try{
this.tar = g;
- this.partransformable = matrix;
this.transformable = NAIBU.transformToCTM(g,matrix); //g要素のtransform属性を前もって処理
//以下、ツリーとして処理
this.children = [];
@@ -352,7 +350,7 @@
STGroupElement.prototype.set = function (sw,sh) {
try{
stvsetob(this.children,sw,sh);
- this.w = sw; this.h = sh;
+ this.children = this.transformable = null;
} catch(e){stlog.addd(e,3145)}
}
STGroupElement.prototype.chset = SVGtoVML.prototype.chset;
@@ -542,7 +540,6 @@
//path要素の処理
function STPath( /*element*/ ele, /*Matrix*/ matrix) {
this.tar = ele;
- this.partransformable = matrix;
this.d = ele.getAttribute("d");
this.paint = new NAIBU.PaintColor(ele);
this.transformable = NAIBU.transformToCTM(ele,matrix);
@@ -643,55 +640,10 @@
ele.path = dat + " e";
ele.coordsize = w + " " + h;
this.paint.set(w, h, ttm);
- this.w = w; this.h = h;
- if(Nnenn) {
- Nnenn = false;
- this.setAttributeNS("http://www.w3.org/svg/2000","stroke", "black");
- this.setAttributeNS("http://www.w3.org/svg/2000","transform", "scale(1.2)");
- }
- dat = preCom = x = y = x0 = y0 = dx = dy = tma = tmb = tmc = tmd = tme = tmf = null; //解放
+ dat = this.paint = ttm = this.transformable = this.d = preCom = x = y = x0 = y0 = dx = dy = tma = tmb = tmc = tmd = tme = tmf = w = h = null; //解放
} catch(e) {stlog.add(e,372);}
}
-Nnenn = true;
-STPath.prototype.setAttributeNS = function ( /*string*/ namespaceURI, /*string*/ name, /*string*/ value) {
-try{ //以下でfill,storke要素のリセットが必要
- if (this instanceof STGroupElement) { //g要素ならば
- this.paint = NAIBU.PaintColor.prototype.cache[this.tar.uniqueID];
- name = name.replace(/fill-/, "fill").replace(/stroke-/, "stroke");
- if (this.paint.defaults[name] !== void 0) { //スタイルで定義されていれば
- this.paint[name] = value;
- }
- } else {
- var tgebtfill = this.tar.getElementsByTagName("fill"), tgebtstroke = this.tar.getElementsByTagName("stroke");
- if (tgebtfill.length > 0) {
- this.tar.removeChild(tgebtfill[0]);
- }
- if (tgebtstroke.length > 0) {
- this.tar.removeChild(tgebtstroke[0]);
- }
- name = name.replace(/fill-/, "fill").replace(/stroke-/, "stroke");
- if (this.paint.defaults[name] !== void 0) {
- this.paint[name] = value;
- this.paint.set(this.w, this.h, this.transformable);
- }
- }
- if (name === "transform") {
- var tar = {getAttribute : (function(n){return value})};
- this.transformable = NAIBU.transformToCTM(tar, this.partransformable);
- tar = null;
- this.set(this.w, this.h);
- }
- var tn = this[name];
- if (tn !== void 0) { //属性が定義されていれば
- if (typeof tn === "string"){//文字列の場合
- this[tn] = value;
- } else if (tn instanceof STLength) { //長さの場合
- this[tn].newValueSpecifiedUnits(this[tn].uniType, parseFloat(value));
- }
- this.set(this.w, this.h);
- }
- }catch(e){stlog.add(e,6824);}
-}
+
//QからCに変換
NAIBU.qtoc = function (/*float*/ x, /*float*/ y, /*Array*/ F) {
F[0] = "c";
@@ -1062,7 +1014,7 @@
if (this.fill === "none") {
el.filled = "false";
} else {
- var fillElement = document.createElement("v:fill");;
+ var fillElement = document.createElement("v:fill");
var isRadial = false;
try {
if (this._urlreg.test(this.fill)) { //fill属性の値がurl(#id)ならば、idを設定したグラデーション関連要素を呼び出す
@@ -1085,7 +1037,7 @@
if (this.stroke === "none") {
el.stroked = "false";
} else {
- var strokeElement = document.createElement("v:stroke");;
+ var strokeElement = document.createElement("v:stroke");
try {
var sw = new STLength(this.strokewidth, Math.sqrt((w*w + h*h) / 2));
var swx = sw.value * Math.sqrt(Math.abs(matrix.determinant()));
@@ -1441,7 +1393,7 @@
tst.style[sname] = ti;
}
}
- } catch(e) {stlog.add(e,899); return "";}
+ } catch(e) {stlog.add(e,1396); return "";}
}
NAIBU.FontStyle.prototype.fset = function( /*float*/ w, /*float*/ h, /*Matrix*/ matrix) {
try{