Changeset 32582 for lang/cpluspluscli/OpenCvSharp2/trunk/OpenCvSharp/Src/Core

Timestamp:

04/18/09 18:37:46 (4 years ago)

Author:

schima

Message:

added japanese comments (subdiv)

Location:

lang/cpluspluscli/OpenCvSharp2/trunk/OpenCvSharp/Src/Core

Files:

• Cv_A-C.cs (modified) (6 diffs)
• Cv_D-G.cs (modified) (2 diffs)
• Cv_R-Z.cs (modified) (12 diffs)

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

@@ -1846 +1846 @@
         #endregion
         #region CalcSubdivVoronoi2D
+#if LANG_JP
         /// <summary>
         /// 仮想点の座標を計算する．元の細分割面のある頂点に対応する仮想点全てを接続すると，その頂点を含むボロノイ領域の境界を構成する． 
         /// </summary>
         /// <param name="subdiv">ドロネー細分割．全ての点は追加済みである</param>
+#else
+        /// <summary>
+        /// Calculates coordinates of Voronoi diagram cells.
+        /// </summary>
+        /// <param name="subdiv">Delaunay subdivision, where all the points are added already. </param>
+#endif
         public static void CalcSubdivVoronoi2D(CvSubdiv2D subdiv)
         {
@@ -2501 +2508 @@
         #endregion
         #region ClearSubdivVoronoi2D
+#if LANG_JP
         /// <summary>
         /// 全ての仮想点を削除する． 
@@ -2506 +2514 @@
         /// </summary>
         /// <param name="subdiv">ドロネー細分割</param>
+#else
+        /// <summary>
+        /// Removes all virtual points
+        /// </summary>
+        /// <param name="subdiv">Delaunay subdivision. </param>
+#endif
         public static void ClearSubdivVoronoi2D(CvSubdiv2D subdiv)
         {
@@ -4344 +4358 @@
         #endregion
         #region CreateSubdiv2D
+#if LANG_JP
         /// <summary>
         /// CvSubdiv2Dを生成する。
@@ -4354 +4369 @@
         /// <param name="storage"></param>
         /// <returns></returns>
+#else
+        /// <summary>
+        /// Creates empty Delaunay triangulation.
+        /// The users must initialize the returned value by cvInitSubdivDelaunay2D.
+        /// </summary>
+        /// <param name="subdiv_type"></param>
+        /// <param name="header_size"></param>
+        /// <param name="vtx_size"></param>
+        /// <param name="quadedge_size"></param>
+        /// <param name="storage"></param>
+        /// <returns></returns>
+#endif
         public static CvSubdiv2D CreateSubdiv2D(SeqType subdiv_type, Int32 header_size, Int32 vtx_size, Int32 quadedge_size, CvMemStorage storage)
         {
@@ -4360 +4387 @@
                 throw new ArgumentNullException("storage");
             }
-            IntPtr ptr = CvDll.cvCreateSubdiv2D(subdiv_type, header_size, vtx_size, quadedge_size, storage.CvPtr);
-            if (ptr == IntPtr.Zero)
+            IntPtr result = CvDll.cvCreateSubdiv2D(subdiv_type, header_size, vtx_size, quadedge_size, storage.CvPtr);
+            if (result == IntPtr.Zero)
                 return null;
             else
-                return new CvSubdiv2D(ptr);
+                return new CvSubdiv2D(result);
+        }
+        #endregion
+        #region CreateSubdivDelaunay2D
+#if LANG_JP
+        /// <summary>
+        /// 空のドロネー三角形を作成する
+        /// </summary>
+        /// <param name="rect">細分割のために追加される全ての２次元点を包含する矩形．</param>
+        /// <param name="storage">細分割のための領域．</param>
+        /// <returns></returns>
+#else
+        /// <summary>
+        /// Creates empty Delaunay triangulation
+        /// </summary>
+        /// <param name="rect">Rectangle that includes all the 2d points that are to be added to subdivision. </param>
+        /// <param name="storage">Container for subdivision. </param>
+        /// <returns></returns>
+#endif
+        public static CvSubdiv2D CreateSubdivDelaunay2D(CvRect rect, CvMemStorage storage)
+        {
+            if (storage == null)
+            {
+                throw new ArgumentNullException("storage");
+            }
+            IntPtr result = CvInline.cvCreateSubdivDelaunay2D(rect, storage.CvPtr);
+            if (result == IntPtr.Zero)
+                return null;
+            else
+                return new CvSubdiv2D(result);
         }
         #endregion

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

@@ -1381 +1381 @@
         #endregion
         #region FindNearestPoint2D
+#if LANG_JP
         /// <summary>
         /// 与えられた点に最も近い細分割の頂点を求める. 入力点を細分割内に配置するもう一つの関数である．
@@ -1388 +1389 @@
         /// <param name="pt">入力点</param>
         /// <returns></returns>
-        public static CvSubdiv2DPoint FindNearestPoint2D(CvSubdiv2D subdiv, CvPoint2D32f pt)
+#else
+        /// <summary>
+        /// Finds the closest subdivision vertex to given point
+        /// </summary>
+        /// <param name="subdiv">Delaunay or another subdivision. </param>
+        /// <param name="pt">Input point. </param>
+        /// <returns></returns>
+#endif
+        public static CvSubdiv2DPoint FindNearestPoint2D(this CvSubdiv2D subdiv, CvPoint2D32f pt)
         {
             if (subdiv == null)

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

@@ -3083 +3083 @@
         #endregion
         #region Subdiv2DEdgeDst
+#if LANG_JP
         /// <summary>
         /// 辺の終点を返す． 
-        /// 辺が双対細分割のものであり，仮想点の座標がまだ計算されていない場合は，nullを返す． 
-        /// 仮想点は関数 cvCalcSubdivVoronoi2D を用いて計算される
+        /// 仮想点は関数 cvCalcSubdivVoronoi2D を用いて計算される.
         /// </summary>
         /// <param name="edge">細分割平面の辺の一つ（quad-edge表現ではない）</param>
-        /// <returns>辺の終点</returns>
+        /// <returns>辺の終点. 辺が双対細分割のものであり，仮想点の座標がまだ計算されていない場合は，nullを返す．</returns>
+#else
+        /// <summary>
+        /// Returns edge destination.
+        /// </summary>
+        /// <param name="edge">Subdivision edge (not a quad-edge) </param>
+        /// <returns>The edge destination. If the edge is from dual subdivision and the virtual point coordinates are not calculated yet, the returned pointer may be null.</returns>
+#endif
         public static CvSubdiv2DPoint Subdiv2DEdgeDst(CvSubdiv2DEdge edge)
         {
@@ -3100 +3107 @@
         #endregion
         #region Subdiv2DEdgeOrg
+#if LANG_JP
         /// <summary>
         /// 辺の始点を返す． 
-        /// 辺が双対細分割のものであり，仮想点の座標がまだ計算されていない場合は，nullを返す． 
-        /// 仮想点は関数 cvCalcSubdivVoronoi2D を用いて計算される
+        /// 仮想点は関数 cvCalcSubdivVoronoi2D を用いて計算される.
         /// </summary>
         /// <param name="edge">細分割平面の辺の一つ（quad-edge表現ではない）</param>
-        /// <returns>辺の始点</returns>
+        /// <returns>辺の始点. 辺が双対細分割のものであり，仮想点の座標がまだ計算されていない場合は，nullを返す．</returns>
+#else
+        /// <summary>
+        /// Returns edge origin.
+        /// </summary>
+        /// <param name="edge">Subdivision edge (not a quad-edge) </param>
+        /// <returns>The edge origin. If the edge is from dual subdivision and the virtual point coordinates are not calculated yet, the returned pointer may be null.</returns>
+#endif
         public static CvSubdiv2DPoint Subdiv2DEdgeOrg(CvSubdiv2DEdge edge)
         {
@@ -3117 +3131 @@
         #endregion
         #region Subdiv2DGetEdge
+#if LANG_JP
         /// <summary>
         /// 入力された辺に関連する辺の一つを返す
@@ -3123 +3138 @@
         /// <param name="type">戻り値とする辺の条件</param>
         /// <returns>与えられた辺に関連する辺の一つ</returns>
+#else
+        /// <summary>
+        /// Returns one of edges related to given.
+        /// </summary>
+        /// <param name="edge">Subdivision edge (not a quad-edge) </param>
+        /// <param name="type">Specifies, which of related edges to return</param>
+        /// <returns>one the edges related to the input edge</returns>
+#endif
         public static CvSubdiv2DEdge Subdiv2DGetEdge(CvSubdiv2DEdge edge, CvNextEdgeType type)
         {
@@ -3129 +3152 @@
         #endregion
         #region Subdiv2DLocate
+#if LANG_JP
         /// <summary>
         /// ドロネー三角形に点を追加する
@@ -3136 +3160 @@
         /// <param name="edge">出力される辺．配置した点は，その辺上または端に存在する.</param>
         /// <returns>配置する点</returns>
+#else
+        /// <summary>
+        /// Inserts a single point to Delaunay triangulation
+        /// </summary>
+        /// <param name="subdiv">Delaunay or another subdivision. </param>
+        /// <param name="pt">The point to locate. </param>
+        /// <param name="edge">The output edge the point falls onto or right to. </param>
+        /// <returns></returns>
+#endif
         public static CvSubdiv2DPointLocation Subdiv2DLocate(CvSubdiv2D subdiv, CvPoint2D32f pt, out CvSubdiv2DEdge edge)
         {
@@ -3148 +3181 @@
             return result;
         }
+#if LANG_JP
         /// <summary>
         /// ドロネー三角形に点を追加する
@@ -3156 +3190 @@
         /// <param name="vertex">オプション出力．入力点と一致する細分割の頂点へのポインタのポインタ</param>
         /// <returns>配置する点</returns>
+#else
+        /// <summary>
+        /// Inserts a single point to Delaunay triangulation
+        /// </summary>
+        /// <param name="subdiv">Delaunay or another subdivision. </param>
+        /// <param name="pt">The point to locate. </param>
+        /// <param name="edge">The output edge the point falls onto or right to. </param>
+        /// <param name="vertex">Optional output vertex double pointer the input point coinsides with. </param>
+        /// <returns></returns>
+#endif
         public static CvSubdiv2DPointLocation Subdiv2DLocate(CvSubdiv2D subdiv, CvPoint2D32f pt, out CvSubdiv2DEdge edge, ref CvSubdiv2DPoint vertex)
         {
@@ -3178 +3222 @@
         #endregion
         #region Subdiv2DRotateEdge
+#if LANG_JP
         /// <summary>
         /// 入力された辺を含むquad-edge中の辺の一つを返す．
@@ -3184 +3229 @@
         /// <param name="rotate">関係の指定（入力された辺と同じquad-edgeのどの辺を返すかを指定）</param>
         /// <returns></returns>
+#else
+        /// <summary>
+        /// Returns another edge of the same quad-edge
+        /// </summary>
+        /// <param name="edge">Subdivision edge (not a quad-edge) </param>
+        /// <param name="rotate">Specifies, which of edges of the same quad-edge as the input one to return</param>
+        /// <returns>one the edges of the same quad-edge as the input edge. </returns>
+#endif
         public static CvSubdiv2DEdge Subdiv2DRotateEdge(CvSubdiv2DEdge edge, RotateEdgeFlag rotate)
         {
@@ -3190 +3243 @@
         #endregion
         #region SubdivDelaunay2DInsert
+#if LANG_JP
         /// <summary>
         /// ドロネー三角形に点を追加する
@@ -3196 +3250 @@
         /// <param name="pt">追加する点</param>
         /// <returns></returns>
+#else
+        /// <summary>
+        /// Inserts a single point to Delaunay triangulation
+        /// </summary>
+        /// <param name="subdiv">Delaunay subdivision created by function cvCreateSubdivDelaunay2D. </param>
+        /// <param name="pt">Inserted point. </param>
+        /// <returns></returns>
+#endif
         public static CvSubdiv2DPoint SubdivDelaunay2DInsert(CvSubdiv2D subdiv, CvPoint2D32f pt)
         {