Merge branch 'dev' of github.com:livecv/livecv into dev

dinusv · dinusv · commit 85d07fdad7f5 · 2018-03-13T23:35:51.000+02:00
diff --git a/application/application.pro b/application/application.pro
@@ -12,7 +12,8 @@ linkLocalLibrary(lveditqmljs, lveditqmljs)
 unix:!macx{
     QMAKE_LFLAGS += \
         '-Wl,-rpath,\'\$$ORIGIN\'' \
-        '-Wl,-rpath,\'\$$ORIGIN/link\''
+        '-Wl,-rpath,\'\$$ORIGIN/link\'' \
+	'-Wl,-rpath,\'\$$ORIGIN/lib\''
 
 
     createlinkdir.commands += $${QMAKE_MKDIR_CMD} $$shell_path($${DEPLOY_PATH}/link)
diff --git a/application/qml/License.qml b/application/qml/License.qml
@@ -88,14 +88,14 @@ Rectangle{
         Rectangle{
             id: boxTop
             width: parent.width
-            height: 30
+            height: 35
             color: 'transparent'
             Text{
                 anchors.centerIn: parent
                 text: 'Manage Licenses'
 
                 color: root.titleColor
-                font.pixelSize: 14
+                font.pixelSize: 12
                 font.family: "Open Sans, sans-serif"
                 font.weight: Font.Light
             }
@@ -110,7 +110,7 @@ Rectangle{
                     anchors.centerIn: parent
                     text: "x"
                     color: root.titleColor
-                    font.pixelSize: closeBoxArea.containsMouse ? 24 : 18
+                    font.pixelSize: closeBoxArea.containsMouse ? 22 : 18
                     font.family: "Open Sans, sans-serif"
                     font.weight: Font.Light
                     Behavior on font.pixelSize{ NumberAnimation{ duration: 250 } }
@@ -273,7 +273,7 @@ Rectangle{
                     anchors.topMargin: 12
 
                     text: licenseList.currentItem
-                          ? settings.custom('license').licenseText(licenseList.currentItem.licenseId)
+                          ? livecv.settings.file('license').licenseText(licenseList.currentItem.licenseId)
                           : "No license selected."
 
                     width: boxRight.width - 24
@@ -314,7 +314,7 @@ Rectangle{
                     id: acceptButtonArea
                     anchors.fill: parent
                     hoverEnabled: true
-                    onClicked: settings.custom('license').acceptLicense(licenseList.currentItem.licenseId)
+                    onClicked: livecv.settings.file('license').acceptLicense(licenseList.currentItem.licenseId)
                 }
             }
         }
diff --git a/doc/src/images/logo-dark.png b/doc/src/images/logo-dark.png
diff --git a/livecv.json b/livecv.json
@@ -64,6 +64,7 @@
                     "{source}/samples" : "-"
                 }
               },
+	      { "run" : ["mkdir", "-m", "775", "link"] },
               { "run" : ["chmod", "755", "livecv"] },
               { "solveincludes": [
                     {
@@ -143,7 +144,7 @@
                     "libQt5Script.so*": "lib/-",
                     "libQt5Widgets.so*": "lib/-",
                     "libQt5Network.so*": "lib/-",
-                    "libQt5Xml.so*": "-",
+                    "libQt5Xml.so*": "lib/-",
                     "libQt5XcbQpa.so*": "lib/-",
                     "libicudata.so*": "lib/-",
                     "libicui18n.so*": "lib/-",
@@ -154,10 +155,10 @@
                     "libicuuc.so*": "lib/-"
                   },
                   "{qtdir}/plugins" : {
-                    "imageformats" : "lib/plugins/imageformats",
-                    "platforminputcontexts" : "lib/plugins/platforminputcontexts",
-                    "platforms" : "lib/plugins/platforms",
-                    "xcbglintegrations" : "lib/plugins/xcbglintegrations"
+                    "imageformats" : "libraries/imageformats",
+                    "platforminputcontexts" : "libraries/platforminputcontexts",
+                    "platforms" : "libraries/platforms",
+                    "xcbglintegrations" : "libraries/xcbglintegrations"
                   },
                   "{qtdir}/qml" : {
                     "QtQuick" : {
@@ -180,32 +181,21 @@
                     "QtWebSockets" : "plugins/-"
                   },
                   "{opencv_dir}" : {
-                    "libopencv_calib3d.so*" : "-",
-                    "libopencv_core.so*" : "-",
-                    "libopencv_features2d.so*" : "-",
-                    "libopencv_shape.so*" : "-",
-                    "libopencv_flann.so*" : "-",
-                    "libopencv_highgui.so*" : "-",
-                    "libopencv_imgproc.so*" : "-",
-                    "libopencv_imgcodecs.so*" : "-",
-                    "libopencv_objdetect.so*" : "-",
-                    "libopencv_stitching.so*" : "-",
-                    "libopencv_photo.so*" : "-",
-                    "libopencv_videoio.so*" : "-",
-                    "libopencv_video.so*" : "-"
+                    "libopencv_*.so*" : "external/opencv/-"
                   }
                 }
               },
+              { "run" : ["mkdir", "-m", "775", "link"] },
               { "run" : ["chmod", "755", "livecv"] },
               { "write" : {
                   "file": "launcher.sh",
                   "data": [
                     "#!/bin/bash\n",
-                    "export LD_LIBRARY_PATH=`pwd`/lib:\n",
+		    "export LD_LIBRARY_PATH=`pwd`/lib:`pwd`:\n",
                     "export QML_IMPORT_PATH=`pwd`/plugins\n",
                     "export QML2_IMPORT_PATH=`pwd`/plugins\n",
-                    "export QT_PLUGIN_PATH=`pwd`/lib/plugins\n",
-                    "export QT_QPA_PLATFORM_PLUGIN_PATH=`pwd`/lib/plugins/platforms\n",
+                    "export QT_PLUGIN_PATH=`pwd`/libraries\n",
+                    "export QT_QPA_PLATFORM_PLUGIN_PATH=`pwd`/libraries/platforms\n",
                     "./livecv"
                     ]
                   }
diff --git a/plugins/lcvcore/src/qcvglobalobject.cpp b/plugins/lcvcore/src/qcvglobalobject.cpp
@@ -1,6 +1,92 @@
 #include "qcvglobalobject.h"
+#include "opencv2/core.hpp"
+
+namespace helpers{
+
+template<typename T, typename LT> void getValues( cv::Mat& m, QVariantList& output){
+    T* data  = reinterpret_cast<T*>(m.data);
+    int step = (int)(m.step / sizeof(T));
+
+    for ( int i = 0; i < m.rows; ++i ){
+        int rowstep = i * step;
+        for ( int j = 0; j < m.cols * m.channels(); ++j ){
+            output.append(data[rowstep + j]);
+        }
+    }
+}
+
+template<typename T, typename LT> void setValues(const QVariantList& values, cv::Mat& m){
+    T* data  = reinterpret_cast<T*>(m.data);
+    int step = (int)(m.step / sizeof(T));
+
+    for ( int i = 0; i < m.rows; ++i ){
+        int rowstep = i * step;
+        for ( int j = 0; j < m.cols * m.channels(); ++j ){
+            data[rowstep + j] =values.at(j + i * m.cols * m.channels()).value<T>();
+        }
+    }
+}
+
+} // namespace
 
 QCvGlobalObject::QCvGlobalObject(QObject *parent)
     : QObject(parent){
 
 }
+
+QVariantList QCvGlobalObject::matToArray(QMat *m){
+    QVariantList values;
+    cv::Mat* cvmat = m->cvMat();
+    switch(cvmat->depth()){
+    case CV_8U:
+        helpers::getValues<uchar, int>(*cvmat, values);
+        break;
+    case CV_8S:
+        helpers::getValues<uchar, int>(*cvmat, values);
+        break;
+    case CV_16U:
+        helpers::getValues<short, int>(*cvmat, values);
+        break;
+    case CV_16S:
+        helpers::getValues<short, int>(*cvmat, values);
+        break;
+    case CV_32S:
+        helpers::getValues<int, int>(*cvmat, values);
+        break;
+    case CV_32F:
+        helpers::getValues<float, float>(*cvmat, values);
+        break;
+    case CV_64F:
+        helpers::getValues<float, qreal>(*cvmat, values);
+        break;
+    }
+
+    return values;
+}
+
+void QCvGlobalObject::assignArrayToMat(const QVariantList &a, QMat *m){
+    cv::Mat* cvmat = m->cvMat();
+    switch(cvmat->depth()){
+    case CV_8U:
+        helpers::setValues<uchar, int>(a, *cvmat);
+        break;
+    case CV_8S:
+        helpers::setValues<uchar, int>(a, *cvmat);
+        break;
+    case CV_16U:
+        helpers::setValues<short, int>(a, *cvmat);
+        break;
+    case CV_16S:
+        helpers::setValues<short, int>(a, *cvmat);
+        break;
+    case CV_32S:
+        helpers::setValues<int, int>(a, *cvmat);
+        break;
+    case CV_32F:
+        helpers::setValues<float, float>(a, *cvmat);
+        break;
+    case CV_64F:
+        helpers::setValues<float, qreal>(a, *cvmat);
+        break;
+    }
+}
diff --git a/plugins/lcvcore/src/qcvglobalobject.h b/plugins/lcvcore/src/qcvglobalobject.h
@@ -13,6 +13,10 @@ class QCvGlobalObject : public QObject{
     explicit QCvGlobalObject(QObject *parent = nullptr);
 
     QMat* nullMat() const;
+
+public slots:
+    QVariantList matToArray(QMat* m);
+    void assignArrayToMat(const QVariantList &a, QMat *m);
 };
 
 inline QMat *QCvGlobalObject::nullMat() const{
diff --git a/plugins/lcvfeatures2d/include/qdescriptormatchfilter.h b/plugins/lcvfeatures2d/include/qdescriptormatchfilter.h
diff --git a/plugins/lcvfeatures2d/src/lcvfeatures2d_plugin.cpp b/plugins/lcvfeatures2d/src/lcvfeatures2d_plugin.cpp
@@ -22,16 +22,13 @@
 #include "qbriskfeaturedetector.h"
 //#include "qdensefeaturedetector.h"
 //#include "qgoodfeaturestotrackdetector.h"
-//#include "qstarfeaturedetector.h"   IN OPENCV_EXPERIMENTAL
 #include "qorbfeaturedetector.h"
 #include "qmserfeaturedetector.h"
 #include "qsimpleblobdetector.h"
 
 #include "qdescriptorextractor.h"
-//#include "qbriefdescriptorextractor.h" IN OPENCV_EXPERIMENTAL
 #include "qbriskdescriptorextractor.h"
 #include "qorbdescriptorextractor.h"
-//#include "qfreakdescriptorextractor.h"   IN OPENCV_EXPERIMENTAL
 
 #include "qdescriptormatcher.h"
 #include "qbruteforcematcher.h"
@@ -53,18 +50,13 @@ void Lcvfeatures2dPlugin::registerTypes(const char *uri){
     qmlRegisterType<QFeatureDetector>(            uri, 1, 0, "FeatureDetector");
     qmlRegisterType<QFastFeatureDetector>(        uri, 1, 0, "FastFeatureDetector");
     qmlRegisterType<QBriskFeatureDetector>(       uri, 1, 0, "BriskFeatureDetector");
-//    qmlRegisterType<QDenseFeatureDetector>(       uri, 1, 0, "DenseFeatureDetector");
-//    qmlRegisterType<QGoodFeaturesToTrackDetector>(uri, 1, 0, "GoodFeaturesToTrackFeatureDetector");
-//    qmlRegisterType<QStarFeatureDetector>(        uri, 1, 0, "StarFeatureDetector");
     qmlRegisterType<QOrbFeatureDetector>(         uri, 1, 0, "OrbFeatureDetector");
     qmlRegisterType<QMSerFeatureDetector>(        uri, 1, 0, "MSerFeatureDetector");
     qmlRegisterType<QSimpleBlobDetector>(         uri, 1, 0, "SimpleBlobDetector");
 
     qmlRegisterType<QDescriptorExtractor>(        uri, 1, 0, "DescriptorExtractor");
-//    qmlRegisterType<QBriefDescriptorExtractor>(   uri, 1, 0, "BriefDescriptorExtractor");
     qmlRegisterType<QBriskDescriptorExtractor>(   uri, 1, 0, "BriskDescriptorExtractor");
     qmlRegisterType<QOrbDescriptorExtractor>(     uri, 1, 0, "OrbDescriptorExtractor");
-//    qmlRegisterType<QFreakDescriptorExtractor>(   uri, 1, 0, "FreakDescriptorExtractor");
 
     qmlRegisterType<QDMatchVector>(               uri, 1, 0, "DMatchVector");
     qmlRegisterType<QDescriptorMatcher>(          uri, 1, 0, "DescriptorMatcher");
diff --git a/plugins/lcvfeatures2d/src/qdescriptorextractor.h b/plugins/lcvfeatures2d/src/qdescriptorextractor.h
@@ -58,7 +58,7 @@ class Q_LCVFEATURES2D_EXPORT QDescriptorExtractor : public QQuickItem{
     void paramsChanged();
 
 public slots:
-    void compute();
+    virtual void compute();
     void setParams(const QVariantMap &arg);
 
 private:
diff --git a/plugins/lcvfeatures2d/src/qfeaturedetector.h b/plugins/lcvfeatures2d/src/qfeaturedetector.h
@@ -55,7 +55,7 @@ class Q_LCVFEATURES2D_EXPORT QFeatureDetector : public QQuickItem{
 
     cv::FeatureDetector* detector();
     void initializeDetector(cv::Ptr<cv::FeatureDetector> detector);
-    void detect();
+    virtual void detect();
     virtual void componentComplete();
 
 public:
diff --git a/plugins/live/include/liveheaders.pri b/plugins/live/include/liveheaders.pri
@@ -7,5 +7,6 @@ HEADERS += \
     $$PWD/qstaticcontainer.h \
     $$PWD/qstaticloader.h \
     $$PWD/qenginemonitor.h \
-    $$PWD/qfilereader.h
+    $$PWD/qfilereader.h \
+    $$PWD/qlicensesettings.h
 #    $$PWD/qlicensecontainer.h
diff --git a/plugins/live/include/qlicensesettings.h b/plugins/live/include/qlicensesettings.h
@@ -0,0 +1 @@
+#include "../src/qlicensesettings.h"
diff --git a/project/functions.pri b/project/functions.pri
@@ -78,6 +78,35 @@ defineTest(linkLocalLibrary){
     debug(Linking: $$LIB_PATH -$$LIB_NAME with include path: $$LIB_INCLUDE_PATH, 1)
 }
 
+# Links a livecv library to the current project
+#
+# Args: (path, name, [include_dir])
+#  * path: relative path to the library from root
+#  * name: name of the library
+#  * include_dir: include dir path(defaults to library path in source tree + '/include')
+
+defineTest(linkLibrary){
+
+    win32:LIB_PATH = $$DEPLOY_PATH/dev/$$1/lib
+    else:LIB_PATH = $$LIBRARY_DEPLOY_PATH
+
+    LIB_NAME = $$2
+    LIB_INCLUDE_PATH = $$PROJECT_ROOT/lib/$$1/include
+    !isEmpty(LIVECV_DEV_PATH):LIB_INCLUDE_PATH = $$LIVECV_DEV_PATH/lib/$$1/include
+    !isEmpty($$3):LIB_INCLUDE_PATH=$$3
+
+    # use *= instead of += to prevent duplications of link path cofigurations
+    LIBS *= -L$$LIB_PATH
+    LIBS *= -l$$LIB_NAME
+    INCLUDEPATH += $$LIB_INCLUDE_PATH
+    DEPENDPATH  += $$LIB_INCLUDE_PATH
+    export(LIBS)
+    export(INCLUDEPATH)
+    export(DEPENDPATH)
+
+    debug(Linking: $$LIB_PATH -$$LIB_NAME with include path: $$LIB_INCLUDE_PATH, 1)
+}
+
 # Links a local plugin to the current project
 #
 # Args: (path, name, [include_dir])
@@ -129,7 +158,7 @@ defineReplace(pluginLibraryDeployPath){
             exists($$LIVECV_DEV_PATH/plugins/$$1/lib): return($$LIVECV_DEV_PATH/plugins/$$1/lib)
             else: return($$LIVECV_BIN_PATH/dev/plugins/$$1/lib)
         } else {
-            return($$LIBRARY_DEPLOY_PATH)
+            return($$LIVECV_BIN_PATH/plugins/$$1)
         }
     }
 }
diff --git a/project/plugin.pri b/project/plugin.pri
@@ -56,7 +56,7 @@ macx{
     warning(Expected folder $$PLUGIN_QML_DIR)
     qmlcopy.commands =
 } else {
-    qmlcopy.commands = $$deployDirCommand($$PLUGIN_QML_DIR, $$PLUGIN_DEPLOY_PATH/$$PLUGIN_NAME)
+    qmlcopy.commands = $$deployDirCommand($$PLUGIN_QML_DIR, $$PLUGIN_DEPLOY_PATH/$$PLUGIN_PATH)
 }
 
 QMAKE_EXTRA_TARGETS += qmlcopy
diff --git a/samples/core/customfilter.qml b/samples/core/customfilter.qml
@@ -19,9 +19,15 @@ Row{
         height : src.height
         
         onOutputChanged : {
+            // Versions of Qt >= 5.8 have raw buffer processing
+            // which is a lot faster than the current method
+            // If you're using a higher version, you can replace the 
+            // 5.7 lines with 5.8
+            
             var dim   = output.dimensions()
-            var buffer = output.buffer()
-            var uview = new Uint8Array(buffer)
+            var uview = cv.matToArray(output) // 5.7
+            //var buffer = output.buffer() // 5.8
+            //var uview = new Uint8Array(buffer) // 5.8
 
             for ( var i = 0; i < dim.height; ++i ){
                 for ( var j = 0; j < dim.width; ++j ){
@@ -30,6 +36,8 @@ Row{
                         uview[i * dim.width + j] = 0
                 }
             }
+            
+            cv.assignArrayToMat(uview, output) // 5.7
         }
     }
     
