Commit: 9ae25e539b85b797a617b3cfe470e314b02dd8cb - QtUSBRH_Logger_win32 (git)

Commit MetaInfo

• Revision: 9ae25e539b85b797a617b3cfe470e314b02dd8cb (tree)
• Time: 2013-01-30 00:07:36
• Author: arakaki <alucky4416@user...>
• Commiter: arakaki

Log Message

feature: log save interval 1minute. change log file each days.

Change Summary

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

Incremental Difference

--- a/logthread.cpp
+++ b/logthread.cpp
@@ -60,31 +60,37 @@ void LogThread::LogData(quint64 timestamp, double tmpr, double humid)
 void LogThread::run()
 {
 
-    qDebug() << "logTh is started.";
+    // qDebug() << "logTh is started.";
     EventData event;
     QFile csvfile;
     QTextStream out;
     QDateTime timestamp;
+    int prev_Minute; // prev minutes for timestamp for 1 minutes interval
+    int prev_Day;    // prev Day for Change logfile.
+
     while(!stopped) {
         if (EvtQue->isEmpty()) {
             msleep(100);
-       } else {
+        } else {
             event = EvtQue->dequeue();
             if (!logging) { // idle
                 if (event.id == Ev_Log_Start) {
                     // then file open
-                    logfilepath = logsavefolderpath + QDir::separator() + "USBRHLog_" + QDateTime::currentDateTime().toString("yyyyMMdd") + ".csv";
+                    prev_Minute = -1;
+                    QDateTime today = QDateTime::currentDateTime();
+                    logfilepath = logsavefolderpath + QDir::separator() + "USBRHLog_" + today.toString("yyyyMMdd") + ".csv";
                     csvfile.setFileName(logfilepath);
                     if (csvfile.open(QIODevice::WriteOnly | QIODevice::Append)) {
                         logging = true;
                         qDebug() << "logTh log started. logfilename is " << logfilepath;
-                        out.flush();
+                        //out.flush();
                         out.setDevice(&csvfile);
                         out.setRealNumberNotation(QTextStream::FixedNotation);
                         out.setRealNumberPrecision(2);
                         if (csvfile.size() == 0) {
                             out << "timestamp, tempr(C), humid(%)" << endl; // append header
                         }
+                        prev_Day = today.date().day();
                         emit LogStarted();
                     } else {
                         emit LogEnded(1);
@@ -104,8 +110,28 @@ void LogThread::run()
                 } else if (event.id == Ev_Log_Data) {
                     // if data; // write data to file.
                     timestamp.setMSecsSinceEpoch(event.timestamp_ms);
-                    qDebug() << "timestamp: "  << timestamp.toString("yyyy/MM/dd hh:mm:ss") << "," << "tmpr = " << event.tmpr << ", humid = " << event.humid;
-                    out << timestamp.toString("yyyy/MM/dd hh:mm:ss") << "," << event.tmpr << "," << event.humid << endl;
+                    if (timestamp.time().minute() != prev_Minute) { // save interval is 1 minute
+                        if (timestamp.date().day() != prev_Day) {
+                            out.flush();
+                            csvfile.close();
+                            logfilepath = logsavefolderpath + QDir::separator() + "USBRHLog_" + timestamp.toString("yyyyMMdd") + ".csv";
+                            csvfile.setFileName(logfilepath);
+                            if (csvfile.open(QIODevice::WriteOnly | QIODevice::Append)) {
+                                logging = true;
+                                qDebug() << "logTh log started. logfilename is " << logfilepath;
+                                out.setDevice(&csvfile);
+                                out.setRealNumberNotation(QTextStream::FixedNotation);
+                                out.setRealNumberPrecision(2);
+                                if (csvfile.size() == 0) {
+                                    out << "timestamp, tempr(C), humid(%)" << endl; // append header
+                                }
+                                prev_Day = timestamp.date().day();
+                            }
+                        }
+                        // qDebug() << "timestamp: "  << timestamp.toString("yyyy/MM/dd hh:mm:ss") << "," << "tmpr = " << event.tmpr << ", humid = " << event.humid;
+                        out << timestamp.toString("yyyy/MM/dd hh:mm") << ", " << event.tmpr << ", " << event.humid << endl;
+                        prev_Minute = timestamp.time().minute();
+                    }
                 }
             }
         }
@@ -121,5 +147,5 @@ void LogThread::run()
         csvfile.close();
     }
 
-    qDebug() << "logTh is stopped.";
+    // qDebug() << "logTh is stopped.";
 }

--- a/mainwindow.ui
+++ b/mainwindow.ui
@@ -28,6 +28,9 @@
       <pointsize>18</pointsize>
      </font>
     </property>
+    <property name="segmentStyle">
+     <enum>QLCDNumber::Flat</enum>
+    </property>
    </widget>
    <widget class="QLCDNumber" name="lcdHumid">
     <property name="geometry">
@@ -43,6 +46,9 @@
       <pointsize>18</pointsize>
      </font>
     </property>
+    <property name="segmentStyle">
+     <enum>QLCDNumber::Flat</enum>
+    </property>
    </widget>
    <widget class="QLabel" name="label">
     <property name="geometry">