apoorva/greenhouse
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

-Changed defaults to SURF/SURF and 2Hz camera

Browse Source 
-Added CPACK packaging for Windows

git-svn-id: http://find-object.googlecode.com/svn/trunk/find_object@15 620bd6b2-0a58-f614-fd9a-1bd335dccda9
This commit is contained in:
matlabbe
2011-11-09 19:01:46 +00:00
parent ab8fb21b38
commit a600190f80
3 changed files with 130 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/CMakeLists.txt
+51 -1
View File
@@ -63,7 +63,57 @@ SET(LIBRARIES
INCLUDE_DIRECTORIES(${INCLUDE_DIRS})
# create an executable file
ADD_EXECUTABLE(find_object ${SRC_FILES})
ADD_EXECUTABLE(find_object WIN32 ${SRC_FILES})
# Linking with Qt libraries
TARGET_LINK_LIBRARIES(find_object ${LIBRARIES})
IF(WIN32)
SET_TARGET_PROPERTIES(find_object PROPERTIES
OUTPUT_NAME ${PROJECT_NAME})
ENDIF(WIN32)
#---------------------------
# Installation stuff
#---------------------------
INSTALL(TARGETS find_object
RUNTIME DESTINATION bin COMPONENT runtime
BUNDLE DESTINATION "${CMAKE_BUNDLE_LOCATION}" COMPONENT runtime)
SET(APPS "\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/bin/${PROJECT_NAME}${CMAKE_EXECUTABLE_SUFFIX}")
IF(WIN32)
SET(plugin_dest_dir bin)
SET(qtconf_dest_dir bin)
# Install needed Qt plugins by copying directories from the qt installation
# One can cull what gets copied by using 'REGEX "..." EXCLUDE'
# Exclude debug libraries
INSTALL(DIRECTORY "${QT_PLUGINS_DIR}/imageformats"
DESTINATION ${plugin_dest_dir}/plugins
COMPONENT runtime
REGEX ".*d4.dll" EXCLUDE
REGEX ".*d4.a" EXCLUDE)
# install a qt.conf file
# this inserts some cmake code into the install script to write the file
SET(QT_CONF_FILE [Paths]\nPlugins=plugins)
INSTALL(CODE "
file(WRITE \"\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${qtconf_dest_dir}/qt.conf\" \"${QT_CONF_FILE}\")
" COMPONENT runtime)
# directories to look for dependencies
SET(DIRS ${QT_LIBRARY_DIRS} ${PROJECT_SOURCE_DIR}/bin)
# Now the work of copying dependencies into the bundle/package
# The quotes are escaped and variables to use at install time have their $ escaped
# An alternative is the do a configure_file() on a script and use install(SCRIPT ...).
# Note that the image plugins depend on QtSvg and QtXml, and it got those copied
# over.
# To find dependencies, cmake use "otool" on Apple and "dumpbin" on Windows (make sure you have one of them).
install(CODE "
file(GLOB_RECURSE QTPLUGINS \"\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${plugin_dest_dir}/plugins/*${CMAKE_SHARED_LIBRARY_SUFFIX}\")
include(\"BundleUtilities\")
fixup_bundle(\"${APPS}\" \"\${QTPLUGINS}\" \"${DIRS}\")
" COMPONENT runtime)
ENDIF(WIN32)
src/Settings.h
+4 -4
View File
@@ -42,11 +42,11 @@ class Settings
PARAMETER(Camera, deviceId, int, 0);
PARAMETER(Camera, imageWidth, int, 640);
PARAMETER(Camera, imageHeight, int, 480);
PARAMETER(Camera, imageRate, int, 5); // Hz
PARAMETER(Camera, imageRate, int, 2); // Hz
//List format : [Index:item0;item1;item3;...]
PARAMETER(Detector, Type, QString, "1:Dense;Fast;GoodFeaturesToTrack;Mser;Orb;Sift;Star;Surf");
PARAMETER(Descriptor, Type, QString, "0:Brief;Orb;Sift;Surf");
PARAMETER(Detector, Type, QString, "7:Dense;Fast;GoodFeaturesToTrack;Mser;Orb;Sift;Star;Surf");
PARAMETER(Descriptor, Type, QString, "3:Brief;Orb;Sift;Surf");
PARAMETER(Brief, bytes, int, 32);
@@ -100,7 +100,7 @@ class Settings
PARAMETER(Star, lineThresholdBinarized, int, cvStarDetectorParams().lineThresholdBinarized);
PARAMETER(Star, suppressNonmaxSize, int, cvStarDetectorParams().suppressNonmaxSize);
PARAMETER(Surf, hessianThreshold, double, 400.0);
PARAMETER(Surf, hessianThreshold, double, 600.0);
PARAMETER(Surf, octaves, int, 3);
PARAMETER(Surf, octaveLayers, int, 4);
PARAMETER(Surf, upright, bool, false);