From 7a055b9a1c880457dd7c8186cbf0c8df5d831017 Mon Sep 17 00:00:00 2001 From: "bob.pan" Date: Wed, 18 Aug 2021 15:35:19 +0800 Subject: [PATCH] update UI --- 3part/tadpole/include/tpBase/lpdesigner.h | 3 - src/algorithm/AlgorithmCompare.cpp | 40 +--- src/algorithm/AlgorithmCompare.h | 3 - src/lpbdesigner/CDetectorUI.cpp | 14 -- src/lpbdesigner/CDetectorUI.h | 4 - src/lpbdesigner/DrawTool.cpp | 2 - src/lpbdesigner/DsgAlgoDlg.cpp | 11 - src/lpbdesigner/DsgParamDlg.cpp | 5 + src/lpbdesigner/DsgRoiDlg.cpp | 61 +++--- src/lpbdesigner/GeneratedFiles/ui_RoiDlg.h | 189 +--------------- src/lpbdesigner/MainFrame.cpp | 41 +++- src/lpbdesigner/RoiDlg.ui | 242 +-------------------- 12 files changed, 90 insertions(+), 525 deletions(-) diff --git a/3part/tadpole/include/tpBase/lpdesigner.h b/3part/tadpole/include/tpBase/lpdesigner.h index 46d68ea..01dcd9a 100644 --- a/3part/tadpole/include/tpBase/lpdesigner.h +++ b/3part/tadpole/include/tpBase/lpdesigner.h @@ -19,10 +19,7 @@ class IDetectorUI { public: virtual bool Initialize(IDetectorEngine* lpDE) = 0; - virtual bool ShowDeviceMgrDlg() = 0; - virtual bool ShowSolutionMgrDlg() = 0; virtual bool ShowMainFrame() = 0; - virtual bool ShowReportView(QMap statInfo) = 0; }; diff --git a/src/algorithm/AlgorithmCompare.cpp b/src/algorithm/AlgorithmCompare.cpp index 32df78c..49d370d 100644 --- a/src/algorithm/AlgorithmCompare.cpp +++ b/src/algorithm/AlgorithmCompare.cpp @@ -323,7 +323,7 @@ int CAlgorithmCompare::IImageAnalysis(class IImageObject* pImgObj) QVariantMap mResult;//匹配算法结果 CLocalWheel wheelLocal; - wheelLocal.defectList = strModelList;// *getDefectListPtr(pImgObj); + wheelLocal.defectList = strModelList; wheelLocal.img = matMatch.clone(); wheelLocal.height = th; wheelLocal.diameter = dDiameter; @@ -375,23 +375,6 @@ int CAlgorithmCompare::IImageAnalysis(class IImageObject* pImgObj) return 1; } -QStringList *CAlgorithmCompare::getDefectListPtr(class IImageObject *pImgObj) -{ - return nullptr; -// IAlgorithmShared *pShare = pImgObj->IGetShared(); -// int nMap = pShare->IGetInt("defectList"); -// return (QStringList*)nMap; -} - -QMap *CAlgorithmCompare::getWheelMapPtr(class IImageObject *pImgObj) -{ -// IAlgorithmShared *pShare = pImgObj->IGetShared(); -// if (!pShare) -// return nullptr; -// int nMap = pShare->IGetInt("modelMap"); -// return (QMap*)nMap; - return nullptr; -} cv::Mat CAlgorithmCompare::getImage(class IImageObject *pImgObj) { @@ -419,11 +402,11 @@ cv::Mat CAlgorithmCompare::getBackGroundImage(class IImageObject *pObj, bool bRe { static Mat matback; if (matback.empty()) { - QString filepath = /*getPath(pObj) +*/ ".\\user\\background.png"; + QString filepath = ".\\user\\background.png"; matback = cv::imread(string((const char *)filepath.toLocal8Bit()), 0); //matback = cv::imread(filepath.toLatin1().data(), 0); if (matback.empty()) { - QString filepath = getPath(pObj) + "\\user\\background_r.png"; + QString filepath = "\\user\\background_r.png"; matback = cv::imread(string((const char *)filepath.toLocal8Bit()), 0); //matback = cv::imread(filepath.toLatin1().data(), 0); cv::flip(matback, matback, 1); @@ -431,10 +414,10 @@ cv::Mat CAlgorithmCompare::getBackGroundImage(class IImageObject *pObj, bool bRe } else { if (bReLoad) { - QString filepath = getPath(pObj) + "\\user\\background.png"; + QString filepath = "\\user\\background.png"; matback = cv::imread(string((const char *)filepath.toLocal8Bit()), 0); if (matback.empty()) { - QString filepath = getPath(pObj) + "\\user\\background_r.png"; + QString filepath = "\\user\\background_r.png"; matback = cv::imread(string((const char *)filepath.toLocal8Bit()), 0); //matback = cv::imread(filepath.toLatin1().data(), 0); cv::flip(matback, matback, 1); @@ -444,18 +427,7 @@ cv::Mat CAlgorithmCompare::getBackGroundImage(class IImageObject *pObj, bool bRe return matback; } -QString CAlgorithmCompare::getPath(class IImageObject *pObj) -{ -// IAlgorithmShared* pShare = pObj->IGetShared(); -// if (!pShare) -// return QString(); -// QStringList mlist = pObj->IGetShared()->IGetStringList("filepath"); -// if (mlist.empty()) { -// return QString(); -// } -// return mlist.first(); - return QString(); -} + //void CAlgorithmFluorescence::imageSegementation(const cv::Mat &srcImage) //{ diff --git a/src/algorithm/AlgorithmCompare.h b/src/algorithm/AlgorithmCompare.h index 6597f34..9667ff5 100644 --- a/src/algorithm/AlgorithmCompare.h +++ b/src/algorithm/AlgorithmCompare.h @@ -31,11 +31,8 @@ public: private: virtual int IImageAnalysis(class IImageObject* pImgObj); QString bestMatch(const QMap* modelMap, CLocalWheel*pLocal, double* pMinDis /*= NULL*/, int minDisNum /*= -1*/) const; - QMap *getWheelMapPtr(class IImageObject *pObj); - QString getPath(class IImageObject *pObj); cv::Mat getImage(class IImageObject *pObj); cv::Mat getBackGroundImage(class IImageObject *pObj, bool bReLoad = false); - QStringList *getDefectListPtr(class IImageObject *pImgObj); QMutex mutex; }; diff --git a/src/lpbdesigner/CDetectorUI.cpp b/src/lpbdesigner/CDetectorUI.cpp index f8f4b01..92fbcae 100644 --- a/src/lpbdesigner/CDetectorUI.cpp +++ b/src/lpbdesigner/CDetectorUI.cpp @@ -28,16 +28,6 @@ bool CDetectorUI::Initialize(IDetectorEngine* lpDE) return true; } -bool CDetectorUI::ShowDeviceMgrDlg() -{ - return true; -} - -bool CDetectorUI::ShowSolutionMgrDlg() -{ - return true; -} - bool CDetectorUI::ShowMainFrame() { if (!m_pMainFrame->Initialize(m_pDE)) @@ -50,7 +40,3 @@ bool CDetectorUI::ShowMainFrame() return true; } -bool CDetectorUI::ShowReportView(QMap statInfo) -{ - return true; -} \ No newline at end of file diff --git a/src/lpbdesigner/CDetectorUI.h b/src/lpbdesigner/CDetectorUI.h index 9dbc64d..389fb85 100644 --- a/src/lpbdesigner/CDetectorUI.h +++ b/src/lpbdesigner/CDetectorUI.h @@ -9,11 +9,7 @@ public: CDetectorUI(); virtual ~CDetectorUI(); bool Initialize(IDetectorEngine* lpDE); - virtual bool ShowDeviceMgrDlg(); - virtual bool ShowSolutionMgrDlg(); virtual bool ShowMainFrame(); - virtual bool ShowReportView(QMap statInfo); - private: CMainFrame* m_pMainFrame{ nullptr }; IDetectorEngine* m_pDE{ nullptr }; diff --git a/src/lpbdesigner/DrawTool.cpp b/src/lpbdesigner/DrawTool.cpp index 22604f5..a1ad482 100644 --- a/src/lpbdesigner/DrawTool.cpp +++ b/src/lpbdesigner/DrawTool.cpp @@ -58,8 +58,6 @@ void DrawTool::mousePressEvent(QGraphicsSceneMouseEvent *event, RoiScene *scene) QList items = scene->selectedItems(); c_down = event->scenePos(); - //if (scene->flag) - // c_last = event->scenePos(); } void DrawTool::mouseMoveEvent(QGraphicsSceneMouseEvent *event, RoiScene *scene) diff --git a/src/lpbdesigner/DsgAlgoDlg.cpp b/src/lpbdesigner/DsgAlgoDlg.cpp index 6276d86..5ca6734 100644 --- a/src/lpbdesigner/DsgAlgoDlg.cpp +++ b/src/lpbdesigner/DsgAlgoDlg.cpp @@ -13,10 +13,6 @@ CDsgAlgoDlg::CDsgAlgoDlg(QWidget *parent) : QDialog(parent), ui(new Ui::AlgoDlg) connect(ui->pushButton, SIGNAL(clicked()), this, SLOT(OnOk())); connect(ui->pushButton_2, SIGNAL(clicked()), this, SLOT(OnCancel())); connect(ui->pushButton_4, SIGNAL(clicked()), this, SLOT(OnSelectAlgo())); - Qt::WindowFlags flags = Qt::Dialog; - flags |= Qt::WindowMinMaxButtonsHint; - flags |= Qt::WindowCloseButtonHint; - setWindowFlags(flags); } bool CDsgAlgoDlg::Initialize(IDetectorEngine* lpDE, IDetectorTask* lpTask) @@ -29,10 +25,6 @@ bool CDsgAlgoDlg::Initialize(IDetectorEngine* lpDE, IDetectorTask* lpTask) if (!InitGraphView()) return false; - - //if (!m_pDrawScene->Initialize(m_pTask, NULL)) - // return false; - return true; } @@ -145,13 +137,10 @@ IDetectorAlgorithm* CDsgAlgoDlg::ShowAlgoDlg(IDetectorAlgorithm* pAlgo) pNewAlgo->InitAlgo(); return pNewAlgo; - } - return pAlgo; } - void CDsgAlgoDlg::CleanUp() { diff --git a/src/lpbdesigner/DsgParamDlg.cpp b/src/lpbdesigner/DsgParamDlg.cpp index 3c927f2..e1f82d9 100644 --- a/src/lpbdesigner/DsgParamDlg.cpp +++ b/src/lpbdesigner/DsgParamDlg.cpp @@ -140,6 +140,11 @@ bool CDsgParamDlg::OnShowRoiDlg() if (!m_tRoiDlg.Initialize(m_pDE, m_pAlgo, m_pTask)) return false; m_tRoiData.img = m_pTask->GetTaskInfo()->templateImg; + m_tRoiDlg.setParent(this); + m_tRoiDlg.setWindowFlags(Qt::Dialog | Qt::WindowCloseButtonHint); + m_tRoiDlg.setWindowIcon(QIcon(":/image/leaper")); + m_tRoiDlg.setWindowModality(Qt::ApplicationModal); + m_tRoiDlg.setAttribute(Qt::WA_ShowModal, true); m_tRoiData = m_tRoiDlg.ShowRoiDlg(m_tRoiData); return true; } diff --git a/src/lpbdesigner/DsgRoiDlg.cpp b/src/lpbdesigner/DsgRoiDlg.cpp index 8c1e7e9..ac1486a 100644 --- a/src/lpbdesigner/DsgRoiDlg.cpp +++ b/src/lpbdesigner/DsgRoiDlg.cpp @@ -37,6 +37,7 @@ bool subDevListSort(const Item_List &info1, const Item_List &info2) CDsgRoiDlg::CDsgRoiDlg(QWidget *parent) : QDialog(parent), ui(new Ui::RoiDlg) { + m_pDE = NULL; m_pTask = NULL; @@ -51,17 +52,17 @@ CDsgRoiDlg::CDsgRoiDlg(QWidget *parent) : QDialog(parent), ui(new Ui::RoiDlg) connect(ui->pushButton_8, SIGNAL(clicked()), this, SLOT(OnShowColorDlg())); ui->pushButton_8->setAutoDefault(false); - connect(ui->pushButton_9, SIGNAL(clicked()), this, SLOT(OnSetItem())); +// connect(ui->pushButton_9, SIGNAL(clicked()), this, SLOT(OnSetItem())); - connect(ui->pushButton_10, SIGNAL(clicked()), this, SLOT(OnMove())); - connect(ui->pushButton_11, SIGNAL(clicked()), this, SLOT(OnMove())); - connect(ui->pushButton_12, SIGNAL(clicked()), this, SLOT(OnMove())); - connect(ui->pushButton_13, SIGNAL(clicked()), this, SLOT(OnMove())); +// connect(ui->pushButton_10, SIGNAL(clicked()), this, SLOT(OnMove())); +// connect(ui->pushButton_11, SIGNAL(clicked()), this, SLOT(OnMove())); +// connect(ui->pushButton_12, SIGNAL(clicked()), this, SLOT(OnMove())); +// connect(ui->pushButton_13, SIGNAL(clicked()), this, SLOT(OnMove())); - connect(ui->pushButton_14, SIGNAL(clicked()), this, SLOT(OnSelectImage())); - connect(ui->pushButton_15, SIGNAL(clicked()), this, SLOT(OnSnapCameraImage())); - connect(ui->pushButton_16, SIGNAL(clicked()), this, SLOT(OnZoomOut())); - connect(ui->pushButton_17, SIGNAL(clicked()), this, SLOT(OnZoomIn())); +// connect(ui->pushButton_14, SIGNAL(clicked()), this, SLOT(OnSelectImage())); +// connect(ui->pushButton_15, SIGNAL(clicked()), this, SLOT(OnSnapCameraImage())); +// connect(ui->pushButton_16, SIGNAL(clicked()), this, SLOT(OnZoomOut())); +// connect(ui->pushButton_17, SIGNAL(clicked()), this, SLOT(OnZoomIn())); connect(this, SIGNAL(sgShowCameraImage(QImage)), this, SLOT(OnShowCameraImage(QImage))); @@ -530,27 +531,27 @@ void CDsgRoiDlg::OnSetItem() //QPointF pos1 = item1->pos(); //QPointF pos2 = item2->pos(); //int a = 0; - QPoint pos; - QRect size; - pos.setX(ui->lineEdit_4->text().toInt() - m_pRoiScene->GetOffSet().x()); - pos.setY(ui->lineEdit_5->text().toInt() - m_pRoiScene->GetOffSet().y()); - size.setWidth(ui->lineEdit_6->text().toInt()); - size.setHeight(ui->lineEdit_7->text().toInt()); - m_pRoiScene->SetSelectedItem(pos, size); +// QPoint pos; +// QRect size; +// pos.setX(ui->lineEdit_4->text().toInt() - m_pRoiScene->GetOffSet().x()); +// pos.setY(ui->lineEdit_5->text().toInt() - m_pRoiScene->GetOffSet().y()); +// size.setWidth(ui->lineEdit_6->text().toInt()); +// size.setHeight(ui->lineEdit_7->text().toInt()); +// m_pRoiScene->SetSelectedItem(pos, size); } void CDsgRoiDlg::ResetItem(QPoint pos, QRect size) { - ui->lineEdit_4->clear(); - ui->lineEdit_5->clear(); - ui->lineEdit_6->clear(); - ui->lineEdit_7->clear(); - - ui->lineEdit_4->setText(QString::number(pos.x())); - ui->lineEdit_5->setText(QString::number(pos.y())); - - ui->lineEdit_6->setText(QString::number(size.width())); - ui->lineEdit_7->setText(QString::number(size.height())); +// ui->lineEdit_4->clear(); +// ui->lineEdit_5->clear(); +// ui->lineEdit_6->clear(); +// ui->lineEdit_7->clear(); +// +// ui->lineEdit_4->setText(QString::number(pos.x())); +// ui->lineEdit_5->setText(QString::number(pos.y())); +// +// ui->lineEdit_6->setText(QString::number(size.width())); +// ui->lineEdit_7->setText(QString::number(size.height())); } void CDsgRoiDlg::showEvent(QShowEvent *evt) @@ -558,10 +559,10 @@ void CDsgRoiDlg::showEvent(QShowEvent *evt) m_pRoiScene->Initialize(m_tempRoiData); m_pRoiScene->DisableMenu(false); - ui->lineEdit_4->clear(); - ui->lineEdit_5->clear(); - ui->lineEdit_6->clear(); - ui->lineEdit_7->clear(); +// ui->lineEdit_4->clear(); +// ui->lineEdit_5->clear(); +// ui->lineEdit_6->clear(); +// ui->lineEdit_7->clear(); } void CDsgRoiDlg::OnZoomIn() diff --git a/src/lpbdesigner/GeneratedFiles/ui_RoiDlg.h b/src/lpbdesigner/GeneratedFiles/ui_RoiDlg.h index f9da855..f78f418 100644 --- a/src/lpbdesigner/GeneratedFiles/ui_RoiDlg.h +++ b/src/lpbdesigner/GeneratedFiles/ui_RoiDlg.h @@ -39,9 +39,8 @@ public: QGroupBox *groupBox_2; QVBoxLayout *verticalLayout_2; QHBoxLayout *horizontalLayout_2; - QLineEdit *lineEdit_3; QPushButton *pushButton_8; - QSpacerItem *horizontalSpacer_6; + QLineEdit *lineEdit_3; QPushButton *pushButton_7; QSpacerItem *verticalSpacer; QPushButton *pushButton_5; @@ -49,32 +48,6 @@ public: QVBoxLayout *verticalLayout; QLabel *label_pixel_info; QGraphicsView *graphicsView; - QGroupBox *groupBox_3; - QHBoxLayout *horizontalLayout; - QGridLayout *gridLayout_2; - QLabel *label_4; - QLineEdit *lineEdit_4; - QLabel *label_7; - QLineEdit *lineEdit_6; - QLabel *label_5; - QLineEdit *lineEdit_5; - QLabel *label_6; - QLineEdit *lineEdit_7; - QVBoxLayout *verticalLayout_5; - QPushButton *pushButton_16; - QPushButton *pushButton_17; - QGridLayout *gridLayout; - QSpacerItem *horizontalSpacer; - QPushButton *pushButton_11; - QSpacerItem *horizontalSpacer_2; - QPushButton *pushButton_10; - QPushButton *pushButton_9; - QPushButton *pushButton_12; - QSpacerItem *horizontalSpacer_3; - QPushButton *pushButton_13; - QSpacerItem *horizontalSpacer_4; - QPushButton *pushButton_14; - QPushButton *pushButton_15; void setupUi(QDialog *RoiDlg) { @@ -118,9 +91,15 @@ public: verticalLayout_2->setContentsMargins(2, 2, 2, 2); horizontalLayout_2 = new QHBoxLayout(); horizontalLayout_2->setObjectName(QStringLiteral("horizontalLayout_2")); + pushButton_8 = new QPushButton(groupBox_2); + pushButton_8->setObjectName(QStringLiteral("pushButton_8")); + pushButton_8->setMaximumSize(QSize(80, 16777215)); + + horizontalLayout_2->addWidget(pushButton_8); + lineEdit_3 = new QLineEdit(groupBox_2); lineEdit_3->setObjectName(QStringLiteral("lineEdit_3")); - QSizePolicy sizePolicy(QSizePolicy::Minimum, QSizePolicy::Fixed); + QSizePolicy sizePolicy(QSizePolicy::Preferred, QSizePolicy::Fixed); sizePolicy.setHorizontalStretch(0); sizePolicy.setVerticalStretch(0); sizePolicy.setHeightForWidth(lineEdit_3->sizePolicy().hasHeightForWidth()); @@ -129,16 +108,6 @@ public: horizontalLayout_2->addWidget(lineEdit_3); - pushButton_8 = new QPushButton(groupBox_2); - pushButton_8->setObjectName(QStringLiteral("pushButton_8")); - pushButton_8->setMaximumSize(QSize(80, 16777215)); - - horizontalLayout_2->addWidget(pushButton_8); - - horizontalSpacer_6 = new QSpacerItem(40, 20, QSizePolicy::Expanding, QSizePolicy::Minimum); - - horizontalLayout_2->addItem(horizontalSpacer_6); - verticalLayout_2->addLayout(horizontalLayout_2); @@ -185,134 +154,6 @@ public: verticalLayout->addWidget(graphicsView); - groupBox_3 = new QGroupBox(groupBox); - groupBox_3->setObjectName(QStringLiteral("groupBox_3")); - horizontalLayout = new QHBoxLayout(groupBox_3); - horizontalLayout->setObjectName(QStringLiteral("horizontalLayout")); - horizontalLayout->setContentsMargins(2, 2, 2, 2); - gridLayout_2 = new QGridLayout(); - gridLayout_2->setObjectName(QStringLiteral("gridLayout_2")); - label_4 = new QLabel(groupBox_3); - label_4->setObjectName(QStringLiteral("label_4")); - - gridLayout_2->addWidget(label_4, 0, 0, 1, 1); - - lineEdit_4 = new QLineEdit(groupBox_3); - lineEdit_4->setObjectName(QStringLiteral("lineEdit_4")); - - gridLayout_2->addWidget(lineEdit_4, 0, 1, 1, 1); - - label_7 = new QLabel(groupBox_3); - label_7->setObjectName(QStringLiteral("label_7")); - - gridLayout_2->addWidget(label_7, 0, 2, 1, 1); - - lineEdit_6 = new QLineEdit(groupBox_3); - lineEdit_6->setObjectName(QStringLiteral("lineEdit_6")); - - gridLayout_2->addWidget(lineEdit_6, 0, 3, 1, 1); - - label_5 = new QLabel(groupBox_3); - label_5->setObjectName(QStringLiteral("label_5")); - - gridLayout_2->addWidget(label_5, 1, 0, 1, 1); - - lineEdit_5 = new QLineEdit(groupBox_3); - lineEdit_5->setObjectName(QStringLiteral("lineEdit_5")); - - gridLayout_2->addWidget(lineEdit_5, 1, 1, 1, 1); - - label_6 = new QLabel(groupBox_3); - label_6->setObjectName(QStringLiteral("label_6")); - - gridLayout_2->addWidget(label_6, 1, 2, 1, 1); - - lineEdit_7 = new QLineEdit(groupBox_3); - lineEdit_7->setObjectName(QStringLiteral("lineEdit_7")); - - gridLayout_2->addWidget(lineEdit_7, 1, 3, 1, 1); - - - horizontalLayout->addLayout(gridLayout_2); - - verticalLayout_5 = new QVBoxLayout(); - verticalLayout_5->setObjectName(QStringLiteral("verticalLayout_5")); - pushButton_16 = new QPushButton(groupBox_3); - pushButton_16->setObjectName(QStringLiteral("pushButton_16")); - - verticalLayout_5->addWidget(pushButton_16); - - pushButton_17 = new QPushButton(groupBox_3); - pushButton_17->setObjectName(QStringLiteral("pushButton_17")); - - verticalLayout_5->addWidget(pushButton_17); - - - horizontalLayout->addLayout(verticalLayout_5); - - gridLayout = new QGridLayout(); - gridLayout->setSpacing(1); - gridLayout->setObjectName(QStringLiteral("gridLayout")); - horizontalSpacer = new QSpacerItem(40, 20, QSizePolicy::Expanding, QSizePolicy::Minimum); - - gridLayout->addItem(horizontalSpacer, 0, 0, 1, 1); - - pushButton_11 = new QPushButton(groupBox_3); - pushButton_11->setObjectName(QStringLiteral("pushButton_11")); - pushButton_11->setMinimumSize(QSize(0, 25)); - - gridLayout->addWidget(pushButton_11, 0, 1, 1, 1); - - horizontalSpacer_2 = new QSpacerItem(40, 20, QSizePolicy::Expanding, QSizePolicy::Minimum); - - gridLayout->addItem(horizontalSpacer_2, 0, 2, 1, 1); - - pushButton_10 = new QPushButton(groupBox_3); - pushButton_10->setObjectName(QStringLiteral("pushButton_10")); - - gridLayout->addWidget(pushButton_10, 1, 0, 1, 1); - - pushButton_9 = new QPushButton(groupBox_3); - pushButton_9->setObjectName(QStringLiteral("pushButton_9")); - - gridLayout->addWidget(pushButton_9, 1, 1, 1, 1); - - pushButton_12 = new QPushButton(groupBox_3); - pushButton_12->setObjectName(QStringLiteral("pushButton_12")); - - gridLayout->addWidget(pushButton_12, 1, 2, 1, 1); - - horizontalSpacer_3 = new QSpacerItem(58, 13, QSizePolicy::Expanding, QSizePolicy::Minimum); - - gridLayout->addItem(horizontalSpacer_3, 2, 0, 1, 1); - - pushButton_13 = new QPushButton(groupBox_3); - pushButton_13->setObjectName(QStringLiteral("pushButton_13")); - - gridLayout->addWidget(pushButton_13, 2, 1, 1, 1); - - horizontalSpacer_4 = new QSpacerItem(40, 20, QSizePolicy::Expanding, QSizePolicy::Minimum); - - gridLayout->addItem(horizontalSpacer_4, 2, 2, 1, 1); - - - horizontalLayout->addLayout(gridLayout); - - pushButton_14 = new QPushButton(groupBox_3); - pushButton_14->setObjectName(QStringLiteral("pushButton_14")); - pushButton_14->setMinimumSize(QSize(0, 30)); - - horizontalLayout->addWidget(pushButton_14); - - pushButton_15 = new QPushButton(groupBox_3); - pushButton_15->setObjectName(QStringLiteral("pushButton_15")); - pushButton_15->setMinimumSize(QSize(0, 30)); - - horizontalLayout->addWidget(pushButton_15); - - - verticalLayout->addWidget(groupBox_3); - splitter->addWidget(groupBox); gridLayout_3->addWidget(splitter, 0, 0, 1, 3); @@ -334,20 +175,6 @@ public: pushButton_5->setText(QApplication::translate("RoiDlg", "\345\215\201\345\255\227\346\240\207\345\256\232\347\272\277", Q_NULLPTR)); groupBox->setTitle(QApplication::translate("RoiDlg", "\347\273\230\345\233\276\345\214\272\345\237\237\357\274\232", Q_NULLPTR)); label_pixel_info->setText(QApplication::translate("RoiDlg", "Pixel info: ", Q_NULLPTR)); - groupBox_3->setTitle(QApplication::translate("RoiDlg", "\346\216\247\345\210\266\345\217\260\357\274\232", Q_NULLPTR)); - label_4->setText(QApplication::translate("RoiDlg", "X:", Q_NULLPTR)); - label_7->setText(QApplication::translate("RoiDlg", "\345\256\275:", Q_NULLPTR)); - label_5->setText(QApplication::translate("RoiDlg", "Y:", Q_NULLPTR)); - label_6->setText(QApplication::translate("RoiDlg", "\351\253\230", Q_NULLPTR)); - pushButton_16->setText(QApplication::translate("RoiDlg", "+", Q_NULLPTR)); - pushButton_17->setText(QApplication::translate("RoiDlg", "-", Q_NULLPTR)); - pushButton_11->setText(QApplication::translate("RoiDlg", "\344\270\212", Q_NULLPTR)); - pushButton_10->setText(QApplication::translate("RoiDlg", "\345\267\246", Q_NULLPTR)); - pushButton_9->setText(QApplication::translate("RoiDlg", "\347\241\256\350\256\244", Q_NULLPTR)); - pushButton_12->setText(QApplication::translate("RoiDlg", "\345\217\263", Q_NULLPTR)); - pushButton_13->setText(QApplication::translate("RoiDlg", "\344\270\213", Q_NULLPTR)); - pushButton_14->setText(QApplication::translate("RoiDlg", "\350\256\276\347\275\256\345\233\276\347\211\207", Q_NULLPTR)); - pushButton_15->setText(QApplication::translate("RoiDlg", "\344\273\216\347\233\270\346\234\272\350\216\267\345\217\226\345\233\276\347\211\207", Q_NULLPTR)); } // retranslateUi }; diff --git a/src/lpbdesigner/MainFrame.cpp b/src/lpbdesigner/MainFrame.cpp index a5bb7bf..6c0200e 100644 --- a/src/lpbdesigner/MainFrame.cpp +++ b/src/lpbdesigner/MainFrame.cpp @@ -625,7 +625,6 @@ bool CMainFrame::OnParamPopMenu(const QPoint& points) updateRelyOnAlgoAciton->setObjectName("updateRelyOnAlgoAciton"); - QAction *selectedAction = menu.exec(QCursor::pos()); if (!selectedAction) { @@ -698,12 +697,15 @@ bool CMainFrame::OnAddAlgo() { if (!m_tAlgoDlg.Initialize(m_pDE, m_pCurrentTask)) return false; - + m_tAlgoDlg.setParent(this); + m_tAlgoDlg.setWindowFlags(Qt::Dialog | Qt::WindowCloseButtonHint); + m_tAlgoDlg.setWindowIcon(QIcon(":/image/leaper")); + m_tAlgoDlg.setWindowModality(Qt::ApplicationModal); + m_tAlgoDlg.setAttribute(Qt::WA_ShowModal, true); IDetectorAlgorithm* pAlgo = m_tAlgoDlg.ShowAlgoDlg(NULL); if (pAlgo) { int nRowCount = ui->tableWidget_2->rowCount(); - ui->tableWidget_2->setRowCount(nRowCount + 1); QTableWidgetItem* pItem = new QTableWidgetItem(QString::number(pAlgo->GetID())); pItem->setData(Qt::UserRole, pAlgo->GetID()); @@ -711,9 +713,7 @@ bool CMainFrame::OnAddAlgo() ui->tableWidget_2->setItem(nRowCount, 1, new QTableWidgetItem(QObject::tr(pAlgo->GetAlgorithmInfo()->strName.toStdString().c_str()))); //ui->tableWidget_2->setItem(nRowCount, 2, new QTableWidgetItem(pAlgo->GetAlgorithmInfo()->strDescription)); ui->tableWidget_2->setItem(nRowCount, 2, new QTableWidgetItem(QString::number(pAlgo->GetAlgorithmInfo()->nRoiID))); - ui->tableWidget_2->setCurrentCell(nRowCount, QItemSelectionModel::Select); - OnInitCurrentAlgoParam(); } @@ -722,12 +722,10 @@ bool CMainFrame::OnAddAlgo() bool CMainFrame::OnEditAlgo() { - //return false; if (!currentTask()) return false; int nRowIndex = ui->tableWidget_2->currentRow(); - if (nRowIndex != -1) { QListitems = ui->tableWidget_2->selectedItems(); @@ -741,7 +739,11 @@ bool CMainFrame::OnEditAlgo() if (!m_tAlgoDlg.Initialize(m_pDE, m_pCurrentTask)) return false; - + m_tAlgoDlg.setParent(this); + m_tAlgoDlg.setWindowFlags(Qt::Dialog | Qt::WindowCloseButtonHint); + m_tAlgoDlg.setWindowIcon(QIcon(":/image/leaper")); + m_tAlgoDlg.setWindowModality(Qt::ApplicationModal); + m_tAlgoDlg.setAttribute(Qt::WA_ShowModal, true); pAlgo = m_tAlgoDlg.ShowAlgoDlg(pAlgo); if (items.size()>1) items.at(1)->setText(QObject::tr(pAlgo->GetAlgorithmInfo()->strName.toStdString().c_str())); @@ -809,7 +811,11 @@ bool CMainFrame::OnSetAlgo() //CDsgAlgorithmParamMgrDlg m_tParamMgrDlg; if (!m_tParamMgrDlg.Initialize(m_pDE, m_pCurrentTask, pAlgo,PARAM_IN)) return false; - + m_tParamMgrDlg.setParent(this); + m_tParamMgrDlg.setWindowFlags(Qt::Dialog | Qt::WindowCloseButtonHint); + m_tParamMgrDlg.setWindowIcon(QIcon(":/image/leaper")); + m_tParamMgrDlg.setWindowModality(Qt::ApplicationModal); + m_tParamMgrDlg.setAttribute(Qt::WA_ShowModal, true); m_tParamMgrDlg.ShowParamMgrDlg(pAlgo); //m_tParamMgrDlg.exec(); } @@ -839,6 +845,11 @@ bool CMainFrame::OnSetOutParam() if (!m_tParamMgrDlg.Initialize(m_pDE, m_pCurrentTask, pAlgo,PARAM_OUT)) return false; + m_tParamMgrDlg.setParent(this); + m_tParamMgrDlg.setWindowFlags(Qt::Dialog | Qt::WindowCloseButtonHint); + m_tParamMgrDlg.setWindowIcon(QIcon(":/image/leaper")); + m_tParamMgrDlg.setWindowModality(Qt::ApplicationModal); + m_tParamMgrDlg.setAttribute(Qt::WA_ShowModal, true); m_tParamMgrDlg.ShowParamMgrDlg(pAlgo); //m_tParamMgrDlg.exec(); } @@ -1254,7 +1265,11 @@ bool CMainFrame::OnAddParam() if (!m_tParamDlg.InitGraphView()) return false; - + m_tParamDlg.setParent(this); + m_tParamDlg.setWindowFlags(Qt::Dialog | Qt::WindowCloseButtonHint); + m_tParamDlg.setWindowIcon(QIcon(":/image/leaper")); + m_tParamDlg.setWindowModality(Qt::ApplicationModal); + m_tParamDlg.setAttribute(Qt::WA_ShowModal, true); PLP_ALGORITHM_PARAM pParam = m_tParamDlg.ShowParamDlg(NULL); if (pParam) { @@ -1331,7 +1346,11 @@ bool CMainFrame::OnEditParam() return false; // m_tParamDlg.show(); - + m_tParamDlg.setParent(this); + m_tParamDlg.setWindowFlags(Qt::Dialog | Qt::WindowCloseButtonHint); + m_tParamDlg.setWindowIcon(QIcon(":/image/leaper")); + m_tParamDlg.setWindowModality(Qt::ApplicationModal); + m_tParamDlg.setAttribute(Qt::WA_ShowModal, true); m_tParamDlg.ShowParamDlg(pParam); // items.at(1)->setText(pParam->strName); // items.at(2)->setText(GetParamTypeStr(pParam->type)); diff --git a/src/lpbdesigner/RoiDlg.ui b/src/lpbdesigner/RoiDlg.ui index 2cc85d6..fa6eea8 100644 --- a/src/lpbdesigner/RoiDlg.ui +++ b/src/lpbdesigner/RoiDlg.ui @@ -108,22 +108,6 @@ - - - - - 0 - 0 - - - - - 50 - 16777215 - - - - @@ -138,17 +122,20 @@ - - - Qt::Horizontal + + + + 0 + 0 + - + - 40 - 20 + 50 + 16777215 - + @@ -249,215 +236,6 @@ - - - - 控制台： - - - - 2 - - - 2 - - - 2 - - - 2 - - - - - - - X: - - - - - - - - - - 宽: - - - - - - - - - - Y: - - - - - - - - - - 高 - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - - 1 - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - 0 - 25 - - - - 上 - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - 左 - - - - - - - 确认 - - - - - - - 右 - - - - - - - Qt::Horizontal - - - - 58 - 13 - - - - - - - - 下 - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - - - 0 - 30 - - - - 设置图片 - - - - - - - - 0 - 30 - - - - 从相机获取图片 - - - - - -