xuqiang hai 3 meses
pai
achega
9b81298162
Modificáronse 5 ficheiros con 11 adicións e 11 borrados
  1. 1 1
      include/mainwindow.h
  2. 1 1
      scripts/run.sh
  3. 1 1
      src/datafifo.cpp
  4. 3 3
      src/main.cpp
  5. 5 5
      src/mainwindow.cpp

+ 1 - 1
include/mainwindow.h

@@ -15,7 +15,7 @@ class MainWindow : public QMainWindow
     Q_OBJECT
 
 public:
-    explicit MainWindow(const int &frequency, QWidget *parent = nullptr);
+    explicit MainWindow(QWidget *parent = nullptr);
     ~MainWindow();
 
 protected:

+ 1 - 1
scripts/run.sh

@@ -9,4 +9,4 @@ export QT_QPA_PLATFORMTHEME=qt5ct
 
 # run
 export LD_LIBRARY_PATH=./lib:$LD_LIBRARY_PATH
-./bin/monitor 32
+./bin/monitor

+ 1 - 1
src/datafifo.cpp

@@ -85,7 +85,7 @@ void DataFifo::doWork()
             n = getline(&line, &len, stream);
             if(n > 0) {
                 m_recvTimestamp = QDateTime::currentMSecsSinceEpoch();  // 更新接收数据时间戳
-                // LOG_INFO("read size: {}, buffer size: {}, data: {}", n, len, line);
+                LOG_INFO("read size: {}, buffer size: {}, data: {}", n, len, line);
                 QByteArray byteArray(line, n);
                 QJsonParseError error;
                 QJsonDocument doc = QJsonDocument::fromJson(byteArray, &error);

+ 3 - 3
src/main.cpp

@@ -45,16 +45,16 @@ int main(int argc, char *argv[])
     free(ip);
     free(mask);
 
+#if 0
     if(argc != 2) {
         LOG_ERROR("miss arg: frequency");
         return -1;
     }
-
     int frequency = QString(argv[1]).toInt();
+#endif
 
     AppContext &appCtx = AppContext::instance();
-
-    MainWindow w(frequency);
+    MainWindow w;
     w.resize(SCREEN_WIDTH, SCREEN_HEIGHT);
     w.showFullScreen();
 

+ 5 - 5
src/mainwindow.cpp

@@ -12,12 +12,11 @@
 #include <time.h>
 #include "defs.h"
 
-MainWindow::MainWindow(const int &frequency, QWidget *parent)
+MainWindow::MainWindow(QWidget *parent)
     : QMainWindow(parent)
     , m_pStackedWidget(nullptr)
     , m_pErrStrLabel(nullptr)
     , m_broadcast(Broadcast(BROADCAST_PORT))
-    , m_frequency(frequency)
     , m_packageCount("0")
 {
     setWindowFlags(Qt::FramelessWindowHint | Qt::Window);
@@ -69,9 +68,10 @@ MainWindow::MainWindow(const int &frequency, QWidget *parent)
     });
 
     m_timer.start(5000);
-
-    // connect(&m_updateScreenTimer, &QTimer::timeout, this, &MainWindow::onUpdateScreen);
-    // m_updateScreenTimer.start(1000 / m_frequency);
+#if 0
+    connect(&m_updateScreenTimer, &QTimer::timeout, this, &MainWindow::onUpdateScreen);
+    m_updateScreenTimer.start(1000 / m_frequency);
+#endif
 }
 
 MainWindow::~MainWindow()