Changeset 23212

Timestamp:

11/11/08 12:53:30 (5 years ago)

Author:

schima

Message:

cvCreateTrackbarの引数の参照渡しがGCのためうまくいかないので廃止

Location:

lang/cpluspluscli/OpenCvSharp/trunk/OpenCvSharp

Files:

• CV.cpp (modified) (8 diffs)
• CV.h (modified) (2 diffs)
• CvTrackbar.cpp (modified) (5 diffs)
• CvTrackbar.h (modified) (2 diffs)
• CvWindow.cpp (modified) (7 diffs)
• CvWindow.h (modified) (4 diffs)

lang/cpluspluscli/OpenCvSharp/trunk/OpenCvSharp/CV.cpp

@@ -6 +6 @@
 #include "stdafx.h"
 #include "CV.h"
+#include "CvWindow.h"
 
 using namespace System;
@@ -2033 +2034 @@
         /// <summary>
         /// 指定された名前と範囲のトラックバー（スライダ，レンジコントロールとも呼ばれる）を作成する．
-        /// この関数の引数には，トラックバーの位置に同期する変数と，トラックバーの位置変化に応じて呼び出されるコールバック関数を指定する．
-        /// 作成されたトラックバーは，与えられたウィンドウの最上段に表示される.
-        /// </summary>
-        /// <param name="trackbar_name">トラックバーの名前</param>
-        /// <param name="window_name">トラックバーの親ウィンドウの名前</param>
-        /// <param name="value">スライダの初期位置。refで渡すので、この変数に現在のスライダの位置が随時更新される。</param>
-        /// <param name="count">スライダの最大値．最小値は常に 0.</param>
-        /// <param name="on_change">スライダの位置が変更されるたびに呼び出されるデリゲート</param>
-        /// <returns></returns>
-        Int32 CV::CreateTrackbar( String^ trackbar_name, String^ window_name, [In][Out] Int32% value, Int32 count, CvTrackbarCallbackHandler^ on_change )
-        {
-                CHECK_NULL(trackbar_name);
-                CHECK_NULL(window_name);
-                StringConverter^ conv1 = gcnew StringConverter(trackbar_name);
-                StringConverter^ conv2 = gcnew StringConverter(window_name);
-                pin_ptr<int> v_pin = &value;
-                if(on_change != nullptr){
-                        CvTrackbarCallback callbackPtr = (CvTrackbarCallback)(void*)Marshal::GetFunctionPointerForDelegate(on_change);
-                        return ::cvCreateTrackbar(conv1->ToCharPtr(), conv2->ToCharPtr(), v_pin, count, callbackPtr);
-                }else{
-                        return ::cvCreateTrackbar(conv1->ToCharPtr(), conv2->ToCharPtr(), v_pin, count, NULL);
-                }
-        }
-        /// <summary>
-        /// 指定された名前と範囲のトラックバー（スライダ，レンジコントロールとも呼ばれる）を作成する．
-        /// この関数の引数には，トラックバーの位置に同期する変数と，トラックバーの位置変化に応じて呼び出されるコールバック関数を指定する．
-        /// 作成されたトラックバーは，与えられたウィンドウの最上段に表示される.
-        /// </summary>
-        /// <param name="trackbar_name">トラックバーの名前</param>
-        /// <param name="window_name">トラックバーの親ウィンドウの名前</param>
-        /// <param name="value">スライダの初期位置。refで渡すので、この変数に現在のスライダの位置が随時更新される。</param>
-        /// <param name="count">スライダの最大値．最小値は常に 0.</param>
-        /// <returns></returns>
-        Int32 CV::CreateTrackbar( String^ trackbar_name, String^ window_name, [In][Out] Int32% value, Int32 count )
-        {
-                CHECK_NULL(trackbar_name);
-                CHECK_NULL(window_name);
-                pin_ptr<int> v_pin = &value;
-                int* v_ptr = v_pin;
-                StringConverter^ conv1 = gcnew StringConverter(trackbar_name);
-                StringConverter^ conv2 = gcnew StringConverter(window_name);
-                return ::cvCreateTrackbar(conv1->ToCharPtr(), conv2->ToCharPtr(), v_ptr, count, NULL);
-        }
-        /// <summary>
-        /// 指定された名前と範囲のトラックバー（スライダ，レンジコントロールとも呼ばれる）を作成する．
-        /// この関数の引数には，トラックバーの位置に同期する変数と，トラックバーの位置変化に応じて呼び出されるコールバック関数を指定する．
         /// 作成されたトラックバーは，与えられたウィンドウの最上段に表示される.
         /// </summary>
@@ -2088 +2043 @@
                 CHECK_NULL(trackbar_name);
                 CHECK_NULL(window_name);
-                StringConverter^ conv1 = gcnew StringConverter(trackbar_name);
-                StringConverter^ conv2 = gcnew StringConverter(window_name);
-                return ::cvCreateTrackbar(conv1->ToCharPtr(), conv2->ToCharPtr(), 0, 100, NULL);
-        }
+                CvWindow^ w = CvWindow::GetWindowByName(window_name);
+                if(w == nullptr){
+                        throw gcnew Exception("指定されたウィンドウは存在しません.");
+                }
+                try{
+                        w->CreateTrackbar(trackbar_name);
+                        return 1;
+                }catch(Exception^){
+                        return 0;
+                }
+        }
+        /// <summary>
+        /// 指定された名前と範囲のトラックバー（スライダ，レンジコントロールとも呼ばれる）を作成する．
+        /// 作成されたトラックバーは，与えられたウィンドウの最上段に表示される.
+        /// </summary>
+        /// <param name="trackbar_name">トラックバーの名前</param>
+        /// <param name="window_name">トラックバーの親ウィンドウの名前</param>
+        /// <param name="value">スライダの初期位置</param>
+        /// <param name="count">スライダの最大値．最小値は常に 0.</param>
+        /// <returns></returns>
+        Int32 CV::CreateTrackbar( String^ trackbar_name, String^ window_name, Int32 value, Int32 count )
+        {
+                CHECK_NULL(trackbar_name);
+                CHECK_NULL(window_name);
+                CvWindow^ w = CvWindow::GetWindowByName(window_name);
+                if(w == nullptr){
+                        throw gcnew Exception("指定されたウィンドウは存在しません.");
+                }
+                try{
+                        w->CreateTrackbar(trackbar_name, value, count);
+                        return 1;
+                }catch(Exception^){
+                        return 0;
+                }
+        }
+        /// <summary>
+        /// 指定された名前と範囲のトラックバー（スライダ，レンジコントロールとも呼ばれる）を作成する．
+        /// 作成されたトラックバーは，与えられたウィンドウの最上段に表示される.
+        /// </summary>
+        /// <param name="trackbar_name">トラックバーの名前</param>
+        /// <param name="window_name">トラックバーの親ウィンドウの名前</param>
+        /// <param name="value">スライダの初期位置</param>
+        /// <param name="count">スライダの最大値．最小値は常に 0.</param>
+        /// <param name="on_change">スライダの位置が変更されるたびに呼び出されるデリゲート</param>
+        /// <returns></returns>
+        Int32 CV::CreateTrackbar( String^ trackbar_name, String^ window_name, Int32 value, Int32 count, CvTrackbarCallbackHandler^ on_change )
+        {
+                CHECK_NULL(trackbar_name);
+                CHECK_NULL(window_name);
+                CvWindow^ w = CvWindow::GetWindowByName(window_name);
+                if(w == nullptr){
+                        throw gcnew Exception("指定されたウィンドウは存在しません.");
+                }
+                try{
+                        w->CreateTrackbar(trackbar_name, value, count, on_change);
+                        return 1;
+                }catch(Exception^){
+                        return 0;
+                }
+        }       
         #pragma endregion 
         #pragma region CreateVideoWriter
@@ -2237 +2248 @@
         void CV::DestroyAllWindows( void )
         {
-                ::cvDestroyAllWindows();
+                //::cvDestroyAllWindows();
+                CvWindow::DestroyAllWindows();
         }
         #pragma endregion 
@@ -2247 +2259 @@
         void CV::DestroyWindow( String^ name )
         {
-                if(name == nullptr){
-                        throw gcnew ArgumentNullException();
-                }
-                StringConverter^ conv = gcnew StringConverter(name);
-                ::cvDestroyWindow(conv->ToCharPtr());
+                CHECK_NULL(name);               
+                CvWindow^ w = CvWindow::GetWindowByName(name);
+                if(w != nullptr){
+                        w->Close();
+                }
         }
         #pragma endregion 
@@ -6074 +6086 @@
         {
                 CHECK_NULL(name);
-                StringConverter^ conv = gcnew StringConverter(name);
-                return ::cvNamedWindow(conv->ToCharPtr());
+                try{
+                        gcnew N::CvWindow(name);
+                        return 0;
+                }catch(Exception^){
+                        return 1;
+                }
         }
         /// <summary>
@@ -6087 +6103 @@
         {
                 CHECK_NULL(name);
-                StringConverter^ conv = gcnew StringConverter(name);
-                return ::cvNamedWindow(conv->ToCharPtr(), (int)flags);
+                try{
+                        gcnew N::CvWindow(name, flags);
+                        return 0;
+                }catch(Exception^){
+                        return 1;
+                }
         }
         #pragma endregion 
@@ -8419 +8439 @@
                 CHECK_NULL(name);
                 CHECK_NULL(image);
-                StringConverter^ conv = gcnew StringConverter(name);
-                ::cvShowImage(conv->ToCharPtr(), image->Ptr);
+                CvWindow^ w = CvWindow::GetWindowByName(name);
+                if(w != nullptr){
+                        w->Image = image;
+                }               
         }
         #pragma endregion 

lang/cpluspluscli/OpenCvSharp/trunk/OpenCvSharp/CV.h

@@ -19 +19 @@
 
 using namespace System;
+using namespace System::Collections::Generic;
 using namespace System::Runtime::InteropServices;
 namespace N = KwsmLab::OpenCvSharp;
@@ -169 +170 @@
                 static N::CvSubdiv2D^ CreateSubdiv2D( SeqType subdiv_type, Int32 header_size, Int32 vtx_size, Int32 quadedge_size, N::CvMemStorage^ storage );
                 static Int32 CreateTrackbar( String^ trackbar_name, String^ window_name );
-                static Int32 CreateTrackbar( String^ trackbar_name, String^ window_name, [In][Out] Int32% value, Int32 count );
-                static Int32 CreateTrackbar( String^ trackbar_name, String^ window_name, [In][Out] Int32% value, Int32 count, N::CvTrackbarCallbackHandler^ on_change );
+                static Int32 CreateTrackbar( String^ trackbar_name, String^ window_name, Int32 value, Int32 count );
+                static Int32 CreateTrackbar( String^ trackbar_name, String^ window_name, Int32 value, Int32 count, N::CvTrackbarCallbackHandler^ on_change );
                 static N::CvVideoWriter^ CreateVideoWriter( String^ filename, String^ fourcc, Double fps, N::CvSize frame_size );
                 static N::CvVideoWriter^ CreateVideoWriter( String^ filename, String^ fourcc, Double fps, N::CvSize frame_size, Boolean is_color );     

lang/cpluspluscli/OpenCvSharp/trunk/OpenCvSharp/CvTrackbar.cpp

@@ -12 +12 @@
         CvTrackbar::CvTrackbar(String^ name, String^ window)
         {
-                CHECK_NULL(name);
-                CHECK_NULL(window);             
-                this->name = name;
-                this->window = window;
-                this->max = 100;                
-                this->callback = nullptr;
-                int value = 0;
-                CV::CreateTrackbar(name, window, value, max, callback);
+                this->value = 0;
+                Initialize(name, window, this->value, 100, nullptr);
         }
         /// <summary>
@@ -29 +23 @@
         CvTrackbar::CvTrackbar(String^ name, String^ window, CvTrackbarCallbackHandler^ callback)
         {
-                CHECK_NULL(name);
-                CHECK_NULL(window);             
-                this->name = name;
-                this->window = window;
-                this->max = 100;                
-                this->callback = callback;
-                int value = 0;
-                CV::CreateTrackbar(name, window, value, max, callback);
+                this->value = 0;
+                Initialize(name, window, this->value, 100, callback);
         }
         /// <summary>
@@ -43 +31 @@
         /// <param name="name">�g���b�N�o�[�̖��O</param>
         /// <param name="window">�g���b�N�o�[�̐e�E�B���h�E��</param>
-        /// <param name="value">�X���C�_�̈ʒu����C�����^�ϐ��̎Q�ƁD�쐬���̃X���C�_�ʒu�́C���̕ϐ��ɂ��Ē�����. ref�œn���̂ŁA�X���C�_�������Ƃ����Ɋ��蓖�Ă��ϐ��̒l��������/param>
+        /// <param name="value">�X���C�_�̏���</param>
         /// <param name="max">�X���C�_�̍ő��D�ŏ��l�͏� 0.</param>
-        CvTrackbar::CvTrackbar(String^ name, String^ window, [In][Out] Int32% value, Int32 max)
+        CvTrackbar::CvTrackbar( String^ name, String^ window, Int32 value, Int32 max)
         {
-                CHECK_NULL(name);
-                CHECK_NULL(window);
-                this->name = name;
-                this->window = window;
-                this->max = max;
-                this->callback = nullptr;
-                CV::CreateTrackbar(name, window, value, max, callback);
+                this->value = value;
+                Initialize(name, window, this->value, max, nullptr);
         }
         /// <summary>
@@ -59 +42 @@
         /// <param name="name">�g���b�N�o�[�̖��O</param>
         /// <param name="window">�g���b�N�o�[�̐e�E�B���h�E��</param>
-        /// <param name="value">�X���C�_�̈ʒu����C�����^�ϐ��̎Q�ƁD�쐬���̃X���C�_�ʒu�́C���̕ϐ��ɂ��Ē�����. ref�œn���̂ŁA�X���C�_�������Ƃ����Ɋ��蓖�Ă��ϐ��̒l��������/param>
+        /// <param name="value">�X���C�_�̏���</param>
         /// <param name="max">�X���C�_�̍ő��D�ŏ��l�͏� 0.</param>
         /// <param name="callback">�X���C�_�̈ʒu���ύX�������тɌĂяo�����f���Q�[�g</param>
-        CvTrackbar::CvTrackbar(String^ name, String^ window, [In][Out] Int32% value, Int32 max, CvTrackbarCallbackHandler^ callback)
+        CvTrackbar::CvTrackbar(String^ name, String^ window, Int32 value, Int32 max, CvTrackbarCallbackHandler^ callback)
+        {
+                this->value = value;
+                Initialize(name, window, this->value, max, callback);
+        }
+
+        /// <summary>
+        /// �e�R���X�g���N�^���ʂ̏���    /// </summary>
+        /// <param name="name">�g���b�N�o�[�̖��O</param>
+        /// <param name="window">�g���b�N�o�[�̐e�E�B���h�E��</param>
+        /// <param name="value">�X���C�_�̏���. �Q�Ɠn���ɂ��A���̕ϐ��Ɍ��݂̃X���C�_�̈ʒu�������X�V���� (!!!���AGC�ɂ��ǐՎQ�ƕs�\�ɂȂ��\����������tatic�ϐ���肷�邱��!!)</param>
+        /// <param name="max">�X���C�_�̍ő��D�ŏ��l�͏� 0.</param>
+        /// <param name="callback">�X���C�_�̈ʒu���ύX�������тɌĂяo�����f���Q�[�g</param>
+        void CvTrackbar::Initialize(String^ name, String^ window, [In][Out] Int32% value, Int32 max, CvTrackbarCallbackHandler^ callback)
         {
                 CHECK_NULL(name);
@@ -70 +66 @@
                 this->max = max;
                 this->callback = callback;
-                CV::CreateTrackbar(name, window, value, max, callback);
+
+                StringConverter^ conv_n = gcnew StringConverter(name);
+                StringConverter^ conv_w = gcnew StringConverter(window);                
+                int result;
+                this->gch_value = GCHandle::Alloc(value, GCHandleType::Pinned);
+                pin_ptr<int> v_pin = &value;
+                if(callback != nullptr){
+                        this->gch_callback = GCHandle::Alloc(callback);
+                        CvTrackbarCallback callbackPtr = static_cast<CvTrackbarCallback>(Marshal::GetFunctionPointerForDelegate(callback).ToPointer());
+                        result = ::cvCreateTrackbar(conv_n->ToCharPtr(), conv_w->ToCharPtr(), v_pin, max, callbackPtr);
+                }else{
+                        result = ::cvCreateTrackbar(conv_n->ToCharPtr(), conv_w->ToCharPtr(), v_pin, max, NULL);
+                }
+                if(result == 0){
+                        throw gcnew Exception("CvTrackbar�̐����Ɏ��s���܂���.");
+                }
+        }
+
+        /// <summary>
+        /// ����
+        /// </summary>
+        void CvTrackbar::Release( void )
+        {
+                if ( this->gch_callback.IsAllocated ) {
+                        this->gch_callback.Free();
+        }
+                if ( this->gch_value.IsAllocated ) {
+                        this->gch_value.Free();
+        }
         }
 

lang/cpluspluscli/OpenCvSharp/trunk/OpenCvSharp/CvTrackbar.h

@@ -10 +10 @@
 
 using namespace System;
+using namespace System::Collections::Generic;
 using namespace System::Runtime::InteropServices;
 namespace N = KwsmLab::OpenCvSharp;
@@ -24 +25 @@
                 String^ name;
                 String^ window;
+                Int32 value;
                 Int32 max;
                 CvTrackbarCallbackHandler^ callback;
+                GCHandle gch_value;
+                GCHandle gch_callback;
+
+                void Initialize(String^ name, String^ window, [In][Out] Int32% value, Int32 max, CvTrackbarCallbackHandler^ callback);
+
         internal:
                 CvTrackbar(String^ name, String^ window);
                 CvTrackbar(String^ name, String^ window, CvTrackbarCallbackHandler^ callback);
-                CvTrackbar(String^ name, String^ window, [In][Out] Int32% value, Int32 max);
-                CvTrackbar(String^ name, String^ window, [In][Out] Int32% value, Int32 max, CvTrackbarCallbackHandler^ callback);
+                CvTrackbar(String^ name, String^ window, Int32 value, Int32 max);
+                CvTrackbar(String^ name, String^ window, Int32 value, Int32 max, CvTrackbarCallbackHandler^ callback);
+                void Release( void );
+
         public:
                 /// <summary>

lang/cpluspluscli/OpenCvSharp/trunk/OpenCvSharp/CvWindow.cpp

@@ -5 +5 @@
 namespace OpenCvSharp
 {
+        #pragma region ������
         /// <summary>
         /// �K���ȃE�B���h�E���ŏ���      /// </summary>
         CvWindow::CvWindow(void)
         {               
-                this->name = GetDefaultWindowName();
-                CV::NamedWindow(this->name);
-                this->isDisposed = false;
-                this->image = nullptr;
+                Initialize(nullptr, WindowMode::AutoSize, nullptr);
         }
         /// <summary>
@@ -19 +17 @@
         CvWindow::CvWindow(WindowMode flags)
         {               
-                this->name = GetDefaultWindowName();
-                CV::NamedWindow(this->name, flags);
-                this->isDisposed = false;
-                this->image = nullptr;
+                Initialize(nullptr, WindowMode::AutoSize, nullptr);
         }
         /// <summary>
@@ -29 +24 @@
         CvWindow::CvWindow(N::CvArr^ image)
         {               
-                this->name = GetDefaultWindowName();
-                CV::NamedWindow(this->name);
+                Initialize(nullptr, WindowMode::AutoSize, image);
+        }
+        /// <summary>
+        /// �K���ȃE�B���h�E���ŁA�摜�̕\�����[�h�Ǝn�߂��������Ă����摜��肵�ď���        /// </summary>
+        /// <param name="flags">�E�B���h�E�̃t���O</param>
+        /// <param name="image">�E�B���h�E�ɕ\��������</param>
+        CvWindow::CvWindow(WindowMode flags, N::CvArr^ image)
+        {               
+                Initialize(nullptr, WindowMode::AutoSize, image);
+        }
+        /// <summary>
+        /// �E�B���h�E����肵�ď���        /// </summary>
+        /// <param name="name">�E�B���h�E�̎��ʂɗp�������B���h�E���ŁC�E�B���h�E�̃^�C�g���o �[�ɕ\�������D</param>
+        CvWindow::CvWindow(String^ name)
+        {               
+                Initialize(name, WindowMode::AutoSize, nullptr);
+        }
+        /// <summary>
+        /// �E�B���h�E���Ɖ摜�̕\�����[�h��肵�ď���  /// </summary>
+        /// <param name="name">�E�B���h�E�̎��ʂɗp�������B���h�E���ŁC�E�B���h�E�̃^�C�g���o �[�ɕ\�������D</param>
+        /// <param name="flags">�E�B���h�E�̃t���O</param>
+        CvWindow::CvWindow(String^ name, WindowMode flags)
+        {
+                Initialize(name, flags, nullptr);
+        }
+        /// <summary>
+        /// �E�B���h�E���Ǝn�߂��������Ă����摜��肵�ď���     /// </summary>
+        /// <param name="name">�E�B���h�E�̎��ʂɗp�������B���h�E���ŁC�E�B���h�E�̃^�C�g���o �[�ɕ\�������D</param>
+        /// <param name="image">�E�B���h�E�ɕ\��������</param>
+        CvWindow::CvWindow(String^ name, N::CvArr^ image) 
+        {               
+                Initialize(name, WindowMode::AutoSize, image);
+        }
+        /// <summary>
+        /// �E�B���h�E���Ɖ摜�̕\�����[�h�Ǝn�߂��������Ă����摜��肵�ď���       /// </summary>
+        /// <param name="name">�E�B���h�E�̎��ʂɗp�������B���h�E���ŁC�E�B���h�E�̃^�C�g���o �[�ɕ\�������D</param>
+        /// <param name="flags">�E�B���h�E�̃t���O</param>
+        /// <param name="image">�E�B���h�E�ɕ\��������</param>
+        CvWindow::CvWindow(String^ name, WindowMode flags, N::CvArr^ image) 
+        {       
+                Initialize(name, flags, image);
+        }
+        /// <summary>
+        /// �R���X�g���N�^�̊e�I�[�o�[���[�h���ʂ̏�����
+        /// </summary>
+        /// <param name="name">�E�B���h�E�̎��ʂɗp�������B���h�E���ŁC�E�B���h�E�̃^�C�g���o �[�ɕ\�������D</param>
+        /// <param name="flags">�E�B���h�E�̃t���O</param>
+        /// <param name="image">�E�B���h�E�ɕ\��������</param>
+        void CvWindow::Initialize(String^ name, WindowMode flags, N::CvArr^ image)
+        {
+                this->name = (name == nullptr) ? GetDefaultWindowName() : name;
+                
+                StringConverter^ conv = gcnew StringConverter(this->name);
+                int status = ::cvNamedWindow(conv->ToCharPtr(), (int)flags);
+                if(status == 0){
+                        throw gcnew Exception("CvWindow�̐����Ɏ��s���܂���.");
+                }
+
                 this->isDisposed = false;
                 this->Image = image;
-        }
-        /// <summary>
-        /// �K���ȃE�B���h�E���ŁA�摜�̕\�����[�h�Ǝn�߂��������Ă����摜��肵�ď���        /// </summary>
-        /// <param name="flags">�E�B���h�E�̃t���O</param>
-        /// <param name="image">�E�B���h�E�ɕ\��������</param>
-        CvWindow::CvWindow(WindowMode flags, N::CvArr^ image)
-        {               
-                this->name = GetDefaultWindowName();
-                CV::NamedWindow(this->name, flags);
-                this->isDisposed = false;
-                this->Image = image;
-        }
-        /// <summary>
-        /// �E�B���h�E����肵�ď���        /// </summary>
-        /// <param name="name">�E�B���h�E�̎��ʂɗp�������B���h�E���ŁC�E�B���h�E�̃^�C�g���o �[�ɕ\�������D</param>
-        CvWindow::CvWindow(String^ name)
-        {               
-                CV::NamedWindow(name);
-                this->name = name;
-                this->isDisposed = false;
-                this->image = nullptr;
-        }
-        /// <summary>
-        /// �E�B���h�E���Ɖ摜�̕\�����[�h��肵�ď���  /// </summary>
-        /// <param name="name">�E�B���h�E�̎��ʂɗp�������B���h�E���ŁC�E�B���h�E�̃^�C�g���o �[�ɕ\�������D</param>
-        /// <param name="flags">�E�B���h�E�̃t���O</param>
-        CvWindow::CvWindow(String^ name, WindowMode flags)
-        {
-                CV::NamedWindow(name, flags);
-                this->name = name;
-                this->isDisposed = false;
-                this->image = nullptr;
-        }
-        /// <summary>
-        /// �E�B���h�E���Ǝn�߂��������Ă����摜��肵�ď���     /// </summary>
-        /// <param name="name">�E�B���h�E�̎��ʂɗp�������B���h�E���ŁC�E�B���h�E�̃^�C�g���o �[�ɕ\�������D</param>
-        /// <param name="image">�E�B���h�E�ɕ\��������</param>
-        CvWindow::CvWindow(String^ name, N::CvArr^ image)
-        {               
-                CV::NamedWindow(name);
-                this->name = name;
-                this->isDisposed = false;
-                this->Image = image;
-        }
-        /// <summary>
-        /// �E�B���h�E���Ɖ摜�̕\�����[�h�Ǝn�߂��������Ă����摜��肵�ď���       /// </summary>
-        /// <param name="name">�E�B���h�E�̎��ʂɗp�������B���h�E���ŁC�E�B���h�E�̃^�C�g���o �[�ɕ\�������D</param>
-        /// <param name="flags">�E�B���h�E�̃t���O</param>
-        /// <param name="image">�E�B���h�E�ɕ\��������</param>
-        CvWindow::CvWindow(String^ name, WindowMode flags, N::CvArr^ image)
-        {               
-                CV::NamedWindow(name, flags);
-                this->name = name;
-                this->isDisposed = false;
-                this->Image = image;
+                this->trackbars = gcnew Dictionary<String^, CvTrackbar^>();
+                windows->Add(this->name, this);
         }
         /// <summary>
@@ -118 +116 @@
         {
                 if(!this->isDisposed){
-                        this->isDisposed = true;
-                        CV::DestroyWindow(this->name);
-                }
-        }
+                        this->isDisposed = true;                        
+                        StringConverter^ conv = gcnew StringConverter(name);
+                        ::cvDestroyWindow(conv->ToCharPtr());
+                        for each(KeyValuePair<String^, CvTrackbar^>^ pair in trackbars){
+                                if(pair->Value != nullptr){
+                                        pair->Value->Release();
+                                }
+                        }
+                        try{
+                                windows->Remove(this->Name);
+                        }catch(Exception^){}
+                }
+        }
+        /// <summary>
+        /// �w�肵�����O�ɑΉ������B���h�E���
+        /// </summary>
+        CvWindow^ CvWindow::GetWindowByName(String^ name){
+                CHECK_NULL(name);
+                if(windows->ContainsKey(name)){
+                        return windows[name];
+                }else{
+                        return nullptr;
+                }
+        }
+        /// <summary>
+        /// �S��HighGUI �E�B���h�E���
+        /// </summary>
+        void CvWindow::DestroyAllWindows( void )
+        {
+                for each(KeyValuePair<String^, CvWindow^>^ pair in windows){
+                        if(pair->Value != nullptr){
+                                pair->Value->Close();
+                        }
+                }
+        }
+        #pragma endregion
 
         /// <summary>
@@ -129 +159 @@
         CvTrackbar^ CvWindow::CreateTrackbar( String^ name )
         {
-                return gcnew CvTrackbar(name, this->Name);
+                CvTrackbar^ trackbar = gcnew CvTrackbar(name, this->Name);
+                this->trackbars->Add(name, trackbar);
+                return trackbar;
         }
         /// <summary>
@@ -138 +170 @@
         CvTrackbar^ CvWindow::CreateTrackbar( String^ name, CvTrackbarCallbackHandler^ callback )
         {
-                return gcnew CvTrackbar(name, this->Name, callback);
-        }
-        /// <summary>
-        /// �E�B���h�E�Ƀg���b�N�o�[������A�쐬�����g���b�N�o�[���
-        /// </summary>
-        /// <param name="name">�g���b�N�o�[�̖��O</param>
-        /// <param name="value">�X���C�_�̈ʒu����C�����^�ϐ��̎Q�ƁD�쐬���̃X���C�_�ʒu�́C���̕ϐ��ɂ��Ē�����. ref�œn���̂ŁA�X���C�_�������Ƃ����Ɋ��蓖�Ă��ϐ��̒l��������/param>
+                CvTrackbar^ trackbar = gcnew CvTrackbar(name, this->Name, callback);
+                this->trackbars->Add(name, trackbar);
+                return trackbar;
+        }
+        /// <summary>
+        /// �E�B���h�E�Ƀg���b�N�o�[������A�쐬�����g���b�N�o�[���
+        /// </summary>
+        /// <param name="name">�g���b�N�o�[�̖��O</param>
+        /// <param name="value">�X���C�_�̈ʒu.</param>
         /// <param name="max">�X���C�_�̍ő��D�ŏ��l�͏� 0.</param>
-        CvTrackbar^ CvWindow::CreateTrackbar( String^ name, [In][Out] Int32% value, Int32 max )
-        {
-                return gcnew CvTrackbar(name, this->Name, value, max);
-        }
-        /// <summary>
-        /// �E�B���h�E�Ƀg���b�N�o�[������A�쐬�����g���b�N�o�[���
-        /// </summary>
-        /// <param name="name">�g���b�N�o�[�̖��O</param>
-        /// <param name="value">�X���C�_�̈ʒu����C�����^�ϐ��̎Q�ƁD�쐬���̃X���C�_�ʒu�́C���̕ϐ��ɂ��Ē�����. ref�œn���̂ŁA�X���C�_�������Ƃ����Ɋ��蓖�Ă��ϐ��̒l��������/param>
+        CvTrackbar^ CvWindow::CreateTrackbar( String^ name, Int32 value, Int32 max )
+        {
+                CvTrackbar^ trackbar = gcnew CvTrackbar(name, this->Name, value, max);
+                this->trackbars->Add(name, trackbar);
+                return trackbar;
+        }
+        /// <summary>
+        /// �E�B���h�E�Ƀg���b�N�o�[������A�쐬�����g���b�N�o�[���
+        /// </summary>
+        /// <param name="name">�g���b�N�o�[�̖��O</param>
+        /// <param name="value">�X���C�_�̏���</param>
         /// <param name="max">�X���C�_�̍ő��D�ŏ��l�͏� 0.</param>
         /// <param name="callback">�X���C�_�̈ʒu���ύX�������тɌĂяo�����f���Q�[�g</param>
-        CvTrackbar^ CvWindow::CreateTrackbar( String^ name, [In][Out] Int32% value, Int32 max, CvTrackbarCallbackHandler^ callback )
-        {
-                return gcnew CvTrackbar(name, this->Name, value, max, callback);
+        CvTrackbar^ CvWindow::CreateTrackbar( String^ name, Int32 value, Int32 max, CvTrackbarCallbackHandler^ callback )
+        {
+                CvTrackbar^ trackbar = gcnew CvTrackbar(name, this->Name, value, max, callback);
+                this->trackbars->Add(name, trackbar);
+                return trackbar;
         }
 
@@ -188 +226 @@
         void CvWindow::ShowImage(N::CvArr^ image)
         {
-                this->image = image;
-                CV::ShowImage(this->name, image);
+                if(image != nullptr){
+                        this->image = image;                            
+                        StringConverter^ conv = gcnew StringConverter(name);
+                        ::cvShowImage(conv->ToCharPtr(), image->Ptr);
+                }               
         }
 

lang/cpluspluscli/OpenCvSharp/trunk/OpenCvSharp/CvWindow.h

@@ -25 +25 @@
         {
         private:
+                static Dictionary<String^, CvWindow^>^ windows = gcnew Dictionary<String^, CvWindow^>();
+
                 Boolean isDisposed;
                 String^ name;
                 N::CvArr^ image;
                 CvMouseCallbackHandler^ mouseCallback;
+                Dictionary<String^, CvTrackbar^>^ trackbars;
                 
+                void Initialize(String^ name, WindowMode flags, N::CvArr^ image);
                 String^ GetDefaultWindowName(void);
 
+        internal:
+                /// <summary>
+                /// �S�ẴE�B���h�E������邽�߂̎���
+                /// </summary>
+                static property Dictionary<String^, CvWindow^>^ Windows{
+                        Dictionary<String^, CvWindow^>^ get(){ return windows; }
+                }               
+
         public:
+                #pragma region ���\�b�h
                 CvWindow(void);
                 CvWindow(WindowMode flags);
@@ -42 +55 @@
                 CvWindow(String^ name, WindowMode flags, N::CvArr^ image);
                 !CvWindow(void);
-                ~CvWindow(void);        
+                ~CvWindow(void);
+
                 void Close(void);
                 CvTrackbar^ CreateTrackbar( String^ name );
                 CvTrackbar^ CreateTrackbar( String^ name, CvTrackbarCallbackHandler^ callback );
-                CvTrackbar^ CreateTrackbar( String^ name, [In][Out] Int32% value, Int32 max );
-                CvTrackbar^ CreateTrackbar( String^ name, [In][Out] Int32% value, Int32 max, CvTrackbarCallbackHandler^ callback );
+                CvTrackbar^ CreateTrackbar( String^ name, Int32 value, Int32 max );
+                CvTrackbar^ CreateTrackbar( String^ name, Int32 value, Int32 max, CvTrackbarCallbackHandler^ callback );
                 void Move( Int32 x, Int32 y );
                 void Resize( Int32 width, Int32 height );
                 void ShowImage( CvArr^ image );
+
                 static Int32 WaitKey( void );
                 static Int32 WaitKey( Int32 delay );
                 static void ShowImages( ...array<N::CvArr^>^ images );
                 static void ShowImages( WindowMode flags, ...array<N::CvArr^>^ images );
+                static CvWindow^ GetWindowByName(String^ name);
+                static void DestroyAllWindows( void );
+                #pragma endregion
+
+                #pragma region �v���p�e�B
+                /// <summary>
+                /// �o�^�����������b�N�o�[�������               /// </summary>
+                property Dictionary<String^, CvTrackbar^>^ Trackbars{
+                        Dictionary<String^, CvTrackbar^>^ get(){ return trackbars; }
+                }
                 /// <summary>
                 /// �}�E�X�C�x���g�����������Ƃ��̃C�x���g�n���h��
@@ -81 +106 @@
                         }       
                         void set(N::CvArr^ value){ 
-                                this->image = value;
-                                CV::ShowImage(this->name, image);
+                                if(image != nullptr){
+                                        this->image = value;                            
+                                        StringConverter^ conv = gcnew StringConverter(name);
+                                        ::cvShowImage(conv->ToCharPtr(), image->Ptr);
+                                }
                         }
                 }
@@ -96 +124 @@
                         IntPtr get(void){ return CV::GetWindowHandle(name); }
                 }
+                #pragma endregion
         };