OSDN Git Service

git-svn-id: http://svn.sourceforge.jp/svnroot/nyartoolkit/NyARToolkit/trunk@763 7cac0...
authornyatla <nyatla@7cac0a50-4618-4814-88d0-24b83990f816>
Fri, 31 Dec 2010 05:26:27 +0000 (05:26 +0000)
committerAtsuo Igarashi <atsuoigarashi@ubuntu.(none)>
Tue, 5 Apr 2011 09:02:36 +0000 (18:02 +0900)
utils/jmf/test/jp/nyatla/nyartoolkit/jmf/utils/test/JmfCaptureTest.java [deleted file]
utils/jmf/test/jp/nyatla/nyartoolkit/jmf/utils/test/LabelingViewer.java [deleted file]
utils/jmf/test/jp/nyatla/nyartoolkit/jmf/utils/test/NyarToolkitLinkTest.java [deleted file]

diff --git a/utils/jmf/test/jp/nyatla/nyartoolkit/jmf/utils/test/JmfCaptureTest.java b/utils/jmf/test/jp/nyatla/nyartoolkit/jmf/utils/test/JmfCaptureTest.java
deleted file mode 100644 (file)
index 1c13166..0000000
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
- * PROJECT: NyARToolkit JMF utilities.
- * --------------------------------------------------------------------------------
- * The MIT License
- * Copyright (c) 2008 nyatla
- * 
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- * 
- */
-
-package jp.nyatla.nyartoolkit.jmf.utils.test;
-
-import javax.media.*;
-
-import javax.media.util.BufferToImage;
-import javax.media.format.*;
-
-import jp.nyatla.nyartoolkit.NyARException;
-import jp.nyatla.nyartoolkit.jmf.utils.*;
-
-import java.awt.*;
-
-/**
- * VFMキャプチャテストプログラム
- */
-public class JmfCaptureTest extends Frame implements JmfCaptureListener
-{
-       private static final long serialVersionUID = -2110888320986446576L;
-       private JmfCaptureDevice _capture;
-       public JmfCaptureTest() throws NyARException
-       {
-               setTitle("JmfCaptureTest");
-               setBounds(0, 0, 320 + 64, 240 + 64);
-               JmfCaptureDeviceList dl=new JmfCaptureDeviceList();
-               this._capture=dl.getDevice(0);
-               if(!this._capture.setCaptureFormat(JmfCaptureDevice.PIXEL_FORMAT_RGB,320,240,30.0f)){
-                       if(!this._capture.setCaptureFormat(JmfCaptureDevice.PIXEL_FORMAT_YUV,320,240,30.0f)){
-                               throw new NyARException("キャプチャフォーマットが見つかりません。");
-                       }
-               }
-               this._capture.setOnCapture(this);
-       }
-
-
-       public void onUpdateBuffer(Buffer i_buffer)
-       {
-               BufferToImage b2i = new BufferToImage((VideoFormat) i_buffer.getFormat());
-               Image img = b2i.createImage(i_buffer);
-               Graphics g = getGraphics();
-               g.drawImage(img, 32, 32, this);
-       }
-
-       private void startCapture()
-       {
-               try {
-                       this._capture.start();
-               } catch (Exception e) {
-                       e.printStackTrace();
-               }
-       }
-
-       public static void main(String[] args)
-       {
-               try {
-                       JmfCaptureTest mainwin = new JmfCaptureTest();
-                       mainwin.setVisible(true);
-                       mainwin.startCapture();
-               } catch (Exception e) {
-                       e.printStackTrace();
-               }
-
-       }
-
-}
diff --git a/utils/jmf/test/jp/nyatla/nyartoolkit/jmf/utils/test/LabelingViewer.java b/utils/jmf/test/jp/nyatla/nyartoolkit/jmf/utils/test/LabelingViewer.java
deleted file mode 100644 (file)
index f4c67a7..0000000
+++ /dev/null
@@ -1,174 +0,0 @@
-/* 
- * PROJECT: NyARToolkit JMF sample program.
- * --------------------------------------------------------------------------------
- * The MIT License
- * Copyright (c) 2008 nyatla
- * airmail(at)ebony.plala.or.jp
- * http://nyatla.jp/nyartoolkit/
- * 
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- * 
- */
-package jp.nyatla.nyartoolkit.jmf.utils.test;
-
-import javax.media.*;
-
-import javax.media.util.BufferToImage;
-import javax.media.format.*;
-
-import jp.nyatla.nyartoolkit.NyARException;
-import jp.nyatla.nyartoolkit.jmf.utils.*;
-
-import java.awt.*;
-import java.awt.event.WindowAdapter;
-import java.awt.event.WindowEvent;
-
-import jp.nyatla.nyartoolkit.core.labeling.rlelabeling.NyARRleLabelFragmentInfo;
-import jp.nyatla.nyartoolkit.core.labeling.rlelabeling.NyARRleLabelFragmentInfoPtrStack;
-import jp.nyatla.nyartoolkit.core.param.NyARParam;
-import jp.nyatla.nyartoolkit.core.raster.*;
-import jp.nyatla.nyartoolkit.core.rasterfilter.rgb2gs.NyARRasterFilter_Rgb2Gs_RgbAve192;
-import jp.nyatla.nyartoolkit.core.squaredetect.NyARSquareContourDetector_Rle;
-import jp.nyatla.nyartoolkit.core.types.*;
-
-/**
- * VFM+ARToolkitテストプログラム
- * カメラから取り込んだデータからマーカーを検出して、一致度と変換行列を表示します。
- */
-public class LabelingViewer extends Frame implements JmfCaptureListener
-{
-       class SquareDetector extends NyARSquareContourDetector_Rle
-       {
-               public SquareDetector(NyARIntSize i_size) throws NyARException
-               {
-                       super(i_size);
-               }
-               protected void onSquareDetect(NyARIntCoordinates i_coord,int[] i_vertex_index)  throws NyARException
-               {
-                       
-               }
-       }
-       private static final long serialVersionUID = 6471434231970804953L;
-
-       private final String PARAM_FILE = "../../Data/camera_para.dat";
-
-       private JmfCaptureDevice _capture;
-
-
-       private JmfNyARRaster_RGB _raster;
-
-       public LabelingViewer() throws NyARException
-       {
-               setTitle("JmfCaptureTest");
-               setBounds(0, 0, 320 + 64, 240 + 64);
-               //キャプチャの準備
-               JmfCaptureDeviceList devlist=new JmfCaptureDeviceList();
-               this._capture=devlist.getDevice(0);
-               //JmfNyARRaster_RGBはYUVよりもRGBで高速に動作します。
-               if(!this._capture.setCaptureFormat(JmfCaptureDevice.PIXEL_FORMAT_RGB,320, 240,15f)){
-                       if(!this._capture.setCaptureFormat(JmfCaptureDevice.PIXEL_FORMAT_YUV,320, 240,15f)){
-                               throw new NyARException("キャプチャフォーマットが見つかりません");
-                       }               
-               }
-               this._capture.setOnCapture(this);
-               this.addWindowListener(new WindowAdapter() {
-                       public void windowClosing(WindowEvent e)
-                       {
-                               System.exit(0);
-                       }
-               });
-               //NyARToolkitの準備
-               NyARParam ar_param = new NyARParam();
-               ar_param.loadARParamFromFile(PARAM_FILE);
-               ar_param.changeScreenSize(320, 240);
-               this._raster = new JmfNyARRaster_RGB(this._capture.getCaptureFormat());
-               this._detect=new SquareDetector(ar_param.getScreenSize());
-               this._filter    = new NyARRasterFilter_Rgb2Gs_RgbAve192(_raster.getBufferType());
-               //キャプチャイメージ用のラスタを準備
-               return;
-       }
-       private NyARSquareContourDetector_Rle _detect;
-       private NyARGrayscaleRaster _bi=new NyARGrayscaleRaster(320,240);
-       private NyARRasterFilter_Rgb2Gs_RgbAve192 _filter;
-
-
-       
-       public void onUpdateBuffer(Buffer i_buffer)
-       {
-               try {
-                       NyARGrayscaleRaster gs = this._bi;
-                       //キャプチャしたバッファをラスタにセット
-                       this._raster.setBuffer(i_buffer);
-
-                       //キャプチャしたイメージを表示用に加工
-                       BufferToImage b2i = new BufferToImage((VideoFormat) i_buffer.getFormat());
-                       Image img = b2i.createImage(i_buffer);
-                       this._filter.doFilter(this._raster,gs);
-
-                       Graphics g = getGraphics();
-                       
-                       NyARParam param=new NyARParam();
-                       param.loadARParamFromFile(PARAM_FILE);
-                       param.changeScreenSize(320,240);
-                       try{
-                               NyARIntRect rect=new NyARIntRect();
-                               rect.x=100;rect.y=100;rect.w=220;rect.h=140;
-                               this._detect.detectMarker(gs,rect,110);
-                       }catch(Exception e){
-                               e.printStackTrace();
-                       }
-                       NyARRleLabelFragmentInfoPtrStack ls=(NyARRleLabelFragmentInfoPtrStack)this._detect._probe()[0];
-                       for(int i=0;i<ls.getLength();i++){
-                               NyARRleLabelFragmentInfo label=ls.getItem(i);
-//                             if(label.area==0){break;}
-                               Graphics g2=img.getGraphics();
-                               g2.setColor(Color.RED);
-                               g2.drawRect(label.clip_l,label.clip_t,label.clip_r-label.clip_l,label.clip_b-label.clip_t);
-                       }               
-                       
-                       
-                       g.drawImage(img,50,50,null);
-               }catch(Exception e)
-               {
-                       e.printStackTrace();
-               }
-
-       }
-
-       private void startCapture()
-       {
-               try {
-                       this._capture.start();
-               } catch (Exception e) {
-                       e.printStackTrace();
-               }
-       }
-
-       public static void main(String[] args)
-       {
-               try {
-                       LabelingViewer mainwin = new LabelingViewer();
-                       mainwin.setVisible(true);
-                       mainwin.startCapture();
-               } catch (Exception e) {
-                       e.printStackTrace();
-               }
-
-       }
-
-}
diff --git a/utils/jmf/test/jp/nyatla/nyartoolkit/jmf/utils/test/NyarToolkitLinkTest.java b/utils/jmf/test/jp/nyatla/nyartoolkit/jmf/utils/test/NyarToolkitLinkTest.java
deleted file mode 100644 (file)
index f2f8771..0000000
+++ /dev/null
@@ -1,164 +0,0 @@
-/* 
- * PROJECT: NyARToolkit JMF sample program.
- * --------------------------------------------------------------------------------
- * The MIT License
- * Copyright (c) 2008 nyatla
- * airmail(at)ebony.plala.or.jp
- * http://nyatla.jp/nyartoolkit/
- * 
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- * 
- */
-package jp.nyatla.nyartoolkit.jmf.utils.test;
-
-import javax.media.*;
-
-import javax.media.util.BufferToImage;
-import javax.media.format.*;
-
-import jp.nyatla.nyartoolkit.NyARException;
-import jp.nyatla.nyartoolkit.jmf.utils.*;
-
-import java.awt.*;
-import java.awt.event.WindowAdapter;
-import java.awt.event.WindowEvent;
-
-import jp.nyatla.nyartoolkit.core.*;
-import jp.nyatla.nyartoolkit.core.param.NyARParam;
-import jp.nyatla.nyartoolkit.core.transmat.*;
-import jp.nyatla.nyartoolkit.detector.NyARSingleDetectMarker;
-
-/**
- * VFM+ARToolkitテストプログラム
- * カメラから取り込んだデータからマーカーを検出して、一致度と変換行列を表示します。
- */
-public class NyarToolkitLinkTest extends Frame implements JmfCaptureListener
-{
-       private static final long serialVersionUID = 6471434231970804953L;
-
-       private final String CARCODE_FILE = "../../Data/patt.hiro";
-
-       private final String PARAM_FILE = "../../Data/camera_para.dat";
-
-       private JmfCaptureDevice _capture;
-
-       private NyARSingleDetectMarker _nya;
-
-       private JmfNyARRaster_RGB _raster;
-
-       private NyARTransMatResult _trans_mat_result = new NyARTransMatResult();
-
-       public NyarToolkitLinkTest() throws NyARException
-       {
-               setTitle("JmfCaptureTest");
-               setBounds(0, 0, 320 + 64, 240 + 64);
-               //キャプチャの準備
-               JmfCaptureDeviceList devlist=new JmfCaptureDeviceList();
-               this._capture=devlist.getDevice(0);
-               //JmfNyARRaster_RGBはYUVよりもRGBで高速に動作します。
-               if(!this._capture.setCaptureFormat(JmfCaptureDevice.PIXEL_FORMAT_RGB,320, 240,15f)){
-                       if(!this._capture.setCaptureFormat(JmfCaptureDevice.PIXEL_FORMAT_YUV,320, 240,15f)){
-                               throw new NyARException("キャプチャフォーマットが見つかりません");
-                       }               
-               }
-               this._capture.setOnCapture(this);
-               this.addWindowListener(new WindowAdapter() {
-                       public void windowClosing(WindowEvent e)
-                       {
-                               System.exit(0);
-                       }
-               });
-               //NyARToolkitの準備
-               NyARParam ar_param = new NyARParam();
-               NyARCode ar_code = new NyARCode(16, 16);
-               ar_param.loadARParamFromFile(PARAM_FILE);
-               ar_param.changeScreenSize(320, 240);
-               this._raster = new JmfNyARRaster_RGB(this._capture.getCaptureFormat());
-               this._nya = new NyARSingleDetectMarker(ar_param, ar_code, 80.0,this._raster.getBufferType());
-               ar_code.loadARPattFromFile(CARCODE_FILE);
-               //キャプチャイメージ用のラスタを準備
-               return;
-       }
-
-       public void onUpdateBuffer(Buffer i_buffer)
-       {
-               try {
-                       //キャプチャしたバッファをラスタにセット
-                       this._raster.setBuffer(i_buffer);
-
-                       //キャプチャしたイメージを表示用に加工
-                       BufferToImage b2i = new BufferToImage((VideoFormat) i_buffer.getFormat());
-                       Image img = b2i.createImage(i_buffer);
-
-                       Graphics g = getGraphics();
-
-                       //マーカー検出
-                       boolean is_marker_exist = this._nya.detectMarkerLite(this._raster, 110);
-                       if (is_marker_exist) {
-                               //変換行列を取得
-                               this._nya.getTransmationMatrix(this._trans_mat_result);
-                       }
-                       //情報を画面に書く
-                       Graphics image_g=img.getGraphics();
-                       image_g.setColor(Color.red);
-                       if (is_marker_exist) {
-                               image_g.drawString("マーカー検出:" + this._nya.getConfidence(), 4, 20);
-                               image_g.drawString("[m00]" +this._trans_mat_result.m00, 4, 20 + 16*1);
-                               image_g.drawString("[m01]" +this._trans_mat_result.m01, 4, 20 + 16*2);
-                               image_g.drawString("[m02]" +this._trans_mat_result.m02, 4, 20 + 16*3);
-                               image_g.drawString("[m03]" +this._trans_mat_result.m03, 4, 20 + 16*4);
-                               image_g.drawString("[m10]" +this._trans_mat_result.m10, 4, 20 + 16*5);
-                               image_g.drawString("[m11]" +this._trans_mat_result.m11, 4, 20 + 16*6);
-                               image_g.drawString("[m12]" +this._trans_mat_result.m12, 4, 20 + 16*7);
-                               image_g.drawString("[m13]" +this._trans_mat_result.m13, 4, 20 + 16*8);
-                               image_g.drawString("[m20]" +this._trans_mat_result.m20, 4, 20 + 16*9);
-                               image_g.drawString("[m21]" +this._trans_mat_result.m21, 4, 20 + 16*10);
-                               image_g.drawString("[m22]" +this._trans_mat_result.m22, 4, 20 + 16*11);
-                               image_g.drawString("[m23]" +this._trans_mat_result.m23, 4, 20 + 16*12);
-                       } else {
-                               g.drawString("マーカー未検出:", 32, 100);
-                       }
-                       g.drawImage(img, 32, 32, this);
-               } catch (Exception e) {
-                       e.printStackTrace();
-               }
-
-       }
-
-       private void startCapture()
-       {
-               try {
-                       this._capture.start();
-               } catch (Exception e) {
-                       e.printStackTrace();
-               }
-       }
-
-       public static void main(String[] args)
-       {
-               try {
-                       NyarToolkitLinkTest mainwin = new NyarToolkitLinkTest();
-                       mainwin.setVisible(true);
-                       mainwin.startCapture();
-               } catch (Exception e) {
-                       e.printStackTrace();
-               }
-
-       }
-
-}