89 Commits

Author SHA1 Message Date
matlabbe
82f953b911 Added tcpService tool to Add/Remove objects through TCP
git-svn-id: http://find-object.googlecode.com/svn/trunk/find_object@420 620bd6b2-0a58-f614-fd9a-1bd335dccda9
2015-01-12 01:19:09 +00:00
matlabbe
02e31c2e69 Added "save/load session" menu actions.
git-svn-id: http://find-object.googlecode.com/svn/trunk/find_object@418 620bd6b2-0a58-f614-fd9a-1bd335dccda9
2015-01-09 22:44:16 +00:00
matlabbe
84166e6ddc fixed Debug build errors, changed all Q_ASSERT to UASSERT
git-svn-id: http://find-object.googlecode.com/svn/trunk/find_object@417 620bd6b2-0a58-f614-fd9a-1bd335dccda9
2015-01-05 23:11:15 +00:00
matlabbe
c879fae867 New minor enhancements:
-Added actions to show/hide all features of the objects
-Auto adjust size slider to widest added object
-Compare to both size of the scene and object to reject a too large homography
-Removed descriptor/detector label on objects
-Added Refresh GUI time statistic

git-svn-id: http://find-object.googlecode.com/svn/trunk/find_object@416 620bd6b2-0a58-f614-fd9a-1bd335dccda9
2014-12-23 21:22:18 +00:00
matlabbe
a96ea6c4f5 Added DragNDrop images directly in objects or scene zones.
git-svn-id: http://find-object.googlecode.com/svn/trunk/find_object@415 620bd6b2-0a58-f614-fd9a-1bd335dccda9
2014-12-22 21:56:10 +00:00
matlabbe
807c8b5b43 Added Version.h.in. When NONFREE module is not detected, disable SIFT/SURF instead of hiding them.
git-svn-id: http://find-object.googlecode.com/svn/trunk/find_object@413 620bd6b2-0a58-f614-fd9a-1bd335dccda9
2014-11-28 21:47:02 +00:00
matlabbe
4d3b9e88b2 Added BruteForce nearest neighbor (with GPU option), which is now the default for binary descriptors
CMake: Detecting if openCV is built with nonfree module, if yes, SIFT and SURF can be used

git-svn-id: http://find-object.googlecode.com/svn/trunk/find_object@411 620bd6b2-0a58-f614-fd9a-1bd335dccda9
2014-10-24 02:46:03 +00:00
matlabbe
629b2aefaa Added ASIFT (to activate, check parameter Feature2D/Affine) (fixed issue 27)
git-svn-id: http://find-object.googlecode.com/svn/trunk/find_object@385 620bd6b2-0a58-f614-fd9a-1bd335dccda9
2014-08-22 22:36:09 +00:00
matlabbe
dcf406429e updated License typo
git-svn-id: http://find-object.googlecode.com/svn/trunk/find_object@383 620bd6b2-0a58-f614-fd9a-1bd335dccda9
2014-08-11 15:49:53 +00:00
matlabbe
f16595d505 Added find_object namespace prefix to all signals and slots
git-svn-id: http://find-object.googlecode.com/svn/trunk/find_object@381 620bd6b2-0a58-f614-fd9a-1bd335dccda9
2014-08-06 14:09:55 +00:00
matlabbe
26213d87c0 Added find_object namespace, updated license/copyright in source files
git-svn-id: http://find-object.googlecode.com/svn/trunk/find_object@380 620bd6b2-0a58-f614-fd9a-1bd335dccda9
2014-08-06 13:43:29 +00:00
matlabbe
072f6cc8f5 Updated how the homography is validated (which should be more robust now). Added new parameters Homography/allCornersVisible, Homography/minAngle and General/autoPauseOnDetection.
git-svn-id: http://find-object.googlecode.com/svn/trunk/find_object@377 620bd6b2-0a58-f614-fd9a-1bd335dccda9
2014-08-06 01:17:17 +00:00
matlabbe
e6fcc961b8 Added DetectionInfo object for easier serialization/deserialization of the detection results.
Added filename property in json files
Added JsonWritter class for convenience

git-svn-id: http://find-object.googlecode.com/svn/trunk/find_object@369 620bd6b2-0a58-f614-fd9a-1bd335dccda9
2014-08-04 01:33:52 +00:00
matlabbe
cd8368f0de Added Camera::finished() signal
git-svn-id: http://find-object.googlecode.com/svn/trunk/find_object@368 620bd6b2-0a58-f614-fd9a-1bd335dccda9
2014-08-03 22:40:37 +00:00
matlabbe
970b9e95aa Added SetColor menu option to ObjWidget
git-svn-id: http://find-object.googlecode.com/svn/trunk/find_object@367 620bd6b2-0a58-f614-fd9a-1bd335dccda9
2014-08-03 22:23:02 +00:00
matlabbe
9829b29dd0 minor fixes
git-svn-id: http://find-object.googlecode.com/svn/trunk/find_object@366 620bd6b2-0a58-f614-fd9a-1bd335dccda9
2014-08-03 21:35:28 +00:00
matlabbe
167aeee4bc Added TcpRequest tool (ask a running find_object to process an image and wait results over TCP)
Refactored CameraTcpClient to CameraTcpServer (to send images we connect to find_object, instead of connecting find_object to an image server), removed parameter CameraIP

git-svn-id: http://find-object.googlecode.com/svn/trunk/find_object@364 620bd6b2-0a58-f614-fd9a-1bd335dccda9
2014-08-02 06:09:27 +00:00
matlabbe
9bc7c15abc Created a library find_object for convenience
Updated version to 0.5.0

git-svn-id: http://find-object.googlecode.com/svn/trunk/find_object@357 620bd6b2-0a58-f614-fd9a-1bd335dccda9
2014-07-31 20:11:46 +00:00
matlabbe
680b1740b1 Moved all non-gui stuff outside the GUI
Added FindObject and ObjSignature classes
Added ULogger from utilite for pretty log

git-svn-id: http://find-object.googlecode.com/svn/trunk/find_object@356 620bd6b2-0a58-f614-fd9a-1bd335dccda9
2014-07-31 19:02:31 +00:00
matlabbe
81c3bcb71c added Camera_queueSize for TCP images buffering
ImagesTcpServer can read from a path of images


git-svn-id: http://find-object.googlecode.com/svn/trunk/find_object@354 620bd6b2-0a58-f614-fd9a-1bd335dccda9
2014-07-25 19:31:34 +00:00
matlabbe
e8f0016a55 fixed update() slot called more than one time with a single camera emit (when start/pause/start/...etc , multiple connections were added... solved by adding Qt::UniqueConnection)
git-svn-id: http://find-object.googlecode.com/svn/trunk/find_object@353 620bd6b2-0a58-f614-fd9a-1bd335dccda9
2014-07-24 13:02:31 +00:00
matlabbe
1ee2bfbb47 let camera imageRate enabled for ROS camera
git-svn-id: http://find-object.googlecode.com/svn/trunk/find_object@349 620bd6b2-0a58-f614-fd9a-1bd335dccda9
2014-07-08 20:20:49 +00:00
matlabbe
488c5865fe Added QT_NO_KEYWORDS build compilation to avoid conflicts with boost signals used in the ROS package
git-svn-id: http://find-object.googlecode.com/svn/trunk/find_object@347 620bd6b2-0a58-f614-fd9a-1bd335dccda9
2014-07-08 19:55:03 +00:00
matlabbe
0dd16a6ef4 Refactored GPU/Keypoint detector/Descriptor extractor
git-svn-id: http://find-object.googlecode.com/svn/trunk/find_object@342 620bd6b2-0a58-f614-fd9a-1bd335dccda9
2014-06-19 21:52:04 +00:00
matlabbe
7bdf4e903e Added GPU options for FAST and ORB
git-svn-id: http://find-object.googlecode.com/svn/trunk/find_object@341 620bd6b2-0a58-f614-fd9a-1bd335dccda9
2014-06-19 18:55:46 +00:00
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
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
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
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
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
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
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
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
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
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
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