diff --git a/src/include/qnode.hpp b/src/include/qnode.hpp index 0a79ed1..8585220 100644 --- a/src/include/qnode.hpp +++ b/src/include/qnode.hpp @@ -4,25 +4,46 @@ #ifndef Q_MOC_RUN #include #endif +#include -#include +#include +#include +#include +#include +#include +#include +#include +#include #include class QNode : public QThread{ Q_OBJECT + public: QNode(int argc, char **argv); virtual ~QNode(); bool init(); + void SubAndPubTopic(); void KeyboardMove(char key); + //void myCallback_img(const sensor_msgs::ImageConstPtr& msg);//camera callback function + //QImage image; + + +//Q_SIGNALS: + //void loggingCamera();//发出设置相机图片信号 private: int init_argc; char **init_argv; - ros::NodeHandle n; + ros::Subscriber cmdVel_sub; ros::Publisher cmd_pub; + //ros::Publisher chatter_publisher; + //QStringList logging_model; + //image_transport::Subscriber image_sub; + +//cv::Mat img; }; #endif diff --git a/src/include/roskeyboardteleopnode.h b/src/include/roskeyboardteleopnode.h deleted file mode 100644 index 5c2c008..0000000 --- a/src/include/roskeyboardteleopnode.h +++ /dev/null @@ -1,58 +0,0 @@ -#ifndef ROSKEYBOARDTELEOPNODE_H -#define ROSKEYBOARDTELEOPNODE_H - -#include -#include -#include -#include -#include -#include - -#include -#include -#include - -#define KEYCODE_W 0x77 -#define KEYCODE_A 0x61 -#define KEYCODE_S 0x73 -#define KEYCODE_D 0x64 - -#define KEYCODE_A_CAP 0x41 -#define KEYCODE_D_CAP 0x44 -#define KEYCODE_S_CAP 0x53 -#define KEYCODE_W_CAP 0x57 - - - -class RosKeyboardTeleopNode -{ -private: - double walk_vel_; - double run_vel_; - double yaw_rate_; - double yaw_rate_run_; - - geometry_msgs::Twist cmdvel_; - ros::NodeHandle n_; - ros::Publisher pub_; - -public: - RosKeyboardTeleopNode(); - - ~RosKeyboardTeleopNode() { } - void keyboardLoop(); - - void stopRobot() - { - cmdvel_.linear.x = 0.0; - cmdvel_.angular.z = 0.0; - pub_.publish(cmdvel_); - } -}; - -extern int kfd; -extern struct termios cooked, raw; -extern bool done; -extern RosKeyboardTeleopNode* tbk; - -#endif // ROSKEYBOARDTELEOPNODE_H diff --git a/src/main/main.cpp b/src/main/main.cpp index b4d3b2b..a983b77 100644 --- a/src/main/main.cpp +++ b/src/main/main.cpp @@ -1,4 +1,4 @@ -#include "../include/roskeyboardteleopnode.h" + #include "../ui/mainwindow.hpp" #include @@ -11,25 +11,12 @@ int main(int argc, char** argv) { - - ros::init(argc,argv,"tbk", ros::init_options::AnonymousName | ros::init_options::NoSigintHandler); - QApplication app(argc, argv); MainWindow CEC(0,0,0); + CEC.show(); return app.exec(); -/* - RosKeyboardTeleopNode tbk; - - boost::thread t = boost::thread(boost::bind(&RosKeyboardTeleopNode::keyboardLoop, &tbk)); - - ros::spin(); - t.interrupt(); - t.join(); - tbk.stopRobot(); - tcsetattr(kfd, TCSANOW, &cooked); -*/ return(0); } diff --git a/src/main/mainwindow.cpp b/src/main/mainwindow.cpp index 60c5b93..46c1caa 100644 --- a/src/main/mainwindow.cpp +++ b/src/main/mainwindow.cpp @@ -1,12 +1,14 @@ #include "../ui/mainwindow.hpp" + MainWindow::MainWindow(int argc, char **argv, QWidget *parent) : QMainWindow(parent), qnode(argc, argv), ui(new Ui::MainWindow) + { + qnode.init(); ui->setupUi(this); - connections(); } @@ -41,7 +43,6 @@ void MainWindow::slot_keyboard_control(){ qnode.KeyboardMove(key); - std::cout<pushButton_D->setShortcut(Qt::Key_D); connect(ui->pushButton_D, SIGNAL(clicked()), this, SLOT(slot_keyboard_control())); connect(ui->pushButton_shift, SIGNAL(clicked()), this, SLOT(slot_keyboard_control())); + // + //QObject::connect(&qnode, SIGNAL(loggingCamera()), this, SLOT(slot_updateCamera())); +} + + +/* +void MainWindow::slot_dispalyCamera(const QImage &image){ + qimage_mutex.lock(); + qimage = image.copy(); + ui->UGV_Vedio->setPixmap(QPixmap::fromImage(qimage)); + ui->UGV_Vedio->resize(ui->UGV_Vedio->pixmap()->size()); + qimage_mutex.unlock(); } + +void MainWindow::slot_updateCamera() +{ + slot_dispalyCamera(qnode.image); +} +*/ + + diff --git a/src/main/qnode.cpp b/src/main/qnode.cpp index 036425b..35c7ed5 100644 --- a/src/main/qnode.cpp +++ b/src/main/qnode.cpp @@ -1,11 +1,11 @@ #include "../include/qnode.hpp" -#include -#include -#include +#include "sensor_msgs/image_encodings.h" QNode::QNode(int argc, char **argv) : init_argc(argc), init_argv(argv){ - cmd_pub = n.advertise("cmd_vel", 1); + + + } @@ -18,15 +18,16 @@ QNode::~QNode() { } bool QNode::init() { - ros::init(init_argc, init_argv, "cyrobot_monitor", - ros::init_options::AnonymousName); - if (!ros::master::check()) { - return false; - } - ros::start(); // explicitly needed since our nodehandle is going out of - // scope. - start(); - return true; + + ros::init(init_argc,init_argv,"Air_Ground_CEC", + ros::init_options::AnonymousName | ros::init_options::NoSigintHandler); + SubAndPubTopic(); + return true; +} + +void QNode::SubAndPubTopic(){ + ros::NodeHandle n; + cmd_pub = n.advertise("cmd_vel", 1); } void QNode::KeyboardMove(char key){ @@ -45,3 +46,21 @@ void QNode::KeyboardMove(char key){ cmd_pub.publish(twist); ros::spinOnce(); } + +/* +void QNode::myCallback_img(const sensor_msgs::ImageConstPtr &msg) +{ + try + { + cv_bridge::CvImageConstPtr cv_ptr = cv_bridge::toCvShare(msg, sensor_msgs::image_encodings::RGB8); + img = cv_ptr->image; + image = QImage(img.data,img.cols,img.rows,img.step[0],QImage::Format_RGB888);//change to QImage format + ROS_INFO("I'm setting picture in mul_t callback function!"); + Q_EMIT loggingCamera(); + } +catch (cv_bridge::Exception& e) + { + ROS_ERROR("Could not convert from '%s' to 'bgr8'.", msg->encoding.c_str()); + } +} +*/ diff --git a/src/main/roskeyboardteleopnode.cpp b/src/main/roskeyboardteleopnode.cpp deleted file mode 100644 index 37618ea..0000000 --- a/src/main/roskeyboardteleopnode.cpp +++ /dev/null @@ -1,138 +0,0 @@ -#include "../include/roskeyboardteleopnode.h" - -int kfd = 0; -struct termios cooked, raw; -bool done; -RosKeyboardTeleopNode* tbk; - -RosKeyboardTeleopNode::RosKeyboardTeleopNode() -{ - pub_ = n_.advertise("cmd_vel", 1); - - ros::NodeHandle n_private("~"); - n_private.param("walk_vel", walk_vel_, 0.5); - n_private.param("run_vel", run_vel_, 1.0); - n_private.param("yaw_rate", yaw_rate_, 1.0); - n_private.param("yaw_rate_run", yaw_rate_run_, 1.5); -} - - -void RosKeyboardTeleopNode::keyboardLoop() -{ - char c; - double max_tv = walk_vel_; - double max_rv = yaw_rate_; - bool dirty = false; - int speed = 0; - int turn = 0; - - // get the console in raw mode - tcgetattr(kfd, &cooked); - memcpy(&raw, &cooked, sizeof(struct termios)); - raw.c_lflag &=~ (ICANON | ECHO); - raw.c_cc[VEOL] = 1; - raw.c_cc[VEOF] = 2; - tcsetattr(kfd, TCSANOW, &raw); - - puts("Reading from keyboard"); - puts("Use WASD keys to control the robot"); - puts("Press Shift to move faster"); - - struct pollfd ufd; - ufd.fd = kfd; - ufd.events = POLLIN; - - for(;;) - { - boost::this_thread::interruption_point(); - - // get the next event from the keyboard - int num; - - if ((num = poll(&ufd, 1, 250)) < 0) - { - perror("poll():"); - return; - } - else if(num > 0) - { - if(read(kfd, &c, 1) < 0) - { - perror("read():"); - return; - } - } - else - { - if (dirty == true) - { - stopRobot(); - dirty = false; - } - - continue; - } - - switch(c) - { - case KEYCODE_W: - max_tv = walk_vel_; - speed = 1; - turn = 0; - dirty = true; - break; - case KEYCODE_S: - max_tv = walk_vel_; - speed = -1; - turn = 0; - dirty = true; - break; - case KEYCODE_A: - max_rv = yaw_rate_; - speed = 0; - turn = 1; - dirty = true; - break; - case KEYCODE_D: - max_rv = yaw_rate_; - speed = 0; - turn = -1; - dirty = true; - break; - - case KEYCODE_W_CAP: - max_tv = run_vel_; - speed = 1; - turn = 0; - dirty = true; - break; - case KEYCODE_S_CAP: - max_tv = run_vel_; - speed = -1; - turn = 0; - dirty = true; - break; - case KEYCODE_A_CAP: - max_rv = yaw_rate_run_; - speed = 0; - turn = 1; - dirty = true; - break; - case KEYCODE_D_CAP: - max_rv = yaw_rate_run_; - speed = 0; - turn = -1; - dirty = true; - break; - default: - max_tv = walk_vel_; - max_rv = yaw_rate_; - speed = 0; - turn = 0; - dirty = false; - } - cmdvel_.linear.x = speed * max_tv; - cmdvel_.angular.z = turn * max_rv; - pub_.publish(cmdvel_); - } -} diff --git a/src/ui/mainwindow.hpp b/src/ui/mainwindow.hpp index dc416b9..3254020 100644 --- a/src/ui/mainwindow.hpp +++ b/src/ui/mainwindow.hpp @@ -2,6 +2,9 @@ #define MAINWINDOW_H #include +#include +#include + #include "ui_mainwindow.h" #include "../include/qnode.hpp" @@ -19,11 +22,15 @@ public: public slots: void slot_keyboard_control(); + //void slot_updateCamera(); + //void slot_dispalyCamera(const QImage& image); private: Ui::MainWindow *ui; void connections(); QNode qnode; + //QImage qimage; + //mutable QMutex qimage_mutex; }; diff --git a/src/ui/mainwindow.ui b/src/ui/mainwindow.ui index ea78c87..a3c59f5 100644 --- a/src/ui/mainwindow.ui +++ b/src/ui/mainwindow.ui @@ -14,29 +14,16 @@ MainWindow - + - 410 - 260 + 1160 + 240 314 164 - - - - Qt::Horizontal - - - - 40 - 20 - - - - @@ -61,21 +48,8 @@ - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - + + 100 @@ -94,12 +68,12 @@ - + - - + + 100 @@ -118,12 +92,12 @@ - 加速 + - - + + 100 @@ -142,25 +116,12 @@ - + - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - + + 100 @@ -179,23 +140,95 @@ - + 加速 + + + + + + + + + 610 + 60 + 321 + 211 + + + + TextLabel + + + + + + 60 + 30 + 502 + 654 + + + + + + + + 500 + 300 + + + + + 500 + 300 + + + + false + + + + + + UAV_VEDIO + + + false - - + + - Qt::Horizontal + Qt::Vertical - 40 - 20 + 20 + 40 + + + + + 500 + 300 + + + + + 500 + 300 + + + + PATH + + +