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

Added find_object namespace prefix to all signals and slots

Browse Source 
git-svn-id: http://find-object.googlecode.com/svn/trunk/find_object@381 620bd6b2-0a58-f614-fd9a-1bd335dccda9
This commit is contained in:
matlabbe 2014-08-06 14:09:55 +00:00
parent 26213d87c0
commit f16595d505
10 changed files with 46 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
app/main.cpp
View File

@ -38,8 +38,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include "find_object/JsonWriter.h" #include "find_object/JsonWriter.h"
#include "find_object/utilite/ULogger.h" #include "find_object/utilite/ULogger.h"
using namespace find_object;
bool running = true; bool running = true;
#ifdef WIN32 #ifdef WIN32
@ -108,8 +106,8 @@ void showUsage()
" --My/Parameter \"value\" Set find-Object's parameter (look --params for parameters' name).\n" " --My/Parameter \"value\" Set find-Object's parameter (look --params for parameters' name).\n"
" It will override the one in --config. Example to set 4 threads:\n" " It will override the one in --config. Example to set 4 threads:\n"
" $ find_object --General/threads 4\n" " $ find_object --General/threads 4\n"
" --help Show usage.\n", Settings::iniDefaultPath().toStdString().c_str()); " --help Show usage.\n", find_object::Settings::iniDefaultPath().toStdString().c_str());
if(JsonWriter::available()) if(find_object::JsonWriter::available())
{ {
printf(" --json \"path\" Path to an output JSON file (only in --console mode with --scene).\n"); printf(" --json \"path\" Path to an output JSON file (only in --console mode with --scene).\n");
} }
@ -129,9 +127,9 @@ int main(int argc, char* argv[])
bool guiMode = true; bool guiMode = true;
QString objectsPath = ""; QString objectsPath = "";
QString scenePath = ""; QString scenePath = "";
QString configPath = Settings::iniDefaultPath(); QString configPath = find_object::Settings::iniDefaultPath();
QString jsonPath; QString jsonPath;
ParametersMap customParameters; find_object::ParametersMap customParameters;
for(int i=1; i<argc; ++i) for(int i=1; i<argc; ++i)
{ {
@ -216,7 +214,7 @@ int main(int argc, char* argv[])
{ {
showUsage(); showUsage();
} }
if(JsonWriter::available()) if(find_object::JsonWriter::available())
{ {
if(strcmp(argv[i], "-json") == 0 || if(strcmp(argv[i], "-json") == 0 ||
strcmp(argv[i], "--json") == 0) strcmp(argv[i], "--json") == 0)
@ -239,15 +237,15 @@ int main(int argc, char* argv[])
} }
if(strcmp(argv[i], "--params") == 0) if(strcmp(argv[i], "--params") == 0)
{ {
ParametersMap parameters = Settings::getDefaultParameters(); find_object::ParametersMap parameters = find_object::Settings::getDefaultParameters();
for(ParametersMap::iterator iter=parameters.begin(); iter!=parameters.end(); ++iter) for(find_object::ParametersMap::iterator iter=parameters.begin(); iter!=parameters.end(); ++iter)
{ {
std::string str = "Param: " + iter.key().toStdString() + " = \"" + iter.value().toString().toStdString() + "\""; std::string str = "Param: " + iter.key().toStdString() + " = \"" + iter.value().toString().toStdString() + "\"";
std::cout << std::cout <<
str << str <<
std::setw(60 - str.size()) << std::setw(60 - str.size()) <<
" [" << " [" <<
Settings::getDescriptions().value(iter.key()).toStdString().c_str() << find_object::Settings::getDescriptions().value(iter.key()).toStdString().c_str() <<
"]" << "]" <<
std::endl; std::endl;
} }
@ -257,7 +255,7 @@ int main(int argc, char* argv[])
} }
// Check for custom parameters: // Check for custom parameters:
ParametersMap parameters = Settings::getDefaultParameters(); find_object::ParametersMap parameters = find_object::Settings::getDefaultParameters();
QString name = argv[i]; QString name = argv[i];
if(name.size() > 2) if(name.size() > 2)
{ {
@ -287,11 +285,11 @@ int main(int argc, char* argv[])
UINFO(" Objects path: \"%s\"", objectsPath.toStdString().c_str()); UINFO(" Objects path: \"%s\"", objectsPath.toStdString().c_str());
UINFO(" Scene path: \"%s\"", scenePath.toStdString().c_str()); UINFO(" Scene path: \"%s\"", scenePath.toStdString().c_str());
UINFO(" Settings path: \"%s\"", configPath.toStdString().c_str()); UINFO(" Settings path: \"%s\"", configPath.toStdString().c_str());
if(JsonWriter::available()) if(find_object::JsonWriter::available())
{ {
UINFO(" JSON path: \"%s\"", jsonPath.toStdString().c_str()); UINFO(" JSON path: \"%s\"", jsonPath.toStdString().c_str());
} }
for(ParametersMap::iterator iter= customParameters.begin(); iter!=customParameters.end(); ++iter) for(find_object::ParametersMap::iterator iter= customParameters.begin(); iter!=customParameters.end(); ++iter)
{ {
UINFO(" Param \"%s\"=\"%s\"", iter.key().toStdString().c_str(), iter.value().toString().toStdString().c_str()); UINFO(" Param \"%s\"=\"%s\"", iter.key().toStdString().c_str(), iter.value().toString().toStdString().c_str());
} }
@ -301,16 +299,16 @@ int main(int argc, char* argv[])
////////////////////////// //////////////////////////
// Load settings, should be loaded before creating other objects // Load settings, should be loaded before creating other objects
Settings::init(configPath); find_object::Settings::init(configPath);
// Override custom parameters: // Override custom parameters:
for(ParametersMap::iterator iter= customParameters.begin(); iter!=customParameters.end(); ++iter) for(find_object::ParametersMap::iterator iter= customParameters.begin(); iter!=customParameters.end(); ++iter)
{ {
Settings::setParameter(iter.key(), iter.value()); find_object::Settings::setParameter(iter.key(), iter.value());
} }
// Create FindObject // Create FindObject
FindObject * findObject = new FindObject(); find_object::FindObject * findObject = new find_object::FindObject();
// Load objects if path is set // Load objects if path is set
int objectsLoaded = 0; int objectsLoaded = 0;
@ -335,7 +333,7 @@ int main(int argc, char* argv[])
if(guiMode) if(guiMode)
{ {
QApplication app(argc, argv); QApplication app(argc, argv);
MainWindow mainWindow(findObject, 0); // ownership transfered find_object::MainWindow mainWindow(findObject, 0); // ownership transfered
app.connect( &app, SIGNAL( lastWindowClosed() ), &app, SLOT( quit() ) ); app.connect( &app, SIGNAL( lastWindowClosed() ), &app, SLOT( quit() ) );
mainWindow.show(); mainWindow.show();
@ -348,7 +346,7 @@ int main(int argc, char* argv[])
app.exec(); app.exec();
// Save settings // Save settings
Settings::saveSettings(); find_object::Settings::saveSettings();
} }
else else
{ {
@ -366,7 +364,7 @@ int main(int argc, char* argv[])
// process the scene and exit // process the scene and exit
QTime time; QTime time;
time.start(); time.start();
DetectionInfo info; find_object::DetectionInfo info;
findObject->detect(scene, info); findObject->detect(scene, info);
if(info.objDetected_.size() > 1) if(info.objDetected_.size() > 1)
@ -377,26 +375,26 @@ int main(int argc, char* argv[])
{ {
UINFO("Object %d detected! (%d ms)", (int)info.objDetected_.begin().key(), time.elapsed()); UINFO("Object %d detected! (%d ms)", (int)info.objDetected_.begin().key(), time.elapsed());
} }
else if(Settings::getGeneral_sendNoObjDetectedEvents()) else if(find_object::Settings::getGeneral_sendNoObjDetectedEvents())
{ {
UINFO("No objects detected. (%d ms)", time.elapsed()); UINFO("No objects detected. (%d ms)", time.elapsed());
} }
if(!jsonPath.isEmpty() && JsonWriter::available()) if(!jsonPath.isEmpty() && find_object::JsonWriter::available())
{ {
JsonWriter::write(info, jsonPath); find_object::JsonWriter::write(info, jsonPath);
UINFO("JSON written to \"%s\"", jsonPath.toStdString().c_str()); UINFO("JSON written to \"%s\"", jsonPath.toStdString().c_str());
} }
} }
else else
{ {
Camera camera; find_object::Camera camera;
TcpServer tcpServer(Settings::getGeneral_port()); find_object::TcpServer tcpServer(find_object::Settings::getGeneral_port());
UINFO("Detection sent on port: %d (IP=%s)", tcpServer.getPort(), tcpServer.getHostAddress().toString().toStdString().c_str()); UINFO("Detection sent on port: %d (IP=%s)", tcpServer.getPort(), tcpServer.getHostAddress().toString().toStdString().c_str());
// connect stuff: // connect stuff:
// [FindObject] ---ObjectsDetected---> [TcpServer] // [FindObject] ---ObjectsDetected---> [TcpServer]
QObject::connect(findObject, SIGNAL(objectsFound(DetectionInfo)), &tcpServer, SLOT(publishDetectionInfo(DetectionInfo))); QObject::connect(findObject, SIGNAL(objectsFound(find_object::DetectionInfo)), &tcpServer, SLOT(publishDetectionInfo(find_object::DetectionInfo)));
// [Camera] ---Image---> [FindObject] // [Camera] ---Image---> [FindObject]
QObject::connect(&camera, SIGNAL(imageReceived(const cv::Mat &)), findObject, SLOT(detect(const cv::Mat &))); QObject::connect(&camera, SIGNAL(imageReceived(const cv::Mat &)), findObject, SLOT(detect(const cv::Mat &)));

4
include/find_object/FindObject.h
View File

@ -65,7 +65,7 @@ public:
void removeObject(int id); void removeObject(int id);
void removeAllObjects(); void removeAllObjects();
bool detect(const cv::Mat & image, DetectionInfo & info); bool detect(const cv::Mat & image, find_object::DetectionInfo & info);
void updateDetectorExtractor(); void updateDetectorExtractor();
void updateObjects(); void updateObjects();
@ -78,7 +78,7 @@ public Q_SLOTS:
void detect(const cv::Mat & image); // emit objectsFound() void detect(const cv::Mat & image); // emit objectsFound()
Q_SIGNALS: Q_SIGNALS:
void objectsFound(const DetectionInfo &); void objectsFound(const find_object::DetectionInfo &);
private: private:
void clearVocabulary(); void clearVocabulary();

12
include/find_object/MainWindow.h
View File

@ -66,7 +66,7 @@ class FINDOBJECT_EXP MainWindow : public QMainWindow
Q_OBJECT Q_OBJECT
public: public:
MainWindow(FindObject * findObject, Camera * camera = 0, QWidget * parent = 0); MainWindow(find_object::FindObject * findObject, find_object::Camera * camera = 0, QWidget * parent = 0);
virtual ~MainWindow(); virtual ~MainWindow();
void setSourceImageText(const QString & text); void setSourceImageText(const QString & text);
@ -91,7 +91,7 @@ private Q_SLOTS:
void setupCameraFromVideoFile(); void setupCameraFromVideoFile();
void setupCameraFromImagesDirectory(); void setupCameraFromImagesDirectory();
void setupCameraFromTcpIp(); void setupCameraFromTcpIp();
void removeObject(ObjWidget * object); void removeObject(find_object::ObjWidget * object);
void removeAllObjects(); void removeAllObjects();
void updateObjectsSize(); void updateObjectsSize();
void updateMirrorView(); void updateMirrorView();
@ -102,7 +102,7 @@ private Q_SLOTS:
void rectHovered(int objId); void rectHovered(int objId);
Q_SIGNALS: Q_SIGNALS:
void objectsFound(const DetectionInfo &); void objectsFound(const find_object::DetectionInfo &);
private: private:
bool loadSettings(const QString & path); bool loadSettings(const QString & path);
@ -111,8 +111,8 @@ private:
int saveObjects(const QString & dirPath); int saveObjects(const QString & dirPath);
void setupTCPServer(); void setupTCPServer();
bool addObjectFromFile(const QString & filePath); bool addObjectFromFile(const QString & filePath);
void showObject(ObjWidget * obj); void showObject(find_object::ObjWidget * obj);
void updateObjectSize(ObjWidget * obj); void updateObjectSize(find_object::ObjWidget * obj);
void updateVocabulary(); void updateVocabulary();
private: private:
@ -122,7 +122,7 @@ private:
rtabmap::PdfPlotCurve * likelihoodCurve_; rtabmap::PdfPlotCurve * likelihoodCurve_;
rtabmap::PdfPlotCurve * inliersCurve_; rtabmap::PdfPlotCurve * inliersCurve_;
AboutDialog * aboutDialog_; AboutDialog * aboutDialog_;
QMap<int, ObjWidget*> objWidgets_; QMap<int, find_object::ObjWidget*> objWidgets_;
QTime updateRate_; QTime updateRate_;
QTime refreshStartTime_; QTime refreshStartTime_;
int lowestRefreshRate_; int lowestRefreshRate_;

2
include/find_object/ObjWidget.h
View File

@ -96,7 +96,7 @@ protected:
virtual void mouseReleaseEvent(QMouseEvent * event); virtual void mouseReleaseEvent(QMouseEvent * event);
Q_SIGNALS: Q_SIGNALS:
void removalTriggered(ObjWidget *); void removalTriggered(find_object::ObjWidget *);
void selectionChanged(); void selectionChanged();
void roiChanged(const cv::Rect &); void roiChanged(const cv::Rect &);

2
include/find_object/TcpServer.h
View File

@ -49,7 +49,7 @@ public:
quint16 getPort() const; quint16 getPort() const;
public Q_SLOTS: public Q_SLOTS:
void publishDetectionInfo(const DetectionInfo & info); void publishDetectionInfo(const find_object::DetectionInfo & info);
private Q_SLOTS: private Q_SLOTS:
void addClient(); void addClient();

4
src/FindObject.cpp
View File

@ -48,7 +48,7 @@ FindObject::FindObject(QObject * parent) :
detector_(Settings::createKeypointDetector()), detector_(Settings::createKeypointDetector()),
extractor_(Settings::createDescriptorExtractor()) extractor_(Settings::createDescriptorExtractor())
{ {
qRegisterMetaType<DetectionInfo>("DetectionInfo"); qRegisterMetaType<find_object::DetectionInfo>("find_object::DetectionInfo");
Q_ASSERT(detector_ != 0 && extractor_ != 0); Q_ASSERT(detector_ != 0 && extractor_ != 0);
} }
@ -655,7 +655,7 @@ void FindObject::detect(const cv::Mat & image)
} }
} }
bool FindObject::detect(const cv::Mat & image, DetectionInfo & info) bool FindObject::detect(const cv::Mat & image, find_object::DetectionInfo & info)
{ {
QTime totalTime; QTime totalTime;
totalTime.start(); totalTime.start();

6
src/MainWindow.cpp
View File

@ -294,7 +294,7 @@ void MainWindow::setupTCPServer()
delete tcpServer_; delete tcpServer_;
} }
tcpServer_ = new TcpServer(Settings::getGeneral_port(), this); tcpServer_ = new TcpServer(Settings::getGeneral_port(), this);
connect(this, SIGNAL(objectsFound(DetectionInfo)), tcpServer_, SLOT(publishDetectionInfo(DetectionInfo))); connect(this, SIGNAL(objectsFound(find_object::DetectionInfo)), tcpServer_, SLOT(publishDetectionInfo(find_object::DetectionInfo)));
ui_->label_ipAddress->setText(tcpServer_->getHostAddress().toString()); ui_->label_ipAddress->setText(tcpServer_->getHostAddress().toString());
ui_->label_port->setNum(tcpServer_->getPort()); ui_->label_port->setNum(tcpServer_->getPort());
UINFO("Detection sent on port: %d (IP=%s)", tcpServer_->getPort(), tcpServer_->getHostAddress().toString().toStdString().c_str()); UINFO("Detection sent on port: %d (IP=%s)", tcpServer_->getPort(), tcpServer_->getHostAddress().toString().toStdString().c_str());
@ -446,7 +446,7 @@ bool MainWindow::saveObjects()
return false; return false;
} }
void MainWindow::removeObject(ObjWidget * object) void MainWindow::removeObject(find_object::ObjWidget * object)
{ {
if(object) if(object)
{ {
@ -735,7 +735,7 @@ void MainWindow::showObject(ObjWidget * obj)
vLayout->addLayout(hLayout); vLayout->addLayout(hLayout);
vLayout->addWidget(obj); vLayout->addWidget(obj);
obj->setDeletable(true); obj->setDeletable(true);
connect(obj, SIGNAL(removalTriggered(ObjWidget*)), this, SLOT(removeObject(ObjWidget*))); connect(obj, SIGNAL(removalTriggered(find_object::ObjWidget*)), this, SLOT(removeObject(find_object::ObjWidget*)));
connect(obj, SIGNAL(destroyed(QObject *)), title, SLOT(deleteLater())); connect(obj, SIGNAL(destroyed(QObject *)), title, SLOT(deleteLater()));
connect(obj, SIGNAL(destroyed(QObject *)), detectedLabel, SLOT(deleteLater())); connect(obj, SIGNAL(destroyed(QObject *)), detectedLabel, SLOT(deleteLater()));
connect(obj, SIGNAL(destroyed(QObject *)), detectorDescriptorType, SLOT(deleteLater())); connect(obj, SIGNAL(destroyed(QObject *)), detectorDescriptorType, SLOT(deleteLater()));

4
tools/tcpClient/TcpClient.cpp
View File

@ -32,8 +32,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include <QtCore/QPointF> #include <QtCore/QPointF>
#include <QtCore/QTime> #include <QtCore/QTime>
using namespace find_object;
TcpClient::TcpClient(QObject *parent) : TcpClient::TcpClient(QObject *parent) :
QTcpSocket(parent), QTcpSocket(parent),
blockSize_(0) blockSize_(0)
@ -65,7 +63,7 @@ void TcpClient::readReceivedData()
blockSize_ = 0; blockSize_ = 0;
DetectionInfo info; find_object::DetectionInfo info;
in >> info; in >> info;
printf("---\n"); printf("---\n");

6
tools/tcpImagesServer/ImagesTcpServer.cpp
View File

@ -33,14 +33,12 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include <QtNetwork/QTcpSocket> #include <QtNetwork/QTcpSocket>
#include <QtGui/QTransform> #include <QtGui/QTransform>
using namespace find_object;
ImagesTcpServer::ImagesTcpServer(float hz, const QString & path, QObject * parent) : ImagesTcpServer::ImagesTcpServer(float hz, const QString & path, QObject * parent) :
QTcpSocket(parent) QTcpSocket(parent)
{ {
// Set camera parameters // Set camera parameters
Settings::setCamera_4imageRate(hz); find_object::Settings::setCamera_4imageRate(hz);
Settings::setCamera_5mediaPath(path); find_object::Settings::setCamera_5mediaPath(path);
connect(&camera_, SIGNAL(imageReceived(const cv::Mat &)), this, SLOT(publishImage(const cv::Mat &))); connect(&camera_, SIGNAL(imageReceived(const cv::Mat &)), this, SLOT(publishImage(const cv::Mat &)));
connect(this, SIGNAL(connected()), this, SLOT(startCamera())); connect(this, SIGNAL(connected()), this, SLOT(startCamera()));

10
tools/tcpRequest/main.cpp
View File

@ -33,8 +33,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include "TcpResponse.h" #include "TcpResponse.h"
#include "find_object/JsonWriter.h" #include "find_object/JsonWriter.h"
using namespace find_object;
void showUsage() void showUsage()
{ {
printf("\ntcpRequest [options] --scene image.png --out # --in #\n" printf("\ntcpRequest [options] --scene image.png --out # --in #\n"
@ -42,7 +40,7 @@ void showUsage()
" \"in\" is the port from which the detection is received.\n" " \"in\" is the port from which the detection is received.\n"
" Options:\n" " Options:\n"
" --host #.#.#.# Set host address.\n"); " --host #.#.#.# Set host address.\n");
if(JsonWriter::available()) if(find_object::JsonWriter::available())
{ {
printf(" --json \"path\" Path to an output JSON file.\n"); printf(" --json \"path\" Path to an output JSON file.\n");
} }
@ -116,7 +114,7 @@ int main(int argc, char * argv[])
continue; continue;
} }
if(JsonWriter::available()) if(find_object::JsonWriter::available())
{ {
if(strcmp(argv[i], "--json") == 0 || strcmp(argv[i], "-json") == 0) if(strcmp(argv[i], "--json") == 0 || strcmp(argv[i], "-json") == 0)
{ {
@ -236,9 +234,9 @@ int main(int argc, char * argv[])
printf("No objects detected.\n"); printf("No objects detected.\n");
} }
// write json // write json
if(!jsonPath.isEmpty() && JsonWriter::available()) if(!jsonPath.isEmpty() && find_object::JsonWriter::available())
{ {
JsonWriter::write(response.info(), jsonPath); find_object::JsonWriter::write(response.info(), jsonPath);
printf("JSON written to \"%s\"\n", jsonPath.toStdString().c_str()); printf("JSON written to \"%s\"\n", jsonPath.toStdString().c_str());
} }
} }