From: dhrname <dhrname@users.sourceforge.jp>
Date: Sat, 28 Nov 2015 13:37:16 +0000 (+0900)
Subject: Add an additive property to the  object
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=6e25f07196688a90e4511690f941180aab5ccb85;p=sie%2Fsie.git

Add an additive property to the  object
---

diff --git a/org/w3c/dom/smil.js b/org/w3c/dom/smil.js
index 144f65c..46b69be 100644
--- a/org/w3c/dom/smil.js
+++ b/org/w3c/dom/smil.js
@@ -536,14 +536,13 @@ base("$from").of( {
   call: function() {
     if (this.numList.length) {
       var additive = [],
-          accumlate = [],
-          tu = this.underlying;
+          accumlate = [];
       for (var i=0;i<this.numList.length;++i) {
         /*0で配列を初期化しておく*/
         additive[i] = accumlate[i] = 0;
       }
-      tu.additive = additive;
-      tu.accumlate = accumlate;
+      this.additive = additive;
+      this.accumlate = accumlate;
     }
     /*文字部分の配置パターンは4通りあるので、ここでstrListを処理
      * (1) a 0 の場合
@@ -573,10 +572,8 @@ base("$from").of( {
    degit: 0,
    
    /*additve属性やaccumlate属性が設定された、累積アニメーションか、加法アニメーションで使われる*/
-   underlying: {
-     additive: [0],
-     accumlate: [0]
-   },
+   additive: [0],
+   accumlate: [0],
    
    /*advance メソッド
     * アニメーションの進行具合を示す進捗率 t (0 <= t <= 1)をもとに、現在の呈示値を算出するためのもの
@@ -593,9 +590,8 @@ base("$from").of( {
           strList = this.strList,
           fromNumList = this.from,
           deg = this.degit,
-          underlying = this.underlying,
-          additive = underlying.additive,
-          accumlate = underlying.accumlate;
+          additive = this.additive,
+          accumlate = this.accumlate;
       
       for (var i=0,nuli=numList.length;i<nuli;++i) {
         /*原点Oを(0,0,...0)とおく
@@ -607,7 +603,7 @@ base("$from").of( {
       }
       /*文字列はcallメソッドにより、a0aのパターンになっているので、aの部分を追加*/
       str = (strList ? strList[0] : "") + str;
-      numList = strList = fromNumList = i = nuli = deg = underlying = additive = accumlate = void 0;
+      numList = strList = fromNumList = i = nuli = deg = additive = accumlate = void 0;
       return str;
     },
     
@@ -627,7 +623,21 @@ base("$from").of( {
          s += (toList[i] - fromList[i])*(toList[i] - fromList[i]);
        }
        return Math.sqrt(s);
-     }
+     },
+     
+     /*setAdditive メソッド
+      * additve属性がsumのときに使われるメソッド
+      * 引数は親要素の、現在の属性値*/
+      setAdditive: function(str) {
+        if (!str) {
+          return 0;
+        }
+        var from = this.$from.up();
+        from.string = str;
+        var s = from.call();
+        this.additive = s;
+        return s;
+      }
   } )
   /*fromプロパティの初期化*/
  .up("$to").from = null;
diff --git a/tool/Spec/spec/SvgDomSpec.js b/tool/Spec/spec/SvgDomSpec.js
index 2446667..593a664 100644
--- a/tool/Spec/spec/SvgDomSpec.js
+++ b/tool/Spec/spec/SvgDomSpec.js
@@ -2962,8 +2962,8 @@ describe("SMIL Animation Spec", function() {
         from.strList();
       } ).toThrow();
       
-      expect(from.underlying.additive[0]).toBe(0);
-      expect(from.underlying.accumlate[0]).toBe(0);
+      expect(from.additive[0]).toBe(0);
+      expect(from.accumlate[0]).toBe(0);
     } );
     /*同値分割をして、有効同値クラスを調べておく (Equivalence partitioning, the following is the valid partion)*/
     it("should be this for the value (the valid partion)", function() {
@@ -3177,11 +3177,11 @@ describe("SMIL Animation Spec", function() {
         expect(from.$to.advance(0.4)).toBe("a-2.0s-0.3");
         expect(from.$to.advance(1)).toBe("a10.0s-3.0");
         
-        from.$to.underlying.additive[0] = 1;
-        from.$to.underlying.accumlate[1] = 2;
+        from.$to.additive[0] = 1;
+        from.$to.accumlate[1] = 2;
         expect(from.$to.advance(0.4)).toBe("a-1.0s1.7");
-        from.$to.underlying.additive[0] = 0.5;
-        from.$to.underlying.accumlate[1] = 0.8;
+        from.$to.additive[0] = 0.5;
+        from.$to.accumlate[1] = 0.8;
         expect(from.$to.advance(1)).toBe("a10.5s-2.2");
       } );
       /*無効同値クラスを調べておく (Equivalence partitioning, the following is the invalid partion)*/
@@ -3195,7 +3195,7 @@ describe("SMIL Animation Spec", function() {
       } );
     } )
   } );
-   describe("A distance method", function() {
+  describe("A distance method", function() {
       var from = base("$from");
        beforeEach( function() {
          from = base("$from").up();
@@ -3220,7 +3220,7 @@ describe("SMIL Animation Spec", function() {
         expect(from.$to.distance(from)).toBe(12);
         expect(from.$to.distance(from)).toBe(12);
         expect(from.$to.distance(from.call())).toBe(12);
-
+  
         from = base("$from").up();
         from.up("$to");
         from.string = "rgb(1, 0, 0)";
@@ -3234,7 +3234,32 @@ describe("SMIL Animation Spec", function() {
         from.$to.string = "s";
         expect(from.$to.distance(from)).toBe(0);
       } );
-   } );
+  } );
+    describe("A setAdditive method", function() {
+      var from = base("$from");
+       beforeEach( function() {
+         from = base("$from").up();
+         from.string = "";
+         from.up("$to");
+       } );
+      /*境界条件を調べておく (limit value analysis)*/
+      it("should be this for the value  (limit value analysis)", function() {
+        expect(from.setAdditive()).toBe(0);
+        expect(from.setAdditive("")).toBe(0);
+        expect(from.setAdditive("1")).toEqual([1]);
+        expect(from.additive).toEqual([1]);
+      } );
+      /*同値分割をして、有効同値クラスを調べておく (Equivalence partitioning, the following is the valid partion)*/
+      it("should be this for the value (the valid partion)", function() {
+
+      } );
+      /*無効同値クラスを調べておく (Equivalence partitioning, the following is the invalid partion)*/
+      it("should be this for the value (the invalid partion)", function() {
+        from.string = "s";
+        from.$to.string = "s";
+        expect(from.$to.distance(from)).toBe(0);
+      } );
+  } );
   describe("A $calcMode object", function() {
     var calc = base("$calcMode"),
         to = calc.to,