Commit: e3a845c5d63f23707e64906a2d5b65f124ac38b8 - QtUSBRH_Logger_win32 (git)

Commit MetaInfo

• Revision: e3a845c5d63f23707e64906a2d5b65f124ac38b8 (tree)
• Time: 2013-01-31 00:49:32
• Author: alucky4416 <alucky4416@user...>
• Commiter: alucky4416

Log Message

feature: add display lapsed time, logfile name.

Change Summary

• modified: daqthread.cpp
• modified: daqthread.h
• modified: logthread.cpp
• modified: logthread.h
• modified: mainwindow.cpp
• modified: mainwindow.h
• modified: mainwindow.ui

Incremental Difference

--- a/daqthread.cpp
+++ b/daqthread.cpp
@@ -21,6 +21,8 @@ DAQThread::DAQThread(QObject *parent) :
             this, SLOT(slotLogStarted()));
     connect(logTh, SIGNAL(LogEnded(int)),
             this, SLOT(slotLogEnded(int)));
+    connect(logTh, SIGNAL(ChangeLogFilename(QString)),
+            this, SIGNAL(ChangeLogFilename(QString)));
 
     // logTh start
     logTh->start();

--- a/daqthread.h
+++ b/daqthread.h
@@ -18,6 +18,7 @@ signals:
     void LogStart(QString logfolderpath);
     void LogStop();
     void GetData(QDateTime timestamp, double tmpr, double humid);
+    void ChangeLogFilename(QString filename);
     void LogStarted();
     void LogEnded(int status); // status 0 is success, !0 is Fail
 

--- a/logthread.cpp
+++ b/logthread.cpp
@@ -92,6 +92,7 @@ void LogThread::run()
                         }
                         prev_Day = today.date().day();
                         emit LogStarted();
+                        emit ChangeLogFilename(logfilepath);
                     } else {
                         emit LogEnded(1);
                         qDebug() << "open error";
@@ -126,6 +127,7 @@ void LogThread::run()
                                     out << "timestamp, tempr(C), humid(%)" << endl; // append header
                                 }
                                 prev_Day = timestamp.date().day();
+                                emit ChangeLogFilename(logfilepath);
                             }
                         }
                         // qDebug() << "timestamp: "  << timestamp.toString("yyyy/MM/dd hh:mm:ss") << "," << "tmpr = " << event.tmpr << ", humid = " << event.humid;

--- a/logthread.h
+++ b/logthread.h
@@ -26,6 +26,7 @@ public:
 signals:
     void LogStarted();
     void LogEnded(int status); // status 0 is success, !0 is Fail
+    void ChangeLogFilename(QString filename);
 
 public slots:
     void slotLogStart(QString logfolderpath);

--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -26,6 +26,10 @@ MainWindow::MainWindow(QWidget *parent) :
     ui->lcdTempr->display(0.0);
     ui->lcdHumid->display(0.0);
 
+    ui->label_LogLapsedTime->setText(""); // "Lapsed Time: "
+//    ui->label_LogLapsedTime->hide(); // hidden label_LogLapsedTime
+
+
     logging = false;
 
     tmpr_max = -1000.0;
@@ -46,6 +50,8 @@ MainWindow::MainWindow(QWidget *parent) :
             this, SLOT(slotLogEnded(int)));
     connect(daqTh, SIGNAL(GetData(QDateTime, double, double)),
             this, SLOT(slotGetData(QDateTime, double, double)));
+    connect(daqTh, SIGNAL(ChangeLogFilename(QString)),
+            this, SLOT(slotChangeLogFilename(QString)));
     // DaqTh start
     daqTh->start();
 
@@ -91,6 +97,23 @@ void MainWindow::slotGetData(QDateTime timestamp, double tmpr, double humid)
     }
     ui->label_Max->setText(QString("Max: %1 'C at ").arg(tmpr_max) + time_max.toString("yyyy/MM/dd hh:mm:ss"));
     ui->label_Min->setText(QString("Min: %1 'C at ").arg(tmpr_min) + time_min.toString("yyyy/MM/dd hh:mm:ss"));
+
+    if (logging) {
+        int lapsed_time = (QDateTime::currentMSecsSinceEpoch() - logstart_time.toMSecsSinceEpoch()) / 1000;
+        if (lapsed_time < 60) { // 1 minute
+            ui->label_LogLapsedTime->setText(QString("Lapsed Time: %1 sec").arg(lapsed_time));
+        } else if (lapsed_time < 3600) { // 1 hour
+            ui->label_LogLapsedTime->setText(QString("Lapsed Time: %1 min").arg(lapsed_time/60));
+        } else if (lapsed_time < 86400) { // 1 day
+            ui->label_LogLapsedTime->setText(QString("Lapsed Time: %1 hour").arg(lapsed_time/3600));
+        } else { // over 1 day
+            ui->label_LogLapsedTime->setText(QString("Lapsed Time: %1 day").arg(lapsed_time/86400));
+        }
+    }
+}
+void MainWindow::slotChangeLogFilename(QString filename)
+{
+    ui->statusBar->showMessage(QString("logfile: %1").arg(filename));
 }
 
 void MainWindow::slotLogStarted()
@@ -122,7 +145,7 @@ void MainWindow::on_pushButton_LogStart_clicked()
         logging = false;
         ui->pushButton_LogStart->setText("Log Start");
         ui->label_LogState->setText("LogEnded: " + QDateTime::currentDateTime().toString("yyyy/MM/dd hh:mm:ss"));
-
+        ui->label_LogLapsedTime->setText("");
     } else {
         // now idle..
         LogStartDialog *dlg = new LogStartDialog(logpath, this);
@@ -134,7 +157,8 @@ void MainWindow::on_pushButton_LogStart_clicked()
 
             logging = true;
             ui->pushButton_LogStart->setText("Log Stop");
-            ui->label_LogState->setText("LogStarted: " + QDateTime::currentDateTime().toString("yyyy/MM/dd hh:mm:ss"));
+            logstart_time = QDateTime::currentDateTime();
+            ui->label_LogState->setText("LogStarted: " + logstart_time.toString("yyyy/MM/dd hh:mm:ss"));
 
             // reset Max/Min
             tmpr_max = -1000.0;

--- a/mainwindow.h
+++ b/mainwindow.h
@@ -24,6 +24,7 @@ signals:
 
 private slots:
     void slotGetData(QDateTime, double, double);
+    void slotChangeLogFilename(QString);
     void slotLogStarted();
     void slotLogEnded(int status);
 
@@ -49,6 +50,8 @@ private:
     double tmpr_min;
     QDateTime time_max;
     QDateTime time_min;
+
+    QDateTime logstart_time; // for lapsed time
 };
 
 #endif // MAINWINDOW_H

--- a/mainwindow.ui
+++ b/mainwindow.ui
@@ -138,9 +138,9 @@
     <property name="geometry">
      <rect>
       <x>50</x>
-      <y>220</y>
+      <y>230</y>
       <width>161</width>
-      <height>41</height>
+      <height>61</height>
      </rect>
     </property>
     <property name="font">
@@ -198,7 +198,7 @@
     <property name="geometry">
      <rect>
       <x>230</x>
-      <y>230</y>
+      <y>220</y>
       <width>381</width>
       <height>31</height>
      </rect>
@@ -215,6 +215,27 @@
      <string>Idle...</string>
     </property>
    </widget>
+   <widget class="QLabel" name="label_LogLapsedTime">
+    <property name="geometry">
+     <rect>
+      <x>230</x>
+      <y>260</y>
+      <width>381</width>
+      <height>31</height>
+     </rect>
+    </property>
+    <property name="font">
+     <font>
+      <pointsize>12</pointsize>
+     </font>
+    </property>
+    <property name="frameShape">
+     <enum>QFrame::StyledPanel</enum>
+    </property>
+    <property name="text">
+     <string>Lapsed time: </string>
+    </property>
+   </widget>
   </widget>
   <widget class="QMenuBar" name="menuBar">
    <property name="geometry">