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
Download Patch File Download Diff File Expand all files Collapse all files
src/FindObject.cpp
+2 -2
View File
@@ -48,7 +48,7 @@ FindObject::FindObject(QObject * parent) :
detector_(Settings::createKeypointDetector()),
extractor_(Settings::createDescriptorExtractor())
{
qRegisterMetaType<DetectionInfo>("DetectionInfo");
qRegisterMetaType<find_object::DetectionInfo>("find_object::DetectionInfo");
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;
totalTime.start();
src/MainWindow.cpp
+3 -3
View File
@@ -294,7 +294,7 @@ void MainWindow::setupTCPServer()
delete tcpServer_;
}
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_port->setNum(tcpServer_->getPort());
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;
}
void MainWindow::removeObject(ObjWidget * object)
void MainWindow::removeObject(find_object::ObjWidget * object)
{
if(object)
{
@@ -735,7 +735,7 @@ void MainWindow::showObject(ObjWidget * obj)
vLayout->addLayout(hLayout);
vLayout->addWidget(obj);
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 *)), detectedLabel, SLOT(deleteLater()));
connect(obj, SIGNAL(destroyed(QObject *)), detectorDescriptorType, SLOT(deleteLater()));