Merge branch 'gehongbo_branch' into majian_branch

pull/35/head
大耳刮子 3 years ago
commit 73d0367db7

@ -14,7 +14,11 @@ MainWindow::MainWindow(int argc, char **argv, QWidget *parent) :
ui->setupUi(this); ui->setupUi(this);
initUis(); initUis();
timer = new QTimer(this);
connections(); connections();
} }
MainWindow::~MainWindow() MainWindow::~MainWindow()
@ -155,6 +159,9 @@ void MainWindow::connections(){
ui->stackedWidget_ros_control->setCurrentIndex(0); ui->stackedWidget_ros_control->setCurrentIndex(0);
}); });
//label -> stream
connect(timer, SIGNAL(timeout()), this, SLOT(importFrame()));
/* /*
* *
*/ */
@ -378,7 +385,7 @@ void MainWindow::importFrame()
void MainWindow::on_Open_receive_clicked() void MainWindow::on_Open_receive_clicked()
{ {
capture.open(1); capture.open(0);
//capture.open("udp://@0.0.0.0:11111"); //capture.open("udp://@0.0.0.0:11111");
timer->start(30); timer->start(30);
} }

Loading…
Cancel
Save