From: dhrname <dhrname@users.sourceforge.jp>
Date: Thu, 26 Feb 2015 14:00:53 +0000 (+0900)
Subject: Modify the Spec for the acvance method
X-Git-Tag: version22~290
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=1c76d63b75593cd040b4bfc1f72d36cfd7171bf7;p=sie%2Fsie.git

Modify the Spec for the acvance method
---

diff --git a/org/w3c/dom/smil.js b/org/w3c/dom/smil.js
index 4db45a8..842c7ab 100644
--- a/org/w3c/dom/smil.js
+++ b/org/w3c/dom/smil.js
@@ -448,6 +448,7 @@ base("$from").of( {
   numList: function() {
     var s  = this.string.match(/[\-\+]?[\d\.]+(?:[eE][\-\+]?[\d\.]+)?/g);
     if (s) {
+      /*mapメソッドで代用してもよい*/
       for (var i=0;i<s.length;++i) {
         s[i] = parseFloat(s[i]);
       }
@@ -467,10 +468,26 @@ base("$from").of( {
   }
     
 } )
- .mix( {
-    advance: function() {
-      return "";
+ .mix( {   
+   /*advance メソッド
+    * アニメーションの進行具合を示す進捗率 t (0 <= t <= 1)をもとに、現在の呈示値を算出するためのもの*/
+    advance: function(t) {
+      if ( (t < 0) || (1 < t)) {
+        throw new Error("An Invalid Number Error");
+      }
+      if (!this.string || !this.from) {
+        return "";
+      }
+      var str = "";
+      for (var i=0,nuli=this.numList.length;i<nuli;++i) {
+        /*$fromと$toを、原点Oから伸びる二つのベクトル (n次空間のベクトル)と考え、
+         * そのベクトルの端同士を結ぶ線上の点Pをベクトルの計算から求める*/
+        str += ( t * this.numList[i] + (1 - t) * this.from.numList[i] );
+        this.strList && ( str += this.strList[i] );
+      }
+      return str;
     }
   } )
- .up("$to");
+  /*fromプロパティの初期化*/
+ .up("$to").from = null;
 //#endif // _SMIL_IDL_
diff --git a/tool/Spec/spec/SvgDomSpec.js b/tool/Spec/spec/SvgDomSpec.js
index 47ebc10..7fc9af6 100644
--- a/tool/Spec/spec/SvgDomSpec.js
+++ b/tool/Spec/spec/SvgDomSpec.js
@@ -2972,12 +2972,49 @@ describe("SMIL Animation Spec", function() {
       it("should be this for the value  (limit value analysis)", function() {
         expect(from.advance()).toBe("");
         expect(from.$to.advance()).toBe("");
+        expect(from.$to.advance(0)).toBe("");
+        expect(from.$to.advance(1)).toBe("");
+        expect(function(){
+          from.$to.advance(1.01);
+        }).toThrow("An Invalid Number Error");
+        expect(function(){
+          from.$to.advance(-0.01);
+        }).toThrow("An Invalid Number Error");
+        
+        from.string = "0";
+        from.$to.string = "1";
+        expect(from.$to.call()).toBe(from.$to);
+        expect(from.$to.numList[0]).toEqual(1);
+        expect(from.$to.strList).toBeNull();
+        expect(from.call()).toBe(from.$to);
+        expect(from.numList[0]).toEqual(0);
+        expect(from.strList).toBeNull();
+        expect(from.advance(0)).toBe("");
+        expect(from.$to.from).toBe(from);
+        expect(from.$to.advance(0)).toBe("0");        
       } );
       /*同値分割をして、有効同値クラスを調べておく (Equivalence partitioning, the following is the valid partion)*/
       it("should be this for the value (the valid partion)", function() {
+        from.string = "0s";
+        from.$to.string = "1s";
+        expect(from.$to.call()).toBe(from.$to);
+        expect(from.$to.numList[0]).toEqual(1);
+        expect(from.$to.strList[0]).toEqual("s");
+        expect(from.call()).toBe(from.$to);
+        expect(from.numList[0]).toEqual(0);
+        expect(from.strList[0]).toEqual("s");
+        expect(from.advance(0)).toBe("");
+        expect(from.$to.from).toBe(from);
+        expect(from.$to.advance(0)).toBe("0s");        
       } );
       /*無効同値クラスを調べておく (Equivalence partitioning, the following is the invalid partion)*/
       it("should be this for the value (the invalid partion)", function() {
+        expect(function(){
+          from.$to.advance(10);
+        }).toThrow("An Invalid Number Error");
+        expect(function(){
+          from.$to.advance(-10);
+        }).toThrow("An Invalid Number Error");
       } );
     } )
   } );