更新文件避免编译报错

Cigarette/Thread/Logthread.h

@@ -1,5 +1,6 @@
 #pragma once
 #include <QDialog>
+
 class  CLog : public QObject
 {
     Q_OBJECT

Cigarette/cigarette.cpp

@@ -144,7 +144,7 @@ Cigarette::Cigarette(QWidget* parent)
     connect(hThread, &QThread::finished, clogWorkThread, &CLog::deleteLater);
     connect(this, &Cigarette::sengMsgToClog, clogWorkThread, &CLog::recMegFromCigarette);
     hThread->start();
-    emit sengMsgToClog("Application Start.");
+    LOG("Application Start.")
 #endif
     g_save_queue = new SyncQueue<std::pair<std::string, cv::Mat>>(Queue_Size);
     g_save_queue->name = "save queue";
@@ -577,7 +577,7 @@ Cigarette::Cigarette(QWidget* parent)
 
 Cigarette::~Cigarette()
 {
-    emit sengMsgToClog("Application exited.");
+    LOG("Application exited.")
     Exit();
     //exit(-1);
 }
@@ -648,12 +648,12 @@ void Cigarette::start_work()
 //开始按钮
 void Cigarette::on_btn_start_released()
 {
-    emit sengMsgToClog("Start to work.");
+    LOG("Start to work.")
     if (!g_admin_mode)
     {
         if (!g_op_mode)
         {
-            emit sengMsgToClog("Start to login in.");
+            LOG("Start to login in.")
             dialogin = new Dialogin(this);
             connect(dialogin, SIGNAL(enter_op()), this, SLOT(OnOp()));
             dialogin->setModal(true);
@@ -765,12 +765,12 @@ void Cigarette::Exit()
 //停止工作按钮
 void Cigarette::on_btn_pause_released()
 {
-    emit sengMsgToClog("Pause the application.");
+    LOG("Pause the application.")
     if (!g_admin_mode)
     {
         if (!g_op_mode)
         {
-            emit sengMsgToClog("Start to login in.");
+            LOG("Start to login in.")
             dialogin = new Dialogin(this);
             connect(dialogin, SIGNAL(enter_op()), this, SLOT(OnOp()));
             dialogin->setModal(true);
@@ -792,7 +792,7 @@ void Cigarette::on_btn_lock_released()
 {
     if (!g_admin_mode)
     {
-        emit sengMsgToClog("Unlock the application.");
+        LOG("Unlock the application.")
         dialog_setup_passwd = new DialogSetupPasswd(this);
         connect(dialog_setup_passwd, SIGNAL(enter_admin()), this, SLOT(OnAdmin()));
         dialog_setup_passwd->setModal(true);
@@ -801,7 +801,7 @@ void Cigarette::on_btn_lock_released()
     }
     else
     {
-        emit sengMsgToClog("Lock the application.");
+        LOG("Lock the application.")
         g_admin_mode = false;
         g_op_mode = false;
         ui.label_12->setText(QStringLiteral("登录用户："));
@@ -824,7 +824,7 @@ void Cigarette::on_btn_lock_released()
 //设置按钮
 void Cigarette::on_btn_setup_released()
 {
-    emit sengMsgToClog("Start to set the application.");
+    LOG("Start to set the application.")
     if (g_admin_mode)
     {
         dialog_setup = new DialogSetup(this);
@@ -909,7 +909,7 @@ void Cigarette::TestImgs()
 //管理员登陆
 void Cigarette::OnAdmin()
 {
-    emit sengMsgToClog("Administrator is login in.");
+    LOG("Administrator is login in.")
     g_admin_mode = true;
     ui.label_12->setText(QStringLiteral("登录用户："));
     ui.label_role->setText(QStringLiteral("管理员"));
@@ -928,7 +928,7 @@ void Cigarette::OnAdmin()
 //操作员登陆
 void Cigarette::OnOp()
 {
-    emit sengMsgToClog("Operator is login in.");
+    LOG("Operator is login in.")
     g_op_mode = true;
     g_op_time = OP_TIME;
     ui.label_role->setText(QStringLiteral("操作员"));
@@ -937,7 +937,7 @@ void Cigarette::OnOp()
 //退出前执行
 void Cigarette::OnExit()
 {
-    emit sengMsgToClog("Close the Application.");
+    LOG("Close the Application.")
     Exit();
     exit(-1);
 }
@@ -978,7 +978,7 @@ void Cigarette::sendLatestData() {
 void Cigarette::OnRotateReleasedHub(int Num)//旋转按钮
 {
     QString str = "Start to rotate picture " + QString::number(90 * ((rotationAngle[Num] + 1) % 4)) + " degrees of camera " + QString::number(Num) + ".";
-    emit sengMsgToClog(str);
+    LOG(str)
     if (isNeedRotate[Num] == true)
     {
         rotationAngle[Num] = (rotationAngle[Num] + 1) % 4;
@@ -995,7 +995,7 @@ void Cigarette::OnToolButtonCamReleasedHub(int Num)
         {
             if (!SingleCamInfo[Num].IsOpen)
             {
-                emit sengMsgToClog("Start open camera " + QString::number(Num) + ".");
+                LOG("Start open camera " + QString::number(Num) + ".")
                 if (ControlCamOpenOrClose(Num, OPEN))
                 {
                     cam_work_mat[Num]->setStyleSheet(tr("background-color: rgb(0, 170, 0);"));//相机工作提示
@@ -1007,7 +1007,7 @@ void Cigarette::OnToolButtonCamReleasedHub(int Num)
             }
             else
             {
-                emit sengMsgToClog("Start close camera " + QString::number(Num) + ".");
+                LOG("Start close camera " + QString::number(Num) + ".")
                 if (ControlCamOpenOrClose(Num, CLOSE))
                 {
                     cam_work_mat[Num]->setStyleSheet(tr("background-color: rgb(255, 255, 0);"));
@@ -1019,12 +1019,12 @@ void Cigarette::OnToolButtonCamReleasedHub(int Num)
         }
         else
         {
-            emit sengMsgToClog("Close or open camera " + QString::number(Num) + " fail, there is no camera in potision 0.");
+            LOG("Close or open camera " + QString::number(Num) + " fail, there is no camera in potision 0.")
             QMessageBox::information(NULL, QStringLiteral("操作失败"), QStringLiteral("该机位没有检测到相机"), QMessageBox::Ok);
         }
     }
     else {
-        emit sengMsgToClog("Close or open camera " + QString::number(Num) + " fail, because of authorization check fail.");
+        LOG("Close or open camera " + QString::number(Num) + " fail, because of authorization check fail.")
         QMessageBox::information(NULL, QStringLiteral("权限检查"), QStringLiteral("请先点击解锁按钮，进入管理员模式"), QMessageBox::Ok);
     }
 }
@@ -1147,7 +1147,7 @@ void Cigarette::OnDBClickHub(int Num_Cnt)
     std::lock_guard<std::mutex> locker(g_display_label_conf[Num].lock);
     if (g_display_label_conf[Num].g_max[Cnt])
     {	/// 全屏状态下 双击取消全屏
-        emit sengMsgToClog("Cancel the picture of camera " + QString::number(Num) + " to full screen.");
+        LOG("Cancel the picture of camera " + QString::number(Num) + " to full screen.")
         g_display_label_conf[Num].g_max[Cnt] = false;
         display_lable_mat[Num][Cnt]->setGeometry(
             display_lable_info[Num][Cnt].x,
@@ -1172,7 +1172,7 @@ void Cigarette::OnDBClickHub(int Num_Cnt)
     }
     else
     {	// 双击全屏
-        emit sengMsgToClog("Set the picture of camera " + QString::number(Num) + " to full screen.");
+        LOG("Set the picture of camera " + QString::number(Num) + " to full screen.")
         g_display_label_conf[Num].g_max[Cnt] = true;
         display_lable_mat[Num][Cnt]->setGeometry(0, 0, 1280, 800);
 
@@ -1293,7 +1293,7 @@ void Cigarette::OnTPClickHub(int Num_Cnt)
 //双击NG
 void Cigarette::OnDBClickNGHub(int Num)
 {
-    emit sengMsgToClog("Double click NG.");
+    LOG("Double click NG.")
     QDateTime now_ts = QDateTime::currentDateTime();
     std::ostringstream   ostr;
     QString file_path = g_conf_path.save_pics_path;
@@ -1416,7 +1416,7 @@ void Cigarette::on_checkBox_unkick_clicked(bool checked)
     {
         if (!g_op_mode)
         {
-            emit sengMsgToClog("Start to login in.");
+            LOG("Start to login in.")
             dialogin = new Dialogin(this);
             connect(dialogin, SIGNAL(enter_op()), this, SLOT(OnOp()));
             dialogin->setModal(true);
@@ -1434,7 +1434,7 @@ void Cigarette::on_checkBox_unkick_clicked(bool checked)
     if (m_PLCDevice->g_plc_ok) {
         if (checked)
         {
-            emit sengMsgToClog("Enter unkick mode.");
+            LOG("Enter unkick mode.")
             int ret = m_PLCDevice->write_bit_2_plc(g_modbus_conf.no_kick, 1);
 #ifdef __UDPSend
             sThread.sendData("UnKickOk", g_sys_conf.FeedbackPort);
@@ -1442,7 +1442,7 @@ void Cigarette::on_checkBox_unkick_clicked(bool checked)
         }
         else
         {
-            emit sengMsgToClog("Exit unkick mode.");
+            LOG("Exit unkick mode.")
             int ret = m_PLCDevice->write_bit_2_plc(g_modbus_conf.no_kick, 0);
 #ifdef __UDPSend
             sThread.sendData("KickOk", g_sys_conf.FeedbackPort);
@@ -1452,7 +1452,7 @@ void Cigarette::on_checkBox_unkick_clicked(bool checked)
     }
     else {
         ui.checkBox_unkick->setChecked(false);
-        emit sengMsgToClog("Enter or exit unkick mode fail.");
+        LOG("Enter or exit unkick mode fail.")
 #ifdef __UDPSend
         sThread.sendData("UnKickFail", g_sys_conf.FeedbackPort);
 #endif
@@ -1477,7 +1477,7 @@ void Cigarette::on_checkBox_debug_clicked(bool checked)
         }
         else
         {
-            emit sengMsgToClog("Enter debug mode.");
+            LOG("Enter debug mode.")
             EnableDebugMode();
             ui.checkBox_debug->setChecked(true);
 #ifdef __UDPSend
@@ -1487,7 +1487,7 @@ void Cigarette::on_checkBox_debug_clicked(bool checked)
     }
     else //关闭相机调试
     {
-        emit sengMsgToClog("Exit debug mode.");
+        LOG("Exit debug mode.")
         DisableDebugMode();
         //on_pushButton_clear_released();	//换班
         ui.checkBox_debug->setChecked(false);
@@ -1526,7 +1526,7 @@ void Cigarette::on_pushButton_wintab_clicked(bool checked) {
 //打开PLC配置对话框
 void Cigarette::on_toolButton_plc_released()
 {
-    emit sengMsgToClog("Open PLC setting.");
+    LOG("Open PLC setting.")
     if (m_PLCDevice->g_plc_ok)
     {
         if (g_admin_mode)
@@ -1911,7 +1911,7 @@ void Cigarette::on_pushButton_reset_released()///复位按钮
 }
 void Cigarette::OnCancelAlarm()	//双击消警
 {
-    emit sengMsgToClog("Cancel alarm mode.");
+    LOG("Cancel alarm mode.")
     if (!g_admin_mode)
     {
         if (!g_op_mode)
@@ -1951,12 +1951,12 @@ void Cigarette::OnCancelAlarm()	//双击消警
 }
 void Cigarette::on_toolButton_alarm_released()
 {
-    emit sengMsgToClog("Open alarm dialog.");
+    LOG("Open alarm dialog.")
     if (!g_admin_mode)
     {
         if (!g_op_mode)
         {
-            emit sengMsgToClog("Start to login in.");
+            LOG("Start to login in.")
             dialogin = new Dialogin(this);
             connect(dialogin, SIGNAL(enter_op()), this, SLOT(OnOp()));
             dialogin->setModal(true);
@@ -1973,9 +1973,10 @@ void Cigarette::on_toolButton_alarm_released()
 }
 void Cigarette::on_pushButton_clear_released()//换班
 {
-    emit sengMsgToClog("Change shift.");
+    LOG("Change shift.")
+#ifdef __ExportData
     emit sendMsgToExportData();
-
+#endif
     if (!g_admin_mode)
     {
         if (!g_op_mode)
@@ -3841,7 +3842,7 @@ void Cigarette::recMsgFromUdp(QString data)
     }
     else if (data == "CLEARNIMAGE")
     {
-        emit sengMsgToClog("Clean images.");
+        LOG("Clean images.")
 #ifdef CLEAR_THREAD
         CleanThreadStart();
 #endif

Cigarette/cigarette.h

@@ -227,7 +227,9 @@ private:
 #endif
 
 public slots:
+#ifdef CLEAR_THREAD
     void CleanThreadStartAuto();
+#endif
 #ifdef __UDPSend
     void recMsgFromUdp(QString data);
 #endif
@@ -238,7 +240,9 @@ signals:
 #ifdef LOG_RECORD
     void sengMsgToClog(QString);
 #endif
+#ifdef __ExportData
     void sendMsgToExportData();
+#endif
 };
 
 #endif // CIGARETTE_H

Cigarette/common.h

@@ -7,9 +7,20 @@
 
 //#define __DEBUG            //debug信息输出功能
 #define LOG_RECORD           //log日志功能
+#ifdef LOG_RECORD
+    #define LOG(x) emit sengMsgToClog(x);
+#else
+    #define LOG(x)
+#endif
 #define CLEAR_THREAD         //定时清理线程
 //#define __UDPSend          //网络发送功能
 //#define __TCPSend          // TCP发送
+#if defined (__TCPSend)
+    //#define __TCPServer      // TCP服务器
+    #define __TCPClient      // TCP客户端
+    //#define __ModebusServer    // 建立modbus主机
+    //#define __ModebusClient    // 建立modbus从机
+#endif
 //#define __MQTTSend           // MQTT发送
 #define BASLER_SUPPORT
 #if defined (BASLER_SUPPORT)