Merge pull request #21 from PeeJay/streaming

Make the QtCaptureTest project more obvious/usable for all platforms

Author: trcwm

.gitignore

@@ -5,4 +5,5 @@ java/target
 mac/openpnp-capture.xcodeproj/xcuserdata
 mac/openpnp-capture.xcodeproj/project.xcworkspace/xcuserdata
 common/version.h
-build
+/build*
+*.pro.user

mac/QtCaptureTest/QtCaptureTest.pro renamed to QtCaptureTest/QtCaptureTest.pro

@@ -16,7 +16,7 @@ CONFIG -= app_bundle
 CONFIG += console
 
 # add the openpnp-capture include path
-INCLUDEPATH += ../../include
+INCLUDEPATH += ../include
 
 SOURCES += main.cpp\
         mainwindow.cpp
@@ -25,7 +25,7 @@ HEADERS  += mainwindow.h
 
 FORMS    += mainwindow.ui
 
-LIBS += -L"../../build/" -lopenpnp-capture
+LIBS += -L../build/ -lopenpnp-capture
 
 # add run-path relative dylib search path
 QMAKE_RPATHDIR += .

mac/QtCaptureTest/main.cpp renamed to QtCaptureTest/main.cpp

@@ -1,6 +1,6 @@
 #include "mainwindow.h"
 #include "ui_mainwindow.h"
-#include <qDebug>
+#include <QDebug>
 #include <QBoxLayout>
 #include <QPixmap>
 
@@ -139,7 +139,7 @@ void MainWindow::doFrameUpdate()
     }
 }
 
-void MainWindow::changeCamera(int index)
+void MainWindow::changeCamera()
 {
     QVariant v = ui->cameraChooser->currentData();
     CustomComboBoxData data = v.value<CustomComboBoxData>();
@@ -219,11 +219,12 @@ void MainWindow::readCameraSettings()
         qDebug() << "Failed to get exposure value";
     }
 
-    int32_t emin,emax;
-    if (Cap_getPropertyLimits(m_ctx, m_streamID, CAPPROPID_EXPOSURE, &emin, &emax)==CAPRESULT_OK)
+    int32_t emin,emax,edefault;
+    if (Cap_getPropertyLimits(m_ctx, m_streamID, CAPPROPID_EXPOSURE, &emin, &emax, &edefault)==CAPRESULT_OK)
     {
         qDebug() << "Exposure min: " << emin;
         qDebug() << "Exposure max: " << emax;
+        qDebug() << "Exposure default: " << edefault;
         m_exposureSlider->setRange(emin, emax);
     }
     else
@@ -232,10 +233,11 @@ void MainWindow::readCameraSettings()
         m_exposureSlider->setRange(0, 0);
     }
 
-    if (Cap_getPropertyLimits(m_ctx, m_streamID, CAPPROPID_WHITEBALANCE, &emin, &emax)==CAPRESULT_OK)
+    if (Cap_getPropertyLimits(m_ctx, m_streamID, CAPPROPID_WHITEBALANCE, &emin, &emax, &edefault)==CAPRESULT_OK)
     {
         qDebug() << "White balance min: " << emin;
         qDebug() << "White balance max: " << emax;
+        qDebug() << "White balance default: " << edefault;
         m_whiteBalanceSlider->setRange(emin, emax);
     }
     else
@@ -244,10 +246,11 @@ void MainWindow::readCameraSettings()
         m_whiteBalanceSlider->setRange(0, 0);
     }
 
-    if (Cap_getPropertyLimits(m_ctx, m_streamID, CAPPROPID_GAIN, &emin, &emax)==CAPRESULT_OK)
+    if (Cap_getPropertyLimits(m_ctx, m_streamID, CAPPROPID_GAIN, &emin, &emax, &edefault)==CAPRESULT_OK)
     {
         qDebug() << "Gain min: " << emin;
         qDebug() << "Gain max: " << emax;
+        qDebug() << "Gain default: " << edefault;
         m_gainSlider->setRange(emin, emax);
     }
     else
@@ -267,21 +270,23 @@ void MainWindow::readCameraSettings()
         qDebug() << "Failed to get gain value";
     }
 
-    if (Cap_getPropertyLimits(m_ctx, m_streamID, CAPPROPID_CONTRAST, &emin, &emax)==CAPRESULT_OK)
+    if (Cap_getPropertyLimits(m_ctx, m_streamID, CAPPROPID_CONTRAST, &emin, &emax, &edefault)==CAPRESULT_OK)
     {
         qDebug() << "Contrast min: " << emin;
         qDebug() << "Contrast max: " << emax;
+        qDebug() << "Contrast default: " << edefault;
         m_contrastSlider->setRange(emin, emax);
     }
     else
     {
         m_contrastSlider->setRange(0, 0);
     }
 
-    if (Cap_getPropertyLimits(m_ctx, m_streamID, CAPPROPID_BRIGHTNESS, &emin, &emax)==CAPRESULT_OK)
+    if (Cap_getPropertyLimits(m_ctx, m_streamID, CAPPROPID_BRIGHTNESS, &emin, &emax, &edefault)==CAPRESULT_OK)
     {
         qDebug() << "Brightness min: " << emin;
         qDebug() << "Brightness max: " << emax;
+        qDebug() << "Brightness default: " << edefault;
         m_brightnessSlider->setRange(emin, emax);
     }
     else

mac/QtCaptureTest/mainwindow.cpp renamed to QtCaptureTest/mainwindow.cpp

@@ -25,7 +25,7 @@ class MainWindow : public QMainWindow
 
 public slots:
     void doFrameUpdate();
-    void changeCamera(int index);
+    void changeCamera();
 
     void onAutoExposure(bool state);
     void onAutoWhiteBalance(bool state);

mac/QtCaptureTest/mainwindow.h renamed to QtCaptureTest/mainwindow.h

@@ -12,25 +12,25 @@ IF ERRORLEVEL 2 GOTO NinjaBuild
 IF ERRORLEVEL 1 GOTO VS
 
 :VS
-mkdir buildRelease
-cd buildRelease
+mkdir build
+cd build
 cmake -DCMAKE_BUILD_TYPE=Release -G "NMake Makefiles" ..
 cd ..
-mkdir buildDebug
-cd buildDebug
-cmake -DCMAKE_BUILD_TYPE=Debug -G "NMake Makefiles" ..
-cd ..
+::mkdir buildDebug
+::cd buildDebug
+::cmake -DCMAKE_BUILD_TYPE=Debug -G "NMake Makefiles" ..
+::cd ..
 GOTO End
 
 :NinjaBuild
-mkdir buildRelease
-cd buildRelease
+mkdir build
+cd build
 cmake -DCMAKE_BUILD_TYPE=Release -G "Ninja" ..
 cd .. 
-mkdir buildDebug
-cd buildDebug
-cmake -DCMAKE_BUILD_TYPE=Debug -G "Ninja" ..
-cd ..
+::mkdir buildDebug
+::cd buildDebug
+::cmake -DCMAKE_BUILD_TYPE=Debug -G "Ninja" ..
+::cd ..
 GOTO End
 
 :End