diff --git a/Cigarette.sln b/Cigarette.sln index 1126f22..5741173 100644 --- a/Cigarette.sln +++ b/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 diff --git a/Cigarette/alg_jd.cpp b/Cigarette/alg_jd.cpp index 6a12d94..00bb6a6 100644 --- a/Cigarette/alg_jd.cpp +++ b/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()); diff --git a/Cigarette/cigarette.cpp b/Cigarette/cigarette.cpp index 249adc2..059d693 100644 --- a/Cigarette/cigarette.cpp +++ b/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(); diff --git a/Cigarette/workthread.cpp b/Cigarette/workthread.cpp index b3874fc..580c6be 100644 --- a/Cigarette/workthread.cpp +++ b/Cigarette/workthread.cpp @@ -132,7 +132,8 @@ void WorkThread::run() bool IsNG = false; for(int index=0;index