fixed embedded builds

Josh Klontz
1 parent 7e6ac9f2
Showing 5 changed files with 168 additions and 171 deletions
sdk/openbr_export.cpp
sdk/plugins/format.cpp
sdk/plugins/gui.cmake
sdk/plugins/gui.cpp
sdk/plugins/misc.cpp
@@ -82,6 +82,7 @@ $ br -help
  *  -# Consider the free open source program <a href="http://wincdemu.sysprogs.org">WinCDEmu</a> if you need a program to mount ISO images.
  *  -# You will have to register with Microsoft after installation, but it's free.
  *  -# Grab any available <a href="http://www.microsoft.com/visualstudio/eng/downloads#d-visual-studio-2012-update">Visual Studio Updates</a>.
+ *  -# Download and install <a href="http://msdn.microsoft.com/en-us/windows/hardware/hh852363.aspx">Windows 8 SDK</a>.
  * -# <a href="http://www.cmake.org/files/v2.8/cmake-2.8.10.2-win32-x86.exe">Download CMake 2.8.10.2</a> and install.
  *  -# During installation setup select "add CMake to PATH".
  * -# <a href="http://downloads.sourceforge.net/project/opencvlibrary/opencv-unix/2.4.4/OpenCV-2.4.4.tar.bz2">Download OpenCV 2.4.4</a>.
@@ -100,19 +101,8 @@ $ br -help
  *  $ nmake install
  *  $ nmake clean
  *  \endcode
- * -# <a href="http://releases.qt-project.org/qt5/5.0.1/single/qt-everywhere-opensource-src-5.0.1.zip">Download Qt 5.0.1</a> and unzip.
- *  -# Install Perl/Python/Ruby dependencies as explained in the "Windows" section of "README". Make sure they are added to "path" when given the option during installation.
+ * -# <a href="http://releases.qt-project.org/digia/5.0.1/backups/2013-01-18-412/qt-windows-opensource-5.0.1-msvc2012_64-x86_64-offline-2013-01-18-412.exe">Download Qt 5.0.1</a> and install.
  *  -# <a href="http://www.microsoft.com/en-us/download/confirmation.aspx?id=6812">Download Direct X Software Developement Kit</a> and install.
- *  -# From the VS2012 x64 Cross Tools Command Prompt:
- *  \code
- *  $ cd qt-everywhere-opensource-src-5.0.1
- *  $ configure -prefix C:\Qt\5.0.1\msvc2012 -opensource -confirm-license -nomake examples -nomake tests
- *  $ nmake
- *  $ nmake install
- *  $ cd ..
- *  $ rmdir /Q /S qt-everywhere-opensource-src-5.0.1
- *  \endcode
- *  -# nmake will take several hours to finish.
  * -# Create a <a href="github.com">GitHub</a> account and follow their instructions for <a href="https://help.github.com/articles/set-up-git">setting up Git</a>.
  *  -# Launch "Git Bash" from the Desktop and clone OpenBR:
  *  \code
@@ -128,7 +118,7 @@ $ br -help
  *  $ cd C:\openbr
  *  $ mkdir build-msvc2012
  *  $ cd build-msvc2012
- *  $ cmake -G "CodeBlocks - NMake Makefiles" -DCMAKE_PREFIX_PATH="C:/OpenCV-2.4.4/build-msvc2012/install;C:/Qt/5.0.1/msvc2012" -DCMAKE_INSTALL_PREFIX="./install" -DBR_INSTALL_DEPENDENCIES=ON -DCMAKE_BUILD_TYPE=Release ..
+ *  $ cmake -G "CodeBlocks - NMake Makefiles" -DCMAKE_PREFIX_PATH="C:/OpenCV-2.4.4/build-msvc2012/install;C:/Qt/Qt5.0.1/5.0.1/msvc2012_64" -DCMAKE_INSTALL_PREFIX="./install" -DBR_INSTALL_DEPENDENCIES=ON -DCMAKE_BUILD_TYPE=Release ..
  *  $ nmake
  *  $ nmake install
  *  \endcode
@@ -565,7 +565,6 @@ class webcamFormat : public Format
 BR_REGISTER(Format, webcamFormat)
-#ifndef BR_EMBEDDED
 /*!
  * \ingroup formats
  * \brief Decodes images from Base64 xml
@@ -578,13 +577,15 @@ class xmlFormat : public Format
     Template read() const
     {
+        Template t;
+
+#ifndef BR_EMBEDDED
         QDomDocument doc(file);
         QFile f(file);
         if (!f.open(QIODevice::ReadOnly)) qFatal("Unable to open %s for reading.", qPrintable(file.flat()));
         if (!doc.setContent(&f))          qFatal("Unable to parse %s.", qPrintable(file.flat()));
         f.close();
-        Template t;
         QDomElement docElem = doc.documentElement();
         QDomNode subject = docElem.firstChild();
         while (!subject.isNull()) {
@@ -620,6 +621,7 @@ class xmlFormat : public Format
             if (current.month() < dob.month()) age--;
             t.file.set("Age", age);
         }
+#endif // BR_EMBEDDED
         return t;
     }
@@ -632,7 +634,6 @@ class xmlFormat : public Format
 };
 BR_REGISTER(Format, xmlFormat)
-#endif // BR_EMBEDDED
 } // namespace br
+if(NOT ${BR_EMBEDDED})
+  set(BR_THIRDPARTY_SRC ${BR_THIRDPARTY_SRC} plugins/gui.cpp)
+endif()
+#include <QApplication>
+#include <QLabel>
+#include <opencv2/imgproc/imgproc.hpp>
+#include <openbr_plugin.h>
+
+using namespace cv;
+
+namespace br
+{
+
+QImage toQImage(const Mat &mat)
+{
+    // Convert to 8U depth
+    Mat mat8u;
+    if (mat.depth() != CV_8U) {
+        double globalMin = std::numeric_limits<double>::max();
+        double globalMax = -std::numeric_limits<double>::max();
+
+        std::vector<Mat> mv;
+        split(mat, mv);
+        for (size_t i=0; i<mv.size(); i++) {
+            double min, max;
+            minMaxLoc(mv[i], &min, &max);
+            globalMin = std::min(globalMin, min);
+            globalMax = std::max(globalMax, max);
+        }
+        assert(globalMax >= globalMin);
+
+        double range = globalMax - globalMin;
+        if (range != 0) {
+            double scale = 255 / range;
+            convertScaleAbs(mat, mat8u, scale, -(globalMin * scale));
+        } else {
+            // Monochromatic
+            mat8u = Mat(mat.size(), CV_8UC1, Scalar((globalMin+globalMax)/2));
+        }
+    } else {
+        mat8u = mat;
+    }
+
+    // Convert to 3 channels
+    Mat mat8uc3;
+    if      (mat8u.channels() == 4) cvtColor(mat8u, mat8uc3, CV_BGRA2RGB);
+    else if (mat8u.channels() == 3) cvtColor(mat8u, mat8uc3, CV_BGR2RGB);
+    else if (mat8u.channels() == 1) cvtColor(mat8u, mat8uc3, CV_GRAY2RGB);
+
+    return QImage(mat8uc3.data, mat8uc3.cols, mat8uc3.rows, 3*mat8uc3.cols, QImage::Format_RGB888).copy();
+}
+
+// Provides slots for manipulating a QLabel, but does not inherit from QWidget.
+// Therefore, it can be moved to the main thread if not created there initially
+// since god forbid you create a QWidget subclass in not the main thread.
+class GUIProxy : public QObject
+{
+    Q_OBJECT
+
+    QLabel * window;
+
+public:
+    GUIProxy()
+    {
+        window =NULL;
+    }
+
+public slots:
+    void showImage(QPixmap pixmap)
+    {
+        window->show();
+        window->setPixmap(pixmap);
+        window->setFixedSize(pixmap.size());
+        window->update();
+    }
+
+    void createWindow()
+    {
+        delete window;
+        window = NULL;
+        window = new QLabel();
+    }
+};
+
+/*!
+ * \ingroup transforms
+ * \brief Displays templates in a GUI pop-up window using QT.
+ * \author Charles Otto \cite caotto
+ * Unlike ShowTransform, this can be used with parallelism enabled, although it
+ * is considered TimeVarying.
+ */
+class Show2Transform : public TimeVaryingTransform
+{
+    Q_OBJECT
+public:
+    Show2Transform() : TimeVaryingTransform(false, false)
+    {
+        // Create our GUI proxy
+        gui = new GUIProxy();
+        // Move it to the main thread, this means signals we send to it will
+        // be run in the main thread, which is hopefully in an event loop
+        gui->moveToThread(QApplication::instance()->thread());
+        // Connect our signals to the proxy's slots
+        connect(this, SIGNAL(needWindow()), gui, SLOT(createWindow()), Qt::BlockingQueuedConnection);
+        connect(this, SIGNAL(updateImage(QPixmap)), gui, SLOT(showImage(QPixmap)));
+    }
+
+    ~Show2Transform()
+    {
+        delete gui;
+    }
+
+    void train(const TemplateList &data) { (void) data; }
+
+    void project(const TemplateList &src, TemplateList &dst) const
+    {
+        Transform * non_const = (Show2Transform *) this;
+        non_const->projectUpdate(src,dst);
+    }
+
+    void projectUpdate(const TemplateList &src, TemplateList &dst)
+    {
+        dst = src;
+
+        if (src.empty())
+            return;
+
+        foreach (const Template & t, src) {
+            foreach(const cv::Mat & m, t) {
+                QImage qImageBuffer = toQImage(m);
+                displayBuffer.convertFromImage(qImageBuffer);
+                emit updateImage(displayBuffer);
+            }
+        }
+    }
+
+    void finalize(TemplateList & output)
+    {
+        (void) output;
+        // todo: hide ui?
+    }
+
+    void init()
+    {
+        emit needWindow();
+    }
+
+protected:
+    GUIProxy * gui;
+    QPixmap displayBuffer;
+
+signals:
+    void needWindow();
+    void updateImage(QPixmap input);
+};
+
+BR_REGISTER(Transform, Show2Transform)
+
+} // namespace br
+
+#include "gui.moc"
@@ -19,13 +19,6 @@
 #include "core/opencvutils.h"
-#ifndef BR_EMBEDDED
-#include <QLabel>
-#include <opencv2/imgproc/imgproc.hpp>
-#include <QApplication>
-#endif
-
-
 using namespace cv;
 namespace br
@@ -97,154 +90,6 @@ int ShowTransform::counter = 0;
 BR_REGISTER(Transform, ShowTransform)
-#ifndef BR_EMBEDDED
-
-QImage toQImage(const Mat &mat)
-{
-    // Convert to 8U depth
-    Mat mat8u;
-    if (mat.depth() != CV_8U) {
-        double globalMin = std::numeric_limits<double>::max();
-        double globalMax = -std::numeric_limits<double>::max();
-
-        std::vector<Mat> mv;
-        split(mat, mv);
-        for (size_t i=0; i<mv.size(); i++) {
-            double min, max;
-            minMaxLoc(mv[i], &min, &max);
-            globalMin = std::min(globalMin, min);
-            globalMax = std::max(globalMax, max);
-        }
-        assert(globalMax >= globalMin);
-
-        double range = globalMax - globalMin;
-        if (range != 0) {
-            double scale = 255 / range;
-            convertScaleAbs(mat, mat8u, scale, -(globalMin * scale));
-        } else {
-            // Monochromatic
-            mat8u = Mat(mat.size(), CV_8UC1, Scalar((globalMin+globalMax)/2));
-        }
-    } else {
-        mat8u = mat;
-    }
-
-    // Convert to 3 channels
-    Mat mat8uc3;
-    if      (mat8u.channels() == 4) cvtColor(mat8u, mat8uc3, CV_BGRA2RGB);
-    else if (mat8u.channels() == 3) cvtColor(mat8u, mat8uc3, CV_BGR2RGB);
-    else if (mat8u.channels() == 1) cvtColor(mat8u, mat8uc3, CV_GRAY2RGB);
-
-    return QImage(mat8uc3.data, mat8uc3.cols, mat8uc3.rows, 3*mat8uc3.cols, QImage::Format_RGB888).copy();
-}
-
-// Provides slots for manipulating a QLabel, but does not inherit from QWidget.
-// Therefore, it can be moved to the main thread if not created there initially
-// since god forbid you create a QWidget subclass in not the main thread.
-class GUIProxy : public QObject
-{
-    Q_OBJECT
-
-    QLabel * window;
-
-public:
-    GUIProxy()
-    {
-        window =NULL;
-    }
-
-public slots:
-    void showImage(QPixmap pixmap)
-    {
-        window->show();
-        window->setPixmap(pixmap);
-        window->setFixedSize(pixmap.size());
-        window->update();
-    }
-
-    void createWindow()
-    {
-        delete window;
-        window = NULL;
-        window = new QLabel();
-    }
-};
-
-/*!
- * \ingroup transforms
- * \brief Displays templates in a GUI pop-up window using QT.
- * \author Charles Otto \cite caotto
- * Unlike ShowTransform, this can be used with parallelism enabled, although it
- * is considered TimeVarying.
- */
-class Show2Transform : public TimeVaryingTransform
-{
-    Q_OBJECT
-public:
-    Show2Transform() : TimeVaryingTransform(false, false)
-    {
-        // Create our GUI proxy
-        gui = new GUIProxy();
-        // Move it to the main thread, this means signals we send to it will
-        // be run in the main thread, which is hopefully in an event loop
-        gui->moveToThread(QApplication::instance()->thread());
-        // Connect our signals to the proxy's slots
-        connect(this, SIGNAL(needWindow()), gui, SLOT(createWindow()), Qt::BlockingQueuedConnection);
-        connect(this, SIGNAL(updateImage(QPixmap)), gui, SLOT(showImage(QPixmap)));
-    }
-
-    ~Show2Transform()
-    {
-        delete gui;
-    }
-
-    void train(const TemplateList &data) { (void) data; }
-
-    void project(const TemplateList &src, TemplateList &dst) const
-    {
-        Transform * non_const = (Show2Transform *) this;
-        non_const->projectUpdate(src,dst);
-    }
-
-    void projectUpdate(const TemplateList &src, TemplateList &dst)
-    {
-        dst = src;
-
-        if (src.empty())
-            return;
-
-        foreach (const Template & t, src) {
-            foreach(const cv::Mat & m, t) {
-                QImage qImageBuffer = toQImage(m);
-                displayBuffer.convertFromImage(qImageBuffer);
-                emit updateImage(displayBuffer);
-            }
-        }
-    }
-
-    void finalize(TemplateList & output)
-    {
-        (void) output;
-        // todo: hide ui?
-    }
-
-    void init()
-    {
-        emit needWindow();
-    }
-
-protected:
-    GUIProxy * gui;
-    QPixmap displayBuffer;
-
-signals:
-    void needWindow();
-    void updateImage(QPixmap input);
-};
-
-BR_REGISTER(Transform, Show2Transform)
-#endif
-
 /*!
  * \ingroup transforms
  * \brief Prints the template's file to stdout or stderr.