apoorva/greenhouse
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
132 Commits 1 Branch 0 Tags
Commit Graph

59 Commits

Author SHA1 Message Date
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
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
matlabbe
dfb4e5038d New features: camera from directory of images, new controls to move across frames of a video or a directory of images. 
git-svn-id: http://find-object.googlecode.com/svn/trunk/find_object@110 620bd6b2-0a58-f614-fd9a-1bd335dccda9
 2012-08-28 20:06:43 +00:00
matlabbe
e3b15a7106 Modified parameters' name to reduce the number of pages in the parameters toolbox. 
Added a way to sort (with a prefix number) parameters in toolbox. 
Can now switch between nearest neighbor strategies (kd-trees, k-means, linear).
Added parameters for all FLANN nearest neighbor approaches.
Added likelihood plot (including UPlot from UtiLite library and PdfPlot from RTAB-Map library).
Added general parameter "MirrorView".
Added general parameter "InvertedSearch" to create the  vocabulary from objects descriptor instead of the scene descriptors. We can then compute likelihood of the current scene with all other objects (or another scenes). 
Fixed a crash (in AddObjectDialog) when selecting outside the image.
Added OpenCV version used in AboutDialog.

git-svn-id: http://find-object.googlecode.com/svn/trunk/find_object@109 620bd6b2-0a58-f614-fd9a-1bd335dccda9
 2012-08-28 13:44:57 +00:00
matlabbe
5c4625a300 Updated to OpenCV 2.4 (as well as all feature descriptors and detectors parameters). 
Updated to OpenCV C++ interface (using cv::Mat instead of IplImage).


git-svn-id: http://find-object.googlecode.com/svn/trunk/find_object@97 620bd6b2-0a58-f614-fd9a-1bd335dccda9
 2012-05-07 22:36:59 +00:00
matlabbe
8e44f2bedf Added actions "Add object from scene/files..." on right-click in the objects panel (same behavior as those in Edit->...). 
Fixed alpha for rectangles.
Refactored the naming of private members (_myAtt to myAtt_).

git-svn-id: http://find-object.googlecode.com/svn/trunk/find_object@96 620bd6b2-0a58-f614-fd9a-1bd335dccda9
 2012-04-04 18:15:51 +00:00
matlabbe
6611fb037d Added parameter autoUpdateObjects 
git-svn-id: http://find-object.googlecode.com/svn/trunk/find_object@87 620bd6b2-0a58-f614-fd9a-1bd335dccda9
 2012-02-05 00:30:52 +00:00
matlabbe
a794ce5aef Added interface to MainWindow to set source image text (for the ROS node) 
git-svn-id: http://find-object.googlecode.com/svn/trunk/find_object@81 620bd6b2-0a58-f614-fd9a-1bd335dccda9
 2012-02-04 22:48:35 +00:00
matlabbe
b111c9996a Fixed parameter ranges when default=0 
git-svn-id: http://find-object.googlecode.com/svn/trunk/find_object@80 620bd6b2-0a58-f614-fd9a-1bd335dccda9
 2012-02-04 22:38:28 +00:00
matlabbe
3fe16927fc Many minor changes 
git-svn-id: http://find-object.googlecode.com/svn/trunk/find_object@79 620bd6b2-0a58-f614-fd9a-1bd335dccda9
 2012-02-04 22:15:32 +00:00
matlabbe
aa1d2f67e9 Fixed issue 2 : save/load from directory, ask user to save objects on quit 
Added new action "Remove all objects"

git-svn-id: http://find-object.googlecode.com/svn/trunk/find_object@78 620bd6b2-0a58-f614-fd9a-1bd335dccda9
 2012-02-04 00:11:11 +00:00
matlabbe
0e3b934316 New feature: we can setup the camera to use a video file intead of the webcam. 
Fixed a crash when user did "Update Objects" with loaded objects.

git-svn-id: http://find-object.googlecode.com/svn/trunk/find_object@76 620bd6b2-0a58-f614-fd9a-1bd335dccda9
 2012-01-30 03:16:30 +00:00
matlabbe
465e2d846e Fixed issue 3: added "Load objects from files..." and "Load scene from file..." actions. 
git-svn-id: http://find-object.googlecode.com/svn/trunk/find_object@75 620bd6b2-0a58-f614-fd9a-1bd335dccda9
 2012-01-30 00:54:23 +00:00
matlabbe
27652b4f8f Added some new features ("update objects" button and region selection) described in issue 2. 
git-svn-id: http://find-object.googlecode.com/svn/trunk/find_object@74 620bd6b2-0a58-f614-fd9a-1bd335dccda9
 2012-01-28 01:00:23 +00:00
matlabbe
a1c6ec7509 Added RestoreAllDefaultSettings action in Edit menu 
git-svn-id: http://find-object.googlecode.com/svn/trunk/find_object@72 620bd6b2-0a58-f614-fd9a-1bd335dccda9
 2012-01-12 22:21:56 +00:00
matlabbe
aafe4beac4 Fixed a crash (Windows) after adding an object. This may be related to issue 1. The cause is that the first image acquired from the camera is blank, so no features are extracted and the code not handled this case, crashing during nearest neighbor search. 
git-svn-id: http://find-object.googlecode.com/svn/trunk/find_object@67 620bd6b2-0a58-f614-fd9a-1bd335dccda9
 2012-01-05 00:31:29 +00:00
matlabbe
921206332c Added homographyComputed parameter 
git-svn-id: http://find-object.googlecode.com/svn/trunk/find_object@63 620bd6b2-0a58-f614-fd9a-1bd335dccda9
 2012-01-04 21:58:29 +00:00
matlabbe
03341c215d Updated signal objectsFound() to send the object rect and full homography 
git-svn-id: http://find-object.googlecode.com/svn/trunk/find_object@62 620bd6b2-0a58-f614-fd9a-1bd335dccda9
 2012-01-04 21:08:42 +00:00
matlabbe
d7247fba70 Simplified Parameter getters to return directly the related type instead of QVariant 
Added Nearest neighbor min distance + statistics

git-svn-id: http://find-object.googlecode.com/svn/trunk/find_object@60 620bd6b2-0a58-f614-fd9a-1bd335dccda9
 2012-01-04 17:30:36 +00:00
matlabbe
49d11d9212 Fixed a crash when the image width/height parameters of the camera are modified while the camera is running. 
git-svn-id: http://find-object.googlecode.com/svn/trunk/find_object@58 620bd6b2-0a58-f614-fd9a-1bd335dccda9
 2012-01-03 22:58:46 +00:00
matlabbe
9a85de5760 Added copyright 
git-svn-id: http://find-object.googlecode.com/svn/trunk/find_object@55 620bd6b2-0a58-f614-fd9a-1bd335dccda9
 2011-12-02 18:34:08 +00:00
matlabbe
7029f14643 Added QStatusBar (with a message when the camera is starting...) 
git-svn-id: http://find-object.googlecode.com/svn/trunk/find_object@54 620bd6b2-0a58-f614-fd9a-1bd335dccda9
 2011-11-26 12:45:35 +00:00
matlabbe
8b12bd8bff Added icons 
git-svn-id: http://find-object.googlecode.com/svn/trunk/find_object@50 620bd6b2-0a58-f614-fd9a-1bd335dccda9
 2011-11-24 20:45:50 +00:00
matlabbe
1f71177807 Added About dialog 
git-svn-id: http://find-object.googlecode.com/svn/trunk/find_object@47 620bd6b2-0a58-f614-fd9a-1bd335dccda9
 2011-11-24 19:11:30 +00:00
matlabbe
d3d90bc6a9 Don't show cmaera rate when the rate is 0 
git-svn-id: http://find-object.googlecode.com/svn/trunk/find_object@44 620bd6b2-0a58-f614-fd9a-1bd335dccda9
 2011-11-23 22:12:44 +00:00
matlabbe
52e4d4fc57 Added getter of the toolbox on MainWindow 
git-svn-id: http://find-object.googlecode.com/svn/trunk/find_object@43 620bd6b2-0a58-f614-fd9a-1bd335dccda9
 2011-11-23 22:04:58 +00:00
matlabbe
26cf597da3 bool returned on loadObjects() 
git-svn-id: http://find-object.googlecode.com/svn/trunk/find_object@41 620bd6b2-0a58-f614-fd9a-1bd335dccda9
 2011-11-23 21:52:17 +00:00
matlabbe
b1b769ec78 updated refresh rate (each second) 
Fixed not connected signals/slots

git-svn-id: http://find-object.googlecode.com/svn/trunk/find_object@40 620bd6b2-0a58-f614-fd9a-1bd335dccda9
 2011-11-23 19:12:41 +00:00
matlabbe
13f493aa5c Added signal when an object is detected (id + pos) 
git-svn-id: http://find-object.googlecode.com/svn/trunk/find_object@39 620bd6b2-0a58-f614-fd9a-1bd335dccda9
 2011-11-23 18:58:55 +00:00