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

130 Commits

Author SHA1 Message Date
matlabbe
98bf4e6887 added missing json sources 
git-svn-id: http://find-object.googlecode.com/svn/trunk/find_object@398 620bd6b2-0a58-f614-fd9a-1bd335dccda9
 2014-08-28 18:06:30 +00:00
matlabbe
91c70ef181 Using default parameters when [ --config "" ] is used. 
Updated default: sendNoObjDetectedEvents = true.
fixed mirror view when autoScale is set on/off


git-svn-id: http://find-object.googlecode.com/svn/trunk/find_object@397 620bd6b2-0a58-f614-fd9a-1bd335dccda9
 2014-08-28 17:54:29 +00:00
matlabbe
2b229dcec2 Building JSONCPP inside Find-Object (easiest integration for Windows) 
git-svn-id: http://find-object.googlecode.com/svn/trunk/find_object@390 620bd6b2-0a58-f614-fd9a-1bd335dccda9
 2014-08-27 20:30:56 +00:00
matlabbe
55a59e2a10 Fixed issue 24 (instead of crashing, an error message is shown in the console and no features are extracted) 
git-svn-id: http://find-object.googlecode.com/svn/trunk/find_object@387 620bd6b2-0a58-f614-fd9a-1bd335dccda9
 2014-08-24 13:55:19 +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
7b3d4460e9 added some comments 
git-svn-id: http://find-object.googlecode.com/svn/trunk/find_object@379 620bd6b2-0a58-f614-fd9a-1bd335dccda9
 2014-08-06 03:06:05 +00:00
matlabbe
da4ee8637b Added acknowledge to CameraTcpServer (a client must wait a response before sending images) 
git-svn-id: http://find-object.googlecode.com/svn/trunk/find_object@378 620bd6b2-0a58-f614-fd9a-1bd335dccda9
 2014-08-06 03:00:17 +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
b6965d416a fixed include path for jsoncpp on Mac OS X 
git-svn-id: http://find-object.googlecode.com/svn/trunk/find_object@375 620bd6b2-0a58-f614-fd9a-1bd335dccda9
 2014-08-05 18:17:59 +00:00
matlabbe
679bef2dcb Added TextSelectable flag on parameters' label 
git-svn-id: http://find-object.googlecode.com/svn/trunk/find_object@372 620bd6b2-0a58-f614-fd9a-1bd335dccda9
 2014-08-04 13:20:24 +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
6a0136cc16 Added JSON optional output when in console mode (see --json option) 
Added --scene option to process a single scene file
Moved some apps in tools subfolder


git-svn-id: http://find-object.googlecode.com/svn/trunk/find_object@362 620bd6b2-0a58-f614-fd9a-1bd335dccda9
 2014-08-01 21:11:26 +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
4383c921e1 making ObjWidget text selectable by mouse 
git-svn-id: http://find-object.googlecode.com/svn/trunk/find_object@348 620bd6b2-0a58-f614-fd9a-1bd335dccda9
 2014-07-08 20:12:42 +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
7a3e2029e2 Fixed fullResults QMap for a QMultiMap (to handle nearest neighbors with exact same distance) 
git-svn-id: http://find-object.googlecode.com/svn/trunk/find_object@344 620bd6b2-0a58-f614-fd9a-1bd335dccda9
 2014-06-21 00:05:23 +00:00
matlabbe
6b41293f74 removed debug printf in GPUSURF 
git-svn-id: http://find-object.googlecode.com/svn/trunk/find_object@343 620bd6b2-0a58-f614-fd9a-1bd335dccda9
 2014-06-19 21:57:06 +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
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