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

完善系统设置页面功能

Browse Source
master
bob.pan 5 years ago
parent 7f14d74824
commit 821affa020
8 changed files with 86 additions and 69 deletions
Show Stats Download Patch File Download Diff File

3
src/tpMain/lpGlobalConfig.cpp
Unescape Escape View File

@ -39,6 +39,8 @@ void lpGlobalConfig::init(QString strPath)
m_applicationDirPath = strPath;
QString fileMyself = m_applicationDirPath + WHEEL_SELFDEFINE_FILE;
QJsonObject jsMyself = QZkJsonParser::ReadJsonAuto(fileMyself);
tcpServerPort = jsMyself.value("tcpServerPort").toInt(10100);
QJsonObject algObj = jsMyself.value(WHEEL_SELFDEFINE_ALGPARA).toObject();
if (!algObj.isEmpty())
{
@ -249,6 +251,7 @@ void lpGlobalConfig::saveDeteImage()
autosystemobj.insert("showThressList", m_showThressList);
jsMyself.insert(WHEEL_SELFDEFINE_AUTOITEM, autosystemobj);
jsMyself.insert("tcpServerPort", tcpServerPort);
QZkJsonParser::WriteJsonObject(fileMyself, jsMyself);
}

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

@ -80,6 +80,7 @@ public:
bool bSaveSrcOKImg{ false };//是否保存识别NG原始图像
bool bSaveSrcNGImg_value{ false };//是否保存定位NG原始图像
bool bSaveSrcOKImg_value{ false };//是否保存定位NG原始图像
int tcpServerPort{ 10100 };
};
#endif

24
tpvs17/tpMain/QSystemSettingDlg.cpp
Unescape Escape View File

@ -240,25 +240,25 @@ void QSystemSettingDlg::addPicRoot(QTreeWidget *pTreewidget, QString strName)
m_saveImgRes_good->setText(tr("保存已匹配图"));
m_saveImgRes_good->setObjectName("m_saveImgRes_good");
connect(m_saveImgRes_good, SIGNAL(stateChanged(int)), this, SLOT(onCheckstateChanged(int)));
m_saveImgRes_good->setChecked(lpGlobalConfig::instance()->saveCutGood == (int)true);
m_saveImgRes_good->setChecked(lpGlobalConfig::instance()->bSaveCutOKImg == (int)true);
QCheckBox *m_saveImgRes_bad = new QCheckBox;
m_saveImgRes_bad->setText(tr("保存无匹配图"));
m_saveImgRes_bad->setObjectName("m_saveImgRes_bad");
connect(m_saveImgRes_bad, SIGNAL(stateChanged(int)), this, SLOT(onCheckstateChanged(int)));
m_saveImgRes_bad->setChecked(lpGlobalConfig::instance()->saveCutBad == (int)true);
m_saveImgRes_bad->setChecked(lpGlobalConfig::instance()->bSaveCutNGImg == (int)true);
QCheckBox *m_saveImgSrc_good = new QCheckBox;
m_saveImgSrc_good->setText(tr("保存已匹配图"));
m_saveImgSrc_good->setObjectName("m_saveImgSrc_good");
connect(m_saveImgSrc_good, SIGNAL(stateChanged(int)), this, SLOT(onCheckstateChanged(int)));
m_saveImgSrc_good->setChecked(lpGlobalConfig::instance()->saveGood == (int)true);
m_saveImgSrc_good->setChecked(lpGlobalConfig::instance()->bSaveSrcOKImg == (int)true);
QCheckBox *m_saveImgSrc_bad = new QCheckBox;
m_saveImgSrc_bad->setText(tr("保存无匹配图"));
m_saveImgSrc_bad->setObjectName("m_saveImgSrc_bad");
connect(m_saveImgSrc_bad, SIGNAL(stateChanged(int)), this, SLOT(onCheckstateChanged(int)));
m_saveImgSrc_bad->setChecked(lpGlobalConfig::instance()->saveBad == (int)true);
m_saveImgSrc_bad->setChecked(lpGlobalConfig::instance()->bSaveCutNGImg == (int)true);
QCheckBox *m_useBackground = new QCheckBox;
m_useBackground->setText(tr("使用背景图"));
@ -270,7 +270,7 @@ void QSystemSettingDlg::addPicRoot(QTreeWidget *pTreewidget, QString strName)
m_ResAll2A->setText(tr("轮毂全去A通道"));
m_ResAll2A->setObjectName("m_ResAll2A");
connect(m_ResAll2A, SIGNAL(stateChanged(int)), this, SLOT(onCheckstateChanged(int)));
m_ResAll2A->setChecked(lpGlobalConfig::instance()->m_bObjAll2A == (int)true);
//m_ResAll2A->setChecked(lpGlobalConfig::instance()->m_bObjAll2A == (int)true);
QPushButton* pChangeBGbp = new QPushButton(tr("查看检测背景"));
connect(pChangeBGbp, SIGNAL(clicked()), this, SLOT(onChangeBackground()));
@ -701,23 +701,23 @@ Q_SLOT void QSystemSettingDlg::onCheckstateChanged(int state)
{
QString strObj = sender()->objectName();
if (strObj == "m_saveImgRes_good") {
lpGlobalConfig::instance()->saveCutGood = int(state == 2);
lpGlobalConfig::instance()->bSaveCutOKImg = int(state == 2);
}
else if (strObj == "m_saveImgRes_bad") {
lpGlobalConfig::instance()->saveCutBad = int(state == 2);
lpGlobalConfig::instance()->bSaveCutNGImg = int(state == 2);
}
else if (strObj == "m_saveImgSrc_good") {
lpGlobalConfig::instance()->saveGood = int(state == 2);
lpGlobalConfig::instance()->bSaveSrcOKImg = int(state == 2);
}
else if (strObj == "m_saveImgSrc_bad") {
lpGlobalConfig::instance()->saveBad = int(state == 2);
lpGlobalConfig::instance()->bSaveSrcNGImg = int(state == 2);
}
else if (strObj == "m_useBackground") {
lpGlobalConfig::instance()->m_UseBackground = int(state == 2);
}
else if (strObj == "m_ResAll2A") {
lpGlobalConfig::instance()->m_bObjAll2A = (state == 2 ? true : false);
}
//else if (strObj == "m_ResAll2A") {
// lpGlobalConfig::instance()->m_bObjAll2A = (state == 2 ? true : false);
//}
else if (strObj == "m_AutoSendTick2COM") {
lpGlobalConfig::instance()->m_AutoSendTick2COM = int(state == 2);
lpGlobalConfig::instance()->saveDeteImage();

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

@ -281,7 +281,7 @@ lpMainWin::lpMainWin(QWidget *parent)
{//PLC tcp 通讯
m_pPlcDevice = new QPLCDevice();
m_pPlcDevice->onInitDevice();
m_pPlcDevice->onStartServer(10100);
m_pPlcDevice->onStartServer(lpGlobalConfig::instance()->tcpServerPort);
connect(m_pPlcDevice, SIGNAL(sgTrigerCam(int)), this, SLOT(onPLCTrigerCam(int)));
}
{
@ -917,13 +917,11 @@ void lpMainWin::IEngineResult(QVariantMap vMap)
valueRlt.center = centerPoint;
//
if (dAngle >= 361)//NG
{
ui.main_value_Result->setText("找不到气门芯");
ui.main_value_Center_point->setText("-");
ui.main_value_Score->setText(QString("%1").arg(matchScore));
saveValveImage(maskImg);
valueRlt.strModel = "NG";
}
else {//OK
@ -1751,33 +1749,33 @@ void lpMainWin::SendResultStr2PLC(Result2Ui* m_Res)
void lpMainWin::SendResultChannel2PLC(Result2Ui* m_Res)
{
qDebug() << "SendResultChannel2PLC";
CChannelInfo *pChannelInfo = m_pCtrl->getChannelInfo();
ChannelInfo *npInfo = pChannelInfo->getChannelInfo(m_Res->m_strModel);
if (npInfo && lpGlobalConfig::instance()->m_bObjAll2A == false) {
if (m_pNet)
m_pNet->sendResultChannel(npInfo->m_value, m_Res->m_dDiameter, m_Res->m_dThickness, m_Res->m_strModel);
emit(sgShowChannelRes(npInfo->m_ChannelName));
}
else
{
int defaultChannel = pChannelInfo->getDefaultChannel();
ChannelInfo *defaultInfo = pChannelInfo->getChannelInfo(defaultChannel);
int nResultChannel = 0;
if (defaultInfo)
{
nResultChannel = defaultInfo->m_value;
emit(sgShowChannelRes(defaultInfo->m_ChannelName + tr("(默认)")));
}
else
{
nResultChannel = 1000;
emit(sgShowChannelRes(tr("默认通道 值1000")));
}
if (m_pNet)
m_pNet->sendResultChannel(nResultChannel, m_Res->m_dDiameter, m_Res->m_dThickness, m_Res->m_strModel);
}
// qDebug() << "SendResultChannel2PLC";
// CChannelInfo *pChannelInfo = m_pCtrl->getChannelInfo();
// ChannelInfo *npInfo = pChannelInfo->getChannelInfo(m_Res->m_strModel);
// if (npInfo && lpGlobalConfig::instance()->m_bObjAll2A == false) {
// if (m_pNet)
// m_pNet->sendResultChannel(npInfo->m_value, m_Res->m_dDiameter, m_Res->m_dThickness, m_Res->m_strModel);
// emit(sgShowChannelRes(npInfo->m_ChannelName));
// }
// else
// {
// int defaultChannel = pChannelInfo->getDefaultChannel();
// ChannelInfo *defaultInfo = pChannelInfo->getChannelInfo(defaultChannel);
// int nResultChannel = 0;
// if (defaultInfo)
// {
// nResultChannel = defaultInfo->m_value;
// emit(sgShowChannelRes(defaultInfo->m_ChannelName + tr("(默认)")));
// }
// else
// {
// nResultChannel = 1000;
// emit(sgShowChannelRes(tr("默认通道 值1000")));
// }
//
// if (m_pNet)
// m_pNet->sendResultChannel(nResultChannel, m_Res->m_dDiameter, m_Res->m_dThickness, m_Res->m_strModel);
// }
}
void lpMainWin::SendResultChannelCOM(Result2Ui* m_Res)
@ -1837,7 +1835,7 @@ void lpMainWin::saveImage(Result2Ui* pRes)
QString goodsourceDir = fileSavePath + "\\Good";
filename += QString("_%1_%2_").arg((int)pRes->m_dThickness).arg((int)pRes->m_dDiameter);
filename += QDateTime::currentDateTime().toString("hhmmsszzz");
if (lpGlobalConfig::instance()->saveGood == 1) {
if (lpGlobalConfig::instance()->bSaveSrcOKImg == true) {
goodsourceDir += "\\Source";
goodsourceDir += "\\";
goodsourceDir += pRes->m_strModel;
@ -1845,7 +1843,7 @@ void lpMainWin::saveImage(Result2Ui* pRes)
saveImage(pRes->m_pixSrc, goodsourceDir + "\\", filename + ".png");
}
QString goodtargetDir = fileSavePath + "\\Good";
if (lpGlobalConfig::instance()->saveCutGood == 1) {
if (lpGlobalConfig::instance()->bSaveCutOKImg == true) {
goodtargetDir += "\\Target";
goodtargetDir += "\\";
goodtargetDir += pRes->m_strModel;
@ -1859,13 +1857,13 @@ void lpMainWin::saveImage(Result2Ui* pRes)
filename += QString("_%1_%2_").arg((int)pRes->m_dThickness).arg((int)pRes->m_dDiameter);
filename += QDateTime::currentDateTime().toString("hhmmsszzz");
filename = filename + "_" + curExposureTimeStr;
if (lpGlobalConfig::instance()->saveBad == 1) {
if (lpGlobalConfig::instance()->bSaveSrcNGImg == true) {
errorSourceDir += "\\Source";
QString resultpath = errorSourceDir + "\\" + filename + ".png";
saveImage(pRes->m_pixSrc, errorSourceDir + "\\", filename + ".png");
}
QString errortargetDir = fileSavePath + "\\Error";
if (lpGlobalConfig::instance()->saveCutBad == 1) {
if (lpGlobalConfig::instance()->bSaveCutNGImg == true) {
errortargetDir += "\\Target";
QString resultpath = errortargetDir + "\\" + filename + "Res.png";
if (pRes->m_pixResult.isNull())
@ -2035,6 +2033,7 @@ void lpMainWin::onSaveValveResult(ValueResult &rlt)
filename = QString("%1_%2").arg(strModeName).arg(QDateTime::currentDateTime().toString("hh-mm-ss zzz"));
QString resultpath = goodsourceDir + "\\" + filename + ".jpeg";
rlt.strImagePath = resultpath;
if(lpGlobalConfig::instance()->bSaveSrcOKImg_value == true)
saveImage(rlt.pixmap, goodsourceDir + "\\", filename + ".jpeg");
}
else
@ -2044,6 +2043,7 @@ void lpMainWin::onSaveValveResult(ValueResult &rlt)
errorSourceDir += "\\ValueImg";
QString resultpath = errorSourceDir + "\\" + filename + ".jepg";
rlt.strImagePath = resultpath;
if(lpGlobalConfig::instance()->bSaveSrcNGImg_value == true)
saveImage(rlt.pixmap, errorSourceDir + "\\", filename + ".jpeg");
}

6
tpvs17/tpMain/lpMainWin.h
Unescape Escape View File

@ -168,7 +168,6 @@ private:
private:
CDllCoreCtrl* m_pDllCoreCtrl{ nullptr };
ICoreCtrl* m_pCoreCtrl{ nullptr };
private:
class IWheelCtrl *m_pCtrl{ nullptr };
class CWheelNet *m_pNet{ nullptr };
@ -202,10 +201,7 @@ private:
//QSystemSettingDlg* m_pSystemSettingDlg{ nullptr };
lpSystemConfigUI* m_pSystemConfigUI{ nullptr };
QCamSettingDlg* m_CamSettingDlg{ nullptr };
lpImageCaliUI* m_pImageCaliUI{ nullptr };
QPLCDevice* m_pPlcDevice{ nullptr };
private:
IUserCtrl *m_pUserCtrl{ nullptr };//用户管理模块
@ -213,7 +209,6 @@ private:
int m_timerID{ 0 };//定时器 更新状态栏信息
quint64 m_runTimeCount{ 0 };
private:
int m_exposureTimeCount{ 0 };
QString m_camKey;
@ -227,7 +222,6 @@ private:
IDetectorEngine* m_pEngineCtrl{nullptr};
CDllDesigner* m_pDllDesigner{ nullptr };
IDetectorUI* m_pDesigner{ nullptr };
};
#endif

34
tpvs17/tpMain/lpSystemConfigUI.cpp
Unescape Escape View File

@ -1,5 +1,9 @@
#include "lpSystemConfigUI.h"
#include "lpGlobalConfig.h"
#include "QFileDialog"
#include "QSettings"
#pragma execution_character_set("utf-8")
lpSystemConfigUI::lpSystemConfigUI(QWidget *parent)
: QWidget(parent)
@ -9,6 +13,10 @@ lpSystemConfigUI::lpSystemConfigUI(QWidget *parent)
connect(ui.m_pbExit, SIGNAL(clicked()), this, SLOT(onButtonClicked()));
connect(ui.m_pbSetPath, SIGNAL(clicked()), this, SLOT(onButtonClicked()));
ui.comboBox->clear();
ui.comboBox->addItem(tr("Chinese"), "Chinese");
ui.comboBox->addItem(tr("English"), "English");
}
lpSystemConfigUI::~lpSystemConfigUI()
@ -20,13 +28,29 @@ Q_SLOT void lpSystemConfigUI::onButtonClicked()
{
QString strObj = sender()->objectName();
if (strObj == "m_pbApply") {
lpGlobalConfig::instance()->bSaveCutNGImg = ui.checkBox_saveNGCutImg->isChecked();//识别
lpGlobalConfig::instance()->bSaveCutOKImg = ui.checkBox_saveOKCutImg->isChecked();//识别
lpGlobalConfig::instance()->bSaveSrcNGImg = ui.checkBox_saveNGSrcImg->isChecked();//识别
lpGlobalConfig::instance()->bSaveSrcOKImg = ui.checkBox_saveOKSrcImg->isChecked();//识别
lpGlobalConfig::instance()->bSaveSrcOKImg_value = ui.checkBox_saveValue_OKSrcImg->isChecked();//定位
lpGlobalConfig::instance()->bSaveSrcNGImg_value = ui.checkBox_saveValue_NGSrcImg->isChecked();//定位
lpGlobalConfig::instance()->m_SaveImgDirPath = ui.lineEdit->text();
lpGlobalConfig::instance()->tcpServerPort = ui.lineEdit_2->text().toInt();
lpGlobalConfig::instance()->saveDeteImage();
QString strLanguage = ui.comboBox->currentText();
QSettings languageSetting("hubdetect.ini", QSettings::IniFormat);
languageSetting.setValue("language", strLanguage);
}
else if (strObj == "m_pbExit") {
this->close();
}
else if (strObj == "m_pbSetPath") {
QString str = QFileDialog::getExistingDirectory(this, "选择文件夹");
if (!str.isEmpty())
{
ui.lineEdit->setText(str);
}
}
}
@ -38,5 +62,11 @@ void lpSystemConfigUI::showEvent(QShowEvent *event)
ui.checkBox_saveOKSrcImg->setChecked(lpGlobalConfig::instance()->bSaveSrcOKImg);//ʶ±ð
ui.checkBox_saveValue_OKSrcImg->setChecked(lpGlobalConfig::instance()->bSaveSrcOKImg_value);//¶¨Î»
ui.checkBox_saveValue_NGSrcImg->setChecked(lpGlobalConfig::instance()->bSaveSrcNGImg_value);//¶¨Î»
ui.lineEdit_2->setText(QString("%1").arg(lpGlobalConfig::instance()->tcpServerPort));
ui.lineEdit->setText(lpGlobalConfig::instance()->m_SaveImgDirPath);
QSettings languageSetting("hubdetect.ini", QSettings::IniFormat);
QString strLanguage = languageSetting.value("language", "Chinese").toString();
ui.comboBox->setCurrentText(strLanguage);
}

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

@ -3,7 +3,7 @@
#include <QWidget>
#include "ui_lpSystemConfigUI.h"
//系统参数设置页面
class lpSystemConfigUI : public QWidget
{
Q_OBJECT

13
tpvs17/tpMain/lpSystemConfigUI.ui
Unescape Escape View File

@ -50,18 +50,7 @@
</widget>
</item>
<item>
<widget class="QComboBox" name="comboBox">
<item>
<property name="text">
<string>中文</string>
</property>
</item>
<item>
<property name="text">
<string>English</string>
</property>
</item>
</widget>
<widget class="QComboBox" name="comboBox"/>
</item>
</layout>
</item>

Write Preview
Loading…
Cancel
Save