From 64511c7ea45934c09627acf75dfc835bcd12d5c4 Mon Sep 17 00:00:00 2001 From: bobpan Date: Mon, 23 Nov 2020 20:11:40 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=B8=BBUI=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- tpvs17/tpMain/lpMainWin.cpp | 12 +++++++++++- tpvs17/tpMain/lpMainWin.h | 5 +++++ tpvs17/tpMain/lpMainWin.ui | 2 +- 3 files changed, 17 insertions(+), 2 deletions(-) diff --git a/tpvs17/tpMain/lpMainWin.cpp b/tpvs17/tpMain/lpMainWin.cpp index 783c115..30fb119 100644 --- a/tpvs17/tpMain/lpMainWin.cpp +++ b/tpvs17/tpMain/lpMainWin.cpp @@ -138,6 +138,12 @@ lpMainWin::lpMainWin(QWidget *parent) connect(pNetTick, SIGNAL(resultReady(int, QVariantMap)), m_pNet, SLOT(onSendDataByType(int, QVariantMap))); pTickThread->start(); } + { + m_pTableCheck = new ModelsView(ui.tableview_checkstate, m_pCtrl->getAllModelMapPtr()); + m_pTableCheck->setEnable(false); + connect(m_pCtrl, SIGNAL(sgModelChanged()), m_pTableCheck, SLOT(updateModels())); + m_pTableCheck->setModelList(forDefectList); + } } lpMainWin::~lpMainWin() @@ -469,7 +475,11 @@ void lpMainWin::onSetModel() 重新加载模板 重新设置模板到算法中使用 */ -// forDefectList = pWorkCtrl->getDefectList(); + forDefectList = pWorkCtrl->getDefectList(); + if (m_pTableCheck) { + m_pTableCheck->setModelList(forDefectList); + } + // IWheelUi *pMainWidget = m_pUi->getItemWidget(WHEEL_UI_MAINWINDOW); // if (pMainWidget) { // pMainWidget->setViewList(forDefectList); diff --git a/tpvs17/tpMain/lpMainWin.h b/tpvs17/tpMain/lpMainWin.h index 658f663..2bcf540 100644 --- a/tpvs17/tpMain/lpMainWin.h +++ b/tpvs17/tpMain/lpMainWin.h @@ -11,6 +11,7 @@ #include "qmythread.h" #include "DetectState.h" #include "WheelNet.h" +#include "ModelTableView.h" class lpMainWin : public QMainWindow { Q_OBJECT @@ -103,6 +104,10 @@ private: class QLabel* main_lb_res_Channle_Show{ nullptr }; class QLabel* main_label_state{ nullptr }; class QLabel* main_showWorkLabel{ nullptr }; + + class ModelsView *m_pTableCheck{ nullptr }; + + private: CDllCoreCtrl* m_pDllCoreCtrl{ nullptr }; ICoreCtrl* m_pCoreCtrl{ nullptr }; diff --git a/tpvs17/tpMain/lpMainWin.ui b/tpvs17/tpMain/lpMainWin.ui index 8b1dffb..919743b 100644 --- a/tpvs17/tpMain/lpMainWin.ui +++ b/tpvs17/tpMain/lpMainWin.ui @@ -728,7 +728,7 @@ background-color: rgb(170, 170, 127); 3 - + 0