diff --git a/README.md b/README.md index cd08b20..ae2d1bc 100644 --- a/README.md +++ b/README.md @@ -7,6 +7,10 @@ - Windows 10 #### 更新履歴 +- 2017.10.21 Ver2.3 T.Nakaguchi + - VC++ 2017に変更 + - 64bit 追加 + - ファイルパス処理のバグ修正 - 2017.3.10 Ver2.2 T.Nakaguchi - 輪郭5点位置を自動並べ替え - VisualStudio2015に更新 diff --git a/TongueAnalysis.sln b/TongueAnalysis.sln index 8597c3e..1f6c946 100644 --- a/TongueAnalysis.sln +++ b/TongueAnalysis.sln @@ -1,20 +1,31 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 2012 +# Visual Studio 15 +VisualStudioVersion = 15.0.27004.2002 +MinimumVisualStudioVersion = 10.0.40219.1 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TongueAnalysis", "TongueAnalysis\TongueAnalysis.vcxproj", "{135FD7EF-3960-4EFD-9E9D-E45D8AD73A78}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 + Debug|x64 = Debug|x64 Release|Win32 = Release|Win32 + Release|x64 = Release|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {135FD7EF-3960-4EFD-9E9D-E45D8AD73A78}.Debug|Win32.ActiveCfg = Debug|Win32 {135FD7EF-3960-4EFD-9E9D-E45D8AD73A78}.Debug|Win32.Build.0 = Debug|Win32 + {135FD7EF-3960-4EFD-9E9D-E45D8AD73A78}.Debug|x64.ActiveCfg = Debug|x64 + {135FD7EF-3960-4EFD-9E9D-E45D8AD73A78}.Debug|x64.Build.0 = Debug|x64 {135FD7EF-3960-4EFD-9E9D-E45D8AD73A78}.Release|Win32.ActiveCfg = Release|Win32 {135FD7EF-3960-4EFD-9E9D-E45D8AD73A78}.Release|Win32.Build.0 = Release|Win32 + {135FD7EF-3960-4EFD-9E9D-E45D8AD73A78}.Release|x64.ActiveCfg = Release|x64 + {135FD7EF-3960-4EFD-9E9D-E45D8AD73A78}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {F1A41644-7C21-4023-9E37-CB5609DA1DE3} + EndGlobalSection EndGlobal diff --git a/TongueAnalysis/Analysis.cpp b/TongueAnalysis/Analysis.cpp index 0e42761..d0c4489 100644 --- a/TongueAnalysis/Analysis.cpp +++ b/TongueAnalysis/Analysis.cpp @@ -523,6 +523,7 @@ sprintf_s(filenam2, PATH_LEN, file, ++ frame); sprintf_s(filename, PATH_LEN, "%s\\%s", path, filenam2); } while (GFileExists(filename)); + frame--; printf("Found %d frames\n", frame); diff --git a/TongueAnalysis/ProcList.txt b/TongueAnalysis/ProcList.txt index 4fa5e89..ab0b972 100644 --- a/TongueAnalysis/ProcList.txt +++ b/TongueAnalysis/ProcList.txt @@ -11,6 +11,134 @@ // // ���j�ŏI�s�͉��s���Ȃ� // -BASEDIR=\\NLAB-FS\Project\��f\�Տ��f�[�^\2016 ��B��w ���f -2016-08-17�v���� +BASEDIR=D:\usr\DL\TIAS +2013-11-07 +2013-11-20 +2013-11-21 +2013-12-04 +2013-12-12 +2013-12-17 +2013-12-26 +2014-01-07 +2014-01-16 +2014-02-25 +2014-03-06 +2014-03-20 +2014-04-09 +2014-04-24 +2014-05-08 +2014-05-14 +2014-05-28 +2014-06-04 +2014-06-17 +2014-06-18 +2014-06-25 +2014-07-01 +2014-07-09 +2014-07-15 +2014-07-25 +2014-08-14 +2014-08-19 +2014-08-21 +2014-09-02 +2014-09-04 +2014-10-02 +2015-01-06 +2015-01-13 +2015-01-16 +2015-01-19 +2015-01-20 +2015-01-27 +2015-01-28 +2015-02-02 +2015-02-03 +2015-02-26 +2015-03-02 +2015-03-05 +2015-03-13 +2015-03-19 +2015-03-25 +2015-03-26 +2015-03-27 +2015-04-06 +2015-04-07 +2015-04-08 +2015-04-17 +2015-04-21 +2015-04-24 +2015-04-27 +2015-04-28 +2015-05-18 +2015-05-19 +2015-05-22 +2015-06-03 +2015-06-10 +2015-06-11 +2015-06-24 +2015-07-10 +2015-08-06 +2015-08-07 +2015-08-11 +2015-08-17 +2015-08-18 +2015-08-20 +2015-08-25 +2015-08-26 +2015-08-27 +2015-09-10 +2015-10-01 +2015-10-05 +2015-10-08 +2015-10-13 +2015-10-14 +2015-10-15 +2015-10-16 +2015-11-06 +2015-11-10 +2015-11-16 +2015-11-19 +2015-11-26 +2015-11-30 +2015-12-02 +2015-12-10 +2015-12-21 +2016-01-04 +2016-01-05 +2016-01-14 +2016-01-15 +2016-01-28 +2016-02-03 +2016-02-16 +2016-02-29 +2016-03-08 +2016-03-14 +2016-03-25 +2016-04-04 +2016-04-05 +2016-04-14 +2016-04-25 +2016-05-06 +2016-05-12 +2016-05-13 +2016-05-20 +2016-05-26 +2016-06-13 +2016-06-27 +2016-07-12 +2016-07-25 +2016-08-22 +2016-09-13 +2016-09-30 +2016-10-03 +2016-10-04 +2016-10-18 +2016-10-21 +2016-10-24 +2016-11-01 +2016-11-04 +2016-11-07 +2016-11-29 +2016-12-19 +2017-01-17 +2017-01-23 END diff --git a/TongueAnalysis/ProcessList.cpp b/TongueAnalysis/ProcessList.cpp index a053302..d948bfd 100644 --- a/TongueAnalysis/ProcessList.cpp +++ b/TongueAnalysis/ProcessList.cpp @@ -169,7 +169,7 @@ if (refdirs[i] > refdir) refdir = refdirs[i]; } char check[PATH_LEN]; - sprintf_s(check, PATH_LEN, "%s\\%s\\Shot0001.bmp", dir, refdir); + sprintf_s(check, PATH_LEN, "%s\\%s\\Shot0001.bmp", dir, refdir.c_str()); if (!PathFileExists(check)) return; strcpy_s(ref, refLen, check); } diff --git a/TongueAnalysis/TongueAnalysis.vcxproj b/TongueAnalysis/TongueAnalysis.vcxproj index bfa1e00..b72ff1f 100644 --- a/TongueAnalysis/TongueAnalysis.vcxproj +++ b/TongueAnalysis/TongueAnalysis.vcxproj @@ -5,15 +5,24 @@ Debug Win32 + + Debug + x64 + Release Win32 + + Release + x64 + {135FD7EF-3960-4EFD-9E9D-E45D8AD73A78} TongueAnalysis Win32Proj + 10.0.16299.0 @@ -22,10 +31,21 @@ MultiByte true - + Application v140 MultiByte + true + + + Application + v141 + MultiByte + + + Application + v141 + MultiByte @@ -34,10 +54,18 @@ + + + + + + + + <_ProjectFileVersion>11.0.50727.1 @@ -47,11 +75,17 @@ $(Configuration)\ true + + true + $(SolutionDir)$(Configuration)\ $(Configuration)\ false + + false + Disabled @@ -76,6 +110,29 @@ + + + Disabled + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebugDLL + true + + + Level3 + ProgramDatabase + + + + + winmm.lib;%(AdditionalDependencies) + $(OutDir)$(ProjectName).exe + true + Console + + + + MaxSpeed @@ -97,6 +154,27 @@ MachineX86 + + + MaxSpeed + true + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + MultiThreadedDLL + true + true + + + Level3 + ProgramDatabase + + + winmm.lib;%(AdditionalDependencies) + true + Console + true + true + + diff --git a/TongueAnalysis/opencv3.props b/TongueAnalysis/opencv3.props deleted file mode 100644 index f4873df..0000000 --- a/TongueAnalysis/opencv3.props +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - D:\SDK\OpenCV3.0\build\include;$(IncludePath) - D:\SDK\OpenCV3.0\build\x64\vc12\lib;$(LibraryPath) - - - D:\SDK\OpenCV3.0\build\include;$(IncludePath) - D:\SDK\OpenCV3.0\build\x86\vc12\lib;$(LibraryPath) - - - D:\SDK\OpenCV3.0\build\include;$(IncludePath) - D:\SDK\OpenCV3.0\build\x64\vc11\lib;$(LibraryPath) - - - D:\SDK\OpenCV3.0\build\include;$(IncludePath) - D:\SDK\OpenCV3.0\build\x86\vc11\lib;$(LibraryPath) - - - - diff --git a/TongueAnalysis/opencv310.props b/TongueAnalysis/opencv310.props deleted file mode 100644 index 1f34ab9..0000000 --- a/TongueAnalysis/opencv310.props +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - D:\SDK\OpenCV3.1.0\build\include;$(IncludePath) - D:\SDK\OpenCV3.1.0\build\x64\vc12\lib;$(LibraryPath) - - - D:\SDK\OpenCV3.1.0\build\include;$(IncludePath) - D:\SDK\OpenCV3.1.0\build\x86\vc12\lib;$(LibraryPath) - - - D:\SDK\OpenCV3.1.0\build\include;$(IncludePath) - D:\SDK\OpenCV3.1.0\build\x64\vc11\lib;$(LibraryPath) - - - D:\SDK\OpenCV3.1.0\build\include;$(IncludePath) - D:\SDK\OpenCV3.1.0\build\x86\vc11\lib;$(LibraryPath) - - - - diff --git a/TongueAnalysis/opencv320.props b/TongueAnalysis/opencv320.props index 73c511a..6b72f7c 100644 --- a/TongueAnalysis/opencv320.props +++ b/TongueAnalysis/opencv320.props @@ -18,6 +18,14 @@ D:\SDK\OpenCV3.2.0\build\include;$(IncludePath) D:\SDK\OpenCV3.2.0\build\x86\vc14\lib;$(LibraryPath) + + D:\SDK\OpenCV3.2.0\build\include;$(IncludePath) + D:\SDK\OpenCV3.2.0\build\x64\vc14\lib;$(LibraryPath) + + + D:\SDK\OpenCV3.2.0\build\include;$(IncludePath) + D:\SDK\OpenCV3.2.0\build\x86\vc14\lib;$(LibraryPath) +