diff --git a/MobileRobot/MobRobGUI/MobileRobotGUI/MobileRobotGUI.pro.user b/MobileRobot/MobRobGUI/MobileRobotGUI/MobileRobotGUI.pro.user
index 754f6d6a28e0b27fadf66470a76192c70be3f9c9..30448badcac0f89b218324ff10e0029b67ea9172 100644
--- a/MobileRobot/MobRobGUI/MobileRobotGUI/MobileRobotGUI.pro.user
+++ b/MobileRobot/MobRobGUI/MobileRobotGUI/MobileRobotGUI.pro.user
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE QtCreatorProject>
-<!-- Written by QtCreator 3.5.1, 2015-11-25T21:14:07. -->
+<!-- Written by QtCreator 3.5.1, 2015-11-26T22:59:30. -->
<qtcreator>
<data>
<variable>EnvironmentId</variable>
diff --git a/MobileRobot/MobRobGUI/MobileRobotGUI/gui.cpp b/MobileRobot/MobRobGUI/MobileRobotGUI/gui.cpp
index 3edd1f40baaaf2ba5b19b77d7dd9817425e6c50e..c8847d21d290367e1f2e305b06b2cae8d933cfbd 100644
--- a/MobileRobot/MobRobGUI/MobileRobotGUI/gui.cpp
+++ b/MobileRobot/MobRobGUI/MobileRobotGUI/gui.cpp
@@ -5,7 +5,7 @@
#include<iostream>
#include<stdio.h>
-
+#include <QTime>
using namespace std;
@@ -17,7 +17,9 @@ GUI::GUI(QWidget *parent) :QMainWindow(parent),ui(new Ui::GUI)
Dock();
VideoStream();
ProgQuit();
-
+ timer = new QTimer(this);
+ connect(timer,SIGNAL(timeout()),this,SLOT(updatePos()));
+ timer->start(100);
}
GUI::~GUI()
@@ -27,7 +29,6 @@ GUI::~GUI()
}
-
void GUI::GoToDocking()
{
btnGoToDocking.setParent(ui->centralWidget);
@@ -41,7 +42,6 @@ void GUI::Dock()
btnDock.setGeometry(70,80,250,30);
btnDock.setText("Dock");
}
-
void GUI::VideoStream()
{
btnVideoStream.setParent(ui->centralWidget);
@@ -49,21 +49,23 @@ void GUI::VideoStream()
btnVideoStream.setText("Video Stream");
Xposlbl.setParent(ui->centralWidget);
- Xposlbl.setGeometry(330,110,150,30);
- Xposlbl.setText("X position of the ball :");
Xpos.setParent(ui->centralWidget);
- Xpos.setGeometry(330,140,50,30);
-
Yposlbl.setParent(ui->centralWidget);
- Yposlbl.setGeometry(500,110,300,30);
- Yposlbl.setText("Y position of the ball :");
Ypos.setParent(ui->centralWidget);
- Ypos.setGeometry(500,140,50,30);
+
+ Xposlbl.setText("X = ");
+ Xposlbl.setGeometry(70,260,50,30);
+ Xpos.setGeometry(100,260,75,30);
+ Yposlbl.setText("Y = ");
+ Yposlbl.setGeometry(210,260,50,30);
+ Ypos.setGeometry(240,260,75,30);
+
vizz = new Visualization();
connect(&btnVideoStream,SIGNAL(clicked()),vizz,SLOT(progStart()));
+
}
void GUI::ProgQuit()
@@ -74,3 +76,13 @@ void GUI::ProgQuit()
connect(&btnExit,SIGNAL(clicked()),this,SLOT(close()));
}
+void GUI::updatePos()
+{
+ vizz2 = new Visualization();
+ QString numX = QString::number(vizz2->getPosX());
+ Xpos.setText(numX);
+
+ vizz3 = new Visualization();
+ QString numY = QString::number(vizz3->getPOSY());
+ Ypos.setText(numY);
+}
diff --git a/MobileRobot/MobRobGUI/MobileRobotGUI/gui.h b/MobileRobot/MobRobGUI/MobileRobotGUI/gui.h
index de0fc8159bafaaec8064cf7721846981f484c23c..2fa149219901685b0128bd9ce6d2dbe8961900b8 100644
--- a/MobileRobot/MobRobGUI/MobileRobotGUI/gui.h
+++ b/MobileRobot/MobRobGUI/MobileRobotGUI/gui.h
@@ -6,6 +6,9 @@
#include "visualization.h"
#include <QLineEdit>
#include <QLabel>
+#include <QCheckBox>
+#include <QRadioButton>
+#include <QTimer>
namespace Ui {
class GUI;
@@ -23,13 +26,17 @@ public:
void Dock();
void VideoStream();
void ProgQuit();
-
+public slots:
+ void updatePos();
private:
Ui::GUI *ui;
Visualization *vizz;
+ Visualization *vizz2;
+
+ Visualization *vizz3;
QPushButton btnGoToDocking;
@@ -38,14 +45,15 @@ private:
QPushButton btnVideoStream;
QPushButton btnExit;
+ // QCheckBox btnXpos;
+ //QRadioButton btnXX;
+ QTimer *timer;
QLineEdit Xpos;
QLineEdit Ypos;
QLabel Xposlbl;
QLabel Yposlbl;
-
-
};
#endif // GUI_H
diff --git a/MobileRobot/MobRobGUI/MobileRobotGUI/main.cpp b/MobileRobot/MobRobGUI/MobileRobotGUI/main.cpp
index 36be58a285561a48f20ee46b06b712c7ae8f438a..65b796bec9047c9cd651db78f8f21e0a1c05e658 100644
--- a/MobileRobot/MobRobGUI/MobileRobotGUI/main.cpp
+++ b/MobileRobot/MobRobGUI/MobileRobotGUI/main.cpp
@@ -8,8 +8,5 @@ int main(int argc, char *argv[])
GUI w;
w.showMaximized();
- /*Visualization vis;
- vis.progStart();*/
-
return a.exec();
}
diff --git a/MobileRobot/MobRobGUI/MobileRobotGUI/visualization.cpp b/MobileRobot/MobRobGUI/MobileRobotGUI/visualization.cpp
index c4fe1603a0e7a13e5ce189258229b7e82a63a1eb..b9e539cfd4f9035bd80fb69a7d18da2ac6563f56 100644
--- a/MobileRobot/MobRobGUI/MobileRobotGUI/visualization.cpp
+++ b/MobileRobot/MobRobGUI/MobileRobotGUI/visualization.cpp
@@ -32,6 +32,9 @@ bool Visualization::useMorphOps = true;
int Visualization::x = 0;
int Visualization::y = 0;
+int Visualization::savedX = 0;
+int Visualization::savedY = 0;
+
Visualization::Visualization(QObject *parent) : QObject(parent)
{
@@ -154,26 +157,23 @@ void Visualization::trackFilteredObject(int &x, int &y, Mat threshold, Mat &came
refArea = area;
}
else objectFound = false;
-
-
}
//let user know you found an object
if (objectFound == true){
putText(cameraFeed, "Tracking Object!", Point(0, 50), 2, 1, Scalar(0, 255, 0), 2);
//draw object location on screen
drawObject(x, y, cameraFeed);
- //cout << "\nx: \n\n" << x;
- //cout << "\ny: \n\n" << y;
- cout << "\n x = " << x << "\n y = " << y;
+ getPOS(x,y);
}
}
- else putText(cameraFeed, "TOO MUCH NOISE! ADJUST FILTER", Point(0, 50), 1, 2, Scalar(0, 0, 255), 2);
- cout << "\nOops! no object... \n\n";
+ else
+ putText(cameraFeed, "TOO MUCH NOISE! ADJUST FILTER", Point(0, 50), 1, 2, Scalar(0, 0, 255), 2);
+ noObjFound();
}
+ return;
}
-
void Visualization::progStart()
{
cout<< "\n The camera is ready to launch... \n" << endl;
@@ -214,3 +214,29 @@ void Visualization::progStart()
}
}
+
+void Visualization::getPOS(int inpX, int inpY)
+{
+
+ savedX = inpX;
+ savedY = inpY;
+
+ cout << "\n x = " << savedX;
+ cout << "\n y = " << savedY;
+}
+
+void Visualization::noObjFound()
+{
+ cout << "\nOops! no object... \n\n";
+}
+
+
+int Visualization::getPosX()
+{
+ return x;
+}
+
+int Visualization::getPOSY()
+{
+ return y;
+}
diff --git a/MobileRobot/MobRobGUI/MobileRobotGUI/visualization.h b/MobileRobot/MobRobGUI/MobileRobotGUI/visualization.h
index 33ebc103e30b0caf8669ea598807fcdebdc0b013..43b888cae7f6e830d60967ae3b842eb6623a4a7a 100644
--- a/MobileRobot/MobRobGUI/MobileRobotGUI/visualization.h
+++ b/MobileRobot/MobRobGUI/MobileRobotGUI/visualization.h
@@ -41,9 +41,22 @@ public:
void trackFilteredObject(int &x, int &y, Mat threshold, Mat &cameraFeed);
+ void noObjFound();
+
+ static int savedX;
+ static int savedY;
+
+ int getPosX();
+ int getPOSY();
+
public slots:
void progStart();
+ void getPOS(int inpX, int inpY);
+
+
+
+
private:
static bool trackObjects;
@@ -57,7 +70,7 @@ private:
//matrix storage for binary threshold image
cv::Mat threshold;
//x and y values for the location of the object
- static int x, y;
+
//video capture object to acquire webcam feed
cv::VideoCapture capture;
@@ -88,7 +101,7 @@ private:
static const string trackbarWindowName;
static const string btnWindowName;
-
+ static int x, y;
};
diff --git a/MobileRobot/MobRobGUI/build-MobileRobotGUI-Desktop_Qt_5_5_1_GCC_64bit-Debug/Makefile b/MobileRobot/MobRobGUI/build-MobileRobotGUI-Desktop_Qt_5_5_1_GCC_64bit-Debug/Makefile
index c896d349ece982e38fa4b359c63c4ed8846bf002..1f12649fff26d750a3e39497419255d2024b0b6e 100644
--- a/MobileRobot/MobRobGUI/build-MobileRobotGUI-Desktop_Qt_5_5_1_GCC_64bit-Debug/Makefile
+++ b/MobileRobot/MobRobGUI/build-MobileRobotGUI-Desktop_Qt_5_5_1_GCC_64bit-Debug/Makefile
@@ -678,6 +678,15 @@ moc_gui.cpp: ../../../../Qt/5.5/gcc_64/include/QtWidgets/QMainWindow \
/usr/local/include/opencv2/contrib/contrib.hpp \
/usr/local/include/opencv2/contrib/retina.hpp \
/usr/local/include/opencv2/contrib/openfabmap.hpp \
+ ../../../../Qt/5.5/gcc_64/include/QtWidgets/QLineEdit \
+ ../../../../Qt/5.5/gcc_64/include/QtWidgets/qlineedit.h \
+ ../../../../Qt/5.5/gcc_64/include/QtWidgets/qframe.h \
+ ../../../../Qt/5.5/gcc_64/include/QtGui/qtextcursor.h \
+ ../../../../Qt/5.5/gcc_64/include/QtGui/qtextformat.h \
+ ../../../../Qt/5.5/gcc_64/include/QtGui/qpen.h \
+ ../../../../Qt/5.5/gcc_64/include/QtGui/qtextoption.h \
+ ../../../../Qt/5.5/gcc_64/include/QtWidgets/QLabel \
+ ../../../../Qt/5.5/gcc_64/include/QtWidgets/qlabel.h \
../MobileRobotGUI/gui.h
/home/faridalijani/Qt/5.5/gcc_64/bin/moc $(DEFINES) -I/home/faridalijani/Qt/5.5/gcc_64/mkspecs/linux-g++ -I/home/faridalijani/thesis/MobileRobot/MobRobGUI/MobileRobotGUI -I/usr/local/include -I/home/faridalijani/Qt/5.5/gcc_64/include -I/home/faridalijani/Qt/5.5/gcc_64/include/QtWidgets -I/home/faridalijani/Qt/5.5/gcc_64/include/QtGui -I/home/faridalijani/Qt/5.5/gcc_64/include/QtCore -I. ../MobileRobotGUI/gui.h -o moc_gui.cpp
@@ -914,6 +923,15 @@ main.o: ../MobileRobotGUI/main.cpp ../MobileRobotGUI/gui.h \
/usr/local/include/opencv2/contrib/contrib.hpp \
/usr/local/include/opencv2/contrib/retina.hpp \
/usr/local/include/opencv2/contrib/openfabmap.hpp \
+ ../../../../Qt/5.5/gcc_64/include/QtWidgets/QLineEdit \
+ ../../../../Qt/5.5/gcc_64/include/QtWidgets/qlineedit.h \
+ ../../../../Qt/5.5/gcc_64/include/QtWidgets/qframe.h \
+ ../../../../Qt/5.5/gcc_64/include/QtGui/qtextcursor.h \
+ ../../../../Qt/5.5/gcc_64/include/QtGui/qtextformat.h \
+ ../../../../Qt/5.5/gcc_64/include/QtGui/qpen.h \
+ ../../../../Qt/5.5/gcc_64/include/QtGui/qtextoption.h \
+ ../../../../Qt/5.5/gcc_64/include/QtWidgets/QLabel \
+ ../../../../Qt/5.5/gcc_64/include/QtWidgets/qlabel.h \
../../../../Qt/5.5/gcc_64/include/QtWidgets/QApplication \
../../../../Qt/5.5/gcc_64/include/QtWidgets/qapplication.h \
../../../../Qt/5.5/gcc_64/include/QtCore/qcoreapplication.h \
@@ -1058,45 +1076,16 @@ gui.o: ../MobileRobotGUI/gui.cpp ../MobileRobotGUI/gui.h \
/usr/local/include/opencv2/contrib/contrib.hpp \
/usr/local/include/opencv2/contrib/retina.hpp \
/usr/local/include/opencv2/contrib/openfabmap.hpp \
- ui_gui.h \
- ../../../../Qt/5.5/gcc_64/include/QtCore/QVariant \
- ../../../../Qt/5.5/gcc_64/include/QtWidgets/QAction \
- ../../../../Qt/5.5/gcc_64/include/QtWidgets/qaction.h \
- ../../../../Qt/5.5/gcc_64/include/QtWidgets/qactiongroup.h \
- ../../../../Qt/5.5/gcc_64/include/QtWidgets/QApplication \
- ../../../../Qt/5.5/gcc_64/include/QtWidgets/qapplication.h \
- ../../../../Qt/5.5/gcc_64/include/QtCore/qcoreapplication.h \
- ../../../../Qt/5.5/gcc_64/include/QtCore/qeventloop.h \
- ../../../../Qt/5.5/gcc_64/include/QtWidgets/qdesktopwidget.h \
- ../../../../Qt/5.5/gcc_64/include/QtGui/qguiapplication.h \
- ../../../../Qt/5.5/gcc_64/include/QtGui/qinputmethod.h \
- ../../../../Qt/5.5/gcc_64/include/QtWidgets/QButtonGroup \
- ../../../../Qt/5.5/gcc_64/include/QtWidgets/qbuttongroup.h \
- ../../../../Qt/5.5/gcc_64/include/QtWidgets/QHeaderView \
- ../../../../Qt/5.5/gcc_64/include/QtWidgets/qheaderview.h \
- ../../../../Qt/5.5/gcc_64/include/QtWidgets/qabstractitemview.h \
- ../../../../Qt/5.5/gcc_64/include/QtWidgets/qabstractscrollarea.h \
+ ../../../../Qt/5.5/gcc_64/include/QtWidgets/QLineEdit \
+ ../../../../Qt/5.5/gcc_64/include/QtWidgets/qlineedit.h \
../../../../Qt/5.5/gcc_64/include/QtWidgets/qframe.h \
- ../../../../Qt/5.5/gcc_64/include/QtCore/qabstractitemmodel.h \
- ../../../../Qt/5.5/gcc_64/include/QtCore/qitemselectionmodel.h \
- ../../../../Qt/5.5/gcc_64/include/QtWidgets/qabstractitemdelegate.h \
- ../../../../Qt/5.5/gcc_64/include/QtWidgets/qstyleoption.h \
- ../../../../Qt/5.5/gcc_64/include/QtWidgets/qabstractspinbox.h \
- ../../../../Qt/5.5/gcc_64/include/QtGui/qvalidator.h \
- ../../../../Qt/5.5/gcc_64/include/QtCore/qregularexpression.h \
- ../../../../Qt/5.5/gcc_64/include/QtWidgets/qslider.h \
- ../../../../Qt/5.5/gcc_64/include/QtWidgets/qabstractslider.h \
- ../../../../Qt/5.5/gcc_64/include/QtWidgets/qstyle.h \
- ../../../../Qt/5.5/gcc_64/include/QtWidgets/qtabbar.h \
- ../../../../Qt/5.5/gcc_64/include/QtWidgets/qrubberband.h \
- ../../../../Qt/5.5/gcc_64/include/QtWidgets/QMenuBar \
- ../../../../Qt/5.5/gcc_64/include/QtWidgets/qmenubar.h \
- ../../../../Qt/5.5/gcc_64/include/QtWidgets/qmenu.h \
- ../../../../Qt/5.5/gcc_64/include/QtWidgets/QStatusBar \
- ../../../../Qt/5.5/gcc_64/include/QtWidgets/qstatusbar.h \
- ../../../../Qt/5.5/gcc_64/include/QtWidgets/QToolBar \
- ../../../../Qt/5.5/gcc_64/include/QtWidgets/qtoolbar.h \
- ../../../../Qt/5.5/gcc_64/include/QtWidgets/QWidget
+ ../../../../Qt/5.5/gcc_64/include/QtGui/qtextcursor.h \
+ ../../../../Qt/5.5/gcc_64/include/QtGui/qtextformat.h \
+ ../../../../Qt/5.5/gcc_64/include/QtGui/qpen.h \
+ ../../../../Qt/5.5/gcc_64/include/QtGui/qtextoption.h \
+ ../../../../Qt/5.5/gcc_64/include/QtWidgets/QLabel \
+ ../../../../Qt/5.5/gcc_64/include/QtWidgets/qlabel.h \
+ ui_gui.h
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o gui.o ../MobileRobotGUI/gui.cpp
visualization.o: ../MobileRobotGUI/visualization.cpp ../MobileRobotGUI/visualization.h \
diff --git a/MobileRobot/MobRobGUI/build-MobileRobotGUI-Desktop_Qt_5_5_1_GCC_64bit-Debug/MobileRobotGUI b/MobileRobot/MobRobGUI/build-MobileRobotGUI-Desktop_Qt_5_5_1_GCC_64bit-Debug/MobileRobotGUI
index 98c728238f45d845af16ccf4a1388ae485c487db..2befe5973b79e9019bdf3fb93d5b8e1ac86369fe 100755
Binary files a/MobileRobot/MobRobGUI/build-MobileRobotGUI-Desktop_Qt_5_5_1_GCC_64bit-Debug/MobileRobotGUI and b/MobileRobot/MobRobGUI/build-MobileRobotGUI-Desktop_Qt_5_5_1_GCC_64bit-Debug/MobileRobotGUI differ
diff --git a/MobileRobot/MobRobGUI/build-MobileRobotGUI-Desktop_Qt_5_5_1_GCC_64bit-Debug/gui.o b/MobileRobot/MobRobGUI/build-MobileRobotGUI-Desktop_Qt_5_5_1_GCC_64bit-Debug/gui.o
index a74546a39d9334e5d1cc7ed006f9f4775350cea3..194c079650d268fcbba430021655c014d00e1f9e 100644
Binary files a/MobileRobot/MobRobGUI/build-MobileRobotGUI-Desktop_Qt_5_5_1_GCC_64bit-Debug/gui.o and b/MobileRobot/MobRobGUI/build-MobileRobotGUI-Desktop_Qt_5_5_1_GCC_64bit-Debug/gui.o differ
diff --git a/MobileRobot/MobRobGUI/build-MobileRobotGUI-Desktop_Qt_5_5_1_GCC_64bit-Debug/main.o b/MobileRobot/MobRobGUI/build-MobileRobotGUI-Desktop_Qt_5_5_1_GCC_64bit-Debug/main.o
index 74a2682f18f5f504a08b0b168fa4bcbddcce54b3..f67105601d178178cd325677c5f58054c41f88a6 100644
Binary files a/MobileRobot/MobRobGUI/build-MobileRobotGUI-Desktop_Qt_5_5_1_GCC_64bit-Debug/main.o and b/MobileRobot/MobRobGUI/build-MobileRobotGUI-Desktop_Qt_5_5_1_GCC_64bit-Debug/main.o differ
diff --git a/MobileRobot/MobRobGUI/build-MobileRobotGUI-Desktop_Qt_5_5_1_GCC_64bit-Debug/moc_gui.cpp b/MobileRobot/MobRobGUI/build-MobileRobotGUI-Desktop_Qt_5_5_1_GCC_64bit-Debug/moc_gui.cpp
index 4cbc6cc7ad99d2adee2813b58cb9a9d91480b288..62b9020fdb76a2ae76b82485ece8fa5dd0f649c8 100644
--- a/MobileRobot/MobRobGUI/build-MobileRobotGUI-Desktop_Qt_5_5_1_GCC_64bit-Debug/moc_gui.cpp
+++ b/MobileRobot/MobRobGUI/build-MobileRobotGUI-Desktop_Qt_5_5_1_GCC_64bit-Debug/moc_gui.cpp
@@ -19,8 +19,8 @@
QT_BEGIN_MOC_NAMESPACE
struct qt_meta_stringdata_GUI_t {
- QByteArrayData data[1];
- char stringdata0[4];
+ QByteArrayData data[3];
+ char stringdata0[15];
};
#define QT_MOC_LITERAL(idx, ofs, len) \
Q_STATIC_BYTE_ARRAY_DATA_HEADER_INITIALIZER_WITH_OFFSET(len, \
@@ -29,10 +29,12 @@ struct qt_meta_stringdata_GUI_t {
)
static const qt_meta_stringdata_GUI_t qt_meta_stringdata_GUI = {
{
-QT_MOC_LITERAL(0, 0, 3) // "GUI"
+QT_MOC_LITERAL(0, 0, 3), // "GUI"
+QT_MOC_LITERAL(1, 4, 9), // "updatePos"
+QT_MOC_LITERAL(2, 14, 0) // ""
},
- "GUI"
+ "GUI\0updatePos\0"
};
#undef QT_MOC_LITERAL
@@ -42,21 +44,32 @@ static const uint qt_meta_data_GUI[] = {
7, // revision
0, // classname
0, 0, // classinfo
- 0, 0, // methods
+ 1, 14, // methods
0, 0, // properties
0, 0, // enums/sets
0, 0, // constructors
0, // flags
0, // signalCount
+ // slots: name, argc, parameters, tag, flags
+ 1, 0, 19, 2, 0x0a /* Public */,
+
+ // slots: parameters
+ QMetaType::Void,
+
0 // eod
};
void GUI::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a)
{
- Q_UNUSED(_o);
- Q_UNUSED(_id);
- Q_UNUSED(_c);
+ if (_c == QMetaObject::InvokeMetaMethod) {
+ GUI *_t = static_cast<GUI *>(_o);
+ Q_UNUSED(_t)
+ switch (_id) {
+ case 0: _t->updatePos(); break;
+ default: ;
+ }
+ }
Q_UNUSED(_a);
}
@@ -84,6 +97,15 @@ int GUI::qt_metacall(QMetaObject::Call _c, int _id, void **_a)
_id = QMainWindow::qt_metacall(_c, _id, _a);
if (_id < 0)
return _id;
+ if (_c == QMetaObject::InvokeMetaMethod) {
+ if (_id < 1)
+ qt_static_metacall(this, _c, _id, _a);
+ _id -= 1;
+ } else if (_c == QMetaObject::RegisterMethodArgumentMetaType) {
+ if (_id < 1)
+ *reinterpret_cast<int*>(_a[0]) = -1;
+ _id -= 1;
+ }
return _id;
}
QT_END_MOC_NAMESPACE
diff --git a/MobileRobot/MobRobGUI/build-MobileRobotGUI-Desktop_Qt_5_5_1_GCC_64bit-Debug/moc_gui.o b/MobileRobot/MobRobGUI/build-MobileRobotGUI-Desktop_Qt_5_5_1_GCC_64bit-Debug/moc_gui.o
index b862d5ae5355217d48f200c544d341cff1160b78..02c349ce8611bd5333735a36ed017a7164985f1b 100644
Binary files a/MobileRobot/MobRobGUI/build-MobileRobotGUI-Desktop_Qt_5_5_1_GCC_64bit-Debug/moc_gui.o and b/MobileRobot/MobRobGUI/build-MobileRobotGUI-Desktop_Qt_5_5_1_GCC_64bit-Debug/moc_gui.o differ
diff --git a/MobileRobot/MobRobGUI/build-MobileRobotGUI-Desktop_Qt_5_5_1_GCC_64bit-Debug/moc_visualization.cpp b/MobileRobot/MobRobGUI/build-MobileRobotGUI-Desktop_Qt_5_5_1_GCC_64bit-Debug/moc_visualization.cpp
index 7d81f21b323b5a2dbe41b75c691c7e9d6196b503..001b8a35d0671399dce5a1a0ae3d2ef3d44ff282 100644
--- a/MobileRobot/MobRobGUI/build-MobileRobotGUI-Desktop_Qt_5_5_1_GCC_64bit-Debug/moc_visualization.cpp
+++ b/MobileRobot/MobRobGUI/build-MobileRobotGUI-Desktop_Qt_5_5_1_GCC_64bit-Debug/moc_visualization.cpp
@@ -19,8 +19,8 @@
QT_BEGIN_MOC_NAMESPACE
struct qt_meta_stringdata_Visualization_t {
- QByteArrayData data[3];
- char stringdata0[25];
+ QByteArrayData data[6];
+ char stringdata0[42];
};
#define QT_MOC_LITERAL(idx, ofs, len) \
Q_STATIC_BYTE_ARRAY_DATA_HEADER_INITIALIZER_WITH_OFFSET(len, \
@@ -31,10 +31,14 @@ static const qt_meta_stringdata_Visualization_t qt_meta_stringdata_Visualization
{
QT_MOC_LITERAL(0, 0, 13), // "Visualization"
QT_MOC_LITERAL(1, 14, 9), // "progStart"
-QT_MOC_LITERAL(2, 24, 0) // ""
+QT_MOC_LITERAL(2, 24, 0), // ""
+QT_MOC_LITERAL(3, 25, 6), // "getPOS"
+QT_MOC_LITERAL(4, 32, 4), // "inpX"
+QT_MOC_LITERAL(5, 37, 4) // "inpY"
},
- "Visualization\0progStart\0"
+ "Visualization\0progStart\0\0getPOS\0inpX\0"
+ "inpY"
};
#undef QT_MOC_LITERAL
@@ -44,7 +48,7 @@ static const uint qt_meta_data_Visualization[] = {
7, // revision
0, // classname
0, 0, // classinfo
- 1, 14, // methods
+ 2, 14, // methods
0, 0, // properties
0, 0, // enums/sets
0, 0, // constructors
@@ -52,10 +56,12 @@ static const uint qt_meta_data_Visualization[] = {
0, // signalCount
// slots: name, argc, parameters, tag, flags
- 1, 0, 19, 2, 0x0a /* Public */,
+ 1, 0, 24, 2, 0x0a /* Public */,
+ 3, 2, 25, 2, 0x0a /* Public */,
// slots: parameters
QMetaType::Void,
+ QMetaType::Void, QMetaType::Int, QMetaType::Int, 4, 5,
0 // eod
};
@@ -67,10 +73,10 @@ void Visualization::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _i
Q_UNUSED(_t)
switch (_id) {
case 0: _t->progStart(); break;
+ case 1: _t->getPOS((*reinterpret_cast< int(*)>(_a[1])),(*reinterpret_cast< int(*)>(_a[2]))); break;
default: ;
}
}
- Q_UNUSED(_a);
}
const QMetaObject Visualization::staticMetaObject = {
@@ -98,13 +104,13 @@ int Visualization::qt_metacall(QMetaObject::Call _c, int _id, void **_a)
if (_id < 0)
return _id;
if (_c == QMetaObject::InvokeMetaMethod) {
- if (_id < 1)
+ if (_id < 2)
qt_static_metacall(this, _c, _id, _a);
- _id -= 1;
+ _id -= 2;
} else if (_c == QMetaObject::RegisterMethodArgumentMetaType) {
- if (_id < 1)
+ if (_id < 2)
*reinterpret_cast<int*>(_a[0]) = -1;
- _id -= 1;
+ _id -= 2;
}
return _id;
}
diff --git a/MobileRobot/MobRobGUI/build-MobileRobotGUI-Desktop_Qt_5_5_1_GCC_64bit-Debug/moc_visualization.o b/MobileRobot/MobRobGUI/build-MobileRobotGUI-Desktop_Qt_5_5_1_GCC_64bit-Debug/moc_visualization.o
index ed0fe7091cd25a2f38a1d5e9c321098bf80b0f5c..63932314b2a5ba0eaa21905796f03f30e53177bb 100644
Binary files a/MobileRobot/MobRobGUI/build-MobileRobotGUI-Desktop_Qt_5_5_1_GCC_64bit-Debug/moc_visualization.o and b/MobileRobot/MobRobGUI/build-MobileRobotGUI-Desktop_Qt_5_5_1_GCC_64bit-Debug/moc_visualization.o differ
diff --git a/MobileRobot/MobRobGUI/build-MobileRobotGUI-Desktop_Qt_5_5_1_GCC_64bit-Debug/visualization.o b/MobileRobot/MobRobGUI/build-MobileRobotGUI-Desktop_Qt_5_5_1_GCC_64bit-Debug/visualization.o
index 09205e930931b36e20f0a4b5ecf3228efe6e9285..f2fc9ba051c61d5c3ca2c057595cf35fdb9bcd3a 100644
Binary files a/MobileRobot/MobRobGUI/build-MobileRobotGUI-Desktop_Qt_5_5_1_GCC_64bit-Debug/visualization.o and b/MobileRobot/MobRobGUI/build-MobileRobotGUI-Desktop_Qt_5_5_1_GCC_64bit-Debug/visualization.o differ