Changeset 30779

Timestamp:

03/04/09 08:56:04 (4 years ago)

Author:

schima

Message:

cvauxのステレオマッチングを追加

Location:

lang/cpluspluscli/OpenCvSharp/sample

Files:

• OpenCvSharpSample.sln (modified) (2 diffs)
• OpenCvSharpSample/OpenCvSharpSample.csproj (modified) (1 diff)
• OpenCvSharpSample/Sample/StereoCorrespondence.cs (modified) (4 diffs)

lang/cpluspluscli/OpenCvSharp/sample/OpenCvSharpSample.sln

@@ -7 +7 @@
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "OpenCvSharp.MachineLearning", "..\OpenCvSharp(CodeRepos)\OpenCvSharp.MachineLearning\OpenCvSharp.MachineLearning.vcproj", "{A23A01C9-C302-41B7-8D94-50BDD340C68E}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenCvSharp.Auxiliary", "..\OpenCvSharp(CodeRepos)\OpenCvSharp.Auxiliary\OpenCvSharp.Auxiliary.csproj", "{EB6341C6-4FBC-4D48-9D09-617F2612AD8B}"
 EndProject
 Global
@@ -48 +50 @@
                 {A23A01C9-C302-41B7-8D94-50BDD340C68E}.Release|Win32.ActiveCfg = Release|Win32
                 {A23A01C9-C302-41B7-8D94-50BDD340C68E}.Release|Win32.Build.0 = Release|Win32
+                {EB6341C6-4FBC-4D48-9D09-617F2612AD8B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+                {EB6341C6-4FBC-4D48-9D09-617F2612AD8B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+                {EB6341C6-4FBC-4D48-9D09-617F2612AD8B}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+                {EB6341C6-4FBC-4D48-9D09-617F2612AD8B}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+                {EB6341C6-4FBC-4D48-9D09-617F2612AD8B}.Debug|Win32.ActiveCfg = Debug|Any CPU
+                {EB6341C6-4FBC-4D48-9D09-617F2612AD8B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+                {EB6341C6-4FBC-4D48-9D09-617F2612AD8B}.Release|Any CPU.Build.0 = Release|Any CPU
+                {EB6341C6-4FBC-4D48-9D09-617F2612AD8B}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+                {EB6341C6-4FBC-4D48-9D09-617F2612AD8B}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+                {EB6341C6-4FBC-4D48-9D09-617F2612AD8B}.Release|Win32.ActiveCfg = Release|Any CPU
         EndGlobalSection
         GlobalSection(SolutionProperties) = preSolution

lang/cpluspluscli/OpenCvSharp/sample/OpenCvSharpSample/OpenCvSharpSample.csproj

@@ -193 +193 @@
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="..\..\OpenCvSharp%28CodeRepos%29\OpenCvSharp.Auxiliary\OpenCvSharp.Auxiliary.csproj">
+      <Project>{EB6341C6-4FBC-4D48-9D09-617F2612AD8B}</Project>
+      <Name>OpenCvSharp.Auxiliary</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\OpenCvSharp%28CodeRepos%29\OpenCvSharp.MachineLearning\OpenCvSharp.MachineLearning.vcproj">
       <Project>{A23A01C9-C302-41B7-8D94-50BDD340C68E}</Project>

lang/cpluspluscli/OpenCvSharp/sample/OpenCvSharpSample/Sample/StereoCorrespondence.cs

@@ -4 +4 @@
 using System.Text;
 using KwsmLab.OpenCvSharp;
+using KwsmLab.OpenCvSharp.Auxiliary;
 
 namespace KwsmLab.OpenCvSharpSample
@@ -20 +21 @@
             // ブロックマッチング, グラフカットの両アルゴリズムによるステレオマッチング
 
+            /*using (IplImage src = new IplImage(Const.IMAGE_TSUKUBA_RIGHT, LoadMode.GrayScale))
+            using (IplImage dst = src.Clone())
+            {
+                KwsmLab.OpenCvSharp.Auxiliary.CvAux.DeleteMoire(dst);
+                using (CvWindow w1 = new CvWindow("1", src))
+                using (CvWindow w2 = new CvWindow("2", dst))
+                {
+                    CV.WaitKey();
+                }
+            }*/
+
             // 入力画像の読み込み
             using (IplImage imgLeft = new IplImage(Const.IMAGE_TSUKUBA_LEFT, LoadMode.GrayScale))
@@ -30 +42 @@
                 using (IplImage dstBM = new IplImage(imgLeft.Size, BitDepth.U8, 1))
                 using (IplImage dstGC = new IplImage(imgLeft.Size, BitDepth.U8, 1))
+                using (IplImage dstAux = new IplImage(imgLeft.Size, BitDepth.U8, 1))
                 {
                     // 距離計測とスケーリング  
@@ -37 +50 @@
                         CV.FindStereoCorrespondenceBM(imgLeft, imgRight, dispBM, stateBM);                      // stateBM.FindStereoCorrespondence(imgLeft, imgRight, dispBM);
                         CV.FindStereoCorrespondenceGC(imgLeft, imgRight, dispLeft, dispRight, stateGC, false);  // stateGC.FindStereoCorrespondence(imgLeft, imgRight, dispLeft, dispRight, false);
-                          
+                        CvAux.FindStereoCorrespondence(imgLeft, imgRight, DisparityMode.Birchfield, dstAux, 50, 25, 5, 12, 15, 25);
+
                         CV.ConvertScale(dispBM, dstBM, 1);
                         CV.ConvertScale(dispLeft, dstGC, -16);
+                        CV.ConvertScale(dstAux, dstAux, 16);
 
-                        using (CvWindow windowBM = new CvWindow("Stereo Correspondence BM", dstBM))
-                        using (CvWindow windowGC = new CvWindow("Stereo Correspondence GC", dstGC))
+                        using (CvWindow windowBM = new CvWindow("Stereo Correspondence (BM)", dstBM))
+                        using (CvWindow windowGC = new CvWindow("Stereo Correspondence (GC)", dstGC))
+                        using (CvWindow windowAux = new CvWindow("Stereo Correspondence (cvaux)", dstAux))
                         {
                             CV.WaitKey();