xuqiang hai 4 meses
pai
achega
cccb8a55da
Modificáronse 4 ficheiros con 6 adicións e 18 borrados
  1. 0 2
      include/calprocess.h
  2. 0 2
      include/netparseprocess.h
  3. 3 7
      src/calprocess.cpp
  4. 3 7
      src/netparseprocess.cpp

+ 0 - 2
include/calprocess.h

@@ -3,7 +3,6 @@
 
 #include <QObject>
 #include <QProcess>
-#include <QTimer>
 
 class CalProcess : public QObject
 {
@@ -21,7 +20,6 @@ public:
 
 private:
     QProcess m_process;
-    QTimer m_timer;
 
 };
 

+ 0 - 2
include/netparseprocess.h

@@ -3,7 +3,6 @@
 
 #include <QObject>
 #include <QProcess>
-#include <QTimer>
 
 class NetParseProcess : public QObject
 {
@@ -21,7 +20,6 @@ public:
 
 private:
     QProcess m_process;
-    QTimer m_timer;
 
 };
 

+ 3 - 7
src/calprocess.cpp

@@ -11,15 +11,11 @@ CalProcess::CalProcess(QObject *parent)
 
     restart();
 
-    connect(&m_timer, &QTimer::timeout, this, [this](){
-        QString state = QMetaEnum::fromType<QProcess::ProcessState>().valueToKey(m_process.state());
+    connect(&m_process, &QProcess::stateChanged, this, [this](QProcess::ProcessState newState){
+        QString state = QMetaEnum::fromType<QProcess::ProcessState>().valueToKey(newState);
         QString error = QMetaEnum::fromType<QProcess::ProcessError>().valueToKey(m_process.error());
-        // LOG_INFO("calculate process state: {}, {}", static_cast<int>(m_process.state()), static_cast<int>(m_process.error()));
-        if(m_process.state() != QProcess::Running) {
-            LOG_INFO("calculate process state: {}, error: {}", state.toStdString(), error.toStdString());
-        }
+        LOG_INFO("calculate process state: {}, {}", state.toStdString(), error.toStdString());
     });
-    m_timer.start(2000);
 }
 
 CalProcess::~CalProcess()

+ 3 - 7
src/netparseprocess.cpp

@@ -10,15 +10,11 @@ NetParseProcess::NetParseProcess(QObject *parent)
 {
     restart();
 
-    connect(&m_timer, &QTimer::timeout, this, [this](){
-        QString state = QMetaEnum::fromType<QProcess::ProcessState>().valueToKey(m_process.state());
+    connect(&m_process, &QProcess::stateChanged, this, [this](QProcess::ProcessState newState){
+        QString state = QMetaEnum::fromType<QProcess::ProcessState>().valueToKey(newState);
         QString error = QMetaEnum::fromType<QProcess::ProcessError>().valueToKey(m_process.error());
-        // LOG_INFO("netparse process state: {}, {}", static_cast<int>(m_process.state()), static_cast<int>(m_process.error()));
-        if(m_process.state() != QProcess::Running) {
-            LOG_INFO("calculate process state: {}, error: {}", state.toStdString(), error.toStdString());
-        }
+        LOG_INFO("netparse process state: {}, {}", state.toStdString(), error.toStdString());
     });
-    m_timer.start(2000);
 
     // connect(&m_process, &QProcess::readyReadStandardOutput, this, [this](){
     //     QByteArray output = m_process.readAllStandardOutput();