diff --git a/Files_4_thesis/Pictures/GUI.png b/Files_4_thesis/Pictures/GUI.png index 2869d65c0ba8ad85954b03472e653e7355de9487..3227b68ce48f23c7a6b19f7f06e39943c924d91d 100644 Binary files a/Files_4_thesis/Pictures/GUI.png and b/Files_4_thesis/Pictures/GUI.png differ diff --git a/MobileRobot/MobRobGUI/MobileRobotGUI/gui.cpp b/MobileRobot/MobRobGUI/MobileRobotGUI/gui.cpp index 3dbd111d069f545d3cfe09c40609bdbdaefc03f1..328d255b10d69d0e1122f50b791f5eecf01b9a07 100644 --- a/MobileRobot/MobRobGUI/MobileRobotGUI/gui.cpp +++ b/MobileRobot/MobRobGUI/MobileRobotGUI/gui.cpp @@ -11,7 +11,7 @@ using namespace std; GUI::GUI(QWidget *parent) :QMainWindow(parent),ui(new Ui::GUI) { ui->setupUi(this); - this->setWindowTitle("GUI for Vison-based Docking Care-O-Bot 3"); + this->setWindowTitle("GUI for vison-based docking of ROB@WORK 3"); GoToDocking(); Dock(); @@ -47,7 +47,7 @@ void GUI::Point_fiducial_Detection() { btnPF.setParent(ui->centralWidget); btnPF.setGeometry(70,140,250,30); - btnPF.setText("Point Fiducial Detection"); + btnPF.setText("Object Detection"); Xposlbl_pf.setParent(ui->centralWidget); Xpos_pf.setParent(ui->centralWidget); @@ -72,7 +72,7 @@ void GUI::AR_Detection() { btnAR.setParent(ui->centralWidget); btnAR.setGeometry(70,200,250,30); - btnAR.setText("AR Fiducial Detection"); + btnAR.setText("AR Marker Detection"); Xposlbl_AR.setParent(ui->centralWidget); Xpos_AR.setParent(ui->centralWidget); @@ -106,7 +106,7 @@ void GUI::ProgQuit() { btnExit.setParent(ui->centralWidget); btnExit.setGeometry(70,260,250,30); - btnExit.setText("EXIT"); + btnExit.setText("Exit"); connect(&btnExit,SIGNAL(clicked()),this,SLOT(close())); } 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 d5099b4e00dae47154861b5127645532fe5b963c..1a911a098caaa9ceb28d169fa86209fd3b4dee46 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 2c146f88205a9804b292dcec6b65bcd9b4d55480..877251b8894b2b227fd2468808874185a82a3c65 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