diff --git a/runner17/algorithmLib/valveDetector.dll b/runner17/algorithmLib/valveDetector.dll index 2d88148..717cc67 100644 Binary files a/runner17/algorithmLib/valveDetector.dll and b/runner17/algorithmLib/valveDetector.dll differ diff --git a/runner17/lpMain.dll b/runner17/lpMain.dll index 0d20963..dc68e8c 100644 Binary files a/runner17/lpMain.dll and b/runner17/lpMain.dll differ diff --git a/tpvs17/lpMain/CMainWin.cpp b/tpvs17/lpMain/CMainWin.cpp index 7072664..8272565 100644 --- a/tpvs17/lpMain/CMainWin.cpp +++ b/tpvs17/lpMain/CMainWin.cpp @@ -288,13 +288,14 @@ QVariant CMainWin::IGetVariantById(int id) return QVariant(); } -QString CMainWin::genSaveSrcImgPath(QString modelName, QImage &img) +QString CMainWin::genSaveSrcImgPath(int stationID, QString modelName, QImage &img) { + QString strStation = (stationID == 1 ? "Station1" : "Station2"); QString strApp = QApplication::applicationDirPath(); QString targetPath = strApp + "/DBFiles/SrcImages"; QString strData = QDateTime::currentDateTime().toString("yyyy-MM-dd"); QString strFileName = QDateTime::currentDateTime().toString("yyyy_MM_dd_hhmmsszzz") + ".jpg"; - targetPath = targetPath + "/" + strData + "/" + modelName; + targetPath = targetPath + "/" + strData + "/" + strStation + "/" + modelName; QDir dir; dir.mkpath(strApp + targetPath); if (!img.isNull()) { @@ -304,13 +305,14 @@ QString CMainWin::genSaveSrcImgPath(QString modelName, QImage &img) return targetPath; } -QString CMainWin::genSavePath(QString modelName, QImage &img) +QString CMainWin::genSavePath(int stationID, QString modelName, QImage &img) { + QString strStation = (stationID == 1 ? "Station1" : "Station2"); QString strApp = QApplication::applicationDirPath(); QString targetPath = strApp + "/DBFiles/Images"; QString strData = QDateTime::currentDateTime().toString("yyyy-MM-dd"); QString strFileName = QDateTime::currentDateTime().toString("yyyy_MM_dd_hhmmsszzz") + ".jpg"; - targetPath = targetPath + "/" + strData + "/" + modelName; + targetPath = targetPath + "/" + strData + "/" + strStation + "/"+ modelName; QDir dir; dir.mkpath(strApp + targetPath); if (!img.isNull()) { @@ -1061,17 +1063,6 @@ void CMainWin::rmTranslator() } } -void CMainWin::writeConfig() -{ -// QSettings setting("language.ini", QSettings::IniFormat); -// setting.setValue("language", m_strCurLanguage); -} - -void CMainWin::saveSolution() -{ - -} - //相机触发 Q_SLOT void CMainWin::onSnapImage(int nCamera /*= -1*/) { @@ -1314,7 +1305,7 @@ void CMainWin::IEngineResult(QVariantMap vMap) //只保存原图 if ((lpSysConfig::instance()->m_bSaveSrcImg_st1 == true && stationID == 1) || (lpSysConfig::instance()->m_bSaveSrcImg_st2 == true && stationID == 2)) - genSaveSrcImgPath(taskName, srcImg); + genSaveSrcImgPath(stationID, taskName, srcImg); return; } @@ -1339,7 +1330,7 @@ void CMainWin::IEngineResult(QVariantMap vMap) if ((lpSysConfig::instance()->m_bSaveSrcImg_st1 == true && stationID == 1) || (lpSysConfig::instance()->m_bSaveSrcImg_st2 == true && stationID == 2)) - genSaveSrcImgPath(taskName, srcImg); + genSaveSrcImgPath(stationID, taskName, srcImg); } else { QVariantMap algResult = vMap.value("AlgoResult").toMap(); @@ -1373,11 +1364,11 @@ void CMainWin::IEngineResult(QVariantMap vMap) QString strImgPath; if ((lpSysConfig::instance()->m_bSaveRltImg_st1 == true && stationID == 1) || (lpSysConfig::instance()->m_bSaveRltImg_st2 == true && stationID == 2)) - strImgPath = genSavePath(taskName, rltImg); + strImgPath = genSavePath(stationID,taskName, rltImg); if ((lpSysConfig::instance()->m_bSaveSrcImg_st1 == true && stationID == 1) || (lpSysConfig::instance()->m_bSaveSrcImg_st2 == true && stationID == 2)) - genSaveSrcImgPath(taskName, srcImg); + genSaveSrcImgPath(stationID,taskName, srcImg); QString str2 = taskName; int ID = stationID; QString strModelName = QString("%1_%2").arg(ID).arg(str2); diff --git a/tpvs17/lpMain/CMainWin.h b/tpvs17/lpMain/CMainWin.h index 2e82f1a..d7152fa 100644 --- a/tpvs17/lpMain/CMainWin.h +++ b/tpvs17/lpMain/CMainWin.h @@ -58,8 +58,8 @@ public: Q_SLOT void onSlotDelOldModel(QString strName); Q_SLOT void onActionClicked(); - QString genSavePath(QString modelName, QImage &img); - QString genSaveSrcImgPath(QString modelName, QImage &img); + QString genSavePath(int stationID, QString modelName, QImage &img); + QString genSaveSrcImgPath(int stationID, QString modelName, QImage &img); protected: virtual void timerEvent(QTimerEvent *event); virtual void closeEvent(QCloseEvent *event); @@ -90,12 +90,7 @@ private:// void SetTranslator(const QString strPath); void SetLanguage(QString strLangage); void rmTranslator(); - void readConfig(); - void writeConfig(); private: - void saveSolution(); - int lastNum(QString str); - Q_SLOT void onSnapImage(int nCamera = -1); Q_SLOT void onTrigImage(); Q_SLOT void onChangeUI(QString strUsr, int nLevel); diff --git a/tpvs17/lpMain/QModelMangerUI.cpp b/tpvs17/lpMain/QModelMangerUI.cpp index 9a20257..b97d0de 100644 --- a/tpvs17/lpMain/QModelMangerUI.cpp +++ b/tpvs17/lpMain/QModelMangerUI.cpp @@ -164,22 +164,23 @@ Q_SLOT bool QModelMangerUI::OnCellClicked(const QModelIndex &index) QImage img = m_pCtrl->IGetStandardImg(key, strModel); if (img.isNull()) { - img.load(":/Resource/no-img.png"); + //img.load(":/Resource/no-img.png"); + m_srcImgView->clear(); + m_srcImgView->setImg(img); } - int widgetWidth = m_srcImgView->width(); - int imgWidth = img.width(); - float scalew = (widgetWidth*1.0) / (imgWidth*1.0); + else { + int widgetWidth = m_srcImgView->width(); + int imgWidth = img.width(); + float scalew = (widgetWidth*1.0) / (imgWidth*1.0); - int widgetHeight = m_srcImgView->height(); - int imgHeight = img.height(); - float scaleh = (widgetHeight*1.0) / (imgHeight*1.0); - float minScale = scalew < scaleh ? scalew : scaleh; -// m_srcImgView->setIsAutoResetToWindowSize(true); -// m_srcImgView->setIsAutoResetTransform(true); - m_srcImgView->setInitScale(minScale - 0.01); - m_srcImgView->clear(); - m_srcImgView->setImg(img); - + int widgetHeight = m_srcImgView->height(); + int imgHeight = img.height(); + float scaleh = (widgetHeight*1.0) / (imgHeight*1.0); + float minScale = scalew < scaleh ? scalew : scaleh; + m_srcImgView->setInitScale(minScale - 0.01); + m_srcImgView->clear(); + m_srcImgView->setImg(img); + } } return true; } diff --git a/tpvs17/lpMain/QModelMangerUI.ui b/tpvs17/lpMain/QModelMangerUI.ui index 523b728..80073cf 100644 --- a/tpvs17/lpMain/QModelMangerUI.ui +++ b/tpvs17/lpMain/QModelMangerUI.ui @@ -91,7 +91,7 @@ - background-color: rgb(170, 255, 127); + diff --git a/tpvs17/valveDetector/valveDetector.cpp b/tpvs17/valveDetector/valveDetector.cpp index 06890a9..2915e74 100644 --- a/tpvs17/valveDetector/valveDetector.cpp +++ b/tpvs17/valveDetector/valveDetector.cpp @@ -1173,7 +1173,7 @@ void ValveDetector::drawResult(Mat &img, InputParam ¶mIn, OutputParam ¶m strAngle = "result: can not find valve"; } else { - strAngle = "result: " + QString::number(paramOut.dAngleRes, 'f', 2); + strAngle = "result: " + QString::number(paramOut.dAngleRes, 'f', 2) + QString(" center:(%1,%2)").arg(paramIn.ptCenter.x).arg(paramIn.ptCenter.y); } putText(img, strAngle.toLatin1().data(), Point(10, 200), 3, 2, LP_COLOR_RED, 3);