diff --git a/app/config/config.ini b/app/config/config.ini index 1de7176..308e49d 100644 --- a/app/config/config.ini +++ b/app/config/config.ini @@ -2,6 +2,7 @@ com_name=COM2 baud=19200 track_name=2 +have_magnet_steel=true magnet_steel_order=8421 up_result=true diff --git a/src/ConfigUtil/ConfigUtil.cpp b/src/ConfigUtil/ConfigUtil.cpp index c9b0e8f..b4c0f31 100644 --- a/src/ConfigUtil/ConfigUtil.cpp +++ b/src/ConfigUtil/ConfigUtil.cpp @@ -23,6 +23,7 @@ bool ConfigUtil::readBaseConfig(const QString &configFile, QString &errorMessage config.comName = mset->value("com_name", "").toString(); config.baud = mset->value("baud", 19200).toInt(); config.trackName = mset->value("track_name", 1).toInt(); + config.havaMagnetSteel = mset->value("have_magnet_steel", false).toBool(); config.magnetSteelOrder = mset->value("magnet_steel_order", "").toString(); config.upResult = mset->value("up_result", false).toBool(); diff --git a/src/ConfigUtil/ConfigUtil.h b/src/ConfigUtil/ConfigUtil.h index 74a898e..d0db783 100644 --- a/src/ConfigUtil/ConfigUtil.h +++ b/src/ConfigUtil/ConfigUtil.h @@ -15,6 +15,8 @@ namespace ai_matrix { int baud; // 股道编号 int trackName; + // 是否有磁钢 + bool havaMagnetSteel; // 磁钢顺序 QString magnetSteelOrder; // 上传识别结果标志 diff --git a/src/qt_source/mainwindow.cpp b/src/qt_source/mainwindow.cpp index 071ac4e..65e341b 100644 --- a/src/qt_source/mainwindow.cpp +++ b/src/qt_source/mainwindow.cpp @@ -676,13 +676,12 @@ void MainWindow::getQueueDataThread() } } } -// logInfo(strRfidInfo); } void MainWindow::upRfid() { if (!this->baseConfig_.upResult) return; - if (!this->needIdentify) + if (!this->needIdentify && this->baseConfig_.havaMagnetSteel) { QIcon icon("./Fail.ico"); QPixmap m_pic = icon.pixmap(icon.actualSize(QSize(32, 32)));//size自行调整