添加巴鲁夫新型号相机

Cigarette.sln

@@ -36,7 +36,7 @@ Global
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {0AF1A30E-A12C-4014-ACD5-65A1E6D54D46}
 		Qt5Version = 5.15.2_msvc2019_64
+		SolutionGuid = {0AF1A30E-A12C-4014-ACD5-65A1E6D54D46}
 	EndGlobalSection
 EndGlobal

Cigarette/alg_jd.cpp

@@ -259,7 +259,7 @@ static void drawPred(int classId, float conf, int left, int top, int right, int
     cv::rectangle(frame, cv::Point(left, top), cv::Point(right, bottom), color, 4);
    
     //Get the label for the class name and its confidence
-    std::string label = cv::format("%.2f%%", (conf*100));
+    std::string label = cv::format("%.2f%%", (conf*100));///
     if (!classes.empty())
     {
         CV_Assert(classId < (int)classes.size());

Cigarette/cigarette.cpp

@@ -3157,7 +3157,7 @@ void Cigarette::EnumerateCameras(SingleCamInfoStruct *TempSingleCamInfoStruct,bo
 		if(showinfo)std::cout << "Camera:" << i << ",vendor = " << manufacture << std::endl;
 		transform(manufacture.begin(), manufacture.end(), manufacture.begin(), ::toupper);
 		SingleCamInfoStruct CamInfo;
-		if (!manufacture.compare(0, 7, "BALLUFF"))
+		if ((!manufacture.compare(0, 7, "BALLUFF"))||(!manufacture.compare(0, 13, "MATRIX VISION")))
 		{
 			mvIMPACT::acquire::GenICam::DeviceControl dc(pDev);
 			std::string UserID = dc.deviceUserID.read();

Cigarette/workthread.cpp

@@ -132,7 +132,8 @@ void WorkThread::run()
 			bool IsNG = false;
 			for(int index=0;index<unit_count;index++)
 			{
-				if(vec_results[index].size() < local_SysConf.no[local_camera_number][index])IsNG |= true;
+				//if(vec_results[index].size() < local_SysConf.no[local_camera_number][index])IsNG |= true;
+				if (vec_results[index].size() != 1)IsNG |= true;//·´ÏòѵÁ·
 				if (local_SysConf.save == 2)//三张照片分别存储
 				{
 					cv::Mat m = vec_in[index].clone();