diff --git a/runner17/Release.zip b/runner17/Release.zip new file mode 100644 index 0000000..9a650c9 Binary files /dev/null and b/runner17/Release.zip differ diff --git a/runner17/Release/Qt5Core.dll b/runner17/Release/Qt5Core.dll new file mode 100644 index 0000000..e964016 Binary files /dev/null and b/runner17/Release/Qt5Core.dll differ diff --git a/runner17/Release/Qt5Gui.dll b/runner17/Release/Qt5Gui.dll new file mode 100644 index 0000000..a9bc6a9 Binary files /dev/null and b/runner17/Release/Qt5Gui.dll differ diff --git a/runner17/Release/Qt5Network.dll b/runner17/Release/Qt5Network.dll new file mode 100644 index 0000000..1360633 Binary files /dev/null and b/runner17/Release/Qt5Network.dll differ diff --git a/runner17/Release/Qt5SerialPort.dll b/runner17/Release/Qt5SerialPort.dll new file mode 100644 index 0000000..aeb2d2d Binary files /dev/null and b/runner17/Release/Qt5SerialPort.dll differ diff --git a/runner17/Release/Qt5Widgets.dll b/runner17/Release/Qt5Widgets.dll new file mode 100644 index 0000000..6ca9516 Binary files /dev/null and b/runner17/Release/Qt5Widgets.dll differ diff --git a/runner17/Release/Qt5WinExtras.dll b/runner17/Release/Qt5WinExtras.dll new file mode 100644 index 0000000..35a5090 Binary files /dev/null and b/runner17/Release/Qt5WinExtras.dll differ diff --git a/runner17/Release/config/camera.json b/runner17/Release/config/camera.json index 54c2c5d..5ed4eb4 100644 --- a/runner17/Release/config/camera.json +++ b/runner17/Release/config/camera.json @@ -74,7 +74,7 @@ "width": 2048, "zoom": 1 }, - "Eagle-M4 F83A01121812": { + "Eagle-M4 EF0CD99CF26B8A23": { "id": 3, "exposure": 10000, "location": 1, diff --git a/runner17/Release/config/camera.json.bak b/runner17/Release/config/camera.json.bak new file mode 100644 index 0000000..54c2c5d --- /dev/null +++ b/runner17/Release/config/camera.json.bak @@ -0,0 +1,106 @@ +{ + "devices": { + "LP-OCM-R060GC 00787720450": { + "algorithm": 1, + "algorithm_dll": 1, + "auto_open": false, + "auto_push": true, + "balanceRatio": 0, + "balanceRatioSelector": 0, + "board_config_file": "", + "board_name": "", + "board_num": 0, + "board_type": 64, + "camera_file": "", + "exposure": 10000, + "folder": "model1\\", + "format": "None", + "frame_rate": 9.3, + "gain": 2, + "height": 1200, + "id": 1, + "location": 1, + "loop": 1, + "mac_address": "", + "offset_x": 0, + "offset_y": 0, + "param_policy": 2, + "rely_on_camera": "", + "rotation_angle": 0, + "calib_file": ".\\config\\1.calib", + "save": 1, + "save_img_suffix": ".PNG", + "savefile_rgb_swapped": false, + "showname": "相机一", + "trigger_source": "Line0", + "type": 140, + "width": 1920, + "zoom": 1 + }, + "LP-OCM-HL060M 00J49540865": { + "algorithm": 1, + "algorithm_dll": 1, + "auto_open": false, + "auto_push": true, + "balanceRatio": 0, + "balanceRatioSelector": 0, + "board_config_file": "", + "board_name": "", + "board_num": 0, + "board_type": 64, + "camera_file": "", + "exposure": 10000, + "folder": "model1\\", + "format": "None", + "frame_rate": 9.3, + "gain": 2, + "height": 3072, + "id": 2, + "location": 2, + "loop": 1, + "mac_address": "", + "offset_x": 0, + "offset_y": 0, + "param_policy": 2, + "rely_on_camera": "", + "rotation_angle": 0, + "calib_file": ".\\config\\1.calib", + "save": 1, + "save_img_suffix": ".PNG", + "savefile_rgb_swapped": false, + "showname": "相机一", + "trigger_source": "Line0", + "type": 140, + "width": 2048, + "zoom": 1 + }, + "Eagle-M4 F83A01121812": { + "id": 3, + "exposure": 10000, + "location": 1, + "save_img_suffix": ".PNG", + "height": 3072, + "width": 2048, + "type": 210 + }, + + "Eagle-M4 F83A01121310": { + "id": 4, + "exposure": 10000, + "location": 2, + "save_img_suffix": ".PNG", + "height": 3072, + "width": 2048, + "type": 210 + } + + }, + "top": { + "startID": 0, + "endID": 0 + }, + "side": { + "startID": 1, + "endID": 4 + } +} diff --git a/runner17/Release/smokeBox.exe b/runner17/Release/smokeBox.exe index 3022dd8..f93584e 100644 Binary files a/runner17/Release/smokeBox.exe and b/runner17/Release/smokeBox.exe differ diff --git a/src/Camera.h b/src/Camera.h index e244c7d..0fae4b6 100644 --- a/src/Camera.h +++ b/src/Camera.h @@ -32,6 +32,8 @@ public: virtual bool startCamera() = 0; // ¿ªÊ¼¹¤×÷ virtual bool stopCamera() = 0; // Í£Ö¹¹¤×÷ virtual bool setTriggerSource(int) = 0; //ÉèÖô¥·¢Ô´ + virtual bool setExposure(int exposure) =0; //ÉèÖÃÆعâʱ¼ä + virtual bool setGain(double gain) = 0; //ÉèÖÃÔöÒæ virtual bool takeAPic(cv::Mat& imgMat, cv::Mat&imgMat3D) = 0; // »ñÈ¡µ±Ç°Í¼Ïñ void start() { m_timer->start(); } diff --git a/src/CameraControl.cpp b/src/CameraControl.cpp index a1d6afd..be70b8f 100644 --- a/src/CameraControl.cpp +++ b/src/CameraControl.cpp @@ -416,7 +416,7 @@ bool CameraControl::setSoftwareTrigger(const QString& serialNumber) return m_vecPCamera[index]->setTriggerSource(SOFTWARE); } -bool CameraControl::capture(const QString& serialNumber, cv::Mat& img, cv::Mat& img3D) +bool CameraControl::capture(const QString& serialNumber, cv::Mat& img, cv::Mat& img3D, int exposure) { QMap::iterator iter = m_mapSNIndex.find(serialNumber); if (iter == m_mapSNIndex.end()) @@ -425,6 +425,7 @@ bool CameraControl::capture(const QString& serialNumber, cv::Mat& img, cv::Mat& return false; } int index = iter.value(); + m_vecPCamera[index]->setExposure(exposure); m_vecPCamera[index]->takeAPic(img, img3D); if (img.empty()) { @@ -465,7 +466,7 @@ bool CameraControl::getSaveImgNameInfo(QString serialNumber, FileInfo& fileInfo) return true; } -Q_SLOT void CameraControl::onCapture(int cameraLocation,int location) +Q_SLOT void CameraControl::onCapture(int cameraLocation,int location, int floor) { QStringList serialNumList; switch (cameraLocation) @@ -506,11 +507,11 @@ Q_SLOT void CameraControl::onCapture(int cameraLocation,int location) if (serialNumList.length() != 0) { qInfo() << "Captured SerialNumList = " << serialNumList; - capture(serialNumList); + capture(serialNumList, floor); } } -void CameraControl::capture(const QStringList& serialNumberList) +void CameraControl::capture(const QStringList& serialNumberList, int floor) { int len = serialNumberList.length(); //qDebug() << "start capture, length: " << len; @@ -537,7 +538,32 @@ void CameraControl::capture(const QStringList& serialNumberList) { rotationAngle = m_mapIdCameraInfoSide.value(id).rotationAngle; } - if (!capture(serialNumber, imgInfo.image, imgInfo.image3D)) + + ////ÏÖÔÚ1ºÍ2ÏïµÀ¶¼ÊÇÓõÄÏÂÈý²ã£¨1-3²ã£©ÆعâÖµ250000ms/ÔöÒæ20£¬ + ////ÖÐÈý²ã£¨4-6²ã£©ÆعâÖµ150000ms/ÔöÒæ20£¬ + ////ÉÏÈý²ã£¨7-9²ã£©ÆعâÖµ50000ms/ÔöÒæ20 + //if (floor!=0) + //{ + // int exposure = 0; + // double gain = 0; + // if (floor >= 1 && floor <= 3) + // { + // exposure = 250000; + // } + // else if (floor >= 7 && floor <= 9) + // { + // exposure = 50000; + // } + // else + // { + // exposure = 150000; + // } + + //} + + + + if (!capture(serialNumber, imgInfo.image, imgInfo.image3D, floor)) { vecImageInfo.push_back(imgInfo); continue; diff --git a/src/CameraControl.h b/src/CameraControl.h index be5e09c..1e52f82 100644 --- a/src/CameraControl.h +++ b/src/CameraControl.h @@ -65,15 +65,15 @@ public: bool setSoftwareTrigger(const QString& serialNumber); - Q_SLOT void onCapture(int cameraLocation,int location); + Q_SLOT void onCapture(int cameraLocation,int location, int floor); signals: void sgCapturedImage(const QVector& vecImageInfo, int cameraLocation); private: Q_SLOT void onOpen(); bool getSaveImgNameInfo(QString serialNumber, FileInfo& fileInfo); - void capture(const QStringList& serialNumberList); - bool capture(const QString& serialNumber, cv::Mat& img, cv::Mat& img3D); + void capture(const QStringList& serialNumberList, int floor); + bool capture(const QString& serialNumber, cv::Mat& img, cv::Mat& img3D,int exposure); void flipImg(const cv::Mat& imgSrc, cv::Mat& imgDst, int rotationAngle); QMap m_mapIdCameraInfoTop; diff --git a/src/HikCamera.cpp b/src/HikCamera.cpp index 09cbb0a..708aa36 100644 --- a/src/HikCamera.cpp +++ b/src/HikCamera.cpp @@ -290,6 +290,14 @@ void HikCamera::destroyCamera() DELETE_POINTER(m_pData); DELETE_POINTER(m_pDeviceInfo); } +bool HikCamera::setExposure(int exposure) +{ + return true; +} +bool HikCamera::setGain(double gain) +{ + return true; +} void HikCamera::RGB2BGR(unsigned char* pRgbData, unsigned int nWidth, unsigned int nHeight) { if (NULL == pRgbData) diff --git a/src/HikCamera.h b/src/HikCamera.h index 42cc61c..fac2cb8 100644 --- a/src/HikCamera.h +++ b/src/HikCamera.h @@ -31,6 +31,8 @@ public: virtual bool takeAPic(cv::Mat& imgMat, cv::Mat&imgMat3D) override; virtual bool setTriggerSource(int mode) override; + virtual bool setExposure(int exposure) override; + virtual bool setGain(double gain) override; static int EnumDevices(unsigned int nTLayerType, MV_CC_DEVICE_INFO_LIST* pstDevList); //QString getCameraProperty(HikCamera::HikCameraProperty type); // »ñÈ¡Ïà»ú²ÎÊý diff --git a/src/LXCamera.cpp b/src/LXCamera.cpp index 5294b30..c63adac 100644 --- a/src/LXCamera.cpp +++ b/src/LXCamera.cpp @@ -34,7 +34,7 @@ LXCamera::~LXCamera() bool LXCamera::initCamera(const QString& serialNumber) { int device_num = 0; - LxDeviceInfo* p_device_list = NULL; + LxDeviceInfo* p_device_list = NULL; checkTC(DcGetDeviceList(&p_device_list, &device_num)); if (device_num <= 0) { @@ -42,7 +42,7 @@ bool LXCamera::initCamera(const QString& serialNumber) return false; } m_handle = serialNumber.toStdString(); - qDebug() << "Find tof device: " << p_device_list; + qInfo() << "Find tof device number = " << device_num; return true; } @@ -55,9 +55,9 @@ void LXCamera::destroyCamera() bool LXCamera::openCamera() { LxDeviceInfo device_info; - LX_STATE lx_state = DcOpenDevice(LX_OPEN_MODE::OPEN_BY_ID, m_handle.c_str(), &handle, &device_info); + LX_STATE lx_state = DcOpenDevice(LX_OPEN_MODE::OPEN_BY_SN, m_handle.c_str(), &handle, &device_info); if (LX_SUCCESS != lx_state) { - QString str = QString("open device failed, open_param: %1").arg(m_handle.c_str()); + QString str = QString("open device failed, open_param: %1, err = %2").arg(m_handle.c_str()).arg(lx_state); qDebug() << str; return false; } @@ -111,6 +111,16 @@ bool LXCamera::setTriggerSource(int mode) return true; } +bool LXCamera::setExposure(int exposure) +{ + return true; +} + +bool LXCamera::setGain(double gain) +{ + return true; +} + bool LXCamera::takeAPic(cv::Mat& imgMat, cv::Mat&imgMat3D) { //¸üÐÂÊý¾Ý diff --git a/src/LXCamera.h b/src/LXCamera.h index fa73cf9..3c0980d 100644 --- a/src/LXCamera.h +++ b/src/LXCamera.h @@ -19,9 +19,11 @@ public: virtual bool takeAPic(cv::Mat& imgMat, cv::Mat&imgMat3D) override; virtual bool setTriggerSource(int mode) override; - + virtual bool setExposure(int exposure) override; + virtual bool setGain(double gain)override; CameraType getCameraType() { return m_type; } + private: CameraType m_type = CameraType::LXTof; std::string m_handle; diff --git a/src/SmokeBoxIdentification.cpp b/src/SmokeBoxIdentification.cpp index d06b858..edce2e5 100644 --- a/src/SmokeBoxIdentification.cpp +++ b/src/SmokeBoxIdentification.cpp @@ -134,14 +134,14 @@ Q_SLOT void SmokeBoxIdentification::onActionClicked() } } -void SmokeBoxIdentification::captureTop(int cameraID) +void SmokeBoxIdentification::captureTop(int cameraID, int floor) { - emit sgCapture(eCameraLocation::emTop, cameraID); + emit sgCapture(eCameraLocation::emTop, cameraID, floor); } -void SmokeBoxIdentification::captureSide(int cameraID) +void SmokeBoxIdentification::captureSide(int cameraID, int floor) { - emit sgCapture(eCameraLocation::emSide, cameraID); + emit sgCapture(eCameraLocation::emSide, cameraID, floor); } void SmokeBoxIdentification::saveImage(const cv::Mat& imgMat, const QString& filePath) @@ -350,8 +350,8 @@ Q_SLOT void SmokeBoxIdentification::onDecodeMsg(const QString& msg) QString currentTaskNum = m_currtStockCheckInfo.taskNum; if (m_workMode == WorkMode::StockCheck) { - captureSide(1); - captureTop(1); + captureSide(1,0); + captureTop(1,0); } } } @@ -366,7 +366,7 @@ Q_SLOT void SmokeBoxIdentification::onDecodeMsg(const QString& msg) intoStockInfo.taskNum = strList.at(2); intoStockInfo.stockNum = strList.at(3); m_currtIntoStockInfo = intoStockInfo; - captureTop(1); + captureTop(1,0); } } else if (strList.at(0) == LIGHT_CONTROL_HEAD) @@ -403,7 +403,7 @@ Q_SLOT void SmokeBoxIdentification::onDecodeMsg(const QString& msg) m_currtIntoStockInfo.stockLocation = strList.at(4); m_currtIntoStockInfo.smokeTypeNum = strList.at(5); m_currtIntoStockInfo.smokeQuantity = strList.at(6); - captureSide(m_currtIntoStockInfo.stockLocation.toInt()); + captureSide(m_currtIntoStockInfo.stockLocation.toInt(),m_currtIntoStockInfo.Floor); } else if (strList.at(0) == START_CALCULATE && strList.length() == 7) { diff --git a/src/SmokeBoxIdentification.h b/src/SmokeBoxIdentification.h index f2c5d94..14713fe 100644 --- a/src/SmokeBoxIdentification.h +++ b/src/SmokeBoxIdentification.h @@ -67,7 +67,7 @@ public: ~SmokeBoxIdentification(); signals: - void sgCapture(int cameraLocation,int cameraID); + void sgCapture(int cameraLocation,int cameraID, int exposure); void sgCategoryMatchFinished(QString smokeNum); void sgShowImage(QLabel* labelPtr, const QImage& qImage); //void sgSendData2AndAlgo(); @@ -94,8 +94,8 @@ private: void sendResults(int mode, int id = 0); void saveData2File(const QVector& strVec, QString folderPath, int side); - void captureTop(int cameraID); - void captureSide(int cameraID); + void captureTop(int cameraID,int floor); + void captureSide(int cameraID, int floor); void saveImage(const QVector& vecImageInfo, int workMode); void saveImage(const cv::Mat& imgMat, const QString& filePath); void saveImage(ILImagePtr image, const cv::Mat& imgMat3D, const QString& filePath); diff --git a/src/common/commonDefine.h b/src/common/commonDefine.h index e07ba2f..553b011 100644 --- a/src/common/commonDefine.h +++ b/src/common/commonDefine.h @@ -152,6 +152,7 @@ struct IntoStockInfo QString stockLocation = 0; // ·½Ïò£º1×ó£¬2ÓÒ£»0±£ÁôΪ֮ǰ¹æÔò QString smokeTypeNum; //ÉÏλ»ú·¢Ë͵ÄÆ·¹æºÅ37010106 QString smokeQuantity; //ÉÏλ»ú·¢Ë͵ÄÊýÁ¿30 + int Floor = 1; //²ãÊý£¬±íʾÏÖÔÚÅĵĻõÎïÔڸ߼ܿâµÄµÚ¼¸²ã QStringList imagesPathList; }; diff --git a/tpvs17/SmokeBoxIdentification/GeneratedFiles/Release/moc_CameraControl.cpp b/tpvs17/SmokeBoxIdentification/GeneratedFiles/Release/moc_CameraControl.cpp index 98f34eb..5024f35 100644 --- a/tpvs17/SmokeBoxIdentification/GeneratedFiles/Release/moc_CameraControl.cpp +++ b/tpvs17/SmokeBoxIdentification/GeneratedFiles/Release/moc_CameraControl.cpp @@ -22,8 +22,8 @@ QT_BEGIN_MOC_NAMESPACE QT_WARNING_PUSH QT_WARNING_DISABLE_DEPRECATED struct qt_meta_stringdata_CameraControl_t { - QByteArrayData data[9]; - char stringdata0[104]; + QByteArrayData data[10]; + char stringdata0[110]; }; #define QT_MOC_LITERAL(idx, ofs, len) \ Q_STATIC_BYTE_ARRAY_DATA_HEADER_INITIALIZER_WITH_OFFSET(len, \ @@ -40,13 +40,14 @@ QT_MOC_LITERAL(4, 50, 12), // "vecImageInfo" QT_MOC_LITERAL(5, 63, 14), // "cameraLocation" QT_MOC_LITERAL(6, 78, 9), // "onCapture" QT_MOC_LITERAL(7, 88, 8), // "location" -QT_MOC_LITERAL(8, 97, 6) // "onOpen" +QT_MOC_LITERAL(8, 97, 5), // "floor" +QT_MOC_LITERAL(9, 103, 6) // "onOpen" }, "CameraControl\0sgCapturedImage\0\0" "QVector\0vecImageInfo\0" "cameraLocation\0onCapture\0location\0" - "onOpen" + "floor\0onOpen" }; #undef QT_MOC_LITERAL @@ -67,14 +68,14 @@ static const uint qt_meta_data_CameraControl[] = { 1, 2, 29, 2, 0x06 /* Public */, // slots: name, argc, parameters, tag, flags - 6, 2, 34, 2, 0x0a /* Public */, - 8, 0, 39, 2, 0x08 /* Private */, + 6, 3, 34, 2, 0x0a /* Public */, + 9, 0, 41, 2, 0x08 /* Private */, // signals: parameters QMetaType::Void, 0x80000000 | 3, QMetaType::Int, 4, 5, // slots: parameters - QMetaType::Void, QMetaType::Int, QMetaType::Int, 5, 7, + QMetaType::Void, QMetaType::Int, QMetaType::Int, QMetaType::Int, 5, 7, 8, QMetaType::Void, 0 // eod @@ -87,7 +88,7 @@ void CameraControl::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _i Q_UNUSED(_t) switch (_id) { case 0: _t->sgCapturedImage((*reinterpret_cast< const QVector(*)>(_a[1])),(*reinterpret_cast< int(*)>(_a[2]))); break; - case 1: _t->onCapture((*reinterpret_cast< int(*)>(_a[1])),(*reinterpret_cast< int(*)>(_a[2]))); break; + case 1: _t->onCapture((*reinterpret_cast< int(*)>(_a[1])),(*reinterpret_cast< int(*)>(_a[2])),(*reinterpret_cast< int(*)>(_a[3]))); break; case 2: _t->onOpen(); break; default: ; } diff --git a/tpvs17/SmokeBoxIdentification/GeneratedFiles/Release/moc_SmokeBoxIdentification.cpp b/tpvs17/SmokeBoxIdentification/GeneratedFiles/Release/moc_SmokeBoxIdentification.cpp index a364183..22039a3 100644 --- a/tpvs17/SmokeBoxIdentification/GeneratedFiles/Release/moc_SmokeBoxIdentification.cpp +++ b/tpvs17/SmokeBoxIdentification/GeneratedFiles/Release/moc_SmokeBoxIdentification.cpp @@ -22,8 +22,8 @@ QT_BEGIN_MOC_NAMESPACE QT_WARNING_PUSH QT_WARNING_DISABLE_DEPRECATED struct qt_meta_stringdata_SmokeBoxIdentification_t { - QByteArrayData data[39]; - char stringdata0[561]; + QByteArrayData data[40]; + char stringdata0[570]; }; #define QT_MOC_LITERAL(idx, ofs, len) \ Q_STATIC_BYTE_ARRAY_DATA_HEADER_INITIALIZER_WITH_OFFSET(len, \ @@ -37,46 +37,48 @@ QT_MOC_LITERAL(1, 23, 9), // "sgCapture" QT_MOC_LITERAL(2, 33, 0), // "" QT_MOC_LITERAL(3, 34, 14), // "cameraLocation" QT_MOC_LITERAL(4, 49, 8), // "cameraID" -QT_MOC_LITERAL(5, 58, 23), // "sgCategoryMatchFinished" -QT_MOC_LITERAL(6, 82, 8), // "smokeNum" -QT_MOC_LITERAL(7, 91, 11), // "sgShowImage" -QT_MOC_LITERAL(8, 103, 7), // "QLabel*" -QT_MOC_LITERAL(9, 111, 8), // "labelPtr" -QT_MOC_LITERAL(10, 120, 6), // "qImage" -QT_MOC_LITERAL(11, 127, 21), // "sgNumDataCollectStart" -QT_MOC_LITERAL(12, 149, 6), // "sideId" -QT_MOC_LITERAL(13, 156, 20), // "sgNumDataCollectStop" -QT_MOC_LITERAL(14, 177, 22), // "sgStartEmptyPlaceCheck" -QT_MOC_LITERAL(15, 200, 10), // "streetName" -QT_MOC_LITERAL(16, 211, 21), // "sgStopEmptyPlaceCheck" -QT_MOC_LITERAL(17, 233, 18), // "sgControlSideLight" -QT_MOC_LITERAL(18, 252, 9), // "sgSendMsg" -QT_MOC_LITERAL(19, 262, 3), // "msg" -QT_MOC_LITERAL(20, 266, 11), // "onDecodeMsg" -QT_MOC_LITERAL(21, 278, 15), // "onCapturedImage" -QT_MOC_LITERAL(22, 294, 18), // "QVector" -QT_MOC_LITERAL(23, 313, 12), // "vecImageInfo" -QT_MOC_LITERAL(24, 326, 14), // "camearLocation" -QT_MOC_LITERAL(25, 341, 14), // "onNumStatistic" -QT_MOC_LITERAL(26, 356, 7), // "typeNum" -QT_MOC_LITERAL(27, 364, 11), // "onShowImage" -QT_MOC_LITERAL(28, 376, 27), // "onMonitorSensorTriggerStart" -QT_MOC_LITERAL(29, 404, 26), // "onMonitorSensorTriggerStop" -QT_MOC_LITERAL(30, 431, 15), // "onActionClicked" -QT_MOC_LITERAL(31, 447, 23), // "onSendEmptyCheckResults" -QT_MOC_LITERAL(32, 471, 17), // "QMap" -QT_MOC_LITERAL(33, 489, 12), // "onNewNumData" -QT_MOC_LITERAL(34, 502, 25), // "QVector >" -QT_MOC_LITERAL(35, 528, 3), // "vec" -QT_MOC_LITERAL(36, 532, 16), // "QVector" -QT_MOC_LITERAL(37, 549, 6), // "strVec" -QT_MOC_LITERAL(38, 556, 4) // "side" +QT_MOC_LITERAL(5, 58, 8), // "exposure" +QT_MOC_LITERAL(6, 67, 23), // "sgCategoryMatchFinished" +QT_MOC_LITERAL(7, 91, 8), // "smokeNum" +QT_MOC_LITERAL(8, 100, 11), // "sgShowImage" +QT_MOC_LITERAL(9, 112, 7), // "QLabel*" +QT_MOC_LITERAL(10, 120, 8), // "labelPtr" +QT_MOC_LITERAL(11, 129, 6), // "qImage" +QT_MOC_LITERAL(12, 136, 21), // "sgNumDataCollectStart" +QT_MOC_LITERAL(13, 158, 6), // "sideId" +QT_MOC_LITERAL(14, 165, 20), // "sgNumDataCollectStop" +QT_MOC_LITERAL(15, 186, 22), // "sgStartEmptyPlaceCheck" +QT_MOC_LITERAL(16, 209, 10), // "streetName" +QT_MOC_LITERAL(17, 220, 21), // "sgStopEmptyPlaceCheck" +QT_MOC_LITERAL(18, 242, 18), // "sgControlSideLight" +QT_MOC_LITERAL(19, 261, 9), // "sgSendMsg" +QT_MOC_LITERAL(20, 271, 3), // "msg" +QT_MOC_LITERAL(21, 275, 11), // "onDecodeMsg" +QT_MOC_LITERAL(22, 287, 15), // "onCapturedImage" +QT_MOC_LITERAL(23, 303, 18), // "QVector" +QT_MOC_LITERAL(24, 322, 12), // "vecImageInfo" +QT_MOC_LITERAL(25, 335, 14), // "camearLocation" +QT_MOC_LITERAL(26, 350, 14), // "onNumStatistic" +QT_MOC_LITERAL(27, 365, 7), // "typeNum" +QT_MOC_LITERAL(28, 373, 11), // "onShowImage" +QT_MOC_LITERAL(29, 385, 27), // "onMonitorSensorTriggerStart" +QT_MOC_LITERAL(30, 413, 26), // "onMonitorSensorTriggerStop" +QT_MOC_LITERAL(31, 440, 15), // "onActionClicked" +QT_MOC_LITERAL(32, 456, 23), // "onSendEmptyCheckResults" +QT_MOC_LITERAL(33, 480, 17), // "QMap" +QT_MOC_LITERAL(34, 498, 12), // "onNewNumData" +QT_MOC_LITERAL(35, 511, 25), // "QVector >" +QT_MOC_LITERAL(36, 537, 3), // "vec" +QT_MOC_LITERAL(37, 541, 16), // "QVector" +QT_MOC_LITERAL(38, 558, 6), // "strVec" +QT_MOC_LITERAL(39, 565, 4) // "side" }, "SmokeBoxIdentification\0sgCapture\0\0" - "cameraLocation\0cameraID\0sgCategoryMatchFinished\0" - "smokeNum\0sgShowImage\0QLabel*\0labelPtr\0" - "qImage\0sgNumDataCollectStart\0sideId\0" + "cameraLocation\0cameraID\0exposure\0" + "sgCategoryMatchFinished\0smokeNum\0" + "sgShowImage\0QLabel*\0labelPtr\0qImage\0" + "sgNumDataCollectStart\0sideId\0" "sgNumDataCollectStop\0sgStartEmptyPlaceCheck\0" "streetName\0sgStopEmptyPlaceCheck\0" "sgControlSideLight\0sgSendMsg\0msg\0" @@ -105,48 +107,48 @@ static const uint qt_meta_data_SmokeBoxIdentification[] = { 9, // signalCount // signals: name, argc, parameters, tag, flags - 1, 2, 104, 2, 0x06 /* Public */, - 5, 1, 109, 2, 0x06 /* Public */, - 7, 2, 112, 2, 0x06 /* Public */, - 11, 1, 117, 2, 0x06 /* Public */, - 13, 0, 120, 2, 0x06 /* Public */, - 14, 1, 121, 2, 0x06 /* Public */, - 16, 0, 124, 2, 0x06 /* Public */, - 17, 1, 125, 2, 0x06 /* Public */, - 18, 1, 128, 2, 0x06 /* Public */, + 1, 3, 104, 2, 0x06 /* Public */, + 6, 1, 111, 2, 0x06 /* Public */, + 8, 2, 114, 2, 0x06 /* Public */, + 12, 1, 119, 2, 0x06 /* Public */, + 14, 0, 122, 2, 0x06 /* Public */, + 15, 1, 123, 2, 0x06 /* Public */, + 17, 0, 126, 2, 0x06 /* Public */, + 18, 1, 127, 2, 0x06 /* Public */, + 19, 1, 130, 2, 0x06 /* Public */, // slots: name, argc, parameters, tag, flags - 20, 1, 131, 2, 0x08 /* Private */, - 21, 2, 134, 2, 0x08 /* Private */, - 25, 1, 139, 2, 0x08 /* Private */, - 27, 2, 142, 2, 0x08 /* Private */, - 28, 1, 147, 2, 0x08 /* Private */, - 29, 1, 150, 2, 0x08 /* Private */, - 30, 0, 153, 2, 0x08 /* Private */, - 31, 1, 154, 2, 0x08 /* Private */, - 33, 3, 157, 2, 0x08 /* Private */, + 21, 1, 133, 2, 0x08 /* Private */, + 22, 2, 136, 2, 0x08 /* Private */, + 26, 1, 141, 2, 0x08 /* Private */, + 28, 2, 144, 2, 0x08 /* Private */, + 29, 1, 149, 2, 0x08 /* Private */, + 30, 1, 152, 2, 0x08 /* Private */, + 31, 0, 155, 2, 0x08 /* Private */, + 32, 1, 156, 2, 0x08 /* Private */, + 34, 3, 159, 2, 0x08 /* Private */, // signals: parameters - QMetaType::Void, QMetaType::Int, QMetaType::Int, 3, 4, - QMetaType::Void, QMetaType::QString, 6, - QMetaType::Void, 0x80000000 | 8, QMetaType::QImage, 9, 10, - QMetaType::Void, QMetaType::Int, 12, + QMetaType::Void, QMetaType::Int, QMetaType::Int, QMetaType::Int, 3, 4, 5, + QMetaType::Void, QMetaType::QString, 7, + QMetaType::Void, 0x80000000 | 9, QMetaType::QImage, 10, 11, + QMetaType::Void, QMetaType::Int, 13, QMetaType::Void, - QMetaType::Void, QMetaType::QString, 15, + QMetaType::Void, QMetaType::QString, 16, QMetaType::Void, QMetaType::Void, QMetaType::Int, 2, - QMetaType::Void, QMetaType::QString, 19, + QMetaType::Void, QMetaType::QString, 20, // slots: parameters - QMetaType::Void, QMetaType::QString, 19, - QMetaType::Void, 0x80000000 | 22, QMetaType::Int, 23, 24, - QMetaType::Void, QMetaType::QString, 26, - QMetaType::Void, 0x80000000 | 8, QMetaType::QImage, 9, 10, + QMetaType::Void, QMetaType::QString, 20, + QMetaType::Void, 0x80000000 | 23, QMetaType::Int, 24, 25, + QMetaType::Void, QMetaType::QString, 27, + QMetaType::Void, 0x80000000 | 9, QMetaType::QImage, 10, 11, QMetaType::Void, QMetaType::Int, 2, QMetaType::Void, QMetaType::Int, 2, QMetaType::Void, - QMetaType::Void, 0x80000000 | 32, 2, - QMetaType::Void, 0x80000000 | 34, 0x80000000 | 36, QMetaType::Int, 35, 37, 38, + QMetaType::Void, 0x80000000 | 33, 2, + QMetaType::Void, 0x80000000 | 35, 0x80000000 | 37, QMetaType::Int, 36, 38, 39, 0 // eod }; @@ -157,7 +159,7 @@ void SmokeBoxIdentification::qt_static_metacall(QObject *_o, QMetaObject::Call _ SmokeBoxIdentification *_t = static_cast(_o); Q_UNUSED(_t) switch (_id) { - case 0: _t->sgCapture((*reinterpret_cast< int(*)>(_a[1])),(*reinterpret_cast< int(*)>(_a[2]))); break; + case 0: _t->sgCapture((*reinterpret_cast< int(*)>(_a[1])),(*reinterpret_cast< int(*)>(_a[2])),(*reinterpret_cast< int(*)>(_a[3]))); break; case 1: _t->sgCategoryMatchFinished((*reinterpret_cast< QString(*)>(_a[1]))); break; case 2: _t->sgShowImage((*reinterpret_cast< QLabel*(*)>(_a[1])),(*reinterpret_cast< const QImage(*)>(_a[2]))); break; case 3: _t->sgNumDataCollectStart((*reinterpret_cast< int(*)>(_a[1]))); break; @@ -207,7 +209,7 @@ void SmokeBoxIdentification::qt_static_metacall(QObject *_o, QMetaObject::Call _ } else if (_c == QMetaObject::IndexOfMethod) { int *result = reinterpret_cast(_a[0]); { - typedef void (SmokeBoxIdentification::*_t)(int , int ); + typedef void (SmokeBoxIdentification::*_t)(int , int , int ); if (*reinterpret_cast<_t *>(_a[1]) == static_cast<_t>(&SmokeBoxIdentification::sgCapture)) { *result = 0; return; @@ -309,9 +311,9 @@ int SmokeBoxIdentification::qt_metacall(QMetaObject::Call _c, int _id, void **_a } // SIGNAL 0 -void SmokeBoxIdentification::sgCapture(int _t1, int _t2) +void SmokeBoxIdentification::sgCapture(int _t1, int _t2, int _t3) { - void *_a[] = { nullptr, const_cast(reinterpret_cast(&_t1)), const_cast(reinterpret_cast(&_t2)) }; + void *_a[] = { nullptr, const_cast(reinterpret_cast(&_t1)), const_cast(reinterpret_cast(&_t2)), const_cast(reinterpret_cast(&_t3)) }; QMetaObject::activate(this, &staticMetaObject, 0, _a); }