Changeset 32142

Timestamp:

04/08/09 23:37:03 (4 years ago)

Author:

schima

Message:

CvChainPtReader?

Location:

lang/cpluspluscli/OpenCvSharp2/trunk

Files:

• OpenCvSharp.Extern/OpenCvSharp.Extern.vcproj (modified) (2 diffs)
• OpenCvSharp.Extern/WCvChainPtReader.cpp (added)
• OpenCvSharp.Extern/WCvChainPtReader.h (added)
• OpenCvSharp.Test/Program.cs (modified) (2 diffs)
• OpenCvSharp.Test/Samples/ContourScanner.cs (modified) (2 diffs)
• OpenCvSharp.Test/Samples/FindContours.cs (modified) (1 diff)
• OpenCvSharp.Test/Samples/Squares.cs (modified) (2 diffs)
• OpenCvSharp.Test/Samples/TreeNodeIterator.cs (modified) (1 diff)
• OpenCvSharp/Class/CvChainPtReader.cs (added)
• OpenCvSharp/Class/CvContourScanner.cs (modified) (4 diffs)
• OpenCvSharp/Core/CvDll.cs (modified) (2 diffs)
• OpenCvSharp/Core/Cv_A-C.cs (modified) (7 diffs)
• OpenCvSharp/Core/Cv_D-G.cs (modified) (2 diffs)
• OpenCvSharp/Core/Cv_R-Z.cs (modified) (3 diffs)
• OpenCvSharp/CvArr/CvChain.cs (modified) (1 diff)
• OpenCvSharp/CvArr/CvContour.cs (modified) (1 diff)
• OpenCvSharp/DisposableObject.cs (modified) (1 diff)
• OpenCvSharp/OpenCvSharp.csproj (modified) (1 diff)
• wrapped functions.csv (modified) (2 diffs)

lang/cpluspluscli/OpenCvSharp2/trunk/OpenCvSharp.Extern/OpenCvSharp.Extern.vcproj

@@ -554 +554 @@
                                 </File>
                                 <File
+                                        RelativePath=".\WCvChainPtReader.cpp"
+                                        >
+                                </File>
+                                <File
                                         RelativePath=".\WCvConnectedComp.cpp"
                                         >
@@ -700 +704 @@
                                 </File>
                                 <File
+                                        RelativePath=".\WCvChainPtReader.h"
+                                        >
+                                </File>
+                                <File
                                         RelativePath=".\WCvConnectedComp.h"
                                         >

lang/cpluspluscli/OpenCvSharp2/trunk/OpenCvSharp.Test/Program.cs

@@ -67 +67 @@
             //new Test.Contour();
             // CvContourScanner Sample
-            //new Test.ContourScanner();
+            new Test.ContourScanner();
             // System.Drawing.Bitmapへの変換
             //new Test.ConvertToBitmap();
@@ -133 +133 @@
             //new Test.Resize();
             // CvSeqのテスト
-            new Test.SeqTest();
+            //new Test.SeqTest();
             // 輪郭検出
             //new Test.Snake();

lang/cpluspluscli/OpenCvSharp2/trunk/OpenCvSharp.Test/Samples/ContourScanner.cs

@@ -27 +27 @@
                 {
                     // find contours by CvContourScanner
-                    CvContourScanner scanner = Cv.StartFindContours(canny, storage, CvContour<CvPoint>.SizeOf, ContourRetrieval.Tree, ContourChain.ApproxSimple);
-                    //CvContourScanner scanner = new CvContourScanner(canny, storage, CvContour<CvPoint>.SizeOf, ContourRetrieval.Tree, ContourChain.ApproxSimple);
+
+                    // native style
+                    /*
+                    CvContourScanner scanner = Cv.StartFindContours(canny, storage, CvContour.SizeOf, ContourRetrieval.Tree, ContourChain.ApproxSimple);
                     while (true)
                     {
@@ -35 +37 @@
                             break;
                         else
-                            result.DrawContours(c, CvColor.Red, CvColor.Green, 0, 3, LineType.AntiAlias);
+                            Cv.DrawContours(result, c, CvColor.Red, CvColor.Green, 0, 3, LineType.AntiAlias);
                     }
                     Cv.EndFindContours(scanner);
-                    //scanner.Dispose();
+                    //*/
+
+                    // wrapper style
+                    using (CvContourScanner scanner = new CvContourScanner(canny, storage, CvContour.SizeOf, ContourRetrieval.Tree, ContourChain.ApproxSimple))
+                    {
+                        foreach (CvSeq<CvPoint> c in scanner)
+                        {
+                            result.DrawContours(c, CvColor.Red, CvColor.Green, 0, 3, LineType.AntiAlias);
+                        }
+                    }                    
                 }
 

lang/cpluspluscli/OpenCvSharp2/trunk/OpenCvSharp.Test/Samples/FindContours.cs

@@ -53 +53 @@
                 CvMemStorage storage = new CvMemStorage();
                 // native style
-                Cv.FindContours(img, storage, out contours, CvContour<CvPoint>.SizeOf, ContourRetrieval.Tree, ContourChain.ApproxSimple);
-                contours = Cv.ApproxPoly(contours, CvContour<CvPoint>.SizeOf, storage, ApproxPolyMethod.DP, 3, true);
+                Cv.FindContours(img, storage, out contours, CvContour.SizeOf, ContourRetrieval.Tree, ContourChain.ApproxSimple);
+                contours = Cv.ApproxPoly(contours, CvContour.SizeOf, storage, ApproxPolyMethod.DP, 3, true);
                 
                 // wrapper style

lang/cpluspluscli/OpenCvSharp2/trunk/OpenCvSharp.Test/Samples/Squares.cs

@@ -122 +122 @@
                     // find contours and store them all as a list
                     CvSeq<CvPoint> contours;
-                    Cv.FindContours(gray, storage, out contours, CvContour<CvPoint>.SizeOf, ContourRetrieval.List, ContourChain.ApproxSimple, new CvPoint(0, 0));
+                    Cv.FindContours(gray, storage, out contours, CvContour.SizeOf, ContourRetrieval.List, ContourChain.ApproxSimple, new CvPoint(0, 0));
 
                     // test each contour
@@ -129 +129 @@
                         // approximate contour with accuracy proportional
                         // to the contour perimeter
-                        CvSeq<CvPoint> result = Cv.ApproxPoly(contours, CvContour<CvPoint>.SizeOf, storage, ApproxPolyMethod.DP, contours.ContourPerimeter() * 0.02, false);
+                        CvSeq<CvPoint> result = Cv.ApproxPoly(contours, CvContour.SizeOf, storage, ApproxPolyMethod.DP, contours.ContourPerimeter() * 0.02, false);
                         // square contours should have 4 vertices after approximation
                         // relatively large area (to filter out noisy contours)

lang/cpluspluscli/OpenCvSharp2/trunk/OpenCvSharp.Test/Samples/TreeNodeIterator.cs

@@ -25 +25 @@
                 Cv.Threshold(src_img_gray, tmp_img, 120, 255, ThresholdType.Binary);
                 CvSeq<CvPoint> contours;
-                Cv.FindContours(tmp_img, storage, out contours, CvContour<CvPoint>.SizeOf, ContourRetrieval.Tree, ContourChain.ApproxSimple);
+                Cv.FindContours(tmp_img, storage, out contours, CvContour.SizeOf, ContourRetrieval.Tree, ContourChain.ApproxSimple);
                 /* 輪郭シーケンスから座標を取得 */
                 using (CvFileStorage fs = new CvFileStorage("contours.yaml", null, FileStorageMode.Write))

lang/cpluspluscli/OpenCvSharp2/trunk/OpenCvSharp/Class/CvContourScanner.cs

@@ -16 +16 @@
     /// </summary>
 #endif
-    public class CvContourScanner : DisposableObject, ICvPtrHolder
+    public class CvContourScanner : DisposableObject, ICvPtrHolder, IEnumerable<CvSeq<CvPoint>>
     {
         /// <summary>
@@ -47 +47 @@
 #endif
         public CvContourScanner(CvArr image, CvMemStorage storage)
-            : this(image, storage, CvContour<CvPoint>.SizeOf, ContourRetrieval.List, ContourChain.ApproxSimple, new CvPoint(0, 0))
+            : this(image, storage, CvContour.SizeOf, ContourRetrieval.List, ContourChain.ApproxSimple, new CvPoint(0, 0))
         {
         }
@@ -163 +163 @@
         public static CvContourScanner StartFindContours(CvArr image, CvMemStorage storage)
         {
-            return new CvContourScanner(image, storage, CvContour<CvPoint>.SizeOf, ContourRetrieval.List, ContourChain.ApproxSimple, new CvPoint(0, 0));
+            return new CvContourScanner(image, storage, CvContour.SizeOf, ContourRetrieval.List, ContourChain.ApproxSimple, new CvPoint(0, 0));
         }
 #if LANG_JP
@@ -291 +291 @@
         }
         #endregion
+
+        #region IEnumerable<CvSeq<CvPoint>>
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <returns></returns>
+        public IEnumerator<CvSeq<CvPoint>> GetEnumerator()
+        {
+            while (true)
+            {
+                CvSeq<CvPoint> c = Cv.FindNextContour(this);
+                if (c == null)
+                    break;
+                else
+                    yield return c;
+            }
+            Cv.EndFindContours(this);
+        }
+        System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()
+        {
+            return GetEnumerator();
+        }
+        #endregion
     }
 }

lang/cpluspluscli/OpenCvSharp2/trunk/OpenCvSharp/Core/CvDll.cs

@@ -227 +227 @@
         public static extern void cvPyrUp(IntPtr src, IntPtr dst, CvFilter filter);
         [DllImport(DLL_CV)]
+        public static extern CvPoint cvReadChainPoint(IntPtr reader);
+        [DllImport(DLL_CV)]
         public static extern void cvReleaseHaarClassifierCascade(ref IntPtr cascade);
         [DllImport(DLL_CV)]
@@ -274 +276 @@
         [DllImport(DLL_CV)]
         public static extern IntPtr cvStartFindContours(IntPtr image, IntPtr storage, int header_size, [MarshalAs(UnmanagedType.U4)] ContourRetrieval mode, [MarshalAs(UnmanagedType.U4)] ContourChain method, CvPoint offset);
+        [DllImport(DLL_CV)]
+        public static extern void cvStartReadChainPoints(IntPtr chain, IntPtr reader);
         [DllImport(DLL_CV)]
         public static extern Subdiv2DPointLocation cvSubdiv2DLocate(IntPtr subdiv, CvPoint2D32f pt, out CvSubdiv2DEdge edge, ref IntPtr vertex);

lang/cpluspluscli/OpenCvSharp2/trunk/OpenCvSharp/Core/Cv_A-C.cs

@@ -462 +462 @@
         /// <returns></returns>
 #endif
-        public static CvSeq<CvPoint> ApproxChains(this CvChain<CvPoint> src_seq, CvMemStorage storage)
+        public static CvSeq<CvPoint> ApproxChains(this CvChain src_seq, CvMemStorage storage)
         {
             return ApproxChains(src_seq, storage, ContourChain.ApproxSimple, 0, 0, false);
@@ -483 +483 @@
         /// /// <returns></returns>
 #endif
-        public static CvSeq<CvPoint> ApproxChains(this CvChain<CvPoint> src_seq, CvMemStorage storage, ContourChain method)
+        public static CvSeq<CvPoint> ApproxChains(this CvChain src_seq, CvMemStorage storage, ContourChain method)
         {
             return ApproxChains(src_seq, storage, method, 0, 0, false);
@@ -506 +506 @@
         /// <returns></returns>
 #endif
-        public static CvSeq<CvPoint> ApproxChains(this CvChain<CvPoint> src_seq, CvMemStorage storage, ContourChain method, double parameter)
+        public static CvSeq<CvPoint> ApproxChains(this CvChain src_seq, CvMemStorage storage, ContourChain method, double parameter)
         {
             return ApproxChains(src_seq, storage, method, parameter, 0, false);
@@ -518 +518 @@
         /// <param name="method">推定手法.</param>
         /// <param name="parameter">メソッドパラメータ（現在は使われていない）．</param>
-        /// <param name="minimal_perimeter"></param>
+        /// <param name="minimal_perimeter">minimal_perimeter以上の周囲長をもつ輪郭のみを計算する．その他のチェーンは結果の構造体から削除される．</param>
         /// <returns></returns>
 #else
@@ -531 +531 @@
         /// <returns></returns>
 #endif
-        public static CvSeq<CvPoint> ApproxChains(this CvChain<CvPoint> src_seq, CvMemStorage storage, ContourChain method, double parameter, int minimal_perimeter)
+        public static CvSeq<CvPoint> ApproxChains(this CvChain src_seq, CvMemStorage storage, ContourChain method, double parameter, int minimal_perimeter)
         {
             return ApproxChains(src_seq, storage, method, parameter, minimal_perimeter, false);
@@ -543 +543 @@
         /// <param name="method">推定手法.</param>
         /// <param name="parameter">メソッドパラメータ（現在は使われていない）．</param>
-        /// <param name="minimal_perimeter"></param>
-        /// <param name="recursive"></param>
+        /// <param name="minimal_perimeter">minimal_perimeter以上の周囲長をもつ輪郭のみを計算する．その他のチェーンは結果の構造体から削除される．</param>
+        /// <param name="recursive">trueの場合，src_seqからh_nextあるいはv_nextによって辿ることができる全てのチェーンを近似する．falseの場合，単一のチェーンを近似する． </param>
         /// <returns></returns>
 #else
@@ -558 +558 @@
         /// <returns></returns>
 #endif
-        public static CvSeq<CvPoint> ApproxChains(this CvChain<CvPoint> src_seq, CvMemStorage storage, ContourChain method, double parameter, int minimal_perimeter, bool recursive)
+        public static CvSeq<CvPoint> ApproxChains(this CvChain src_seq, CvMemStorage storage, ContourChain method, double parameter, int minimal_perimeter, bool recursive)
         {
             if (src_seq == null)

lang/cpluspluscli/OpenCvSharp2/trunk/OpenCvSharp/Core/Cv_D-G.cs

@@ -919 +919 @@
         public static int FindContours(this CvArr image, CvMemStorage storage, out CvSeq<CvPoint> first_contour)
         {
-            return FindContours(image, storage, out first_contour, CvContour<CvPoint>.SizeOf, ContourRetrieval.List, ContourChain.ApproxSimple, new CvPoint(0, 0));
+            return FindContours(image, storage, out first_contour, CvContour.SizeOf, ContourRetrieval.List, ContourChain.ApproxSimple, new CvPoint(0, 0));
         }
 #if LANG_JP
@@ -1041 +1041 @@
             else if (method == ContourChain.Code)
             {
-                first_contour = new CvChain<CvPoint>(first_contour_ptr);
+                first_contour = new CvChain(first_contour_ptr);
             }
             else
             {
-                first_contour = new CvContour<CvPoint>(first_contour_ptr);
+                first_contour = new CvContour(first_contour_ptr);
             }
             return result;

lang/cpluspluscli/OpenCvSharp2/trunk/OpenCvSharp/Core/Cv_R-Z.cs

@@ -158 +158 @@
         }
         #endregion
+        #region ReadChainPoint
+#if LANG_JP
+        /// <summary>
+        /// チェーン上の次の点を得る
+        /// </summary>
+        /// <param name="reader">チェーンリーダの状態</param>
+        /// <returns>現在のチェーン上の点</returns>
+#else
+        /// <summary>
+        /// Gets next chain point
+        /// </summary>
+        /// <param name="reader">Chain reader state.</param>
+        /// <returns>Current chain point.</returns>
+#endif
+        public static CvPoint ReadChainPoint(this CvChainPtReader reader)
+        {
+            if (reader == null)
+            {
+                throw new ArgumentNullException("reader");
+            }
+            return CvDll.cvReadChainPoint(reader.CvPtr);
+        }
+        #endregion
         #region RandInt
         /// <summary>
@@ -2628 +2651 @@
         public static CvContourScanner StartFindContours(this CvArr image, CvMemStorage storage)
         {
-            return StartFindContours(image, storage, CvContour<CvPoint>.SizeOf, ContourRetrieval.List, ContourChain.ApproxSimple, new CvPoint());
+            return StartFindContours(image, storage, CvContour.SizeOf, ContourRetrieval.List, ContourChain.ApproxSimple, new CvPoint());
         }
 #if LANG_JP
@@ -2752 +2775 @@
         }
         #endregion
+        #region StartReadChainPoints
+#if LANG_JP
+        /// <summary>
+        /// チェーンリーダを初期化する
+        /// </summary>
+        /// <param name="chain">チェーンへのポインタ</param>
+        /// <param name="reader">チェーンリーダの状態</param>
+#else
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="chain">Pointer to chain.</param>
+        /// <param name="reader">Chain reader state.</param>
+#endif
+        public static void StartReadChainPoints(CvChain chain, CvChainPtReader reader)
+        {
+            if (reader == null)
+                throw new ArgumentNullException("reader");
+            if (chain == null)
+                throw new ArgumentNullException("chain");
+            CvDll.cvStartReadChainPoints(chain.CvPtr, reader.CvPtr);
+        }
+        #endregion
         #region StartReadSeq
         /// <summary>

lang/cpluspluscli/OpenCvSharp2/trunk/OpenCvSharp/CvArr/CvChain.cs

@@ -9 +9 @@
     /// 輪郭データ
     /// </summary>
-    public class CvChain<T> : CvSeq<T> where T : struct
+    public class CvChain : CvSeq<CvPoint> 
     {
         /// <summary>

lang/cpluspluscli/OpenCvSharp2/trunk/OpenCvSharp/CvArr/CvContour.cs

@@ -9 +9 @@
     /// 輪郭データ
     /// </summary>
-    public class CvContour<T> : CvSeq<T> where T : struct
+    public class CvContour : CvSeq<CvPoint>
     {
         /// <summary>

lang/cpluspluscli/OpenCvSharp2/trunk/OpenCvSharp/DisposableObject.cs

@@ -104 +104 @@
         protected IntPtr AllocMemory(int size)
         {
+            if (AllocatedMemory != IntPtr.Zero)
+            {
+                Marshal.FreeHGlobal(AllocatedMemory);
+            }
             AllocatedMemory = Marshal.AllocHGlobal(size);
             NotifyMemoryPressure(size);

lang/cpluspluscli/OpenCvSharp2/trunk/OpenCvSharp/OpenCvSharp.csproj

@@ -159 +159 @@
   <ItemGroup>
     <Compile Include="Class\CvBox2D.cs" />
+    <Compile Include="Class\CvChainPtReader.cs" />
     <Compile Include="Class\CvHuMoments.cs" />
     <Compile Include="Class\CvMoments.cs" />

lang/cpluspluscli/OpenCvSharp2/trunk/wrapped functions.csv

@@ -362 +362 @@
 Read;X
 ReadByName;X
-ReadChainPoint;
+ReadChainPoint;X
 ReadInt;
 ReadIntByName;X
@@ -470 +470 @@
 StartFindContours;X
 StartNextStream;X
-StartReadChainPoints;
+StartReadChainPoints;X
 StartReadRawData;
 StartReadSeq;X