初步校准测试

HanddleAI/HandleAiUi-new/uiModule/uiModule_imageDoubleCheckQdialog.h

@@ -7,7 +7,6 @@
 #include <uiModule/components/fancyButton.h>
 #include <qdatetime.h>
 #include <uiModule/uiModule_imageView.h>
-
 class imageDoubleCheckQdialog :public QDialog
 {
 	Q_OBJECT
@@ -18,7 +17,8 @@ public:
 	fancyButtonText* okBtn = new fancyButtonText(120, 40, "OK", "继续");
 	fancyButtonText* ngBtn = new fancyButtonText(120, 40, "NG", "继续");
 	QMutex mutex;
-	QQueue< QPixmap>imgqueue;
+	QQueue< imageDoubleCheckPack>imgqueue;
+	imageDoubleCheckPack currentPack;
 	imageDoubleCheckQdialog()
 	{
 		QPalette paletteWhite, paletteRed, paletteGreen;
@@ -83,7 +83,7 @@ public:
 		menuBarLayoutRight->addWidget(closeBtn);
 
 		QObject::connect(closeBtn, &QPushButton::clicked, this, &QDialog::close);
-
+		closeBtn->hide();//隐藏关闭按钮
 		QHBoxLayout* imageViewLayout = new QHBoxLayout();
 		imageViewLayout->addWidget(_ImageWidgetManager);
 
@@ -105,34 +105,35 @@ public:
 		this->setWindowFlags(this->windowFlags() | Qt::WindowStaysOnTopHint);
 		//this->show();
 	}
-	void showAndSetImg(QPixmap img)
+	void showAndSetImg(imageDoubleCheckPack pack)
 	{
 		mutex.lock();
 		std::cout << isShowing<<"-" << imgqueue.size()<< std::endl;
 		if (isShowing == false && imgqueue.size() == 0)
 		{
-			_ImageWidgetManager->showImg(img, imgWidgetShowType::imgWidgetOri, 0);
+			currentPack = pack;
+			_ImageWidgetManager->showImg(pack.img, imgWidgetShowType::imgWidgetOri, 0);
 			this->show();
 			isShowing = true;
 		}
 		else
 		{
-			imgqueue.enqueue(img);
+			imgqueue.enqueue(pack);
 		}
 		mutex.unlock();
 	}
 signals:
-	void okSignal();
-	void ngSignal();
+	void okSignal(int armPos, int type);
+	void ngSignal(int armPos, int type);
 private:
 	void pressOK()
 	{
 		mutex.lock();
-		emit okSignal();
+		emit okSignal(currentPack.armPos , currentPack.type);
 		if (imgqueue.size() > 0)
 		{
-			QPixmap img = imgqueue.dequeue();
-			_ImageWidgetManager->showImg(img, imgWidgetShowType::imgWidgetOri, 0);
+			currentPack = imgqueue.dequeue();
+			_ImageWidgetManager->showImg(currentPack.img, imgWidgetShowType::imgWidgetOri, 0);
 		}
 		else
 		{
@@ -144,11 +145,11 @@ private:
 	void pressNG()
 	{
 		mutex.lock();
-		emit ngSignal();
+		emit ngSignal(currentPack.armPos, currentPack.type);
 		if (imgqueue.size() > 0)
 		{
-			QPixmap img = imgqueue.dequeue();
-			_ImageWidgetManager->showImg(img, imgWidgetShowType::imgWidgetOri, 0);
+			currentPack = imgqueue.dequeue();
+			_ImageWidgetManager->showImg(currentPack.img, imgWidgetShowType::imgWidgetOri, 0);
 		}
 		else
 		{