调整UI显示层级逻辑

3part/tadpole/include/tpBase/lpdesigner.h

@@ -19,7 +19,7 @@ class IDetectorUI
 {
 public:
 	virtual bool Initialize(IDetectorEngine* lpDE) = 0;
-	virtual bool ShowMainFrame() = 0;
+	virtual bool ShowMainFrame(class QWidget* parent = nullptr) = 0;
 };
 
 

src/ImageCompare/ImageCompareModel.cpp

@@ -1871,7 +1871,7 @@ void ImageCompareModelInvoker::operator()(const cv::Range& range) const
 {
 	int i0 = range.start;
 	int i1 = range.end;
-	assert(abs(i1 - i0) == 1);
+	//assert(abs(i1 - i0) == 1);
 	//if (abs(i1 - i0) == 1)
 	//	return;
 	m_pModel->parallelDetect(i0, m_pData);

src/lpbdesigner/CDetectorUI.cpp

@@ -28,7 +28,7 @@ bool CDetectorUI::Initialize(IDetectorEngine* lpDE)
 	return true;
 }
 
-bool CDetectorUI::ShowMainFrame()
+bool CDetectorUI::ShowMainFrame(class QWidget* parent)
 {
 	if (!m_pMainFrame->Initialize(m_pDE))
 		return false;
@@ -36,6 +36,12 @@ bool CDetectorUI::ShowMainFrame()
 	if (!m_pMainFrame->InitGraphView())
 		return false;
 
+	m_pMainFrame->setParent(parent);
+	m_pMainFrame->setWindowFlags(Qt::Dialog | Qt::WindowCloseButtonHint);
+	m_pMainFrame->setWindowIcon(QIcon(":/image/leaper"));
+	m_pMainFrame->setWindowModality(Qt::ApplicationModal);
+	m_pMainFrame->setAttribute(Qt::WA_ShowModal, true);
+
 	m_pMainFrame->show();
 	return true;
 }

src/lpbdesigner/CDetectorUI.h

@@ -9,7 +9,7 @@ public:
 	CDetectorUI();
 	virtual ~CDetectorUI();
 	bool Initialize(IDetectorEngine* lpDE);
-	virtual bool ShowMainFrame();
+	virtual bool ShowMainFrame(class QWidget* parent = nullptr);
 private:
 	CMainFrame* m_pMainFrame{ nullptr };
 	IDetectorEngine* m_pDE{ nullptr };

src/tpMain/algela/lpImgViewer.cpp

@@ -5,8 +5,6 @@
 #include <iostream>
 #include <QtDebug>
 
-
-
 lpImgViewer::lpImgViewer(QWidget* parent /*= 0*/)
     : QGraphicsView(parent), mpImgItem(NULL), mpInfoLabel(NULL), mpImg(NULL), m_scale(1.0), mMinScaleThre(0.01),
     mIsFixedSizeScale(false), mFixedSizeScale(1.0), mImgScaleFunc(NULL), mIsAutoResetTransform(false)
@@ -25,16 +23,11 @@ lpImgViewer::lpImgViewer(QGraphicsScene *scene, QWidget *parent /*= 0*/)
     setTransformationAnchor(QGraphicsView::AnchorUnderMouse);
 }
 
-
 void lpImgViewer::setInitScale(qreal val)
 {
     scaleImg2(val);
 }
 
-
-
-
-
 QGraphicsPixmapItem* lpImgViewer::setImg(QImage& img)
 {
     if (mpImg)
@@ -50,8 +43,6 @@ QGraphicsPixmapItem* lpImgViewer::setImg(QImage& img)
 
     mImgOriSize = img.size();
     mMinScaleThre = 1.0 / std::min(mImgOriSize.width(), mImgOriSize.height());
-    //qreal scale = std::min((qreal)size().width() / img.width(), (qreal)size().height() / img.height());
-
     if (isAutoResetTransform())
     {
         mpImgItem->setPos(0, 0);

tpvs17/tpMain/lpMainWin.cpp

@@ -191,13 +191,9 @@ lpMainWin::lpMainWin(QWidget *parent)
 		//当某个模板加入训练或者不加入训练时修改原来工作单中的模板信息
 		connect(m_pModelMgrDlg, SIGNAL(sgModifyModel(QString)), this, SLOT(modWorkMgr(QString)));
 		connect(m_pModelMgrDlg, SIGNAL(sgUpdatedefect()), this, SLOT(onUpdateDefect()));
-		/*
-		void sgAddNewModel(QString strName);//添加模板
-		void sgDelOldModel(QString strName);//删除模板
-		void sgModeModeName(QString strOld, QString strNew);//修改模板名
-		*/
-		connect(m_pModelMgrDlg, SIGNAL(sgAddNewModel(QString)), this, SLOT(onSlotAddNewModel(QString)));
-		connect(m_pModelMgrDlg, SIGNAL(sgDelOldModel(QString)), this, SLOT(onSlotDelOldModel(QString)));
+
+		connect(m_pModelMgrDlg, SIGNAL(sgAddNewModel(QString)), this, SLOT(onSlotAddNewModel(QString)));//新建模板型号
+		connect(m_pModelMgrDlg, SIGNAL(sgDelOldModel(QString)), this, SLOT(onSlotDelOldModel(QString)));//删除模板型号
 
 
 
@@ -1050,7 +1046,7 @@ Q_SLOT void lpMainWin::onActionClicked()
 	}
 	else if ("action_designer" == strObj) {
 		if (m_pDesigner) {
-			m_pDesigner->ShowMainFrame();
+			m_pDesigner->ShowMainFrame(this);
 		}
 	}
 }