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
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
+2 -2
View File
@@ -65,7 +65,7 @@ public:
void removeObject(int id);
void removeAllObjects();
bool detect(const cv::Mat & image, DetectionInfo & info);
bool detect(const cv::Mat & image, find_object::DetectionInfo & info);
void updateDetectorExtractor();
void updateObjects();
@@ -78,7 +78,7 @@ public Q_SLOTS:
void detect(const cv::Mat & image); // emit objectsFound()
Q_SIGNALS:
void objectsFound(const DetectionInfo &);
void objectsFound(const find_object::DetectionInfo &);
private:
void clearVocabulary();
+6 -6
View File
@@ -66,7 +66,7 @@ class FINDOBJECT_EXP MainWindow : public QMainWindow
Q_OBJECT
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();
void setSourceImageText(const QString & text);
@@ -91,7 +91,7 @@ private Q_SLOTS:
void setupCameraFromVideoFile();
void setupCameraFromImagesDirectory();
void setupCameraFromTcpIp();
void removeObject(ObjWidget * object);
void removeObject(find_object::ObjWidget * object);
void removeAllObjects();
void updateObjectsSize();
void updateMirrorView();
@@ -102,7 +102,7 @@ private Q_SLOTS:
void rectHovered(int objId);
Q_SIGNALS:
void objectsFound(const DetectionInfo &);
void objectsFound(const find_object::DetectionInfo &);
private:
bool loadSettings(const QString & path);
@@ -111,8 +111,8 @@ private:
int saveObjects(const QString & dirPath);
void setupTCPServer();
bool addObjectFromFile(const QString & filePath);
void showObject(ObjWidget * obj);
void updateObjectSize(ObjWidget * obj);
void showObject(find_object::ObjWidget * obj);
void updateObjectSize(find_object::ObjWidget * obj);
void updateVocabulary();
private:
@@ -122,7 +122,7 @@ private:
rtabmap::PdfPlotCurve * likelihoodCurve_;
rtabmap::PdfPlotCurve * inliersCurve_;
AboutDialog * aboutDialog_;
QMap<int, ObjWidget*> objWidgets_;
QMap<int, find_object::ObjWidget*> objWidgets_;
QTime updateRate_;
QTime refreshStartTime_;
int lowestRefreshRate_;
+1 -1
View File
@@ -96,7 +96,7 @@ protected:
virtual void mouseReleaseEvent(QMouseEvent * event);
Q_SIGNALS:
void removalTriggered(ObjWidget *);
void removalTriggered(find_object::ObjWidget *);
void selectionChanged();
void roiChanged(const cv::Rect &);
+1 -1
View File
@@ -49,7 +49,7 @@ public:
quint16 getPort() const;
public Q_SLOTS:
void publishDetectionInfo(const DetectionInfo & info);
void publishDetectionInfo(const find_object::DetectionInfo & info);
private Q_SLOTS:
void addClient();