pull/15/head
13195980010 3 years ago
parent bd38d9d3ef
commit 3d050b12d6

@ -122,12 +122,12 @@ set(CMAKE_INCLUDE_CURRENT_DIR ON)
set(SOURCES set(SOURCES
src/include/qnode.hpp src/include/qnode.hpp
src/include/roskeyboardteleopnode.h
src/main/main.cpp src/main/main.cpp
src/main/mainwindow.cpp src/main/mainwindow.cpp
src/main/qnode.cpp src/main/qnode.cpp
src/main/roskeyboardteleopnode.cpp
src/ui/mainwindow.hpp src/ui/mainwindow.hpp
src/ui/mainwindow.ui src/ui/mainwindow.ui

@ -1,7 +1,6 @@
#include "../ui/mainwindow.hpp" #include "../ui/mainwindow.hpp"
MainWindow::MainWindow(int argc, char **argv, QWidget *parent) : MainWindow::MainWindow(int argc, char **argv, QWidget *parent) :
QMainWindow(parent), qnode(argc, argv), QMainWindow(parent), qnode(argc, argv),
ui(new Ui::MainWindow) ui(new Ui::MainWindow)
@ -60,8 +59,20 @@ void MainWindow::connections(){
// //
//QObject::connect(&qnode, SIGNAL(loggingCamera()), this, SLOT(slot_updateCamera())); //QObject::connect(&qnode, SIGNAL(loggingCamera()), this, SLOT(slot_updateCamera()));
} }
void MainWindow::importFrame()
{
capture >> frame;
cvtColor(frame, frame, CV_BGR2RGB);
QImage srcQImage = QImage((uchar*)(frame.data), frame.cols, frame.rows, QImage::Format_RGB888);
ui->StreamReceive->setPixmap(QPixmap::fromImage(srcQImage));
ui->StreamReceive->resize(srcQImage.size());
ui->StreamReceive->show();
}
void MainWindow::on_PLAY_clicked()
{
capture.open("udp://@0.0.0.0:11111");
timer->start(30);
}
/* /*
void MainWindow::slot_dispalyCamera(const QImage &image){ void MainWindow::slot_dispalyCamera(const QImage &image){
qimage_mutex.lock(); qimage_mutex.lock();
@ -78,3 +89,4 @@ void MainWindow::slot_updateCamera()
*/ */

Some files were not shown because too many files have changed in this diff Show More

Loading…
Cancel
Save