applied marios patch

Author: francisengelmann

qtTest/fscontrolpanel.ui

@@ -326,6 +326,11 @@
     <string>                                                Select a camera from the menu!</string>
    </property>
   </widget>
+  <zorder>cameraLabel</zorder>
+  <zorder>groupBox</zorder>
+  <zorder>groupBox_2</zorder>
+  <zorder>groupBox_3</zorder>
+  <zorder>viewfinder</zorder>
  </widget>
  <customwidgets>
   <customwidget>

qtTest/fswebcam.cpp

@@ -26,7 +26,13 @@ cv::Mat FSWebCam::getFrame()
 {
     frameTaken = false;
     isCapturingImage = true;
+
+    #ifdef LINUX
+    imageCapture->capture();
+    #else
     imageCapture->capture("./");
+    #endif
+
     //qDebug() << "preparing to take frame";
     //wait until camera has taken picture, then return
     while(!frameTaken){
@@ -55,8 +61,13 @@ void FSWebCam::setCamera(const QByteArray &cameraDevice)
         qDebug() << imageCapture->supportedResolutions();
         qDebug() << imageSettings.resolution();
     //QImageEncoderSettings imageSettings;
+
+    #ifdef LINUX
+    #else
     imageSettings.setCodec("image/jpeg");
     imageSettings.setResolution(1280, 960);
+    #endif
+
     imageCapture->setEncodingSettings(imageSettings);
 
     camera->setViewfinder(FSController::getInstance()->controlPanel->ui->viewfinder );
@@ -108,7 +119,11 @@ void FSWebCam::imageSaved(int id, const QString &fileName)
                 img2.width(),
                 CV_8UC3,
                 (uchar*)img2.bits(), img2.bytesPerLine());
+    #ifdef LINUX
+    frame = mat.clone();
+    #else
     frame = mat;
+    #endif
     cv::cvtColor(mat,frame, CV_RGB2BGR);
     frameTaken = true;
     isCapturingImage = false;

qtTest/mainwindow.cpp

@@ -14,6 +14,10 @@
 
 #include <boost/bind.hpp>
 
+#ifdef LINUX
+#include <boost/filesystem.hpp>
+#endif
+
 MainWindow::MainWindow(QWidget *parent) :
     QMainWindow(parent),
     hwTimer(new QBasicTimer),
@@ -58,7 +62,7 @@ void MainWindow::setupMenu()
     connect(savePointCloudAction,SIGNAL(triggered()),this, SLOT(savePointCloud()));
     ui->menuFile->addAction(savePointCloudAction);
 
-    QAction* exportSTLAction = new QAction("Export .stl...", this);
+    QAction* exportSTLAction = new QAction("Export .STL...", this);
     connect(exportSTLAction,SIGNAL(triggered()),this, SLOT(exportSTL()));
     ui->menuFile->addAction(exportSTLAction);
 

qtTest/mainwindow.ui

@@ -93,7 +93,7 @@
        </spacer>
       </item>
       <item>
-       <spacer name="horizontalSpacer_2">
+       <spacer name="horizontalSpacer_4">
         <property name="orientation">
          <enum>Qt::Horizontal</enum>
         </property>
@@ -134,7 +134,7 @@
       <item>
        <widget class="QLabel" name="label">
         <property name="text">
-         <string>Quality: </string>
+         <string>Resolution </string>
         </property>
        </widget>
       </item>

qtTest/qtTest.pro

@@ -100,7 +100,7 @@ macx {
 
     INCLUDEPATH += /usr/local/Cellar/eigen/3.1.2/include/eigen3
     INCLUDEPATH += /usr/local/Cellar/flann/1.7.1/include
-        INCLUDEPATH += /usr/local/Cellar/boost/1.51.0/include/boost
+    INCLUDEPATH += /usr/local/Cellar/boost/1.51.0/include/boost
 
         LIBS += -L/usr/local/Cellar/boost/1.51.0 \
         -lboost_chrono-mt \
@@ -140,7 +140,14 @@ linux-g++ {
     #PKGCONFIG += opencv
     #INCLUDEPATH += /usr/local/include/opencv2/
 
+    DEFINES += LINUX
+
     INCLUDEPATH += /usr/include/eigen3/
+    INCLUDEPATH += /usr/include/boost/
+
+    LIBS += -L/usr/lib/ \
+     -lboost_system \
+     -lboost_filesystem \
 
     LIBS += -L/usr/local/lib/ \
     -lopencv_core \