From 8240030e0930aca5c8dbc1958337a24e97e31954 Mon Sep 17 00:00:00 2001
From: QuShuailong <qu.shuailong@hzleaper.com>
Date: Sun, 24 Sep 2023 13:50:27 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E4=BF=AE=E5=A4=8D=E4=BE=A7=E9=9D=A2?=
 =?UTF-8?q?=E7=9B=B8=E6=9C=BA=E8=87=AA=E5=8A=A8=E6=97=8B=E8=BD=AC=E7=9A=84?=
 =?UTF-8?q?bug=E3=80=822=E3=80=81=E4=BF=AE=E5=A4=8D=E5=BB=BA=E6=95=B0?=
 =?UTF-8?q?=E9=87=8F=E6=A8=A1=E6=9D=BF=E5=8D=A1=E6=AD=BB=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=E3=80=823=E3=80=81=E8=B0=83=E8=8A=82=E5=88=9B?=
 =?UTF-8?q?=E5=BB=BA=E6=95=B0=E9=87=8F=E6=A8=A1=E6=9D=BF=E7=9A=84=E7=AA=97?=
 =?UTF-8?q?=E5=8F=A3=E5=B0=BA=E5=AF=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/CameraControl.cpp                              | 10 +++++++---
 src/SmokeBoxIdentification.cpp                     |  7 +++++--
 tpvs17/SmokeBoxIdentification/QNumTemplateBuild.ui |  4 ++--
 3 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/src/CameraControl.cpp b/src/CameraControl.cpp
index 90a69d4..d6c055a 100644
--- a/src/CameraControl.cpp
+++ b/src/CameraControl.cpp
@@ -112,10 +112,10 @@ bool CameraControl::readCameraConfig(QString filePath)
 	}
 	QJsonObject devicesObj = jsonObj.value("devices").toObject();
 	if (!devicesObj.isEmpty()) {
-		CameraInfo cameraInfo;
 		QStringList devicesLabelList = devicesObj.keys();
 		for each (QString deviceLabel in devicesLabelList)
 		{
+			CameraInfo cameraInfo;
 			cameraInfo.cameraLabel = deviceLabel;
 			QStringList strList = deviceLabel.split(' ');
 			if (strList.length() != 2)
@@ -133,11 +133,11 @@ bool CameraControl::readCameraConfig(QString filePath)
 				cameraInfo.imageHeight = deviceObj.value("height").toInt();
 				cameraInfo.imageWidth = deviceObj.value("width").toInt();
 				cameraInfo.saveImgSuffix = deviceObj.value("save_img_suffix").toString();
+				int id = deviceObj.value("id").toInt();
 				if (deviceObj.contains("rotation_angle"))
 				{
 					cameraInfo.rotationAngle = deviceObj.value("rotation_angle").toInt();
 				}
-				int id = deviceObj.value("id").toInt();
 				if (id >= topStartId && id <= topEndId)
 				{
 					m_mapIdCameraInfoTop[id] = cameraInfo;
@@ -445,7 +445,7 @@ void CameraControl::capture(const QStringList& serialNumberList)
 		QString serialNumber = serialNumberList.at(i);
 		getSaveImgNameInfo(serialNumber, vecImageInfo[i].saveImgInfo);
 		int id = vecImageInfo.at(i).saveImgInfo.strId.toInt();
-		int rotationAngle;
+		int rotationAngle = 0;
 		if (m_mapIdCameraInfoTop.contains(id))
 		{
 			rotationAngle = m_mapIdCameraInfoTop.value(id).rotationAngle;
@@ -468,16 +468,20 @@ void CameraControl::flipImg(const cv::Mat& imgSrc, cv::Mat& imgDst, int rotation
 	case 90:
 		cv::transpose(imgSrc, imgDst);
 		cv::flip(imgDst, imgDst, 1);
+		qDebug() << " 旋转90度";
 		break;
 	case 180:
 		cv::flip(imgSrc, imgDst, 0);
+		qDebug() << " 旋转180度";
 		break;
 	case 270:
 		cv::transpose(imgSrc, imgDst);
 		cv::flip(imgDst, imgDst, 0);
+		qDebug() << " 旋转270度";
 		break;
 	default:
 		imgDst = imgSrc;
+		qDebug() << " 不旋转";
 		break;
 	}
 }
diff --git a/src/SmokeBoxIdentification.cpp b/src/SmokeBoxIdentification.cpp
index 727b80c..b4b55f8 100644
--- a/src/SmokeBoxIdentification.cpp
+++ b/src/SmokeBoxIdentification.cpp
@@ -26,7 +26,6 @@ SmokeBoxIdentification::SmokeBoxIdentification(QWidget *parent)
 		//m_bCamerasInit = initCamera();
 		if (decodeSmokeInfoCsv(applicationDirPath + SMOKEINFO_XLSX_CONFIG))
 			matchSmokeNameAndTemplateFolderName(applicationDirPath + NUM_TEMPLATE_PATH);
-		m_pNumTemplateBuild = new QNumTemplateBuild();
 		m_pDataProcess = std::make_shared<dataPreProcessing>();
 		if (m_pDataProcess)
 		{
@@ -35,10 +34,14 @@ SmokeBoxIdentification::SmokeBoxIdentification(QWidget *parent)
 			m_pDataProcess->transmitFilePathForSampleWithItsCorresLabel();
 			m_pDataProcess->setWinSize(170);
 			ADModule::instance()->setDataProcessObj(m_pDataProcess);
-			m_pNumTemplateBuild->setDataProcessObj(m_pDataProcess);
 		}
 	});
 
+	m_pNumTemplateBuild = new QNumTemplateBuild();
+	if (m_pDataProcess)
+	{
+		m_pNumTemplateBuild->setDataProcessObj(m_pDataProcess);
+	}
 	QString filePath = applicationDirPath + NET_CONFIG;
 	m_pNetControl = new NetControl(filePath, true);
 	connect(m_pNetControl, &NetControl::sgReceiveData, this, &SmokeBoxIdentification::onDecodeMsg);
diff --git a/tpvs17/SmokeBoxIdentification/QNumTemplateBuild.ui b/tpvs17/SmokeBoxIdentification/QNumTemplateBuild.ui
index b684658..09beb07 100644
--- a/tpvs17/SmokeBoxIdentification/QNumTemplateBuild.ui
+++ b/tpvs17/SmokeBoxIdentification/QNumTemplateBuild.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>887</width>
-    <height>601</height>
+    <width>645</width>
+    <height>450</height>
    </rect>
   </property>
   <property name="windowTitle">