apoorva/greenhouse
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added JSON optional output when in console mode (see --json option)

Browse Source 
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
This commit is contained in:
matlabbe
2014-08-01 21:11:26 +00:00
parent 43e855e822
commit 6a0136cc16
18 changed files with 482 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/find_object/FindObject.h
+3 -1
View File
@@ -53,6 +53,7 @@ public:
const QMap<int, ObjSignature*> & objects() const {return objects_;}
const Vocabulary * vocabulary() const {return vocabulary_;}
const QMultiMap<int,QPair<QRect,QTransform> > & objectsDetected() const {return objectsDetected_;}
const QMap<TimeStamp, float> & timeStamps() const {return timeStamps_;}
const std::vector<cv::KeyPoint> & sceneKeypoints() const {return sceneKeypoints_;}
const cv::Mat & sceneDescriptors() const {return sceneDescriptors_;}
@@ -66,7 +67,7 @@ public:
float maxMatchedDistance() const {return maxMatchedDistance_;}
public Q_SLOTS:
void detect(const cv::Mat & image);
void detect(const cv::Mat & image); // emit objectsfound()
Q_SIGNALS:
void objectsFound(const QMultiMap<int, QPair<QRect, QTransform> > &);
@@ -82,6 +83,7 @@ private:
KeypointDetector * detector_;
DescriptorExtractor * extractor_;
QMultiMap<int,QPair<QRect,QTransform> > objectsDetected_;
QMap<TimeStamp, float> timeStamps_;
std::vector<cv::KeyPoint> sceneKeypoints_;
cv::Mat sceneDescriptors_;
include/find_object/MainWindow.h
+1 -1
View File
@@ -50,6 +50,7 @@ public Q_SLOTS:
void startProcessing();
void stopProcessing();
void pauseProcessing();
void update(const cv::Mat & image = cv::Mat());
private Q_SLOTS:
void loadSettings();
@@ -67,7 +68,6 @@ private Q_SLOTS:
void updateObjectsSize();
void updateMirrorView();
void showHideControls();
void update(const cv::Mat & image = cv::Mat());
void updateObjects();
void notifyParametersChanged(const QStringList & param);
void moveCameraFrame(int frame);