wxchen/newspark110
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refactor(*):03LaserCut_V00.00.01,Spark100项目发货前功能提取

Browse Source
This commit is contained in:
adminwu
2024-03-14 14:21:18 +08:00
parent 1dda4f24ad
commit d045ed5fd8
46 changed files with 3457 additions and 938 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
device/ui/specificareaswidget.cpp
View File

@@ -28,7 +28,7 @@
#include "opencv2/opencv.hpp"
#include "rs_settings.h"
#define NUMBER 3
QImage* img=new QImage;
cv::Mat imgcv;//拼接完成的图片
QImage* qimgRecv;//从python返回的img转化为qimage
cv::Mat imgRecv;//从python返回的img
@@ -210,17 +210,22 @@ void SpecificAreasWidget::on_rbSrcImg_clicked()
//imgcv = DEV->Func_merge(StartPos,StartPos+(int)GlobalPix*10);
cv::cvtColor(imgcv, imgcv, cv::COLOR_BGR2RGB);
*img = QImage(imgcv.data, imgcv.cols, imgcv.rows, QImage::Format_RGB888);
//QImage img = QImage(imgcv.data, imgcv.cols, imgcv.rows, QImage::Format_RGB888);
QImage img= QImage(imgcv.data,imgcv.cols, imgcv.rows,imgcv.cols*3, QImage::Format_RGB888);
//调用完成之后把img显示在窗口上
if((double)img->width()/(double)ui->lbImage->width() >= (double)img->height()/(double)ui->lbImage->height())
Mul=(double)img->width()/(double)ui->lbImage->width();
// QString fileName = QFileDialog::getSaveFileName(this, tr("png file"), qApp->applicationDirPath(),
// tr("Files (*.png)"));
// img.save(fileName);
if((double)img.width()/(double)ui->lbImage->width() >= (double)img.height()/(double)ui->lbImage->height())
Mul=(double)img.width()/(double)ui->lbImage->width();
else
Mul=(double)img->height()/(double)ui->lbImage->height();
Mul=(double)img.height()/(double)ui->lbImage->height();
ui->edLog->append("缩放倍数：" + QString::number(Mul,'f',3));
*scaledimg=img->scaled(ui->lbImage->width(),ui->lbImage->height(),Qt::KeepAspectRatio);
*scaledimg=img.scaled(ui->lbImage->width(),ui->lbImage->height(),Qt::KeepAspectRatio);
*scaledimgInit = scaledimg->copy();
ui->lbImage->setPixmap(QPixmap::fromImage(*scaledimg));
}
@@ -233,8 +238,9 @@ void SpecificAreasWidget::on_rbDstImg_clicked()
{
if (!imgRecv.empty())
{
const uchar *pSrc = (const uchar*)imgRecv.data;
QImage qimgRecv(pSrc, imgRecv.cols, imgRecv.rows, imgRecv.step, QImage::Format_RGB888);
//const uchar *pSrc = (const uchar*)imgRecv.data;
//QImage qimgRecv(pSrc, imgRecv.cols, imgRecv.rows, imgRecv.step, QImage::Format_RGB888);
QImage qimgRecv(imgRecv.data,imgRecv.cols, imgRecv.rows,imgRecv.cols*3, QImage::Format_RGB888);
//调用完成之后把img显示在窗口上
if((double)qimgRecv.width()/(double)ui->lbImage->width() >= (double)qimgRecv.height()/(double)ui->lbImage->height())
@@ -257,7 +263,7 @@ void SpecificAreasWidget::ShowMergeSlots()
{
if (!imgRecv.empty())
{
const uchar *pSrc = (const uchar*)imgRecv.data;
//const uchar *pSrc = (const uchar*)imgRecv.data;
/***************************************************************
* 修改码：1008610010
* 日期：
@@ -267,7 +273,9 @@ void SpecificAreasWidget::ShowMergeSlots()
* 描述：
* Format_Grayscale8改为Format_RGB888
**************************************************************/
QImage qimgRecv(pSrc, imgRecv.cols, imgRecv.rows, imgRecv.step, QImage::Format_RGB888);
//QImage qimgRecv(pSrc, imgRecv.cols, imgRecv.rows, imgRecv.step, QImage::Format_RGB888);
QImage qimgRecv(imgRecv.data,imgRecv.cols, imgRecv.rows,imgRecv.cols*3, QImage::Format_RGB888);
//调用完成之后把img显示在窗口上
if((double)qimgRecv.width()/(double)ui->lbImage->width() >= (double)qimgRecv.height()/(double)ui->lbImage->height())