upright
/
whellvalue
mirror of https://gitlab.hzleaper.com:81/bob.pan/whellvalue.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

1、valueMain修复PLC连接状态显示不正常问题

Browse Source 
2、优化valueMain长时间运行出现UI放大缩小卡顿问题
3、标定页面更新，增加按钮移动ROI位置，支持长安移动
4、标定页面更新，修复ROI四个瞄点在鼠标放置时显示方向图标
5、圆抠图算法更新
6、标定页面ROI标定流程，加入防呆流程，没有标定图时不能进入ROI设置页面
master
bob.pan 4 years ago
parent ef4426a264
commit dd5eb7f0c2
61 changed files with 628 additions and 415 deletions
Show Stats Download Patch File Download Diff File

2
src/lpbdesigner/DrawTool.cpp
Unescape Escape View File

@ -42,7 +42,7 @@ static void setCursor(QGraphicsScene * scene, const QCursor & cursor)
for (int i = 0; i < views.count(); i++)
{
QGraphicsView * view = views.at(i);
if (view && (int)view->userData(0) == 1)
if (view /*&& (int)view->userData(0) == 1*/)
view->setCursor(cursor);
}
}

2
src/lpbdesigner/DsgAlgoDlg.cpp
Unescape Escape View File

@ -2,7 +2,7 @@
#include "ui_AlgoDlg.h"
#include "qfiledialog.h"
#include "QDesktopWidget"
#pragma execution_character_set("utf-8")
CDsgAlgoDlg::CDsgAlgoDlg(QWidget *parent) : QDialog(parent), ui(new Ui::AlgoDlg)
{
m_pDE = NULL;

11
src/lpbdesigner/DsgParamDlg.cpp
Unescape Escape View File

@ -1,6 +1,6 @@
#include "DsgParamDlg.h"
#include "ui_ParamDlg.h"
#pragma execution_character_set("utf-8")
CDsgParamDlg::CDsgParamDlg(QWidget *parent) : QDialog(parent), m_valueCombox(this)
{
ui = new Ui::ParamDlg;
@ -144,6 +144,15 @@ bool CDsgParamDlg::OnShowRoiDlg()
if (!m_pRoiDlg->Initialize(m_pDE, m_pAlgo, m_pTask))
return false;
if (m_pTask->GetTaskInfo()->templateImg.data == NULL)
{
QMessageBox infobox(QMessageBox::Critical, tr("提示"), tr("请设置标定图再进行ROI标定!"), QMessageBox::Yes, this);
infobox.setWindowIcon(QIcon(":/image/leaper"));
infobox.setButtonText(QMessageBox::Yes, tr("确认"));
infobox.exec();
return false;
}
m_tRoiData.img = m_pTask->GetTaskInfo()->templateImg;
m_pRoiDlg->setParent(this);
m_pRoiDlg->setWindowFlags(Qt::Dialog | Qt::WindowCloseButtonHint);

70
src/lpbdesigner/DsgRoiDlg.cpp
Unescape Escape View File

@ -49,6 +49,32 @@ CDsgRoiDlg::CDsgRoiDlg(QWidget *parent) : QDialog(parent), ui(new Ui::RoiDlg)
m_pRoiScene = new RoiScene(this);
m_pRoiScene->SetGraphicsView(ui->graphicsView);
m_pRoiScene->SetInfoLable(ui->label_pixel_info);
connect(ui->m_pbUp, SIGNAL(clicked()), this, SLOT(OnMove()));
connect(ui->m_pbLeft, SIGNAL(clicked()), this, SLOT(OnMove()));
connect(ui->m_pbRight, SIGNAL(clicked()), this, SLOT(OnMove()));
connect(ui->m_pbDown, SIGNAL(clicked()), this, SLOT(OnMove()));
/*开启按钮长按功能*/
ui->m_pbUp->setAutoRepeat(true);
ui->m_pbUp->setAutoRepeatDelay(400);
ui->m_pbUp->setAutoRepeatInterval(50);
ui->m_pbLeft->setAutoRepeat(true);
ui->m_pbLeft->setAutoRepeatDelay(400);
ui->m_pbLeft->setAutoRepeatInterval(50);
ui->m_pbRight->setAutoRepeat(true);
ui->m_pbRight->setAutoRepeatDelay(400);
ui->m_pbRight->setAutoRepeatInterval(50);
ui->m_pbDown->setAutoRepeat(true);
ui->m_pbDown->setAutoRepeatDelay(400);
ui->m_pbDown->setAutoRepeatInterval(50);
int slide = SystemStateInfo::setIni.value("sliderValue",1).toInt();
ui->horizontalSlider->setValue(slide);
connect(ui->horizontalSlider, SIGNAL(valueChanged(int)), this, SLOT(onSliderChange(int)));
}
CDsgRoiDlg::~CDsgRoiDlg()
@ -113,7 +139,7 @@ bool CDsgRoiDlg::OnOk()
int nItems = m_pRoiScene->getGraphItems();
if (nCount != nItems)
{
int a = QMessageBox::warning(this, QObject::tr("警告"), QObject::tr("系统检测到有ROI未进行绑定，请绑定后继续！！！"));
QMessageBox::warning(this, QObject::tr("警告"), QObject::tr("系统检测到有ROI未进行绑定，请绑定后继续！！！"));
return false;
}
QDialog::accept();
@ -146,10 +172,8 @@ void CDsgRoiDlg::OnShowColorDlg()
QColor color = QColorDialog::getColor(Qt::black,this,QString("select color"));
if (color.rgb() == QColor(0, 0, 0).rgb())
return ;
QString strRGB = QString("(%1,%2,%3)").arg(QString::number(color.red()), QString::number(color.green()), QString::number(color.blue()));
ui->lineEdit_3->setText(strRGB);
QString strStyle = QString("background-color:rgba(%1,%2,%3,255);").arg(color.red()).arg(color.green()).arg(color.blue());
ui->lineEdit_3->setStyleSheet(strStyle);
QString strStyle = QString("font:8px ;background-color:rgba(%1,%2,%3,255);").arg(color.red()).arg(color.green()).arg(color.blue());
ui->label_Color->setStyleSheet(strStyle);
SystemStateInfo::rgb = color.rgb();
return;
}
@ -193,10 +217,9 @@ LP_DETECTOR_ROI_DATA CDsgRoiDlg::ShowRoiDlg(LP_DETECTOR_ROI_DATA roiData)
if (SystemStateInfo::rgb == 0)
SystemStateInfo::rgb = QColor(255, 0, 0).rgb();
QColor color(SystemStateInfo::rgb);
QString strRGB = QString("(%1,%2,%3)").arg(QString::number(color.red()), QString::number(color.green()), QString::number(color.blue()));
ui->lineEdit_3->setText(strRGB);
QString strStyle = QString("background-color:rgba(%1,%2,%3,255);").arg(color.red()).arg(color.green()).arg(color.blue());
ui->lineEdit_3->setStyleSheet(strStyle);
ui->label_Color->setStyleSheet(strStyle);
QDesktopWidget* desktop = QApplication::desktop();
move((desktop->width() - this->width()) / 2, (desktop->height() - this->height()) / 2);
@ -415,23 +438,24 @@ void CDsgRoiDlg::OnMove()
{
if (!m_pRoiScene)
return;
if (sender()->objectName() == "pushButton_10")
int step = ui->horizontalSlider->value();
if (sender()->objectName() == "m_pbLeft")
{
m_pRoiScene->MoveSelectedItem(LEFT);
m_pRoiScene->MoveSelectedItem(LEFT, step);
}
else if (sender()->objectName() == "pushButton_11")
else if (sender()->objectName() == "m_pbUp")
{
m_pRoiScene->MoveSelectedItem(UP);
m_pRoiScene->MoveSelectedItem(UP, step);
}
else if (sender()->objectName() == "pushButton_12")
else if (sender()->objectName() == "m_pbRight")
{
m_pRoiScene->MoveSelectedItem(RIGHT);
m_pRoiScene->MoveSelectedItem(RIGHT, step);
}
else if (sender()->objectName() == "pushButton_13")
else if (sender()->objectName() == "m_pbDown")
{
m_pRoiScene->MoveSelectedItem(DOWN);
m_pRoiScene->MoveSelectedItem(DOWN, step);
}
}
void CDsgRoiDlg::showEvent(QShowEvent *evt)
@ -456,3 +480,15 @@ void CDsgRoiDlg::OnZoomOut()
m_pRoiScene->zoomImage(false);
}
Q_SLOT void CDsgRoiDlg::onSliderChange(int value)
{
SystemStateInfo::setIni.setValue(QStringLiteral("sliderValue"), value);
}
void CDsgRoiDlg::changeEvent(QEvent *event)
{
if (event->type() == QEvent::LanguageChange)
{
ui->retranslateUi(this);
}
}

4
src/lpbdesigner/DsgRoiDlg.h
Unescape Escape View File

@ -24,6 +24,9 @@ public:
virtual void OnManualTrigger(){}
virtual void OnSetParam(IDetectorTask* pTask){}
virtual void showEvent(QShowEvent *evt);
Q_SLOT void onSliderChange(int value);
protected:
virtual void changeEvent(QEvent *event);
public slots :
bool OnOk();
bool OnCancel();
@ -34,6 +37,7 @@ public slots :
void OnMove();
void OnZoomIn();
void OnZoomOut();
void OnSelectImage();
void OnShowTenFlag();
private:

43
src/lpbdesigner/MainFrame.cpp
Unescape Escape View File

@ -117,26 +117,25 @@ CMainFrame::CMainFrame(QWidget *parent)
ui->setupUi(this);
setContextMenuPolicy(Qt::NoContextMenu);
setWindowIcon(QIcon(":/img/resource/app.png"));
//task列表控件设置
connect(ui->treeWidget, SIGNAL(itemClicked(QTreeWidgetItem*, int)), this, SLOT(OnTreeItemClick()));
ui->treeWidget->setStyleSheet("QTreeWidget::item{height:30px}");
//算法列表控件初始化
ui->tableWidget_2->setContextMenuPolicy(Qt::CustomContextMenu);
connect(ui->tableWidget_2, SIGNAL(customContextMenuRequested(const QPoint&)), this, SLOT(OnParamPopMenu(const QPoint&)));
connect(ui->tableWidget_2, SIGNAL(cellDoubleClicked(int, int)), this, SLOT(OnRunAlgo()));
connect(ui->tableWidget_2, SIGNAL(cellClicked(int, int)), this, SLOT(OnInitCurrentAlgoParam()));
//算法参数列表控件初始化
ui->tableWidget->setContextMenuPolicy(Qt::CustomContextMenu);
connect(ui->tableWidget, SIGNAL(customContextMenuRequested(const QPoint&)), this, SLOT(OnParamListPopMenu(const QPoint&)));
connect(ui->tableWidget, SIGNAL(cellClicked(int, int)), this, SLOT(OnCellClicked(int, int)));
//图像输入框
ui->gv_input->setInfoLabel(ui->label_pixel_info);
ui->gv_input->setContextMenuPolicy(Qt::CustomContextMenu);
connect(ui->gv_input, SIGNAL(customContextMenuRequested(const QPoint&)), this, SLOT(OnGvInputWidgetPopMenu(const QPoint&)));
connect(ui->pushButton_5, SIGNAL(clicked()), this, SLOT(OnClearResult()));//清空打印信息
connect(ui->m_pbLoadImage, SIGNAL(clicked()), this, SLOT(onLoadImage()));//加载图片
connect(ui->m_pbSaveBtn, SIGNAL(clicked()), this, SLOT(OnTrigger()));//保存标定参数
connect(this, SIGNAL(sgShowStatus(QString)), this, SLOT(OnShowStatus(QString)));
ui->gv_input->setInfoLabel(ui->label_pixel_info);
connect(ui->gv_input, SIGNAL(imgScaled(QTransform, QPointF)), ui->gv_output, SLOT(scaleImg(QTransform, QPointF)));
connect(ui->gv_input, SIGNAL(imgMoved(QPointF)), ui->gv_output, SLOT(moveImg(QPointF)));
connect(ui->gv_output, SIGNAL(imgScaled(QTransform, QPointF)), ui->gv_input, SLOT(scaleImg(QTransform, QPointF)));
@ -144,7 +143,12 @@ CMainFrame::CMainFrame(QWidget *parent)
connect(ui->gv_output, SIGNAL(pixelSelected(QPoint)), ui->gv_input, SLOT(selectPixel(QPoint)));
connect(this, SIGNAL(sgShowCameraImage(QImage)), this, SLOT(OnShowCameraImage(QImage)));
m_plablStatus = new QLabel(this);
connect(ui->pushButton_5, SIGNAL(clicked()), this, SLOT(OnClearResult()));//清空打印信息
connect(ui->m_pbLoadImage, SIGNAL(clicked()), this, SLOT(onLoadImage()));//加载图片
connect(ui->m_pbSaveBtn, SIGNAL(clicked()), this, SLOT(OnTrigger()));//保存标定参数
connect(this, SIGNAL(sgShowStatus(QString)), this, SLOT(OnShowStatus(QString)));
m_plablStatus = new QLabel(this);//菜单栏提示信息
ui->statusBar->addWidget(m_plablStatus);
_pSaveStatus = ui->label_SaveStatus;
}
@ -165,12 +169,10 @@ CMainFrame::~CMainFrame()
bool CMainFrame::OnMainMenuTrigger(QAction* pAction)
{
if (pAction)
{
if (pAction) {
QString strName = pAction->objectName();
if ("action_save" == strName)
{
if (_pOldTask){
if ("action_save" == strName) {
if (_pOldTask) {
if (!oldMat.empty())
_pOldTask->GetTaskInfo()->templateImg = oldMat;
}
@ -374,7 +376,16 @@ bool CMainFrame::InitCurrentTask()
std::string strPath = strImageName.toLocal8Bit().toStdString();
m_pCurrentTask->GetTaskInfo()->templateImg = cv::imread(strPath, CV_LOAD_IMAGE_GRAYSCALE);
}
ColossusBase::showImage(m_pCurrentTask->GetTaskInfo()->templateImg, ui->gv_input);
if (m_pCurrentTask->GetTaskInfo()->templateImg.data == NULL)
{
QImage img(":/resource/no-img.png");
ui->gv_input->setImg(img);
}
else
{
ColossusBase::showImage(m_pCurrentTask->GetTaskInfo()->templateImg, ui->gv_input);
}
}
return true;

6
src/lpbdesigner/MainFrame.ui
Unescape Escape View File

@ -9,8 +9,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>1050</width>
<height>755</height>
<width>1022</width>
<height>702</height>
</rect>
</property>
<property name="windowTitle">
@ -315,7 +315,7 @@
<item>
<widget class="QPushButton" name="m_pbLoadImage">
<property name="text">
<string>加载图像</string>
<string>加载标定图像</string>
</property>
</widget>
</item>

613
src/lpbdesigner/RoiDlg.ui
Unescape Escape View File

@ -9,63 +9,79 @@
<rect>
<x>0</x>
<y>0</y>
<width>896</width>
<height>587</height>
<width>925</width>
<height>623</height>
</rect>
</property>
<property name="windowTitle">
<string>ROI检测区域配置</string>
</property>
<layout class="QGridLayout" name="gridLayout_3">
<property name="leftMargin">
<number>5</number>
</property>
<property name="topMargin">
<number>5</number>
</property>
<property name="rightMargin">
<number>5</number>
</property>
<property name="bottomMargin">
<number>5</number>
</property>
<item row="1" column="0">
<spacer name="horizontalSpacer_5">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>649</width>
<height>27</height>
</size>
</property>
</spacer>
</item>
<item row="1" column="1">
<widget class="QPushButton" name="pushButton">
<property name="minimumSize">
<size>
<width>0</width>
<height>30</height>
</size>
</property>
<item row="0" column="0">
<widget class="QGroupBox" name="groupBox">
<property name="font">
<font>
<pointsize>12</pointsize>
</font>
</property>
<property name="text">
<string>确定</string>
<property name="title">
<string>绘图区域：</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<property name="spacing">
<number>2</number>
</property>
<property name="leftMargin">
<number>6</number>
</property>
<property name="topMargin">
<number>6</number>
</property>
<property name="rightMargin">
<number>6</number>
</property>
<property name="bottomMargin">
<number>6</number>
</property>
<item>
<widget class="QLabel" name="label_pixel_info">
<property name="font">
<font>
<pointsize>12</pointsize>
</font>
</property>
<property name="text">
<string>Pixel info: </string>
</property>
</widget>
</item>
<item>
<widget class="QGraphicsView" name="graphicsView">
<property name="font">
<font>
<pointsize>12</pointsize>
</font>
</property>
<property name="styleSheet">
<string notr="true">background-color: rgb(212, 212, 212);</string>
</property>
<property name="transformationAnchor">
<enum>QGraphicsView::AnchorUnderMouse</enum>
</property>
<property name="resizeAnchor">
<enum>QGraphicsView::AnchorUnderMouse</enum>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item row="1" column="2">
<widget class="QPushButton" name="pushButton_2">
<property name="minimumSize">
<item row="0" column="1">
<widget class="QGroupBox" name="groupBox_2">
<property name="maximumSize">
<size>
<width>0</width>
<height>30</height>
<width>140</width>
<height>16777215</height>
</size>
</property>
<property name="font">
@ -73,211 +89,340 @@
<pointsize>12</pointsize>
</font>
</property>
<property name="text">
<string>取消</string>
<property name="title">
<string>工具</string>
</property>
<layout class="QGridLayout" name="gridLayout_2">
<item row="0" column="0">
<layout class="QHBoxLayout" name="horizontalLayout_2">
<item>
<widget class="QLabel" name="label_Color">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string/>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="pushButton_8">
<property name="maximumSize">
<size>
<width>80</width>
<height>16777215</height>
</size>
</property>
<property name="font">
<font>
<pointsize>12</pointsize>
</font>
</property>
<property name="text">
<string>颜色</string>
</property>
</widget>
</item>
</layout>
</item>
<item row="1" column="0">
<widget class="QPushButton" name="pushButton_7">
<property name="minimumSize">
<size>
<width>0</width>
<height>30</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>130</width>
<height>16777215</height>
</size>
</property>
<property name="font">
<font>
<pointsize>12</pointsize>
</font>
</property>
<property name="text">
<string>圆</string>
</property>
</widget>
</item>
<item row="2" column="0">
<widget class="QPushButton" name="pushButton_5">
<property name="minimumSize">
<size>
<width>0</width>
<height>30</height>
</size>
</property>
<property name="font">
<font>
<pointsize>12</pointsize>
</font>
</property>
<property name="text">
<string>十字标定线</string>
</property>
</widget>
</item>
<item row="3" column="0">
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
<item row="4" column="0">
<layout class="QHBoxLayout" name="horizontalLayout_3">
<item>
<widget class="QLabel" name="label">
<property name="text">
<string>步长</string>
</property>
</widget>
</item>
<item>
<widget class="QSlider" name="horizontalSlider">
<property name="minimum">
<number>1</number>
</property>
<property name="maximum">
<number>10</number>
</property>
<property name="pageStep">
<number>1</number>
</property>
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="invertedAppearance">
<bool>false</bool>
</property>
<property name="invertedControls">
<bool>false</bool>
</property>
<property name="tickPosition">
<enum>QSlider::TicksAbove</enum>
</property>
<property name="tickInterval">
<number>1</number>
</property>
</widget>
</item>
</layout>
</item>
<item row="5" column="0">
<layout class="QGridLayout" name="gridLayout">
<property name="topMargin">
<number>5</number>
</property>
<property name="spacing">
<number>0</number>
</property>
<item row="3" column="1">
<spacer name="verticalSpacer_2">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
<item row="0" column="1">
<widget class="QToolButton" name="m_pbUp">
<property name="text">
<string>...</string>
</property>
<property name="icon">
<iconset resource="image.qrc">
<normaloff>:/resource/caret-up.png</normaloff>:/resource/caret-up.png</iconset>
</property>
<property name="iconSize">
<size>
<width>32</width>
<height>32</height>
</size>
</property>
<property name="autoRaise">
<bool>true</bool>
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="QToolButton" name="m_pbDown">
<property name="text">
<string>...</string>
</property>
<property name="icon">
<iconset resource="image.qrc">
<normaloff>:/resource/caret-down.png</normaloff>:/resource/caret-down.png</iconset>
</property>
<property name="iconSize">
<size>
<width>32</width>
<height>32</height>
</size>
</property>
<property name="autoRaise">
<bool>true</bool>
</property>
</widget>
</item>
<item row="1" column="2">
<widget class="QToolButton" name="m_pbRight">
<property name="text">
<string>...</string>
</property>
<property name="icon">
<iconset resource="image.qrc">
<normaloff>:/resource/caret-right.png</normaloff>:/resource/caret-right.png</iconset>
</property>
<property name="iconSize">
<size>
<width>32</width>
<height>32</height>
</size>
</property>
<property name="autoRaise">
<bool>true</bool>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QToolButton" name="m_pbLeft">
<property name="text">
<string>...</string>
</property>
<property name="icon">
<iconset resource="image.qrc">
<normaloff>:/resource/caret-left.png</normaloff>:/resource/caret-left.png</iconset>
</property>
<property name="iconSize">
<size>
<width>32</width>
<height>32</height>
</size>
</property>
<property name="autoRaise">
<bool>true</bool>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QToolButton" name="toolButton">
<property name="enabled">
<bool>false</bool>
</property>
<property name="text">
<string>...</string>
</property>
<property name="icon">
<iconset resource="image.qrc">
<normaloff>:/resource/btn-close.png</normaloff>:/resource/btn-close.png</iconset>
</property>
<property name="iconSize">
<size>
<width>32</width>
<height>32</height>
</size>
</property>
<property name="checkable">
<bool>false</bool>
</property>
<property name="autoRepeat">
<bool>false</bool>
</property>
<property name="autoExclusive">
<bool>false</bool>
</property>
<property name="popupMode">
<enum>QToolButton::DelayedPopup</enum>
</property>
<property name="autoRaise">
<bool>true</bool>
</property>
<property name="arrowType">
<enum>Qt::NoArrow</enum>
</property>
</widget>
</item>
</layout>
</item>
</layout>
</widget>
</item>
<item row="0" column="0" colspan="3">
<widget class="QSplitter" name="splitter">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<widget class="QGroupBox" name="groupBox_2">
<property name="maximumSize">
<size>
<width>140</width>
<height>16777215</height>
</size>
</property>
<property name="font">
<font>
<pointsize>12</pointsize>
</font>
</property>
<property name="title">
<string>工具</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout_2">
<property name="leftMargin">
<number>2</number>
<item row="1" column="0" colspan="2">
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<spacer name="horizontalSpacer_5">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="topMargin">
<number>2</number>
<property name="sizeHint" stdset="0">
<size>
<width>649</width>
<height>27</height>
</size>
</property>
<property name="rightMargin">
<number>2</number>
</spacer>
</item>
<item>
<widget class="QPushButton" name="pushButton">
<property name="minimumSize">
<size>
<width>0</width>
<height>30</height>
</size>
</property>
<property name="bottomMargin">
<number>2</number>
<property name="font">
<font>
<pointsize>12</pointsize>
</font>
</property>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_2">
<item>
<widget class="QPushButton" name="pushButton_8">
<property name="maximumSize">
<size>
<width>80</width>
<height>16777215</height>
</size>
</property>
<property name="font">
<font>
<pointsize>12</pointsize>
</font>
</property>
<property name="text">
<string>颜色</string>
</property>
</widget>
</item>
<item>
<widget class="QLineEdit" name="lineEdit_3">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>50</width>
<height>0</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>100</width>
<height>16777215</height>
</size>
</property>
<property name="font">
<font>
<pointsize>12</pointsize>
</font>
</property>
</widget>
</item>
</layout>
</item>
<item>
<widget class="QPushButton" name="pushButton_7">
<property name="minimumSize">
<size>
<width>0</width>
<height>30</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>130</width>
<height>16777215</height>
</size>
</property>
<property name="font">
<font>
<pointsize>12</pointsize>
</font>
</property>
<property name="text">
<string>圆</string>
</property>
</widget>
</item>
<item>
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QPushButton" name="pushButton_5">
<property name="minimumSize">
<size>
<width>0</width>
<height>30</height>
</size>
</property>
<property name="font">
<font>
<pointsize>12</pointsize>
</font>
</property>
<property name="text">
<string>十字标定线</string>
</property>
</widget>
</item>
</layout>
</widget>
<widget class="QGroupBox" name="groupBox">
<property name="font">
<font>
<pointsize>12</pointsize>
</font>
</property>
<property name="title">
<string>绘图区域：</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<property name="spacing">
<number>2</number>
<property name="text">
<string>确定</string>
</property>
<property name="leftMargin">
<number>6</number>
</widget>
</item>
<item>
<widget class="QPushButton" name="pushButton_2">
<property name="minimumSize">
<size>
<width>0</width>
<height>30</height>
</size>
</property>
<property name="topMargin">
<number>6</number>
<property name="font">
<font>
<pointsize>12</pointsize>
</font>
</property>
<property name="rightMargin">
<number>6</number>
<property name="text">
<string>取消</string>
</property>
<property name="bottomMargin">
<number>6</number>
</property>
<item>
<widget class="QLabel" name="label_pixel_info">
<property name="font">
<font>
<pointsize>12</pointsize>
</font>
</property>
<property name="text">
<string>Pixel info: </string>
</property>
</widget>
</item>
<item>
<widget class="QGraphicsView" name="graphicsView">
<property name="font">
<font>
<pointsize>12</pointsize>
</font>
</property>
<property name="styleSheet">
<string notr="true">background-color: rgb(212, 212, 212);</string>
</property>
<property name="transformationAnchor">
<enum>QGraphicsView::AnchorUnderMouse</enum>
</property>
<property name="resizeAnchor">
<enum>QGraphicsView::AnchorUnderMouse</enum>
</property>
</widget>
</item>
</layout>
</widget>
</widget>
</widget>
</item>
</layout>
</item>
</layout>
</widget>
<resources/>
<resources>
<include location="image.qrc"/>
</resources>
<connections/>
</ui>

12
src/lpbdesigner/RoiItem.cpp
Unescape Escape View File

@ -5,7 +5,7 @@
#include <QCursor>
#include <QDebug>
#include <QGraphicsEffect>
#define MinRECTWITH 20
#define MinRECTWITH 32
static QPainterPath qt_graphicsItem_shapeFromPath(const QPainterPath &path, const QPen &pen)
{
const qreal penWidthZero = qreal(0.00000001);
@ -65,9 +65,9 @@ void GraphicsItemGroup::paint(QPainter *painter, const QStyleOptionGraphicsItem
//绘制中心
painter->setPen(QPen(QColor(qRed(rgb), qGreen(rgb), qBlue(rgb)), 3, Qt::SolidLine, Qt::FlatCap, Qt::MiterJoin));
painter->drawEllipse(-5, -5, 10, 10);
painter->drawLine(QLineF(QPointF(-10, 0), QPointF(10, 0)));
painter->drawLine(QLineF(QPointF(0, -10), QPointF(0, 10)));
painter->drawEllipse(-20, -20, 25, 25);
painter->drawLine(QLineF(QPointF(-15, 0), QPointF(15, 0)));
painter->drawLine(QLineF(QPointF(0, -15), QPointF(0, 15)));
}
}
@ -110,12 +110,8 @@ QRectF GraphicsItemGroup::boundingRect() const
{
rect = mapRectFromItem(m_vecItem[i], m_vecItem[i]->rect());
}
rects = rects.united(rect);
}
return rects;
}

26
src/lpbdesigner/RoiScene.cpp
Unescape Escape View File

@ -233,7 +233,6 @@ bool RoiScene::InitRecord(Item_List record, int nIndex)
itemPoint.setX(item.second.at(0));
itemPoint.setY(item.second.at(1));
graphicItem->setPos(itemPoint-mImgPosOffSet);
//m_graphItemMap[graphicItem]= maptoImgNewPos(graphicItem);
tagROIParas tagItem;
tagItem._model = ENUM_LOCKROI;
tagItem.rectf = maptoImgNewPos(graphicItem);
@ -279,7 +278,6 @@ void RoiScene::mousePressEvent(QGraphicsSceneMouseEvent *mouseEvent)
DrawTool * tool = DrawTool::findTool(DrawTool::c_drawShape);
if (tool)
tool->mousePressEvent(mouseEvent, this);
}
}
@ -337,7 +335,7 @@ void RoiScene::mouseReleaseEvent(QGraphicsSceneMouseEvent *mouseEvent)
}
void RoiScene::MoveSelectedItem(DirType type)
void RoiScene::MoveSelectedItem(DirType type, int step)
{
QList<QGraphicsItem *> items = this->selectedItems();
GraphicsItem *item = 0;
@ -351,22 +349,22 @@ void RoiScene::MoveSelectedItem(DirType type)
{
case LEFT:
{
item->moveBy(-1, 0);
item->moveBy(-step, 0);
break;
}
case RIGHT:
{
item->moveBy(1, 0);
item->moveBy(step, 0);
break;
}
case UP:
{
item->moveBy(0, -1);
item->moveBy(0, -step);
break;
}
case DOWN:
{
item->moveBy(0, 1);
item->moveBy(0, step);
break;
}
}
@ -480,6 +478,7 @@ void RoiScene::contextMenuEvent(QGraphicsSceneContextMenuEvent *event)
{
unCheckAction = menu.addAction(QObject::tr("解绑"));
unCheckAction->setObjectName("unCheckAction");
unCheckAction->setIcon(QIcon(":/resource/lock-open.png"));
}
else if (tmpModel == ENUM_BINDROI)
{
@ -487,28 +486,34 @@ void RoiScene::contextMenuEvent(QGraphicsSceneContextMenuEvent *event)
{
checkAction = menu.addAction(QObject::tr("绑定"));
checkAction->setObjectName("checkAction");
checkAction->setIcon(QIcon(":/resource/lock.png"));
}
unCheckAction = menu.addAction(QObject::tr("解除径向绑定"));
unCheckAction->setObjectName("unCheckAction");
unCheckAction->setIcon(QIcon(":/resource/lock.png"));
}
else if (tmpModel == ENUM_UNBINDROI)
{
radiusFixAction = menu.addAction(QObject::tr("径向解锁"));
radiusFixAction->setObjectName("radiusUnfixAction");
unCheckAction->setIcon(QIcon(":/resource/lock-open_green.png"));
}
else
{
if (items.size() > 0){
deleteAction = menu.addAction(QObject::tr("删除"));
deleteAction->setObjectName("deleteAction");
deleteAction->setIcon(QIcon(":/resource/btn-close.png"));
}
checkAction = menu.addAction(QObject::tr("绑定"));
checkAction->setObjectName("checkAction");
checkAction->setIcon(QIcon(":/resource/lock.png"));
if (m_graphItemMapStruct.size() == 2){
if (tmpModel != ENUM_UNLOCKROI){
unCheckAction = menu.addAction(QObject::tr("解绑"));
unCheckAction->setObjectName("unCheckAction");
unCheckAction->setIcon(QIcon(":/resource/lock-open.png"));
}
GraphicsItem *pFirst = m_graphItemMapStruct.firstKey();
@ -525,6 +530,7 @@ void RoiScene::contextMenuEvent(QGraphicsSceneContextMenuEvent *event)
if (pSmallItem == ptmpItem){
radiusFixAction = menu.addAction(QObject::tr("径向绑定"));
radiusFixAction->setObjectName("radiusFixAction");
radiusFixAction->setIcon(QIcon(":/resource/lock.png"));
}
}
}
@ -767,7 +773,13 @@ void RoiScene::InitShowImage(cv::Mat img)
if (!mpGraphicsView)
return;
if (img.empty())
{
if (m_pImageItem)
{
m_pImageItem = nullptr;
}
return;
}
mpShowImage = ColossusBase::convMat2QImage(img);

2
src/lpbdesigner/RoiScene.h
Unescape Escape View File

@ -53,7 +53,7 @@ public:
bool InitRecord(Item_List record, int nIndex);
void InitShowImage(cv::Mat img);
void DisableMenu(bool bRet) { m_bDisableMenu = bRet; }
void MoveSelectedItem(DirType type);
void MoveSelectedItem(DirType type,int step = 1);
void SetSelectedItem(QPoint pos, QRect size);
void SetGraphicsView(QGraphicsView* ipGV){ mpGraphicsView = ipGV; }
void SetInfoLable(QLabel* ipLable){ mpInfoLabel = ipLable; }

2
src/lpbdesigner/SizeHandle.h
Unescape Escape View File

@ -12,7 +12,7 @@ class QGraphicsSceneMouseEvent;
QT_END_NAMESPACE
enum { SELECTION_HANDLE_SIZE = 10, SELECTION_MARGIN = 10 };
enum { SELECTION_HANDLE_SIZE = 20, SELECTION_MARGIN = 20 };
enum SelectionHandleState { SelectionHandleOff, SelectionHandleInactive, SelectionHandleActive };
class SizeHandleRect :public QGraphicsRectItem

15
src/lpbdesigner/image.qrc
Unescape Escape View File

@ -1,6 +1,21 @@
<RCC>
<qresource prefix="/">
<file>resource/app.png</file>
<file>resource/arrow.png</file>
<file>resource/arrow-down.png</file>
<file>resource/arrow-left.png</file>
<file>resource/arrow-right.png</file>
<file>resource/btn-close.png</file>
<file>resource/lock.png</file>
<file>resource/lock-open.png</file>
<file>resource/no-img.png</file>
<file>resource/caret-down.png</file>
<file>resource/caret-left.png</file>
<file>resource/caret-right.png</file>
<file>resource/caret-up.png</file>
<file>resource/interlines.png</file>
<file>resource/lock-open_green.png</file>
<file>resource/save.png</file>
<file>resource/save-all.png</file>
</qresource>
</RCC>

BIN
src/lpbdesigner/resource/arrow-down.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 594 B

BIN
src/lpbdesigner/resource/arrow-left.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 672 B

BIN
src/lpbdesigner/resource/arrow-right.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 693 B

BIN
src/lpbdesigner/resource/arrow.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 692 B

BIN
src/lpbdesigner/resource/btn-close.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 757 B

BIN
src/lpbdesigner/resource/caret-down.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 446 B

BIN
src/lpbdesigner/resource/caret-left.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 477 B

BIN
src/lpbdesigner/resource/caret-right.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 431 B

BIN
src/lpbdesigner/resource/caret-up.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 461 B

BIN
src/lpbdesigner/resource/down.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.1 KiB

BIN
src/lpbdesigner/resource/img.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.6 KiB

BIN
src/lpbdesigner/resource/interlines.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 10 KiB

BIN
src/lpbdesigner/resource/left_more.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.0 KiB

BIN
src/lpbdesigner/resource/lock-open.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1020 B

BIN
src/lpbdesigner/resource/lock-open_green.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1023 B

BIN
src/lpbdesigner/resource/lock.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 943 B

BIN
src/lpbdesigner/resource/no-img.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 5.3 KiB

BIN
src/lpbdesigner/resource/right_more.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 966 B

BIN
src/lpbdesigner/resource/save-all.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.4 KiB

BIN
src/lpbdesigner/resource/save.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 18 KiB

After

Width:  |  Height:  |  Size: 1.2 KiB

BIN
src/lpbdesigner/resource/thumbtack.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 822 B

BIN
src/lpbdesigner/resource/up.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1017 B

BIN
src/tpMain/Resource/no-img.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 5.3 KiB

1
src/tpMain/hubDetect.qrc
Unescape Escape View File

@ -7,6 +7,7 @@
<file>Resource/windows3.png</file>
<file>Resource/windows4.png</file>
<file>none.jpg</file>
<file alias="no-img">Resource/no-img.png</file>
</qresource>
<qresource prefix="/ToolBarPic">
<file>ToolBarpic/3d12.png</file>

7
src/tpMain/qaddmodel.cpp
Unescape Escape View File

@ -56,4 +56,11 @@ void QAddModel::SetClearData()
ui.wf_model_edit_ply->setText("");
}
void QAddModel::changeEvent(QEvent *event)
{
if (event->type() == QEvent::LanguageChange)
{
ui.retranslateUi(this);
}
}

2
src/tpMain/qaddmodel.h
Unescape Escape View File

@ -25,6 +25,8 @@ public:
QMap<QString, QVariant> getData();
void SetClearData();
protected:
virtual void changeEvent(QEvent *event);
};
#endif // QADDMODEL_H

8
src/tpMain/qshowimg.cpp
Unescape Escape View File

@ -19,6 +19,14 @@ Q_SLOT void QShowImg::showImg()
}
void QShowImg::changeEvent(QEvent *event)
{
if (event->type() == QEvent::LanguageChange)
{
ui.retranslateUi(this);
}
}
void QShowImg::setPicPath(QString m_filePath /*= QString()*/)
{
QPixmap m_pix(m_filePath);

2
src/tpMain/qshowimg.h
Unescape Escape View File

@ -15,6 +15,8 @@ public:
Q_SLOT void showImg();
signals:
void sgChangeImg();
protected:
virtual void changeEvent(QEvent *event);
private:
Ui::QShowImg ui;
};

8
src/tpMain/qworkItemdlg.cpp
Unescape Escape View File

@ -50,3 +50,11 @@ Q_SLOT void QWorkItemDlg::onOk()
QDialog::accept();
}
void QWorkItemDlg::changeEvent(QEvent *event)
{
if (event->type() == QEvent::LanguageChange)
{
ui.retranslateUi(this);
}
}

3
src/tpMain/qworkItemdlg.h
Unescape Escape View File

@ -19,7 +19,8 @@ public:
};
private:
Q_SLOT void onOk();
protected:
virtual void changeEvent(QEvent *event);
private:
Ui::QWorkItemUI ui;

14
src/tpMain/qworkmgrui.cpp
Unescape Escape View File

@ -17,7 +17,7 @@
#include "qworkItemdlg.h"
#include <QMessageBox>
#pragma execution_character_set("utf-8")
#define MODEL_UI_ICON_NONE ":/image/no-img"
QWorkMgrUI::QWorkMgrUI(QWorkMgrCtrl *pWork, IWheelCtrl *pCtrl)
: m_pCtrl(pCtrl), m_pWorkCtrl(pWork), m_ptrModel(NULL), m_ptableModel(NULL)
{
@ -492,7 +492,7 @@ void QWorkMgrUI::UpdateTab2(QStringList m_strList)
QString strFilePath = pModel->getPicPath();
if (strFilePath.isEmpty())
{
strFilePath = ":/image/none.jpg";
strFilePath = MODEL_UI_ICON_NONE;
}
else
{
@ -501,7 +501,7 @@ void QWorkMgrUI::UpdateTab2(QStringList m_strList)
QPixmap pix = QPixmap(strFilePath);
if (pix.isNull())
pix = QPixmap(":/image/none.jpg");
pix = QPixmap(MODEL_UI_ICON_NONE);
QIcon icon(pix.scaled(QSize(100, 100)));
QListWidgetItem* pItem = new QListWidgetItem(icon, strName);
@ -599,6 +599,14 @@ void QWorkMgrUI::closeEvent(QCloseEvent *event)
return;
}
void QWorkMgrUI::changeEvent(QEvent *event)
{
if (event->type() == QEvent::LanguageChange)
{
ui.retranslateUi(this);
}
}
void QWorkMgrUI::setData2Show(QString str){
ui.state_lineEdit->setText(str);
}

1
src/tpMain/qworkmgrui.h
Unescape Escape View File

@ -44,6 +44,7 @@ public:
void UpdateTabView(QString strName, TypeSelect enTymodel);
protected:
virtual void closeEvent(QCloseEvent *event);
virtual void changeEvent(QEvent *event);
signals:
void sgShowMsg(QString str);
void sgUpdatedefect();

8
tpvs17/tpMain/QAlgParamDlg.cpp
Unescape Escape View File

@ -64,6 +64,14 @@ void QAlgParamDlg::timerEvent(QTimerEvent *event)
}
}
void QAlgParamDlg::changeEvent(QEvent *event)
{
if (event->type() == QEvent::LanguageChange)
{
ui.retranslateUi(this);
}
}
void QAlgParamDlg::setParam()
{
ui.checkBox->setChecked(lpGlobalConfig::instance()->algParam.m_UseBackground == 0 ? false : true);

7
tpvs17/tpMain/QAlgParamDlg.h
Unescape Escape View File

@ -12,14 +12,15 @@ public:
QAlgParamDlg(QWidget *parent = Q_NULLPTR);
~QAlgParamDlg();
Q_SLOT void onButtonClicked();
void setParam();
void getParam();
Q_SLOT void onChangeBG();
signals:
void sgParamChange();
protected:
virtual void showEvent(QShowEvent *event);
virtual void timerEvent(QTimerEvent *event);
void setParam();
void getParam();
Q_SLOT void onChangeBG();
virtual void changeEvent(QEvent *event);
private:
Ui::QAlgParamDlg ui;
int m_timeID{ 0 };

8
tpvs17/tpMain/QCamSettingDlg.cpp
Unescape Escape View File

@ -196,3 +196,11 @@ void QCamSettingDlg::EnableUI(bool b)
ui.m_ImgHeight->setDisabled(!b);
}
void QCamSettingDlg::changeEvent(QEvent *event)
{
if (event->type() == QEvent::LanguageChange)
{
ui.retranslateUi(this);
}
}

2
tpvs17/tpMain/QCamSettingDlg.h
Unescape Escape View File

@ -22,6 +22,8 @@ public:
void onShowVirtualDir(bool bShow);
void EnableUI(bool b);
protected:
virtual void changeEvent(QEvent *event);
private:
Ui::QCamSettingDlg ui;
ICoreCtrl* m_pCoreCtl{ nullptr };

8
tpvs17/tpMain/QDebugDlg.cpp
Unescape Escape View File

@ -111,3 +111,11 @@ Q_SLOT void QDebugDlg::onTimeOut()
{
emit sgTriggerCam();
}
void QDebugDlg::changeEvent(QEvent *event)
{
if (event->type() == QEvent::LanguageChange)
{
ui.retranslateUi(this);
}
}

2
tpvs17/tpMain/QDebugDlg.h
Unescape Escape View File

@ -24,6 +24,8 @@ public:
signals:
void sgTriggerCam();
protected:
virtual void changeEvent(QEvent *event);
private:
Ui::QDebugDlg ui;
QTimer m_simuliter;

10
tpvs17/tpMain/QModelMgrDlg.cpp
Unescape Escape View File

@ -16,7 +16,7 @@
#define WS_PICSIZE 129 //!>缩放大小
#define WS_PICSIZELIST_ITEM 100
#define MODEL_UI_ICON_NONE ":/image/none.jpg"
#define MODEL_UI_ICON_NONE ":/image/no-img"
#define MODEL_UI_ICON_LEAPER ":/image/leaper"
enum EM_TYPE_PROCESSMODEL
@ -1011,3 +1011,11 @@ void QModelMgrDlg::closeEvent(QCloseEvent *event)
}
return;
}
void QModelMgrDlg::changeEvent(QEvent *event)
{
if (event->type() == QEvent::LanguageChange)
{
ui.retranslateUi(this);
}
}

2
tpvs17/tpMain/QModelMgrDlg.h
Unescape Escape View File

@ -63,8 +63,8 @@ private:
protected:
Q_SLOT void onButtonClicked();
virtual void showEvent(QShowEvent *event);
virtual void closeEvent(QCloseEvent *event);
virtual void changeEvent(QEvent *event);
private:
Ui::QModelMgrDlg ui;

18
tpvs17/tpMain/QModelMgrDlg.ui
Unescape Escape View File

@ -6,8 +6,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>985</width>
<height>691</height>
<width>1023</width>
<height>700</height>
</rect>
</property>
<property name="windowTitle">
@ -469,6 +469,12 @@
<height>129</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>129</width>
<height>129</height>
</size>
</property>
<property name="acceptDrops">
<bool>true</bool>
</property>
@ -479,10 +485,10 @@
<enum>Qt::PlainText</enum>
</property>
<property name="pixmap">
<pixmap>:/image/none.jpg</pixmap>
<pixmap resource="../../src/tpMain/hubDetect.qrc">:/image/no-img</pixmap>
</property>
<property name="scaledContents">
<bool>false</bool>
<bool>true</bool>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
@ -646,6 +652,8 @@
</layout>
</widget>
<layoutdefault spacing="6" margin="11"/>
<resources/>
<resources>
<include location="../../src/tpMain/hubDetect.qrc"/>
</resources>
<connections/>
</ui>

12
tpvs17/tpMain/QSettingDlg.cpp
Unescape Escape View File

@ -1,12 +0,0 @@
#include "QSettingDlg.h"
QSettingDlg::QSettingDlg(QWidget *parent)
: QWidget(parent)
{
ui.setupUi(this);
setWindowIcon(QIcon(":/image/leaper"));
}
QSettingDlg::~QSettingDlg()
{
}

19
tpvs17/tpMain/QSettingDlg.h
Unescape Escape View File

@ -1,19 +0,0 @@
#ifndef _H_QSETTINGDLG_H_
#define _H_QSETTINGDLG_H_
#include <QWidget>
#include "ui_QSettingDlg.h"
class QSettingDlg : public QWidget
{
Q_OBJECT
public:
QSettingDlg(QWidget *parent = Q_NULLPTR);
~QSettingDlg();
private:
Ui::QSettingDlg ui;
};
#endif

23
tpvs17/tpMain/QSettingDlg.ui
Unescape Escape View File

@ -1,23 +0,0 @@
<UI version="4.0" >
<class>QSettingDlg</class>
<widget class="QWidget" name="QSettingDlg" >
<property name="objectName" >
<string notr="true">QSettingDlg</string>
</property>
<property name="geometry" >
<rect>
<x>0</x>
<y>0</y>
<width>400</width>
<height>300</height>
</rect>
</property>
<property name="windowTitle" >
<string>QSettingDlg</string>
</property>
</widget>
<layoutDefault spacing="6" margin="11" />
<pixmapfunction></pixmapfunction>
<resources/>
<connections/>
</UI>

26
tpvs17/tpMain/lpMainWin.cpp
Unescape Escape View File

@ -22,12 +22,12 @@
#include "databasesql.h"
#include "lpCryptokey.h"
#define VERSION_HUB "3.0.1.4"
#define VERSION_ALG "3.0.1.3"
#define UPDATE_TIME "2021-09-30"
#define VERSION_HUB "3.0.1.5"
#define VERSION_ALG "3.0.1.4"
#define UPDATE_TIME "2021-10-09"
#pragma execution_character_set("utf-8")
#define MODEL_UI_ICON_NONE ":/image/no-img"
static QImage cvMat2QImage(const cv::Mat& mat) {
if (mat.type() == CV_8UC1) {
QImage image(mat.cols, mat.rows, QImage::Format_Indexed8);
@ -85,12 +85,6 @@ static cv::Mat QImageToMat(QImage image) {
lpMainWin::lpMainWin(QWidget *parent)
: QMainWindow(parent)
{
{//加载语言设置
QSettings languageSetting("hubdetect.ini", QSettings::IniFormat);
QString strLanguage = languageSetting.value("language", "Chinese").toString();
SetLanguage(strLanguage);
}
this->setWindowIcon(QIcon(":/image/leaper"));
qRegisterMetaType<TimeStruct>("TimeStruct");
onInitCoreCtrl();//初始化CoreCtrl模块 相机相关处理模块
@ -98,7 +92,11 @@ lpMainWin::lpMainWin(QWidget *parent)
ui.setupUi(this);
onInitAbout();
setupTrayIcon();
{//加载语言设置
QSettings languageSetting("hubdetect.ini", QSettings::IniFormat);
QString strLanguage = languageSetting.value("language", "Chinese").toString();
SetLanguage(strLanguage);
}
lpGlobalConfig::instance()->loadStandParam();
{
QGridLayout *pLayout = new QGridLayout(ui.cam_win_1);
@ -130,11 +128,11 @@ lpMainWin::lpMainWin(QWidget *parent)
ui.action_userManager->setVisible(false);
QMenu *pToolMenu = new QMenu(this);
pToolMenu->addAction(ui.actioncamSetting);
pToolMenu->addAction(ui.action_ImageCali);//图像标定
pToolMenu->addAction(ui.action_debug);
pToolMenu->addAction(ui.actionSystemSeting);
pToolMenu->addAction(ui.actioncamSetting);
pToolMenu->addAction(ui.actionalgo);
pToolMenu->addAction(ui.action_debug);
QToolButton* pbutton = new QToolButton(this);
pbutton->setMenu(pToolMenu);
@ -1392,7 +1390,7 @@ void lpMainWin::onShowResult(Result2Ui* pRlt)
scare = scareh;
if (pRlt->m_strModel.isEmpty()) {
lpGlobalConfig::instance()->totalUnDetectNum++;
QPixmap pix(":/image/none.jpg");
QPixmap pix(MODEL_UI_ICON_NONE);
ui.main_lb_res_model_pic->setPixmap(pix.scaled(scare - 15, scare - 15));
ui.main_lb_res_model_pic->setStyleSheet(QString("QLabel{border: 5px solid rgb(250,0,0,250);background-color: rgb(200, 200, 200);}"));

2
tpvs17/tpMain/lpMainWin.ui
Unescape Escape View File

@ -6,7 +6,7 @@
<rect>
<x>0</x>
<y>0</y>
<width>1026</width>
<width>1025</width>
<height>704</height>
</rect>
</property>

30
tpvs17/tpMain/tpMain.vcxproj
Unescape Escape View File

@ -162,9 +162,6 @@
<ClCompile Include="GeneratedFiles\Debug\moc_qsaveresult.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="GeneratedFiles\Debug\moc_QSettingDlg.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="GeneratedFiles\Debug\moc_qshowimg.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
</ClCompile>
@ -297,9 +294,6 @@
<ClCompile Include="GeneratedFiles\Release\moc_qsaveresult.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="GeneratedFiles\Release\moc_QSettingDlg.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="GeneratedFiles\Release\moc_qshowimg.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
</ClCompile>
@ -336,7 +330,6 @@
<ClCompile Include="QDebugDlg.cpp" />
<ClCompile Include="QModelMgrDlg.cpp" />
<ClCompile Include="QPLCDevice.cpp" />
<ClCompile Include="QSettingDlg.cpp" />
<ClCompile Include="WebServer.cpp" />
</ItemGroup>
<ItemGroup>
@ -430,16 +423,6 @@
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
<Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DWIN64 -DQT_NO_DEBUG -DNDEBUG -DQT_CORE_LIB -DTPMAIN_LIB -DTPMAIN_EXPORTS -DQT_GUI_LIB -DQT_WIDGETS_LIB -DQT_SQL_LIB -DQT_PRINTSUPPORT_LIB -DQT_NETWORK_LIB -DQT_SERIALPORT_LIB -DQT_WEBSOCKETS_LIB -D%(PreprocessorDefinitions) "-I." "-I.\GeneratedFiles" "-I.\GeneratedFiles\$(ConfigurationName)" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\ActiveQt" "-I$(QTDIR)\include\QtSerialPort" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtPrintSupport" "-I$(QTDIR)\include\QtSql" "-I$(QTDIR)\include\QtNetwork" "-I$(QTDIR)\include\QtWebSockets" "-I.\..\..\src\algorithm" "-I.\..\..\src\tpMain" "-I.\..\..\src\tpMain\thread" "-I.\..\..\src\tpMain\splashScreen" "-I.\..\..\src\tpMain\LightBoxwidget" "-I.\..\..\src\tpMain\QDiskCleanThread" "-I.\..\..\src\tpMain\QPixmapListBar" "-I.\..\..\src\userCtrl" "-I.\..\..\src\NetWheel" "-I.\..\..\3part\libzkq\include" "-I.\..\..\3part\tadpole\include\tpBase" "-I.\..\..\3part\opencv3.4.1\include" "-I.\..\..\3part\opencv3.4.1\include\opencv" "-I.\..\..\3part\opencv3.4.1\include\opencv2" "-I.\..\..\3part\edcircle\include" "-I.\..\..\3part\lpCoreCtrl\include" "-I.\..\..\src\tpMain\algela" "-I.\..\..\src\ImageCompare" "-I.\..\..\src\interface" "-I.\lpRawTcp" "-I.\..\..\src\tpMain\cryptokey" "-I.\..\..\3part\RsaCrypto\include" "-I.\..\..\3part\openssl-1.0.2n\vs13\include" "-I.\..\..\3part\lp_libtcp\include"</Command>
</CustomBuild>
<CustomBuild Include="QSettingDlg.h">
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
<Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Moc%27ing %(Identity)...</Message>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DWIN64 -DQT_CORE_LIB -DTPMAIN_LIB -DTPMAIN_EXPORTS -DQT_GUI_LIB -DQT_WIDGETS_LIB -DQT_SQL_LIB -DQT_PRINTSUPPORT_LIB -DQT_NETWORK_LIB -DQT_SERIALPORT_LIB -D_WINDOWS -DQT_WEBSOCKETS_LIB -D%(PreprocessorDefinitions) "-I." "-I.\GeneratedFiles" "-I.\GeneratedFiles\$(ConfigurationName)" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\ActiveQt" "-I$(QTDIR)\include\QtSerialPort" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtPrintSupport" "-I$(QTDIR)\include\QtSql" "-I$(QTDIR)\include\QtNetwork" "-I$(QTDIR)\include\QtWebSockets" "-I.\..\..\src\algorithm" "-I.\..\..\src\tpMain" "-I.\..\..\src\tpMain\thread" "-I.\..\..\src\tpMain\splashScreen" "-I.\..\..\src\tpMain\LightBoxwidget" "-I.\..\..\src\tpMain\QDiskCleanThread" "-I.\..\..\src\tpMain\QPixmapListBar" "-I.\..\..\src\userCtrl" "-I.\..\..\src\NetWheel" "-I.\..\..\3part\libzkq\include" "-I.\..\..\3part\tadpole\include\tpBase" "-I.\..\..\3part\opencv3.4.1\include" "-I.\..\..\3part\opencv3.4.1\include\opencv" "-I.\..\..\3part\opencv3.4.1\include\opencv2" "-I.\..\..\3part\edcircle\include" "-I.\..\..\3part\lpCoreCtrl\include" "-I.\..\..\src\tpMain\algela" "-I.\..\..\src\ImageCompare" "-I.\..\..\src\interface" "-I.\lpRawTcp" "-I.\..\..\src\tpMain\cryptokey" "-I.\..\..\3part\RsaCrypto\include" "-I.\..\..\3part\openssl-1.0.2n\vs13\include" "-I.\..\..\3part\lp_libtcp\include"</Command>
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
<Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Moc%27ing %(Identity)...</Message>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
<Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DWIN64 -DQT_NO_DEBUG -DNDEBUG -DQT_CORE_LIB -DTPMAIN_LIB -DTPMAIN_EXPORTS -DQT_GUI_LIB -DQT_WIDGETS_LIB -DQT_SQL_LIB -DQT_PRINTSUPPORT_LIB -DQT_NETWORK_LIB -DQT_SERIALPORT_LIB -DQT_WEBSOCKETS_LIB -D%(PreprocessorDefinitions) "-I." "-I.\GeneratedFiles" "-I.\GeneratedFiles\$(ConfigurationName)" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\ActiveQt" "-I$(QTDIR)\include\QtSerialPort" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtPrintSupport" "-I$(QTDIR)\include\QtSql" "-I$(QTDIR)\include\QtNetwork" "-I$(QTDIR)\include\QtWebSockets" "-I.\..\..\src\algorithm" "-I.\..\..\src\tpMain" "-I.\..\..\src\tpMain\thread" "-I.\..\..\src\tpMain\splashScreen" "-I.\..\..\src\tpMain\LightBoxwidget" "-I.\..\..\src\tpMain\QDiskCleanThread" "-I.\..\..\src\tpMain\QPixmapListBar" "-I.\..\..\src\userCtrl" "-I.\..\..\src\NetWheel" "-I.\..\..\3part\libzkq\include" "-I.\..\..\3part\tadpole\include\tpBase" "-I.\..\..\3part\opencv3.4.1\include" "-I.\..\..\3part\opencv3.4.1\include\opencv" "-I.\..\..\3part\opencv3.4.1\include\opencv2" "-I.\..\..\3part\edcircle\include" "-I.\..\..\3part\lpCoreCtrl\include" "-I.\..\..\src\tpMain\algela" "-I.\..\..\src\ImageCompare" "-I.\..\..\src\interface" "-I.\lpRawTcp" "-I.\..\..\src\tpMain\cryptokey" "-I.\..\..\3part\RsaCrypto\include" "-I.\..\..\3part\openssl-1.0.2n\vs13\include" "-I.\..\..\3part\lp_libtcp\include"</Command>
</CustomBuild>
<CustomBuild Include="..\..\src\tpMain\algela\lpImgViewer.h">
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
<Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Moc%27ing %(Identity)...</Message>
@ -515,7 +498,6 @@
<ClInclude Include="GeneratedFiles\ui_QDebugDlg.h" />
<ClInclude Include="GeneratedFiles\ui_QModelMgrDlg.h" />
<ClInclude Include="GeneratedFiles\ui_qmodnamedlg.h" />
<ClInclude Include="GeneratedFiles\ui_QSettingDlg.h" />
<ClInclude Include="GeneratedFiles\ui_qshowimg.h" />
<ClInclude Include="GeneratedFiles\ui_qworkItemdlg.h" />
<ClInclude Include="GeneratedFiles\ui_qworkmgrui.h" />
@ -1158,18 +1140,6 @@
<Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(QTDIR)\bin\uic.exe" -o ".\GeneratedFiles\ui_%(Filename).h" "%(FullPath)"</Command>
</CustomBuild>
</ItemGroup>
<ItemGroup>
<CustomBuild Include="QSettingDlg.ui">
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(QTDIR)\bin\uic.exe;%(AdditionalInputs)</AdditionalInputs>
<Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Uic%27ing %(Identity)...</Message>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\GeneratedFiles\ui_%(Filename).h;%(Outputs)</Outputs>
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"$(QTDIR)\bin\uic.exe" -o ".\GeneratedFiles\ui_%(Filename).h" "%(FullPath)"</Command>
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(QTDIR)\bin\uic.exe;%(AdditionalInputs)</AdditionalInputs>
<Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Uic%27ing %(Identity)...</Message>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\GeneratedFiles\ui_%(Filename).h;%(Outputs)</Outputs>
<Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(QTDIR)\bin\uic.exe" -o ".\GeneratedFiles\ui_%(Filename).h" "%(FullPath)"</Command>
</CustomBuild>
</ItemGroup>
<ItemGroup>
<CustomBuild Include="QCamSettingDlg.ui">
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(QTDIR)\bin\uic.exe;%(AdditionalInputs)</AdditionalInputs>

12
tpvs17/tpMain/tpMain.vcxproj.filters
Unescape Escape View File

@ -358,9 +358,6 @@
<ClCompile Include="GeneratedFiles\Release\moc_QSettingDlg.cpp">
<Filter>Generated Files\Release</Filter>
</ClCompile>
<ClCompile Include="QSettingDlg.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\src\ImageCompare\cvdrawutils.cpp">
<Filter>ImageCompare</Filter>
</ClCompile>
@ -609,9 +606,6 @@
<ClInclude Include="GeneratedFiles\ui_QDebugDlg.h">
<Filter>Generated Files</Filter>
</ClInclude>
<ClInclude Include="GeneratedFiles\ui_QSettingDlg.h">
<Filter>Generated Files</Filter>
</ClInclude>
<ClInclude Include="..\..\src\ImageCompare\cvdrawutils.h">
<Filter>ImageCompare</Filter>
</ClInclude>
@ -782,12 +776,6 @@
<CustomBuild Include="lpMainWin.ui">
<Filter>lpMain</Filter>
</CustomBuild>
<CustomBuild Include="QSettingDlg.h">
<Filter>Header Files</Filter>
</CustomBuild>
<CustomBuild Include="QSettingDlg.ui">
<Filter>Form Files</Filter>
</CustomBuild>
<CustomBuild Include="..\..\src\tpMain\algela\lpImgViewer.h">
<Filter>BaseUILib\ImgView</Filter>
</CustomBuild>

Write Preview
Loading…
Cancel
Save