Commit: master - QtUSBRHandUCAM_Logger_win32 (git)

温度+USBカメラ画像 ロガー

Commit MetaInfo

• Revision: 7552607fc8c340fdbea904251c98120b675fe012 (tree)
• Zeit: 2013-03-16 13:03:43
• Autor: alucky4416 <alucky4416@user...>
• Commiter: alucky4416

Log Message

CHG: overlay text Timestamp and Tempr, Humid to SaveImage

Ändern Zusammenfassung

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

Diff

--- a/ImageView.cpp
+++ b/ImageView.cpp
@@ -8,6 +8,12 @@ ImageView::ImageView( QWidget *parent ) : QGraphicsView( parent )
 	pixmapItem		= NULL;
     captureInterval = 0.1; // 0.1 is 100ms
 	scaleValue		= 1.0;
+
+    float hscale      = 0.5f;
+    float vscale      = 0.5f;
+    float italicscale = 0.0f;
+    int  thickness    = 1;
+    cvInitFont (&dfont, CV_FONT_HERSHEY_SIMPLEX , hscale, vscale, italicscale, thickness);
 }
 // ------------------------------------------------------------------------------------------------
 
@@ -120,11 +126,19 @@ void ImageView::scaleXY( double d )
 }
 // ------------------------------------------------------------------------------------------------
 // 最新画像をファイルへ保存
-void ImageView::saveCurrentImage(QString filepath)
+void ImageView::saveCurrentImage(QString filepath, QString overlay_text)
 {
     if (imageCapture==NULL ) return;
     if (filepath.isEmpty()) return;
 
-    QByteArray tmp = filepath.toLocal8Bit();
-    cvSaveImage(tmp.constData(), imageCapture->GetCurrentIplImage());
+    if (overlay_text.isEmpty()) {
+        ;
+    } else {
+        QByteArray msg = overlay_text.toLocal8Bit();
+        // Overley text
+        cvPutText(imageCapture->GetCurrentIplImage(), msg.constData(), cvPoint(20, 20), &dfont, CV_RGB(0, 255, 0));
+    }
+
+    QByteArray tmppath = filepath.toLocal8Bit();
+    cvSaveImage(tmppath.constData(), imageCapture->GetCurrentIplImage());
 }

--- a/ImageView.h
+++ b/ImageView.h
@@ -8,6 +8,7 @@
 #include <QtGui/QGraphicsPixmapItem>
 #include <QtGui/QFileDialog>
 #include <QTimer>
+
 #include "ImageCapture.h"
 // #include "OtToolBar.h"
 
@@ -28,7 +29,7 @@ public:
 	double scaleValue;
 
 	void setCapture( ImageCapture* _capture );
-    void saveCurrentImage(QString filepath);
+    void saveCurrentImage(QString filepath, QString overlay_text);
 
 #if 0
 	OtToolBar* getToolBar( QWidget* parent );
@@ -46,6 +47,8 @@ public slots:
 private:
 	void showQImage( QImage* qimage );
 	void scaleXY( double d );
+
+    CvFont dfont;
 };
 // ------------------------------------------------------------------------------------------------
 

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

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

--- a/logthread.cpp
+++ b/logthread.cpp
@@ -137,7 +137,8 @@ void LogThread::run()
                         // 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;
                         imgfilepath = logsavefolderpath + QDir::separator() + "USBRHLog_" + timestamp.toString("yyyyMMddhhmm") + ".JPG";
-                        emit SaveCurrentImage(imgfilepath);
+                        QString text = timestamp.toString("yyyy/MM/dd hh:mm ") + QString("Tempr = %1 'C, Humid = %2 %").arg(event.tmpr, 0, 'f', 2).arg(event.humid, 0, 'f', 2);
+                        emit SaveCurrentImage(imgfilepath, text);
                         prev_Minute = timestamp.time().minute();
                     }
                 }

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

--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -55,8 +55,8 @@ MainWindow::MainWindow(QWidget *parent) :
     connect(daqTh, SIGNAL(ChangeLogFilename(QString)),
             this, SLOT(slotChangeLogFilename(QString)));
 
-    connect(daqTh, SIGNAL(SaveCurrentImage(QString)),
-            this, SLOT(slotSaveCurrentImage(QString)));
+    connect(daqTh, SIGNAL(SaveCurrentImage(QString, QString)),
+            this, SLOT(slotSaveCurrentImage(QString, QString)));
 
     imageCapture   = new ImageCapture( 0, 640, 480 );
     ui->ImgView->setCapture( imageCapture );
@@ -122,9 +122,9 @@ void MainWindow::slotChangeLogFilename(QString filename)
     label_statusbar->setText(QString(tr("logfile: %1")).arg(filename));
 }
 
-void MainWindow::slotSaveCurrentImage(QString imgfilepath)
+void MainWindow::slotSaveCurrentImage(QString imgfilepath,  QString overlay_text)
 {
-    ui->ImgView->saveCurrentImage(imgfilepath);
+    ui->ImgView->saveCurrentImage(imgfilepath, overlay_text);
 }
 
 void MainWindow::slotLogStarted()

--- a/mainwindow.h
+++ b/mainwindow.h
@@ -29,7 +29,7 @@ signals:
 private slots:
     void slotGetData(QDateTime, double, double);
     void slotChangeLogFilename(QString);
-    void slotSaveCurrentImage(QString imgfilepath);
+    void slotSaveCurrentImage(QString imgfilepath, QString overlay_text);
     void slotLogStarted();
     void slotLogEnded(int status);
 

--- a/mainwindow.ui
+++ b/mainwindow.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>675</width>
-    <height>646</height>
+    <height>681</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -215,7 +215,7 @@
       <x>10</x>
       <y>140</y>
       <width>651</width>
-      <height>461</height>
+      <height>481</height>
      </rect>
     </property>
    </widget>