sunwen/GUI
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix drainage pumb to valve.

Browse Source
This commit is contained in:
sunwen
2023-11-16 11:23:38 +08:00
parent ac01282c68
commit 17cdc48e8d
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/device/DeviceManager.cpp
View File

@@ -780,7 +780,7 @@ void DeviceManager::processShutDownDms(const QString& aResponse)
void DeviceManager::shutdownOperationSystem() void DeviceManager::shutdownOperationSystem()
{ {
qDebug()<< "shut down OS"; qDebug()<< "shut down OS";
//QProcess::startDetached("shutdown", QStringList() << "-h" << "now"); //QProcess::startDetached("shutdown", QStringList() << "-h" << "now");
} }
void DeviceManager::insertEmptyScanRecord() void DeviceManager::insertEmptyScanRecord()
@@ -1094,7 +1094,7 @@ bool DeviceManager::getCEStatus()
void DeviceManager::controlDrainage(const QString& aCode) void DeviceManager::controlDrainage(const QString& aCode)
{ {
mPumpControlAction->setSendData(QString("{\"pumb\":%1}").arg(aCode)); mPumpControlAction->setSendData(QString("{\"valve\":%1}").arg(aCode));
if(!mPumpControlAction->execute()) if(!mPumpControlAction->execute())
{ {
emit startPumpControlResult(false); emit startPumpControlResult(false);

2
src/forms/scan/ScanFormWidget.cpp
View File

@@ -168,6 +168,7 @@ void ScanFormWidget::initScanControlBar(QHBoxLayout *layout){
}); });
connect(DeviceManager::Default(), &DeviceManager::startPumpControlResult, [this](bool aIsSucessful) connect(DeviceManager::Default(), &DeviceManager::startPumpControlResult, [this](bool aIsSucessful)
{ {
mBtnDrainage->setEnabled(true);
if(!aIsSucessful) if(!aIsSucessful)
{ {
bool isChecked = mBtnDrainage->isChecked(); bool isChecked = mBtnDrainage->isChecked();
@@ -204,6 +205,7 @@ void ScanFormWidget::initScanControlBar(QHBoxLayout *layout){
}); });
connect(mBtnDrainage, &QToolButton::clicked, [=](bool aSatus) { connect(mBtnDrainage, &QToolButton::clicked, [=](bool aSatus) {
//Drainage //Drainage
mBtnDrainage->setEnabled(false);
if(aSatus == true) if(aSatus == true)
{ {
QString code = "1"; QString code = "1";