diff --git a/CounterAcqBM/common/utils/SettingConfig.cpp b/CounterAcqBM/common/utils/SettingConfig.cpp index c95ff2a..9a84a43 100644 --- a/CounterAcqBM/common/utils/SettingConfig.cpp +++ b/CounterAcqBM/common/utils/SettingConfig.cpp @@ -11,8 +11,8 @@ KAFKA_BROKERS = getProperty("kafka", "brokers").toString(); KAFKA_DATA_TOPIC = getProperty("kafka", "dataTopic").toString(); NEED_SASL = getProperty("kafka", "needSasl").toInt(); - SASL_USERNAME = getProperty("kafka", "sasl_username").toString(); - SASL_PASSWORD = getProperty("kafka", "sasl_password").toString(); + SASL_USERNAME = getProperty("kafka", "saslUsername").toString(); + SASL_PASSWORD = getProperty("kafka", "saslPassword").toString(); CLIENT_ID = getProperty("client", "clientId").toString(); APP_KEY = getProperty("client", "appKey").toString(); diff --git a/CounterAcqBM/common/utils/SettingConfig.cpp b/CounterAcqBM/common/utils/SettingConfig.cpp index c95ff2a..9a84a43 100644 --- a/CounterAcqBM/common/utils/SettingConfig.cpp +++ b/CounterAcqBM/common/utils/SettingConfig.cpp @@ -11,8 +11,8 @@ KAFKA_BROKERS = getProperty("kafka", "brokers").toString(); KAFKA_DATA_TOPIC = getProperty("kafka", "dataTopic").toString(); NEED_SASL = getProperty("kafka", "needSasl").toInt(); - SASL_USERNAME = getProperty("kafka", "sasl_username").toString(); - SASL_PASSWORD = getProperty("kafka", "sasl_password").toString(); + SASL_USERNAME = getProperty("kafka", "saslUsername").toString(); + SASL_PASSWORD = getProperty("kafka", "saslPassword").toString(); CLIENT_ID = getProperty("client", "clientId").toString(); APP_KEY = getProperty("client", "appKey").toString(); diff --git a/PhaseCompAcq/PhaseDevice.cpp b/PhaseCompAcq/PhaseDevice.cpp index 8bb9173..1bfbd58 100644 --- a/PhaseCompAcq/PhaseDevice.cpp +++ b/PhaseCompAcq/PhaseDevice.cpp @@ -83,6 +83,10 @@ phaseData->milisecond = now.toMSecsSinceEpoch(); this->afterFramePhase(phaseData); } + } else if (this->dataBuff.size() > PHASE_FRAM_LENGTH) + { + std::cout << QString("%1").arg(this->dataBuff.size()).toStdString() << std::endl; + this->dataBuff.clear(); } // 在此处释放内存,不影响后续显示 diff --git a/CounterAcqBM/common/utils/SettingConfig.cpp b/CounterAcqBM/common/utils/SettingConfig.cpp index c95ff2a..9a84a43 100644 --- a/CounterAcqBM/common/utils/SettingConfig.cpp +++ b/CounterAcqBM/common/utils/SettingConfig.cpp @@ -11,8 +11,8 @@ KAFKA_BROKERS = getProperty("kafka", "brokers").toString(); KAFKA_DATA_TOPIC = getProperty("kafka", "dataTopic").toString(); NEED_SASL = getProperty("kafka", "needSasl").toInt(); - SASL_USERNAME = getProperty("kafka", "sasl_username").toString(); - SASL_PASSWORD = getProperty("kafka", "sasl_password").toString(); + SASL_USERNAME = getProperty("kafka", "saslUsername").toString(); + SASL_PASSWORD = getProperty("kafka", "saslPassword").toString(); CLIENT_ID = getProperty("client", "clientId").toString(); APP_KEY = getProperty("client", "appKey").toString(); diff --git a/PhaseCompAcq/PhaseDevice.cpp b/PhaseCompAcq/PhaseDevice.cpp index 8bb9173..1bfbd58 100644 --- a/PhaseCompAcq/PhaseDevice.cpp +++ b/PhaseCompAcq/PhaseDevice.cpp @@ -83,6 +83,10 @@ phaseData->milisecond = now.toMSecsSinceEpoch(); this->afterFramePhase(phaseData); } + } else if (this->dataBuff.size() > PHASE_FRAM_LENGTH) + { + std::cout << QString("%1").arg(this->dataBuff.size()).toStdString() << std::endl; + this->dataBuff.clear(); } // 在此处释放内存,不影响后续显示 diff --git a/PhaseCompAcq/PhaseWindow.cpp b/PhaseCompAcq/PhaseWindow.cpp index d0e8221..ae12e2c 100644 --- a/PhaseCompAcq/PhaseWindow.cpp +++ b/PhaseCompAcq/PhaseWindow.cpp @@ -74,6 +74,7 @@ device->initSerialPort(); QThread::msleep(100); + device->startWork(); } // 5. 设置下拉框的样式 QStandardItemModel * model = qobject_cast(ui->devSelect->model()); diff --git a/CounterAcqBM/common/utils/SettingConfig.cpp b/CounterAcqBM/common/utils/SettingConfig.cpp index c95ff2a..9a84a43 100644 --- a/CounterAcqBM/common/utils/SettingConfig.cpp +++ b/CounterAcqBM/common/utils/SettingConfig.cpp @@ -11,8 +11,8 @@ KAFKA_BROKERS = getProperty("kafka", "brokers").toString(); KAFKA_DATA_TOPIC = getProperty("kafka", "dataTopic").toString(); NEED_SASL = getProperty("kafka", "needSasl").toInt(); - SASL_USERNAME = getProperty("kafka", "sasl_username").toString(); - SASL_PASSWORD = getProperty("kafka", "sasl_password").toString(); + SASL_USERNAME = getProperty("kafka", "saslUsername").toString(); + SASL_PASSWORD = getProperty("kafka", "saslPassword").toString(); CLIENT_ID = getProperty("client", "clientId").toString(); APP_KEY = getProperty("client", "appKey").toString(); diff --git a/PhaseCompAcq/PhaseDevice.cpp b/PhaseCompAcq/PhaseDevice.cpp index 8bb9173..1bfbd58 100644 --- a/PhaseCompAcq/PhaseDevice.cpp +++ b/PhaseCompAcq/PhaseDevice.cpp @@ -83,6 +83,10 @@ phaseData->milisecond = now.toMSecsSinceEpoch(); this->afterFramePhase(phaseData); } + } else if (this->dataBuff.size() > PHASE_FRAM_LENGTH) + { + std::cout << QString("%1").arg(this->dataBuff.size()).toStdString() << std::endl; + this->dataBuff.clear(); } // 在此处释放内存,不影响后续显示 diff --git a/PhaseCompAcq/PhaseWindow.cpp b/PhaseCompAcq/PhaseWindow.cpp index d0e8221..ae12e2c 100644 --- a/PhaseCompAcq/PhaseWindow.cpp +++ b/PhaseCompAcq/PhaseWindow.cpp @@ -74,6 +74,7 @@ device->initSerialPort(); QThread::msleep(100); + device->startWork(); } // 5. 设置下拉框的样式 QStandardItemModel * model = qobject_cast(ui->devSelect->model()); diff --git a/PhaseCompAcq/common/utils/QSerialPortUtil.cpp b/PhaseCompAcq/common/utils/QSerialPortUtil.cpp index ba0ffb5..64da0f7 100644 --- a/PhaseCompAcq/common/utils/QSerialPortUtil.cpp +++ b/PhaseCompAcq/common/utils/QSerialPortUtil.cpp @@ -21,18 +21,18 @@ open = serial.open(QIODevice::ReadWrite); -// if (open == true) -// { + if (open == true) + { // 绑定信号与槽 connect(&serial, &QSerialPort::readyRead, this, &QSerialPortUtil::readData); // mock data received per second - QTimer * timer = new QTimer(this); - connect(timer, &QTimer::timeout, - this, &QSerialPortUtil::mockReceivData); - timer->start(1000); -// } +// QTimer * timer = new QTimer(this); +// connect(timer, &QTimer::timeout, +// this, &QSerialPortUtil::mockReceivData); +// timer->start(1000); + } } void QSerialPortUtil::sendData(QByteArray data) diff --git a/CounterAcqBM/common/utils/SettingConfig.cpp b/CounterAcqBM/common/utils/SettingConfig.cpp index c95ff2a..9a84a43 100644 --- a/CounterAcqBM/common/utils/SettingConfig.cpp +++ b/CounterAcqBM/common/utils/SettingConfig.cpp @@ -11,8 +11,8 @@ KAFKA_BROKERS = getProperty("kafka", "brokers").toString(); KAFKA_DATA_TOPIC = getProperty("kafka", "dataTopic").toString(); NEED_SASL = getProperty("kafka", "needSasl").toInt(); - SASL_USERNAME = getProperty("kafka", "sasl_username").toString(); - SASL_PASSWORD = getProperty("kafka", "sasl_password").toString(); + SASL_USERNAME = getProperty("kafka", "saslUsername").toString(); + SASL_PASSWORD = getProperty("kafka", "saslPassword").toString(); CLIENT_ID = getProperty("client", "clientId").toString(); APP_KEY = getProperty("client", "appKey").toString(); diff --git a/PhaseCompAcq/PhaseDevice.cpp b/PhaseCompAcq/PhaseDevice.cpp index 8bb9173..1bfbd58 100644 --- a/PhaseCompAcq/PhaseDevice.cpp +++ b/PhaseCompAcq/PhaseDevice.cpp @@ -83,6 +83,10 @@ phaseData->milisecond = now.toMSecsSinceEpoch(); this->afterFramePhase(phaseData); } + } else if (this->dataBuff.size() > PHASE_FRAM_LENGTH) + { + std::cout << QString("%1").arg(this->dataBuff.size()).toStdString() << std::endl; + this->dataBuff.clear(); } // 在此处释放内存,不影响后续显示 diff --git a/PhaseCompAcq/PhaseWindow.cpp b/PhaseCompAcq/PhaseWindow.cpp index d0e8221..ae12e2c 100644 --- a/PhaseCompAcq/PhaseWindow.cpp +++ b/PhaseCompAcq/PhaseWindow.cpp @@ -74,6 +74,7 @@ device->initSerialPort(); QThread::msleep(100); + device->startWork(); } // 5. 设置下拉框的样式 QStandardItemModel * model = qobject_cast(ui->devSelect->model()); diff --git a/PhaseCompAcq/common/utils/QSerialPortUtil.cpp b/PhaseCompAcq/common/utils/QSerialPortUtil.cpp index ba0ffb5..64da0f7 100644 --- a/PhaseCompAcq/common/utils/QSerialPortUtil.cpp +++ b/PhaseCompAcq/common/utils/QSerialPortUtil.cpp @@ -21,18 +21,18 @@ open = serial.open(QIODevice::ReadWrite); -// if (open == true) -// { + if (open == true) + { // 绑定信号与槽 connect(&serial, &QSerialPort::readyRead, this, &QSerialPortUtil::readData); // mock data received per second - QTimer * timer = new QTimer(this); - connect(timer, &QTimer::timeout, - this, &QSerialPortUtil::mockReceivData); - timer->start(1000); -// } +// QTimer * timer = new QTimer(this); +// connect(timer, &QTimer::timeout, +// this, &QSerialPortUtil::mockReceivData); +// timer->start(1000); + } } void QSerialPortUtil::sendData(QByteArray data) diff --git a/PhaseCompAcq/common/utils/SettingConfig.cpp b/PhaseCompAcq/common/utils/SettingConfig.cpp index c95ff2a..9a84a43 100644 --- a/PhaseCompAcq/common/utils/SettingConfig.cpp +++ b/PhaseCompAcq/common/utils/SettingConfig.cpp @@ -11,8 +11,8 @@ KAFKA_BROKERS = getProperty("kafka", "brokers").toString(); KAFKA_DATA_TOPIC = getProperty("kafka", "dataTopic").toString(); NEED_SASL = getProperty("kafka", "needSasl").toInt(); - SASL_USERNAME = getProperty("kafka", "sasl_username").toString(); - SASL_PASSWORD = getProperty("kafka", "sasl_password").toString(); + SASL_USERNAME = getProperty("kafka", "saslUsername").toString(); + SASL_PASSWORD = getProperty("kafka", "saslPassword").toString(); CLIENT_ID = getProperty("client", "clientId").toString(); APP_KEY = getProperty("client", "appKey").toString();