From adbb226aba182474ca7cb8e65966c75bbe990a5b Mon Sep 17 00:00:00 2001 From: "bob.pan" Date: Thu, 23 Dec 2021 13:38:07 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8A=A0=E5=85=A5=E5=9B=BE=E5=83=8F=E5=86=85?= =?UTF-8?q?=E5=AD=98=E6=98=AF=E5=90=A6=EF=BC=8C=E5=9C=A8=E5=88=87=E6=8D=A2?= =?UTF-8?q?=E5=9B=BE=E5=83=8F=E6=97=B6=E9=87=8A=E6=94=BE=E5=B7=B2=E5=8A=A0?= =?UTF-8?q?=E8=BD=BD=E7=9A=84=E5=9B=BE=E5=83=8F=E5=86=85=E5=AD=98=EF=BC=8C?= =?UTF-8?q?=E4=BF=9D=E8=AF=81=E6=A3=80=E6=B5=8B=E8=BF=87=E7=A8=8B=E4=B8=AD?= =?UTF-8?q?=E4=B8=8D=E4=BC=9A=E5=87=BA=E7=8E=B0=E5=86=85=E5=AD=98=E6=9A=B4?= =?UTF-8?q?=E6=B6=A8=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/lpbdesigner/MainFrame.cpp | 13 +++++++++---- src/lpbengine/CDetectorEngine.cpp | 1 + tpvs17/tpMain/lpMainWin.cpp | 2 +- tpvs17/wheel.sln | 12 +++++++++++- 4 files changed, 22 insertions(+), 6 deletions(-) diff --git a/src/lpbdesigner/MainFrame.cpp b/src/lpbdesigner/MainFrame.cpp index ff0af7a..faa9e76 100644 --- a/src/lpbdesigner/MainFrame.cpp +++ b/src/lpbdesigner/MainFrame.cpp @@ -311,7 +311,7 @@ bool CMainFrame::InitGraphView() return true; return true; } - +/*初始化*/ bool CMainFrame::InitCurrentTask() { ui->tableWidget->setRowCount(0); @@ -379,9 +379,9 @@ bool CMainFrame::InitCurrentTask() if (m_pCurrentTask->GetTaskInfo()->templateImg.data == NULL) { - QString strExePath = QCoreApplication::applicationDirPath(); - QString strImagePath = strExePath + LP_DETECTOR_BUSSINESS_IMAGE_DIR; - QString strImageName = strImagePath + QString::number(m_pCurrentSolution->GetID()) + "_" + QString::number(m_pCurrentTask->GetID()) + ".bmp"; + //QString strExePath = QCoreApplication::applicationDirPath(); + //QString strImagePath = strExePath + LP_DETECTOR_BUSSINESS_IMAGE_DIR; + QString strImageName = m_pCurrentTask->GetPath()+ "/template.png"; //strImagePath + QString::number(m_pCurrentSolution->GetID()) + "_" + QString::number(m_pCurrentTask->GetID()) + ".bmp"; std::string strPath = strImageName.toLocal8Bit().toStdString(); m_pCurrentTask->GetTaskInfo()->templateImg = cv::imread(strPath, CV_LOAD_IMAGE_GRAYSCALE); } @@ -520,6 +520,10 @@ bool CMainFrame::InitCurrentNode() QString strName = currentItem->data(0,Qt::DisplayRole).toString(); int nTaskID = currentItem->data(0, Qt::UserRole).toInt(); + if (m_pCurrentTask) + { + m_pCurrentTask->GetTaskInfo()->templateImg.release(); + } m_pCurrentTask = m_pCurrentSolution->GetTaskByName(strName); if (!m_pCurrentTask) return false; @@ -925,6 +929,7 @@ bool CMainFrame::OnRunAlgo() return false; } } + m_pCurrentTask->GetTaskInfo()->detectImg.release(); } return true; } diff --git a/src/lpbengine/CDetectorEngine.cpp b/src/lpbengine/CDetectorEngine.cpp index eb092e6..4f196e5 100644 --- a/src/lpbengine/CDetectorEngine.cpp +++ b/src/lpbengine/CDetectorEngine.cpp @@ -129,6 +129,7 @@ void CDetectorEngine::detectFunc(cv::Mat srcImg, QString modeName, AlgResultCall rltMap.insert("taskName", pTask->GetTaskName()); rltMap.insert("taskID", pTask->GetID()); rltMap.insert("originImage", EngineBase::convMat2QImage(srcImg)); + pTask->GetTaskInfo()->detectImg.release(); } } diff --git a/tpvs17/tpMain/lpMainWin.cpp b/tpvs17/tpMain/lpMainWin.cpp index f4b9625..b5ec8c8 100644 --- a/tpvs17/tpMain/lpMainWin.cpp +++ b/tpvs17/tpMain/lpMainWin.cpp @@ -1359,7 +1359,7 @@ Q_SLOT void lpMainWin::onShowMsg(QString str) connect(pw, SIGNAL(finished()), pw, SLOT(deleteLater())); connect(pw, SIGNAL(finished()), this, SLOT(onInitPW())); } - +/*触发相机*/ Q_SLOT void lpMainWin::onTriggerCam() { if (lpGlobalConfig::instance()->IsDetect == false) diff --git a/tpvs17/wheel.sln b/tpvs17/wheel.sln index ec508a2..dbac5f4 100644 --- a/tpvs17/wheel.sln +++ b/tpvs17/wheel.sln @@ -27,6 +27,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Enchanter", "Enchanter\Ench EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tpCamHik", "tpCamHik\tpCamHik.vcxproj", "{64C9A32D-82E8-4C36-9AA6-52D58B23F687}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tpCamVirtual", "tpCamVirtual\tpCamVirtual.vcxproj", "{707DDF6F-B78B-42F7-9EAD-E786C0FCD5FF}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|x64 = Debug|x64 @@ -113,12 +115,20 @@ Global {64C9A32D-82E8-4C36-9AA6-52D58B23F687}.Release|x64.Build.0 = Release|x64 {64C9A32D-82E8-4C36-9AA6-52D58B23F687}.Release|x86.ActiveCfg = Release|Win32 {64C9A32D-82E8-4C36-9AA6-52D58B23F687}.Release|x86.Build.0 = Release|Win32 + {707DDF6F-B78B-42F7-9EAD-E786C0FCD5FF}.Debug|x64.ActiveCfg = Debug|x64 + {707DDF6F-B78B-42F7-9EAD-E786C0FCD5FF}.Debug|x64.Build.0 = Debug|x64 + {707DDF6F-B78B-42F7-9EAD-E786C0FCD5FF}.Debug|x86.ActiveCfg = Debug|Win32 + {707DDF6F-B78B-42F7-9EAD-E786C0FCD5FF}.Debug|x86.Build.0 = Debug|Win32 + {707DDF6F-B78B-42F7-9EAD-E786C0FCD5FF}.Release|x64.ActiveCfg = Release|x64 + {707DDF6F-B78B-42F7-9EAD-E786C0FCD5FF}.Release|x64.Build.0 = Release|x64 + {707DDF6F-B78B-42F7-9EAD-E786C0FCD5FF}.Release|x86.ActiveCfg = Release|Win32 + {707DDF6F-B78B-42F7-9EAD-E786C0FCD5FF}.Release|x86.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution - Qt5Version = qt5.9.4-msvc2017-x64 SolutionGuid = {CD365F32-5EAC-4A16-AD47-BFB1D8E5511A} + Qt5Version = qt5.9.4-msvc2017-x64 EndGlobalSection EndGlobal