|
|
|
@ -97,6 +97,7 @@ void MainWindow::initUI()
@@ -97,6 +97,7 @@ void MainWindow::initUI()
|
|
|
|
|
ui->toolBar->addWidget(ui->spinBox); |
|
|
|
|
ui->toolBar->addWidget(ui->label_3); |
|
|
|
|
ui->toolBar->addWidget(ui->spinBox_2); |
|
|
|
|
ui->toolBar->addWidget(ui->pushButton_13); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
m1 = new menu1(); |
|
|
|
@ -191,6 +192,7 @@ void MainWindow::initConnect()
@@ -191,6 +192,7 @@ void MainWindow::initConnect()
|
|
|
|
|
|
|
|
|
|
connect(m1,SIGNAL(signalsetGPOL(int)),ucontrol,SLOT(setGPOL(int))); |
|
|
|
|
connect(m1,SIGNAL(signalsetIT(double)),ucontrol,SLOT(setIT(double))); |
|
|
|
|
connect(m1,SIGNAL(signalsetspname(QString)),ucontrol,SLOT(slotsetspname(QString))); |
|
|
|
|
connect(m1,&menu1::signalsetIT,[this](double it){ |
|
|
|
|
this->d_it = it; |
|
|
|
|
|
|
|
|
@ -239,6 +241,7 @@ void MainWindow::initConnect()
@@ -239,6 +241,7 @@ void MainWindow::initConnect()
|
|
|
|
|
connect(m1,SIGNAL(signalonepoint()),ucontrol,SLOT(onepoint())); |
|
|
|
|
connect(m1,SIGNAL(signalsaveb()),ucontrol,SLOT(saveb())); |
|
|
|
|
connect(m1,SIGNAL(signalopenb(bool)),ucontrol,SLOT(openb(bool))); |
|
|
|
|
connect(m1,SIGNAL(signalsetge(bool)),ucontrol,SLOT(setge(bool))); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
connect(m2,SIGNAL(signalsag(bool)),ucontrol,SLOT(setsag(bool))); |
|
|
|
@ -246,7 +249,6 @@ void MainWindow::initConnect()
@@ -246,7 +249,6 @@ void MainWindow::initConnect()
|
|
|
|
|
connect(m2,SIGNAL(signalsetkf(int)),ucontrol,SLOT(setkf(int))); |
|
|
|
|
connect(m2,SIGNAL(signalsethist(int)),ucontrol,SLOT(sethist(int))); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
#elif CLIENT==2 |
|
|
|
|
// connect(usb,SIGNAL(signalGetImage(cv::Mat)),m_tp,SLOT(slotprocimg(cv::Mat)));
|
|
|
|
|
// connect(m_tp,SIGNAL(signalsendimg(cv::Mat)),m_avg,SLOT(slotprocimg(cv::Mat)));
|
|
|
|
@ -574,8 +576,8 @@ void MainWindow::on_pushButton_2_clicked()
@@ -574,8 +576,8 @@ void MainWindow::on_pushButton_2_clicked()
|
|
|
|
|
#if CLIENT == 0 || CLIENT == 1 |
|
|
|
|
ucontrol->setIT(5.0); |
|
|
|
|
ucontrol->setGPOL(800); |
|
|
|
|
ucontrol->openk(true); |
|
|
|
|
ucontrol->openb(true); |
|
|
|
|
// ucontrol->openk(true);
|
|
|
|
|
// ucontrol->openb(true);
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@ -881,7 +883,7 @@ void MainWindow::slotShowImage(cv::Mat img)
@@ -881,7 +883,7 @@ void MainWindow::slotShowImage(cv::Mat img)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if(b_stat &(!b_fullscreen)){ |
|
|
|
|
if(b_stat &(!b_fullscreen) &(!ui->pushButton_13->isChecked())){ |
|
|
|
|
QPainter p(&pix); |
|
|
|
|
QPen pen = p.pen(); |
|
|
|
|
QPen npen(QColor(0xad,0x14,0x53)); |
|
|
|
@ -896,8 +898,27 @@ void MainWindow::slotShowImage(cv::Mat img)
@@ -896,8 +898,27 @@ void MainWindow::slotShowImage(cv::Mat img)
|
|
|
|
|
if(b_fullscreen) |
|
|
|
|
ui->imagelabel->setPixmap(pix.scaled(ui->imagelabel->size(),Qt::KeepAspectRatio,Qt::SmoothTransformation)); |
|
|
|
|
else |
|
|
|
|
ui->imagelabel->setPixmap(pix); |
|
|
|
|
{ |
|
|
|
|
if(ui->pushButton_13->isChecked()){ |
|
|
|
|
if(ui->scrollArea->size() - QSize(20,20) != ui->imagelabel->size()){ |
|
|
|
|
ui->imagelabel->resize(ui->scrollArea->size() - QSize(30,30)); |
|
|
|
|
ui->imagelabel->move(10,10); |
|
|
|
|
ui->imagelabel->setAlignment(Qt::AlignLeft|Qt::AlignTop); |
|
|
|
|
|
|
|
|
|
} |
|
|
|
|
ui->imagelabel->setPixmap(pix.scaled(ui->scrollArea->size() - QSize(30,30),Qt::KeepAspectRatio,Qt::SmoothTransformation)); |
|
|
|
|
|
|
|
|
|
} |
|
|
|
|
else{ |
|
|
|
|
if(ui->imagelabel->size() != QSize(rows,cols)){ |
|
|
|
|
ui->imagelabel->resize(rows,cols); |
|
|
|
|
ui->imagelabel->move(10,10); |
|
|
|
|
ui->imagelabel->setAlignment(Qt::AlignLeft|Qt::AlignTop); |
|
|
|
|
|
|
|
|
|
} |
|
|
|
|
ui->imagelabel->setPixmap(pix); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
void MainWindow::slotlogtext(QString msg) |
|
|
|
@ -1028,7 +1049,11 @@ void MainWindow::on_spinBox_valueChanged(int arg1)
@@ -1028,7 +1049,11 @@ void MainWindow::on_spinBox_valueChanged(int arg1)
|
|
|
|
|
rows = arg1; |
|
|
|
|
ui->scrollAreaWidgetContents->setMinimumHeight(rows+20); |
|
|
|
|
ui->imagelabel->resize(cols,rows); |
|
|
|
|
ui->imagelabel->move(10,10); |
|
|
|
|
ui->imagelabel->setAlignment(Qt::AlignLeft|Qt::AlignTop); |
|
|
|
|
|
|
|
|
|
qDebug()<<__LINE__<<ui->scrollArea->width()<<" "<<ui->scrollArea->height(); |
|
|
|
|
qDebug()<<ui->imagelabel->width()<<" "<<ui->imagelabel->height(); |
|
|
|
|
#if CLIENT==2 |
|
|
|
|
m_mp->setparas(rows,cols); |
|
|
|
|
|
|
|
|
@ -1045,6 +1070,9 @@ void MainWindow::on_spinBox_2_valueChanged(int arg1)
@@ -1045,6 +1070,9 @@ void MainWindow::on_spinBox_2_valueChanged(int arg1)
|
|
|
|
|
cols = arg1; |
|
|
|
|
ui->scrollAreaWidgetContents->setMinimumWidth(cols+20); |
|
|
|
|
ui->imagelabel->resize(cols,rows); |
|
|
|
|
ui->imagelabel->move(10,10); |
|
|
|
|
ui->imagelabel->setAlignment(Qt::AlignLeft|Qt::AlignTop); |
|
|
|
|
|
|
|
|
|
#if CLIENT == 2 |
|
|
|
|
m_mp->setparas(rows,cols); |
|
|
|
|
#endif |
|
|
|
@ -1190,3 +1218,14 @@ void MainWindow::on_pushButton_12_clicked()
@@ -1190,3 +1218,14 @@ void MainWindow::on_pushButton_12_clicked()
|
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
void MainWindow::on_pushButton_13_clicked() |
|
|
|
|
{ |
|
|
|
|
if(ui->pushButton_13->isChecked()){ |
|
|
|
|
ui->pushButton_13->setText(u8"适应屏幕"); |
|
|
|
|
} |
|
|
|
|
else{ |
|
|
|
|
ui->pushButton_13->setText(u8"原始大小"); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|