Added in functionality to record from video file and added in a QMain…

…Window and a main display widget

CVOpenGLWidget.h

@@ -26,7 +26,7 @@ Q_OBJECT
 	void imageSizeChanged( int out_width, int out_height );
 
 public slots:
-    bool ImageSlot( QImage* image); /// used to set the image to be viewed
+    bool ImageSlot(QImage* image); /// used to set the image to be viewed
 
 
 private:

camera.cpp

@@ -7,7 +7,7 @@ Camera::Camera(QObject* parent) : QObject(parent)
     cv::String eyeCascadeFilename = "/home/hoff/swdev/opencv_tut/opencv/haarcascade_eye.xml";
 
     loadFiles(faceCascadeFilename, eyeCascadeFilename);
-	
+    usingVideoCamera_ = true;
 }
 
 Camera::~Camera()
@@ -54,7 +54,11 @@ void Camera::loadFiles(cv::String faceCascadeFilename,
 void Camera::runSlot()
 {
     // TODO: want to be able to select this
-    capture->open(cameraIndex_);
+    if (usingVideoCamera_)
+        capture->open(cameraIndex_);
+    else
+        capture->open(videoFileName_);
+
     if( capture->isOpened() )
 	{
 		while( true )
@@ -81,11 +85,21 @@ void Camera::runSlot()
 	}
 }
 
+void Camera::usingVideoCameraSlot(bool value)
+{
+    usingVideoCamera_ = value;
+}
+
 void Camera::cameraIndexSlot(int index)
 {
     cameraIndex_ = index;
 }
 
+void Camera::videoFileNameSlot(QString fileName)
+{
+    videoFileName_ = fileName.toStdString().c_str();
+}
+
 void Camera::detectAndDisplay( cv::Mat frame )
 {
     std::vector<cv::Rect> faces;

camera.h

@@ -30,6 +30,8 @@ Q_OBJECT
 public slots:
     void runSlot();
     void cameraIndexSlot(int index);
+    void videoFileNameSlot(QString fileName);
+    void usingVideoCameraSlot(bool value);
 
 signals:
     void imageSignal(QImage* image);
@@ -38,5 +40,7 @@ public slots:
     void loadFiles(cv::String faceCascadeFilename, cv::String eyesCascadeFilename);
 
 private:
+    bool usingVideoCamera_;
     int cameraIndex_;
+    cv::String videoFileName_;
 };

displaywidget.cpp

@@ -0,0 +1,59 @@
+#include "displaywidget.h"
+
+DisplayWidget::DisplayWidget(QWidget *parent) : QWidget(parent)
+{
+    QStringList cameraOptions;
+    cameraOptions << "0" << "1" << "2" << "3" << "4" << "5" << "6";
+    QComboBox* cameraComboBox = new QComboBox;
+    cameraComboBox->addItems(cameraOptions);
+
+    QHBoxLayout* horizontalLayout = new QHBoxLayout();
+    QPushButton *runButton = new QPushButton("run", this);
+    QPushButton *fileSelector = new QPushButton("select file");
+    horizontalLayout->addWidget(cameraComboBox);
+    horizontalLayout->addWidget(fileSelector);
+    horizontalLayout->addWidget(runButton);
+
+    QVBoxLayout *layout = new QVBoxLayout;
+    CVOpenGLWidget* openGLWidget = new CVOpenGLWidget(this);
+    QRadioButton *sourceSelector = new QRadioButton("Stream from video camera", this);
+    sourceSelector->setDown(true);
+
+    layout->addWidget(openGLWidget);
+    layout->addLayout(horizontalLayout);
+    layout->addWidget(sourceSelector);
+
+    setLayout(layout);
+
+    Camera* camera = new Camera(this);
+
+    QObject::connect(camera, SIGNAL(imageSignal(QImage*)),
+                     openGLWidget, SLOT(ImageSlot(QImage*)));
+
+    // TODO: Add in slot to turn off camera, or something
+    QObject::connect(runButton, SIGNAL(clicked()),
+                     camera, SLOT(runSlot()));
+
+    QObject::connect(cameraComboBox, SIGNAL(currentIndexChanged(int)),
+                     camera, SLOT(cameraIndexSlot(int)));
+
+    QObject::connect(fileSelector, SIGNAL(clicked()),
+                     this,	SLOT(openFileDialog()));
+
+    QObject::connect(sourceSelector, SIGNAL(toggled(bool)),
+                     camera, SLOT(usingVideoCameraSlot(bool)));
+
+    QObject::connect(this, SIGNAL(videoFileNameSignal(QString)),
+                     camera, SLOT(videoFileNameSlot(QString)));
+}
+
+DisplayWidget::~DisplayWidget()
+{
+
+}
+
+void DisplayWidget::openFileDialog()
+{
+    QString filename = QFileDialog::getOpenFileName(this, tr("Video"));
+    emit videoFileNameSignal(filename);
+}

displaywidget.h

@@ -0,0 +1,34 @@
+#ifndef DISPLAYWIDGET_H
+#define DISPLAYWIDGET_H
+
+#include <QWidget>
+
+#include <QObject>
+#include <QVBoxLayout>
+#include <QPushButton>
+#include <QRadioButton>
+#include <QComboBox>
+#include <QFileDialog>
+#include <QFile>
+
+#include <iostream>
+#include <stdio.h>
+
+#include "CVOpenGLWidget.h"
+#include "camera.h"
+
+class DisplayWidget : public QWidget
+{
+    Q_OBJECT
+public:
+    explicit DisplayWidget(QWidget *parent = 0);
+    ~DisplayWidget();
+
+signals:
+    void videoFileNameSignal(QString videoFileName);
+
+public slots:
+    void openFileDialog();
+};
+
+#endif // DISPLAYWIDGET_H

main.cpp

@@ -1,52 +1,13 @@
 #include <QApplication>
-#include <QObject>
-#include <QVBoxLayout>
-#include <QPushButton>
-#include <QComboBox>
-
-#include <iostream>
-#include <stdio.h>
-
-#include "CVOpenGLWidget.h"
-#include "camera.h"
+#include "mainwindow.h"
 
 using namespace std;
 
 /** @function main */
 int main( int argc, char* argv[] )
 {
 	QApplication app(argc, argv);
-
-    QStringList cameraOptions;
-    cameraOptions << "0" << "1" << "2" << "3" << "4" << "5" << "6";
-    QComboBox cameraComboBox;
-    cameraComboBox.addItems(cameraOptions);
-
-    QHBoxLayout* horizontalLayout = new QHBoxLayout;
-    horizontalLayout->addWidget(&cameraComboBox);
-    QPushButton *runButton = new QPushButton("run");
-    horizontalLayout->addWidget(runButton);
-
-    QVBoxLayout *layout = new QVBoxLayout;
-    QWidget layoutWidget;
-    CVOpenGLWidget openGLWidget(&layoutWidget);
-    layout->addWidget(&openGLWidget);
-    layout->addLayout(horizontalLayout);
-
-    layoutWidget.setLayout(layout);
-
-    Camera camera;
-    QObject::connect(&camera, SIGNAL(imageSignal(QImage*)),
-                     &openGLWidget, SLOT(ImageSlot(QImage*)));
-
-
-	// TODO: Add in slot to turn off camera, or something
-	QObject::connect(runButton, SIGNAL(clicked()), 
-					 &camera, SLOT(runSlot()));
-
-    QObject::connect(&cameraComboBox, SIGNAL(currentIndexChanged(int)),
-                     &camera, SLOT(cameraIndexSlot(int)));
-	layoutWidget.show();
-
+    MainWindow window;
+    window.show();
 	return app.exec();
 }

mainwindow.cpp

@@ -0,0 +1,13 @@
+#include "mainwindow.h"
+
+MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent)
+{
+    DisplayWidget* display = new DisplayWidget(this);
+    setCentralWidget(display);
+}
+
+MainWindow::~MainWindow()
+{
+
+}
+

mainwindow.h

@@ -0,0 +1,16 @@
+#ifndef MAINWINDOW_H
+#define MAINWINDOW_H
+
+#include <QMainWindow>
+#include "displaywidget.h"
+class MainWindow : public QMainWindow
+{
+    Q_OBJECT
+public:
+    explicit MainWindow(QWidget *parent = 0);
+    ~MainWindow();
+
+signals:
+};
+
+#endif // MAINWINDOW_H

opencv.pro

@@ -7,15 +7,19 @@
 QT       += core gui opengl
 
 greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
-
+CONFIG += c++11
 TARGET = opencv
 TEMPLATE = app
 INCLUDEPATH += /usr/include/opencv
 LIBS += -L/lib  -lopencv_calib3d -lopencv_core -lopencv_cudaarithm -lopencv_cudabgsegm -lopencv_cudacodec -lopencv_cudafeatures2d -lopencv_cudafilters -lopencv_cudaimgproc -lopencv_cudalegacy -lopencv_cudaobjdetect -lopencv_cudaoptflow -lopencv_cudastereo -lopencv_cudawarping -lopencv_cudev -lopencv_features2d -lopencv_flann -lopencv_highgui -lopencv_imgcodecs -lopencv_imgproc -lopencv_ml -lopencv_objdetect -lopencv_photo -lopencv_shape -lopencv_stitching -lopencv_superres -lopencv_ts -lopencv_video -lopencv_videoio -lopencv_videostab
 
-SOURCES += main.cpp
-SOURCES  += CVOpenGLWidget.cpp
-SOURCES += camera.cpp
+SOURCES += main.cpp \
+    mainwindow.cpp \
+    CVOpenGLWidget.cpp \
+    camera.cpp \
+    displaywidget.cpp
 
-HEADERS += CVOpenGLWidget.h
-HEADERS += camera.h
+HEADERS += CVOpenGLWidget.h \
+    mainwindow.h \
+    camera.h \
+    displaywidget.h