[バックアップ]NyARToolkit for Java

クラス名変更忘れの修正

git-svn-id: http://svn.sourceforge.jp/svnroot/nyartoolkit/NyARToolkit@236 7cac0a50-4618-4814-88d0-24b83990f816

diff --git a/trunk/src/jp/nyatla/nyartoolkit/nyidmarker/NyARIdMarkerParam.java b/trunk/src/jp/nyatla/nyartoolkit/nyidmarker/NyIdMarkerParam.java
similarity index 95%
rename from trunk/src/jp/nyatla/nyartoolkit/nyidmarker/NyARIdMarkerParam.java
rename to trunk/src/jp/nyatla/nyartoolkit/nyidmarker/NyIdMarkerParam.java
index 4c1fb23..4b51215 100644 (file)
--- a/trunk/src/jp/nyatla/nyartoolkit/nyidmarker/NyARIdMarkerParam.java
+++ b/trunk/src/jp/nyatla/nyartoolkit/nyidmarker/NyIdMarkerParam.java
@@ -35,7 +35,7 @@ package jp.nyatla.nyartoolkit.nyidmarker;
  * マーカを抽出した時のパラメータを格納するクラスです。\r
  *\r
  */\r
-public class NyARIdMarkerParam\r
+public class NyIdMarkerParam\r
 {\r
        /**\r
         * マーカの方位値です。\r

diff --git a/trunk/src/jp/nyatla/nyartoolkit/nyidmarker/NyARIdMarkerPattern.java b/trunk/src/jp/nyatla/nyartoolkit/nyidmarker/NyIdMarkerPattern.java
similarity index 95%
rename from trunk/src/jp/nyatla/nyartoolkit/nyidmarker/NyARIdMarkerPattern.java
rename to trunk/src/jp/nyatla/nyartoolkit/nyidmarker/NyIdMarkerPattern.java
index b4598a0..b8cfbd5 100644 (file)
--- a/trunk/src/jp/nyatla/nyartoolkit/nyidmarker/NyARIdMarkerPattern.java
+++ b/trunk/src/jp/nyatla/nyartoolkit/nyidmarker/NyIdMarkerPattern.java
@@ -35,7 +35,7 @@ package jp.nyatla.nyartoolkit.nyidmarker;
  * クラスは、未整形のマーカデータを格納しています。\r
  *\r
  */\r
-public class NyARIdMarkerPattern\r
+public class NyIdMarkerPattern\r
 {\r
        public int model;\r
        public int ctrl_domain;\r

diff --git a/trunk/src/jp/nyatla/nyartoolkit/nyidmarker/NyARIdMarkerPickup.java b/trunk/src/jp/nyatla/nyartoolkit/nyidmarker/NyIdMarkerPickup.java
similarity index 95%
rename from trunk/src/jp/nyatla/nyartoolkit/nyidmarker/NyARIdMarkerPickup.java
rename to trunk/src/jp/nyatla/nyartoolkit/nyidmarker/NyIdMarkerPickup.java
index 53edc38..b9302e1 100644 (file)
--- a/trunk/src/jp/nyatla/nyartoolkit/nyidmarker/NyARIdMarkerPickup.java
+++ b/trunk/src/jp/nyatla/nyartoolkit/nyidmarker/NyIdMarkerPickup.java
@@ -948,7 +948,7 @@ class MarkerPattEncoder
         * 成功すればマーカの方位を返却します。失敗すると-1を返します。\r
         */\r
 \r
-       public int encode(NyARIdMarkerPattern o_out)\r
+       public int encode(NyIdMarkerPattern o_out)\r
        {\r
                final int d=getDirection();\r
                if(d<0){\r
@@ -1032,14 +1032,14 @@ class MarkerPattEncoder
  * ラスタ画像の任意矩形から、NyARIdMarkerDataを抽出します。\r
  *\r
  */\r
-public class NyARIdMarkerPickup\r
+public class NyIdMarkerPickup\r
 {\r
        private PerspectivePixelReader _perspective_reader;\r
        private final PerspectivePixelReader.TThreshold __pickFromRaster_th=new PerspectivePixelReader.TThreshold();\r
        private final MarkerPattEncoder __pickFromRaster_encoder=new MarkerPattEncoder();\r
 \r
 \r
-       public NyARIdMarkerPickup()\r
+       public NyIdMarkerPickup()\r
        {\r
                this._perspective_reader=new PerspectivePixelReader();\r
                return;\r
@@ -1054,7 +1054,7 @@ public class NyARIdMarkerPickup
         * @return\r
         * @throws NyARException\r
         */\r
-       public boolean pickFromRaster(INyARRgbRaster image, NyARSquare i_square,NyARIdMarkerPattern o_data,NyARIdMarkerParam o_param)throws NyARException\r
+       public boolean pickFromRaster(INyARRgbRaster image, NyARSquare i_square,NyIdMarkerPattern o_data,NyIdMarkerParam o_param)throws NyARException\r
        {\r
                this._perspective_reader.setSourceRaster(image);\r
                \r

diff --git a/trunk/src/jp/nyatla/nyartoolkit/nyidmarker/data/INyIdMarkerDataEncoder.java b/trunk/src/jp/nyatla/nyartoolkit/nyidmarker/data/INyIdMarkerDataEncoder.java
index 0da0de1..9ecdbe0 100644 (file)
--- a/trunk/src/jp/nyatla/nyartoolkit/nyidmarker/data/INyIdMarkerDataEncoder.java
+++ b/trunk/src/jp/nyatla/nyartoolkit/nyidmarker/data/INyIdMarkerDataEncoder.java
@@ -1,10 +1,10 @@
 package jp.nyatla.nyartoolkit.nyidmarker.data;\r
 \r
-import jp.nyatla.nyartoolkit.nyidmarker.NyARIdMarkerPattern;\r
+import jp.nyatla.nyartoolkit.nyidmarker.NyIdMarkerPattern;\r
 \r
 \r
 public interface INyIdMarkerDataEncoder\r
 {\r
-       public boolean encode(NyARIdMarkerPattern i_data,INyIdMarkerData o_dest);\r
+       public boolean encode(NyIdMarkerPattern i_data,INyIdMarkerData o_dest);\r
        public INyIdMarkerData createDataInstance();\r
 }\r

diff --git a/trunk/src/jp/nyatla/nyartoolkit/nyidmarker/data/NyIdMarkerDataEncoder_RawBit.java b/trunk/src/jp/nyatla/nyartoolkit/nyidmarker/data/NyIdMarkerDataEncoder_RawBit.java
index 62bea06..c030468 100644 (file)
--- a/trunk/src/jp/nyatla/nyartoolkit/nyidmarker/data/NyIdMarkerDataEncoder_RawBit.java
+++ b/trunk/src/jp/nyatla/nyartoolkit/nyidmarker/data/NyIdMarkerDataEncoder_RawBit.java
@@ -1,13 +1,13 @@
 package jp.nyatla.nyartoolkit.nyidmarker.data;\r
 \r
-import jp.nyatla.nyartoolkit.nyidmarker.NyARIdMarkerPattern;\r
+import jp.nyatla.nyartoolkit.nyidmarker.NyIdMarkerPattern;\r
 \r
 \r
 public class NyIdMarkerDataEncoder_RawBit implements INyIdMarkerDataEncoder\r
 {      \r
        private final static int _DOMAIN_ID=0;\r
        private final static int _mod_data[]={7,31,127,511,2047,4095};\r
-       public boolean encode(NyARIdMarkerPattern i_data,INyIdMarkerData o_dest)\r
+       public boolean encode(NyIdMarkerPattern i_data,INyIdMarkerData o_dest)\r
        {\r
                final NyIdMarkerData_RawBit dest=(NyIdMarkerData_RawBit)o_dest;\r
                if(i_data.ctrl_domain!=_DOMAIN_ID){\r

diff --git a/trunk/src/jp/nyatla/nyartoolkit/processor/SingleNyIdMarkerProcesser.java b/trunk/src/jp/nyatla/nyartoolkit/processor/SingleNyIdMarkerProcesser.java
index ceda32b..762e11d 100644 (file)
--- a/trunk/src/jp/nyatla/nyartoolkit/processor/SingleNyIdMarkerProcesser.java
+++ b/trunk/src/jp/nyatla/nyartoolkit/processor/SingleNyIdMarkerProcesser.java
@@ -68,7 +68,7 @@ public abstract class SingleNyIdMarkerProcesser
 \r
        private NyARRasterFilter_ARToolkitThreshold _tobin_filter = new NyARRasterFilter_ARToolkitThreshold(110);\r
 \r
-       private NyARIdMarkerPickup _id_pickup = new NyARIdMarkerPickup();\r
+       private NyIdMarkerPickup _id_pickup = new NyIdMarkerPickup();\r
 \r
 \r
        protected SingleNyIdMarkerProcesser(NyARParam i_param,INyIdMarkerDataEncoder i_encoder) throws NyARException\r
@@ -135,8 +135,8 @@ public abstract class SingleNyIdMarkerProcesser
        }\r
 \r
        \r
-       private final NyARIdMarkerPattern _marker_data=new NyARIdMarkerPattern();\r
-       private final NyARIdMarkerParam _marker_param=new NyARIdMarkerParam();\r
+       private final NyIdMarkerPattern _marker_data=new NyIdMarkerPattern();\r
+       private final NyIdMarkerParam _marker_param=new NyIdMarkerParam();\r
 \r
        \r
 \r
@@ -144,8 +144,8 @@ public abstract class SingleNyIdMarkerProcesser
         */\r
        private void detectNewMarker(INyARRgbRaster i_raster, NyARSquareStack i_stack) throws NyARException\r
        {\r
-               NyARIdMarkerParam param=this._marker_param;\r
-               NyARIdMarkerPattern patt_data  =this._marker_data;\r
+               NyIdMarkerParam param=this._marker_param;\r
+               NyIdMarkerPattern patt_data  =this._marker_data;\r
                int number_of_square = i_stack.getLength();\r
                int square_index = 0;\r
                INyIdMarkerData marker_id=null;\r
@@ -172,8 +172,8 @@ public abstract class SingleNyIdMarkerProcesser
         */\r
        private void detectExistMarker(INyARRgbRaster i_raster, NyARSquareStack i_stack) throws NyARException\r
        {\r
-               NyARIdMarkerParam param=this._marker_param;\r
-               NyARIdMarkerPattern patt_data  =this._marker_data;\r
+               NyIdMarkerParam param=this._marker_param;\r
+               NyIdMarkerPattern patt_data  =this._marker_data;\r
                int number_of_square = i_stack.getLength();\r
                int square_index = 0;\r
                INyIdMarkerData marker_id=null;\r
@@ -201,7 +201,7 @@ public abstract class SingleNyIdMarkerProcesser
 \r
        /**オブジェクトのステータスを更新し、必要に応じてハンドル関数を駆動します。\r
         */\r
-       private void updateStatus(NyARSquare i_square, INyIdMarkerData i_marker_data,NyARIdMarkerParam i_param)  throws NyARException\r
+       private void updateStatus(NyARSquare i_square, INyIdMarkerData i_marker_data,NyIdMarkerParam i_param)  throws NyARException\r
        {\r
                boolean is_id_found=false;\r
                NyARTransMatResult result = this.__NyARSquare_result;\r

diff --git a/trunk/test/jp/nyatla/nyartoolkit/dev/PattPickupTest.java b/trunk/test/jp/nyatla/nyartoolkit/dev/PattPickupTest.java
index e37c6b0..bbc8022 100644 (file)
--- a/trunk/test/jp/nyatla/nyartoolkit/dev/PattPickupTest.java
+++ b/trunk/test/jp/nyatla/nyartoolkit/dev/PattPickupTest.java
@@ -12,7 +12,7 @@ import javax.media.util.BufferToImage;
 import java.awt.image.*;\r
 import jp.nyatla.nyartoolkit.NyARException;\r
 import jp.nyatla.nyartoolkit.jmf.utils.*;\r
-import jp.nyatla.nyartoolkit.nyidmarker.NyARIdMarkerPickup;\r
+import jp.nyatla.nyartoolkit.nyidmarker.NyIdMarkerPickup;\r
 import jp.nyatla.nyartoolkit.core.*;\r
 import jp.nyatla.nyartoolkit.core.param.*;\r
 import jp.nyatla.nyartoolkit.core.pickup.*;\r
@@ -81,7 +81,7 @@ public class PattPickupTest extends Frame implements JmfCaptureListener
 \r
        private INyARColorPatt _patt2 = new NyARColorPatt_Perspective(100,100);\r
 \r
-       private NyARIdMarkerPickup _patt3 = new NyARIdMarkerPickup();\r
+       private NyIdMarkerPickup _patt3 = new NyIdMarkerPickup();\r
 \r
        public void onUpdateBuffer(Buffer i_buffer)\r
        {\r
@@ -133,8 +133,8 @@ public class PattPickupTest extends Frame implements JmfCaptureListener
                                                g2.drawLine(0,this._patt1.getHeight()/2,this._patt1.getWidth(),this._patt1.getHeight()/2);\r
                                        }\r
                                        {// IDマーカ\r
-                                               NyARIdMarkerPattern data =new NyARIdMarkerPattern();\r
-                                               NyARIdMarkerParam param =new NyARIdMarkerParam();\r
+                                               NyIdMarkerPattern data =new NyIdMarkerPattern();\r
+                                               NyIdMarkerParam param =new NyIdMarkerParam();\r
                                                \r
                                                // 一番それっぽいパターンを取得\r
                                                this._patt3.pickFromRaster(this._capraster, t,data,param);\r