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

197 Commits

Author SHA1 Message Date
matlabbe
cba90579bd Added window icon (to show up in Ubuntu Unity) 
git-svn-id: http://find-object.googlecode.com/svn/trunk/find_object@107 620bd6b2-0a58-f614-fd9a-1bd335dccda9
 2012-05-27 15:05:39 +00:00
matlabbe
f5837e726f Updated Camera class with OpenCV C++ interface (cv::VideoCapture). 
Set default camera image ratio to 640/480.

git-svn-id: http://find-object.googlecode.com/svn/trunk/find_object@106 620bd6b2-0a58-f614-fd9a-1bd335dccda9
 2012-05-16 01:42:10 +00:00
matlabbe
15f441154a Fixed compilation warning (with clang) 
git-svn-id: http://find-object.googlecode.com/svn/trunk/find_object@101 620bd6b2-0a58-f614-fd9a-1bd335dccda9
 2012-05-10 01:44:07 +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
4e1c3e8234 Fixed black keypoints bug in graphics view mode 
git-svn-id: http://find-object.googlecode.com/svn/trunk/find_object@92 620bd6b2-0a58-f614-fd9a-1bd335dccda9
 2012-02-05 16:18:18 +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
cd6b7e8680 Updated a warning... 
git-svn-id: http://find-object.googlecode.com/svn/trunk/find_object@77 620bd6b2-0a58-f614-fd9a-1bd335dccda9
 2012-01-30 03:20:04 +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
095aa8a1e9 Fixed not shown "uint" parameters 
git-svn-id: http://find-object.googlecode.com/svn/trunk/find_object@61 620bd6b2-0a58-f614-fd9a-1bd335dccda9
 2012-01-04 20:44:58 +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
cd13556789 New logo! 
git-svn-id: http://find-object.googlecode.com/svn/trunk/find_object@52 620bd6b2-0a58-f614-fd9a-1bd335dccda9
 2011-11-25 13:56:32 +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
708cfa9cff Updated the camera virtual interface 
git-svn-id: http://find-object.googlecode.com/svn/trunk/find_object@45 620bd6b2-0a58-f614-fd9a-1bd335dccda9
 2011-11-24 00:00:37 +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
matlabbe
541558a57a Added registerMetaType for cv::Mat 
git-svn-id: http://find-object.googlecode.com/svn/trunk/find_object@36 620bd6b2-0a58-f614-fd9a-1bd335dccda9
 2011-11-23 18:19:55 +00:00
matlabbe
a1c5be1d5b Fixed some warnings... 
git-svn-id: http://find-object.googlecode.com/svn/trunk/find_object@35 620bd6b2-0a58-f614-fd9a-1bd335dccda9
 2011-11-23 18:08:33 +00:00
matlabbe
acb12ac688 New camera interface using signals/slots (for ROS nodes) 
git-svn-id: http://find-object.googlecode.com/svn/trunk/find_object@34 620bd6b2-0a58-f614-fd9a-1bd335dccda9
 2011-11-23 16:44:14 +00:00
matlabbe
45f6b9fd17 Changed layout of find_object folders... moved main.cpp to app folder (prepare for ros externals...) 
git-svn-id: http://find-object.googlecode.com/svn/trunk/find_object@30 620bd6b2-0a58-f614-fd9a-1bd335dccda9
 2011-11-23 14:02:53 +00:00
matlabbe
91c2ac1f04 Added "Sized features" action 
Added "Set alpha" action

git-svn-id: http://find-object.googlecode.com/svn/trunk/find_object@26 620bd6b2-0a58-f614-fd9a-1bd335dccda9
 2011-11-18 16:09:23 +00:00
matlabbe
495da944ca Added "Scale view" action (only enabled in graphics view mode) 
git-svn-id: http://find-object.googlecode.com/svn/trunk/find_object@24 620bd6b2-0a58-f614-fd9a-1bd335dccda9
 2011-11-17 20:31:08 +00:00
matlabbe
a761af58da Added code example for descriptors extraction 
git-svn-id: http://find-object.googlecode.com/svn/trunk/find_object@20 620bd6b2-0a58-f614-fd9a-1bd335dccda9
 2011-11-15 16:37:40 +00:00
matlabbe
d71dcd00ea Fixed wrong GUI timing 
Updated version to 0.1.1

git-svn-id: http://find-object.googlecode.com/svn/trunk/find_object@19 620bd6b2-0a58-f614-fd9a-1bd335dccda9
 2011-11-10 14:29:38 +00:00
matlabbe
f2f1ab037a Windows : now saving config file to user's documents. 
git-svn-id: http://find-object.googlecode.com/svn/trunk/find_object@18 620bd6b2-0a58-f614-fd9a-1bd335dccda9
 2011-11-10 14:00:20 +00:00
matlabbe
8cd2d70954 Windows package : Removed version in the install directory path 
Windows : Object save figure in homePath

git-svn-id: http://find-object.googlecode.com/svn/trunk/find_object@17 620bd6b2-0a58-f614-fd9a-1bd335dccda9
 2011-11-09 21:17:52 +00:00
matlabbe
ca47c87b67 Settings default filename is now "config.ini" 
On Mac OS X and ubuntu, configuration file is saved in ~/.find_object
Added Mac OS X packaging (DragNDrop)

git-svn-id: http://find-object.googlecode.com/svn/trunk/find_object@16 620bd6b2-0a58-f614-fd9a-1bd335dccda9
 2011-11-09 20:48:04 +00:00
matlabbe
a600190f80 -Changed defaults to SURF/SURF and 2Hz camera 
-Added CPACK packaging for Windows

git-svn-id: http://find-object.googlecode.com/svn/trunk/find_object@15 620bd6b2-0a58-f614-fd9a-1bd335dccda9
 2011-11-09 19:01:46 +00:00
matlabbe
ab8fb21b38 Added rectangles to the plain view 
git-svn-id: http://find-object.googlecode.com/svn/trunk/find_object@14 620bd6b2-0a58-f614-fd9a-1bd335dccda9
 2011-11-09 15:07:19 +00:00
matlabbe
e78b7ca029 reverted eclipse project name to find_object 
git-svn-id: http://find-object.googlecode.com/svn/trunk/find_object@11 620bd6b2-0a58-f614-fd9a-1bd335dccda9
 2011-10-25 15:48:19 +00:00