150 Commits

Author SHA1 Message Date
matlabbe
4347951c57 Fixed slow BRISK
git-svn-id: http://find-object.googlecode.com/svn/trunk/find_object@340 620bd6b2-0a58-f614-fd9a-1bd335dccda9
2014-06-19 17:43:34 +00:00
matlabbe
83e932eae3 Fixed issue 22
git-svn-id: http://find-object.googlecode.com/svn/trunk/find_object@339 620bd6b2-0a58-f614-fd9a-1bd335dccda9
2014-06-19 15:29:00 +00:00
matlabbe
580aa6c6fc removed compilation warning "not used variable test"
git-svn-id: http://find-object.googlecode.com/svn/trunk/find_object@338 620bd6b2-0a58-f614-fd9a-1bd335dccda9
2014-06-19 13:45:04 +00:00
matlabbe
8dfe9622b0 Added GPU-SURF support when OpenCV is built with CUDA.
git-svn-id: http://find-object.googlecode.com/svn/trunk/find_object@337 620bd6b2-0a58-f614-fd9a-1bd335dccda9
2014-06-17 21:04:26 +00:00
matlabbe
c4ac09b750 Hiding camera actions when a camera is given to main window (like the ros-pkg)
git-svn-id: http://find-object.googlecode.com/svn/trunk/find_object@334 620bd6b2-0a58-f614-fd9a-1bd335dccda9
2014-06-10 22:32:35 +00:00
matlabbe
70bb8728b2 set default General/sendNoObjDetectedEvents = false
git-svn-id: http://find-object.googlecode.com/svn/trunk/find_object@331 620bd6b2-0a58-f614-fd9a-1bd335dccda9
2014-06-10 21:17:49 +00:00
matlabbe
391201dadf resized init main window height
git-svn-id: http://find-object.googlecode.com/svn/trunk/find_object@330 620bd6b2-0a58-f614-fd9a-1bd335dccda9
2014-06-10 21:14:49 +00:00
matlabbe
5b776f998f updated tutorial 1, set default InvertedSearch=true
git-svn-id: http://find-object.googlecode.com/svn/trunk/find_object@328 620bd6b2-0a58-f614-fd9a-1bd335dccda9
2014-06-05 20:01:12 +00:00
matlabbe
b5f0162cff saving objects in png instead of bmp
git-svn-id: http://find-object.googlecode.com/svn/trunk/find_object@287 620bd6b2-0a58-f614-fd9a-1bd335dccda9
2014-05-25 22:55:17 +00:00
matlabbe
e056dd8e14 Added parameter Homography/rectBorderWidth
git-svn-id: http://find-object.googlecode.com/svn/trunk/find_object@286 620bd6b2-0a58-f614-fd9a-1bd335dccda9
2014-05-25 22:34:10 +00:00
matlabbe
6478e78899 Added parameter General/sendNoObjDetectedEvents
git-svn-id: http://find-object.googlecode.com/svn/trunk/find_object@284 620bd6b2-0a58-f614-fd9a-1bd335dccda9
2014-05-22 17:47:00 +00:00
matlabbe
9422df9965 fixed virtual hidden method warning (Mac OS X)
git-svn-id: http://find-object.googlecode.com/svn/trunk/find_object@283 620bd6b2-0a58-f614-fd9a-1bd335dccda9
2014-05-22 15:46:43 +00:00
matlabbe
d2946cac3b git-svn-id: http://find-object.googlecode.com/svn/trunk/find_object@281 620bd6b2-0a58-f614-fd9a-1bd335dccda9 2014-05-22 15:18:29 +00:00
matlabbe
19b5776ba4 Added "Camera from TCP/IP..." action. Find-Object can connect to a server to receive images over TCP/IP. Look at the "imagesTcpServer" example to know how to send a images. The stream format is [quint64 size, std::vector<unsigned char> data]. The data array is decoded to a cv:Mat image using cv::imdecode(data, cv::IMREAD_UNCHANGED). In the server example, the images are encoded like that: cv::imencode(".png", image, data).
git-svn-id: http://find-object.googlecode.com/svn/trunk/find_object@280 620bd6b2-0a58-f614-fd9a-1bd335dccda9
2014-05-21 21:31:42 +00:00
matlabbe
b4d04c9460 Added console mode to Find-Object (see "--help"):
> Find-Object.exe -console -objs "Path objects"

git-svn-id: http://find-object.googlecode.com/svn/trunk/find_object@278 620bd6b2-0a58-f614-fd9a-1bd335dccda9
2014-05-21 15:24:24 +00:00
matlabbe
17873bacfa Don't update objects when a "changed" Feature2D or NearestNeighbor parameter is still the same (it happens when a parameter widget loses focus) to avoid unnecessary objects update
git-svn-id: http://find-object.googlecode.com/svn/trunk/find_object@277 620bd6b2-0a58-f614-fd9a-1bd335dccda9
2014-05-20 15:52:25 +00:00
matlabbe
e4ca56879c Removed "Cannot search, objects must be updated!" warning when no object is yet added when the camera is running
git-svn-id: http://find-object.googlecode.com/svn/trunk/find_object@276 620bd6b2-0a58-f614-fd9a-1bd335dccda9
2014-05-20 15:30:25 +00:00
matlabbe
6d2705846a Added layout spacer in Statistics panel
git-svn-id: http://find-object.googlecode.com/svn/trunk/find_object@273 620bd6b2-0a58-f614-fd9a-1bd335dccda9
2014-05-13 18:12:55 +00:00
matlabbe
b3bed3759b added Feature2D/MaxFeatures parameter
On graphicsView mode, if a homography rectangle is selected, the corresponding object in the objects pane is selected

git-svn-id: http://find-object.googlecode.com/svn/trunk/find_object@271 620bd6b2-0a58-f614-fd9a-1bd335dccda9
2014-05-13 17:47:59 +00:00
matlabbe
166e3b3513 refactored vocabulary matrix copy
git-svn-id: http://find-object.googlecode.com/svn/trunk/find_object@270 620bd6b2-0a58-f614-fd9a-1bd335dccda9
2014-05-13 14:41:36 +00:00
matlabbe
20a32932bf updated incremental vocabulary for binary descriptors (using BruteForce instead of LSH on descriptors not yet indexed)
added parameter General/vocabularyUpdateMinWords
renamed parameter General/incrementalVocabulary to General/vocabularyIncremental

git-svn-id: http://find-object.googlecode.com/svn/trunk/find_object@269 620bd6b2-0a58-f614-fd9a-1bd335dccda9
2014-05-12 22:58:57 +00:00
matlabbe
228cce72bf Added inliers curve
Added incremental vocabulary option
Multi-threaded object features extraction
Moved Statistics to its own dock widget

git-svn-id: http://find-object.googlecode.com/svn/trunk/find_object@268 620bd6b2-0a58-f614-fd9a-1bd335dccda9
2014-05-11 23:57:08 +00:00
matlabbe
3bd58086d2 When selecting an object from scene, don't start the camera when it is paused. (issue with a directory of image, which we don't want the camera running while selecting objects)
git-svn-id: http://find-object.googlecode.com/svn/trunk/find_object@267 620bd6b2-0a58-f614-fd9a-1bd335dccda9
2014-05-08 19:02:42 +00:00
matlabbe
fa07e735a6 Fixed issue 19: Publish detected objects and position on TCP
git-svn-id: http://find-object.googlecode.com/svn/trunk/find_object@243 620bd6b2-0a58-f614-fd9a-1bd335dccda9
2014-05-05 23:08:01 +00:00
matlabbe
6082ab4b63 fixed starting crash on Windows
git-svn-id: http://find-object.googlecode.com/svn/trunk/find_object@239 620bd6b2-0a58-f614-fd9a-1bd335dccda9
2014-04-11 22:30:38 +00:00
matlabbe
5d4e16d954 fixed compilation error on VC2010
git-svn-id: http://find-object.googlecode.com/svn/trunk/find_object@238 620bd6b2-0a58-f614-fd9a-1bd335dccda9
2014-04-11 22:11:01 +00:00
matlabbe
d6a4baab9a fixed compilation error on ubuntu
git-svn-id: http://find-object.googlecode.com/svn/trunk/find_object@235 620bd6b2-0a58-f614-fd9a-1bd335dccda9
2014-04-11 21:34:02 +00:00
matlabbe
e8469026c8 fixed compilation error in Mac Os X
git-svn-id: http://find-object.googlecode.com/svn/trunk/find_object@211 620bd6b2-0a58-f614-fd9a-1bd335dccda9
2014-04-11 20:34:07 +00:00
matlabbe
444a001533 fixed issue 18 : Mutiple detection of the same object
git-svn-id: http://find-object.googlecode.com/svn/trunk/find_object@205 620bd6b2-0a58-f614-fd9a-1bd335dccda9
2014-04-11 19:24:59 +00:00
matlabbe
ada571b679 fixed a memory leak when no features are extracted from the scene
git-svn-id: http://find-object.googlecode.com/svn/trunk/find_object@204 620bd6b2-0a58-f614-fd9a-1bd335dccda9
2014-04-10 18:07:34 +00:00
matlabbe
065ad88ea8 corrected a typo
git-svn-id: http://find-object.googlecode.com/svn/trunk/find_object@203 620bd6b2-0a58-f614-fd9a-1bd335dccda9
2014-04-10 17:50:30 +00:00
matlabbe
2d2e69340a fixed issue 12: In Feature2d panel, only show parameters of the current selected detector/descriptor.
git-svn-id: http://find-object.googlecode.com/svn/trunk/find_object@201 620bd6b2-0a58-f614-fd9a-1bd335dccda9
2014-03-24 22:32:54 +00:00
matlabbe
3eda414d91 Added menu actions "Save settings..." and "Load settings..."
git-svn-id: http://find-object.googlecode.com/svn/trunk/find_object@198 620bd6b2-0a58-f614-fd9a-1bd335dccda9
2014-03-24 21:11:02 +00:00
matlabbe
7a3080cd43 fixed broken link to project web page in About dialog
git-svn-id: http://find-object.googlecode.com/svn/trunk/find_object@197 620bd6b2-0a58-f614-fd9a-1bd335dccda9
2014-03-24 20:08:46 +00:00
matlabbe
0dd44b61ae Added tooltips on parameter labels. On mouse over a parameter, a description is shown of the parameter.
git-svn-id: http://find-object.googlecode.com/svn/trunk/find_object@196 620bd6b2-0a58-f614-fd9a-1bd335dccda9
2014-03-24 20:04:56 +00:00
matlabbe
dfc0c49e00 Added multi-threading (Parameter: General->threads) on objects matching and homography computation
git-svn-id: http://find-object.googlecode.com/svn/trunk/find_object@195 620bd6b2-0a58-f614-fd9a-1bd335dccda9
2014-03-21 22:26:06 +00:00
matlabbe
b860d884c0 Set default detector/descriptor to SIFT
git-svn-id: http://find-object.googlecode.com/svn/trunk/find_object@193 620bd6b2-0a58-f614-fd9a-1bd335dccda9
2013-04-25 01:08:56 +00:00
matlabbe
7921affc14 updated to version 0.4.1
git-svn-id: http://find-object.googlecode.com/svn/trunk/find_object@183 620bd6b2-0a58-f614-fd9a-1bd335dccda9
2013-02-07 18:02:04 +00:00
matlabbe
c0d1f41487 Removed top white line on selection in ObjWidget (ubuntu)
git-svn-id: http://find-object.googlecode.com/svn/trunk/find_object@181 620bd6b2-0a58-f614-fd9a-1bd335dccda9
2012-11-04 22:37:35 +00:00
matlabbe
72bdae12b0 Changed Detector_descriptor group name to Feature2D group name
Added BRISK and FREAK features

git-svn-id: http://find-object.googlecode.com/svn/trunk/find_object@179 620bd6b2-0a58-f614-fd9a-1bd335dccda9
2012-10-29 20:00:44 +00:00
matlabbe
c9e52fdbae Updated default LSH parameters (as set in LSH default constructor)
git-svn-id: http://find-object.googlecode.com/svn/trunk/find_object@178 620bd6b2-0a58-f614-fd9a-1bd335dccda9
2012-10-29 14:35:12 +00:00
matlabbe
597a137854 Fixed compilation errors (cannot convert const char * to const wchar *) with UNICODE projects (when "-DUNICODE" is set).
Fixed control bar showing -2 when webcam is used.

git-svn-id: http://find-object.googlecode.com/svn/trunk/find_object@174 620bd6b2-0a58-f614-fd9a-1bd335dccda9
2012-09-21 14:59:09 +00:00
matlabbe
817f861b63 Added missing FLANN "search" parameters (like number of leafs checked)
git-svn-id: http://find-object.googlecode.com/svn/trunk/find_object@173 620bd6b2-0a58-f614-fd9a-1bd335dccda9
2012-09-06 20:28:12 +00:00
matlabbe
8c39385311 Added a printf before extracting descriptors from objects.
git-svn-id: http://find-object.googlecode.com/svn/trunk/find_object@172 620bd6b2-0a58-f614-fd9a-1bd335dccda9
2012-09-03 16:13:24 +00:00
matlabbe
6b2d0916c3 Disabled actions "Load camera from..." when detecting.
git-svn-id: http://find-object.googlecode.com/svn/trunk/find_object@165 620bd6b2-0a58-f614-fd9a-1bd335dccda9
2012-08-31 14:35:43 +00:00
matlabbe
4fb42d4889 Fixed a warning (int and unsigned int comparison) in Camera.cpp
Updated example to switch between LSH and KDTree depending on descriptors type detected. Also use SIFT as it gives better results than SURF.

git-svn-id: http://find-object.googlecode.com/svn/trunk/find_object@163 620bd6b2-0a58-f614-fd9a-1bd335dccda9
2012-08-31 14:09:25 +00:00
matlabbe
d8ee741fa5 Added tutorial 3 datasets
git-svn-id: http://find-object.googlecode.com/svn/trunk/find_object@135 620bd6b2-0a58-f614-fd9a-1bd335dccda9
2012-08-30 18:15:41 +00:00
matlabbe
74d1fa97f5 Minor text change...
git-svn-id: http://find-object.googlecode.com/svn/trunk/find_object@113 620bd6b2-0a58-f614-fd9a-1bd335dccda9
2012-08-29 19:25:49 +00:00
matlabbe
a6dc94a31d Fixed some crash issues between descriptor type / nearest neighbor strategy required data type / nearest neighbor distance type.
Added selective update on objects when parameters are changed.

git-svn-id: http://find-object.googlecode.com/svn/trunk/find_object@112 620bd6b2-0a58-f614-fd9a-1bd335dccda9
2012-08-29 19:04:14 +00:00
matlabbe
3ba8c95284 Minor changes... added some debug info
git-svn-id: http://find-object.googlecode.com/svn/trunk/find_object@111 620bd6b2-0a58-f614-fd9a-1bd335dccda9
2012-08-28 20:34:00 +00:00