Merge pull request #89 from n-kawauchi/update_tkcalibgui

TkCalibGUIがLinux環境で自動起動する他RTCを見つけられ、Windows環境ではexeファイルを生成できるように修正

Author: n-ando

opencv/CMakeLists.txt

@@ -1,11 +1,11 @@
 cmake_minimum_required(VERSION 3.5.1)
 
-project(ImageProcessing VERSION 2.0.1)
+project(ImageProcessing VERSION 2.0.2)
 set(TOP_PROJECT_NAME ${PROJECT_NAME})
 string(TOLOWER ${TOP_PROJECT_NAME} TOP_PROJECT_NAME_LOWER)
 set(ImageProcessing_VERSION_MAJOR "2")
 set(ImageProcessing_VERSION_MINOR "0")
-set(ImageProcessing_VERSION_REVISION "1")
+set(ImageProcessing_VERSION_REVISION "2")
 SUBDIRS(components)
 set(SolutionDir ${PROJECT_SOURCE_DIR})
 

opencv/components/TkCalibGUI/CMakeLists.txt

@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.5.1)
 project(TkCalibGUI)
 string(TOLOWER ${PROJECT_NAME} PROJECT_NAME_LOWER)
 include("${PROJECT_SOURCE_DIR}/cmake/utils.cmake")
-set(PROJECT_VERSION 2.0.1 CACHE STRING "TkCalibGUI version")
+set(PROJECT_VERSION 2.0.2 CACHE STRING "TkCalibGUI version")
 set(UPGRADE_GUID "")
 DISSECT_VERSION()
 set(PROJECT_SHORT_VER ${PROJECT_VERSION_MAJOR}${PROJECT_VERSION_MINOR}${PROJECT_VERSION_REVISION})

opencv/components/TkCalibGUI/tkcalibgui.py

@@ -358,10 +358,8 @@ def get_search_path(self):
 				path = env + "examples\\C++\\opencv-rtcs\\"
 				ret_path.append(path.replace('\\', '/'))
 		else:
-			import subprocess
-			from subprocess import PIPE 
-			ret = subprocess.run("rtm-config --rtm-datadir", shell=True, stdout=PIPE, text=True) 
-			rtmdir = ret.stdout.strip() 
+			env = os.environ.get("RTM_IDL_DIR2")
+			rtmdir = env + "/.."
 			tmp = (
 					rtmdir + "/components/c++/opencv-rtcs/OpenCVCamera/",
 					rtmdir + "/components/c++/opencv-rtcs/ImageCalibration/",

opencv/ip-build.bat

@@ -43,7 +43,7 @@ if not DEFINED PYTHON_DIR set PYTHON_DIR=c:\python311
 if not DEFINED PYTHONPATH set PYTHONPATH=%PYTHON_DIR%\Lib
 if not DEFINED OpenCV_DIR set OpenCV_DIR=C:\localCV
 if not DEFINED RTM_ROOT   set RTM_ROOT=C:\localRTM\2.0.2
-if not DEFINED OMNI_ROOT  set OMNI_ROOT=%RTM_ROOT%\omniORB\4.3.1_vc16
+if not DEFINED OMNI_ROOT  set OMNI_ROOT=%RTM_ROOT%\omniORB\4.3.2_vc16
 
 set ARCH=x86_64
 set OpenRTM_DIR=%RTM_ROOT%\cmake
@@ -74,7 +74,8 @@ cmake --build . --verbose --config Release
 @rem ------------------------------------------------------------
 :MAKE_ZIP
 cd %OPENCV_RTC_ROOT%/bin
-python freeze.py
+if exist dist rmdir /s/q  dist
+%PYTHON_DIR%\Scripts\pyinstaller --onefile --onedir TkCalibGUIComp.py
 if not "%ERRORLEVEL%" == "0" (
 	goto END
 )

opencv/ip_make_package.sh

@@ -25,9 +25,8 @@ cd ${NEW_DIR}
 cp ${WORK_ROOT}/bin/*.conf .
 cp ${WORK_ROOT}/bin/*.dll .
 cp ${WORK_ROOT}/bin/*.exe .
-cp ${WORK_ROOT}/bin/dist/TkCalibGUIComp.exe .
-cp ${WORK_ROOT}/bin/dist/python*.dll .
-cp -r ${WORK_ROOT}/bin/dist/lib .
+cp ${WORK_ROOT}/bin/dist/TkCalibGUIComp/TkCalibGUIComp.exe .
+cp -r ${WORK_ROOT}/bin/dist/TkCalibGUIComp/_internal .
 cd ${WORK_ROOT}
 chmod -R 755 ${NEW_DIR}