rhodes 5.5.15 → 5.5.17

data/lib/commonAPI/mediacapture/ext/platform/qt/MediaCapture.pro

@@ -1,4 +1,14 @@
-QT += multimedia gui widgets multimediawidgets webkitwidgets core network webkit
+QT += core gui widgets multimedia multimediawidgets network
+
+    lessThan(QT_VERSION, 5.6.0): {
+        QT += webkit widgets webkitwidgets
+        DEFINES += RHODES_VERSION_1
+    }
+    greaterThan(QT_VERSION, 5.6.0): {
+        QT += webengine webenginecore webenginewidgets
+        CONFIG += c++14
+        DEFINES += CPP_ELEVEN RHODES_VERSION_2
+    }
 
 TARGET = Mediacapture
 TEMPLATE = lib
@@ -14,7 +24,7 @@ $$RHODES_ROOT/platform/shared/common\
 $$RHODES_ROOT/platform/shared/rubyext\
 $$RHODES_ROOT/platform/shared/ruby/include\
 $$RHODES_ROOT/platform/shared\
-../../shared\
+../../shared
 
 macx {
   DESTDIR = $$RHODES_ROOT/platform/osx/bin/extensions
@@ -30,6 +40,7 @@ win32 {
   }
   release {
     DEFINES += _NDEBUG NDEBUG
+    #DEFINES += _ITERATOR_DEBUG_LEVEL=2
   }
   INCLUDEPATH += $$RHODES_ROOT/platform/shared/ruby/win32
   RCC_DIR = $$RHODES_ROOT/lib/commonAPI/mediacapture/ext/platform/qt/resources
@@ -55,8 +66,6 @@ win32 {
   QMAKE_CXXFLAGS_DEBUG += -MP9
 }
 
-
-
 HEADERS += \
 ..\..\shared\generated\cpp\ICamera.h\
 ..\..\shared\generated\cpp\CameraBase.h \
@@ -65,7 +74,10 @@ HEADERS += \
     src/ImageFilenameGetterResult.h \
     src/CameraDialogController.h \
     src/CameraDialogView.h \
-    src/CameraDialogBuilder.h
+    src/CameraDialogBuilder.h \
+    src/CameraRefresher.h\
+    $$RHODES_ROOT\platform\shared\qt\rhodes\iexecutable.h
+    $$RHODES_ROOT\platform\shared\qt\rhodes\guithreadfunchelper.h
 
 SOURCES += \
 ..\..\shared\MediacaptureInit.cpp\

data/lib/commonAPI/mediacapture/ext/platform/qt/resources/mediacapture.qrc

@@ -3,5 +3,6 @@
         <file>diaClosed.png</file>
 		<file>diaOpened.png</file>
 		<file>photoSave.png</file>
+		<file>buttonBack.png</file>
     </qresource>
 </RCC>

data/lib/commonAPI/mediacapture/ext/platform/qt/src/CCameraData.cpp

@@ -1,4 +1,5 @@
 #include "CCameraData.h"
+#include "generated/cpp/ICamera.h"
 
 QHash<QString, CCameraData *> CCameraData::camerasKeeper;
 
@@ -28,6 +29,11 @@ const QList<QString> CCameraData::getKeys()
     return camerasKeeper.keys();
 }
 
+const QList<CCameraData *> CCameraData::getValues()
+{
+    return camerasKeeper.values();
+}
+
 
 const CCameraData *CCameraData::addNewCamera(QCameraInfo &info){
     CCameraData * data = new CCameraData(info);
@@ -60,8 +66,8 @@ CCameraData *CCameraData::getCameraData(QString &ID)
 CCameraData::CCameraData(QCameraInfo &info):CameraDialogController(0){
     this->info = info;
     cameraID = QString::number(camerasKeeper.size() + 1);
-    if (info.position() == QCamera::BackFace){cameraType = "back";}
-    else{cameraType = "front";}
+    if (info.position() == QCamera::BackFace){cameraType = QString::fromStdString(rho::ICamera::CAMERA_TYPE_BACK);}
+    else{cameraType = QString::fromStdString(rho::ICamera::CAMERA_TYPE_FRONT);}
 }
 
 
@@ -72,12 +78,13 @@ void CCameraData::showView(rho::apiGenerator::CMethodResult &oResult)
     emit builder->run();
 }
 
-QtMainWindow *CCameraData::getQMainWindow()
+QMainWindow *CCameraData::getQMainWindow()
 {
-    return ((QtMainWindow *) CMainWindow::getInstance()->getQtMainWindow());
+    return IExecutable::getMainWindow();
 }
 
 void CCameraData::choosePicture(rho::apiGenerator::CMethodResult& oResult) {
     ImageFileNameGetter * getter = new ImageFileNameGetter(QThread::currentThread(),oResult,getQMainWindow());
     getter->run();
 }
+

data/lib/commonAPI/mediacapture/ext/platform/qt/src/CCameraData.h

@@ -10,8 +10,6 @@
 #include <QThread>
 #include <QMutex>
 #include <QMutexLocker>
-#include "../../platform/shared/qt/rhodes/QtMainWindow.h"
-#include "../../platform/shared/qt/rhodes/impl/MainWindowImpl.h"
 #include "../../platform/shared/qt/rhodes/iexecutable.h"
 #include "ImageFileNameGetter.h"
 #include "CameraDialogController.h"
@@ -30,24 +28,23 @@ private:
     static QHash<QString, CCameraData *> camerasKeeper;
 
 public:
-    ~CCameraData() {cleanAll();}
+    ~CCameraData() {}//cleanAll();}
     static const CCameraData *addNewCamera(QCameraInfo &info);
     static void cleanAll();
     static const QList<QString> getKeys();
+    static const QList<CCameraData *> getValues();
     static const bool isEmpty();
     static CCameraData *getCameraData(QString &ID);
 
     const QString getCameraType() const;
     const QString getCameraID() const;
 
-    void takeAPicture(rho::apiGenerator::CMethodResult &oResult);
+    //void takeAPicture(rho::apiGenerator::CMethodResult &oResult);
     static QMutex * getMutex();
 
     void showView(rho::apiGenerator::CMethodResult &oResult);
-    static QtMainWindow *getQMainWindow();
+    static QMainWindow *getQMainWindow();
     static void choosePicture(rho::apiGenerator::CMethodResult &oResult);
-public slots:
-
 
 };
 

data/lib/commonAPI/mediacapture/ext/platform/qt/src/CameraDialogView.h

@@ -27,14 +27,12 @@
 #include <QIcon>
 #include "../../../../../platform/shared/api_generator/MethodResult.h"
 #include "../../../../../platform/shared/common/RhoStd.h"
-#include "../../platform/shared/qt/rhodes/QtMainWindow.h"
-#include "../../platform/shared/qt/rhodes/impl/MainWindowImpl.h"
 #include "../../platform/shared/qt/rhodes/iexecutable.h"
 #include "CameraDialogController.h"
 #include <QtPlugin>
 #include <QPluginLoader>
 #include <QJsonObject>
-
+#include <QTextCodec>
 
 class CameraDialogView : public QDialog
 {
@@ -52,13 +50,10 @@ private:
     QCameraImageCapture * imageCapture;
     QCamera * camera;
     CameraDialogController * controller;
-    QLabel * laPreview;
     QImage currentImage;
     bool imageIsSaved;
-    QTimer timerToRestoreCaptureButtonImage;
     QIcon imageCaptureClose;
     QIcon imageCaptureOpened;
-    QIcon imageSave;
     QPushButton * buttonCapture;
 public slots:
     void imageSaved(int id, const QString &fileName);

data/lib/commonAPI/mediacapture/ext/platform/qt/src/CameraRefresher.h

@@ -0,0 +1,54 @@
+#ifndef CAMERAREFRESHER_H
+#define CAMERAREFRESHER_H
+
+#include <QObject>
+#include <QCameraInfo>
+#include <QString>
+#include <QList>
+#include <QEventLoop>
+#include <QtGui>
+#include <QApplication>
+#include "CCameraData.h"
+#include "../../platform/shared/qt/rhodes/guithreadfunchelper.h"
+
+class CameraRefresher : public QObject
+{
+    Q_OBJECT
+
+    explicit CameraRefresher(QObject *parent) : QObject(parent){
+        qRegisterMetaType<QList<QCameraInfo> >("QList<QCameraInfo>");
+        qRegisterMetaType<rho::apiGenerator::CMethodResult>("rho::apiGenerator::CMethodResult");
+    }
+    QEventLoop loop;
+public:
+    static CameraRefresher * getInstance(QObject * parent = 0){
+        static CameraRefresher instance(parent);
+        return &instance;
+    }
+    static void refresh(){
+        getInstance()->getCameraInfo();
+    }
+    ~CameraRefresher(){
+        CCameraData::cleanAll();
+    }
+
+public slots:
+    void getCameraInfo(){
+        QMetaObject::invokeMethod(GuiThreadFuncHelper::getInstance(), "availableCameras",
+                                  Qt::QueuedConnection, Q_ARG(QObject *, this));
+        QTimer::singleShot(100, &(this->loop), SLOT(quit()));
+        loop.exec();
+    }
+
+    void availableCameras(QList<QCameraInfo> info){
+        QMutexLocker locker(CCameraData::getMutex());
+        if(CCameraData::isEmpty()){
+            foreach (QCameraInfo cameraInfo, info) {
+                const CCameraData * data = CCameraData::addNewCamera(cameraInfo);
+            }
+        }
+        loop.quit();
+    }
+};
+
+#endif // CAMERAREFRESHER_H

data/lib/commonAPI/mediacapture/ext/platform/qt/src/Camera_impl.cpp

@@ -2,6 +2,8 @@
 //  CameraImpl.cpp
 #include <Qt>
 #include <QHash>
+#include <QtGui>
+#include <QtWidgets>
 #include <QApplication>
 #include <QWindow>
 #include "CCameraData.h"
@@ -11,6 +13,7 @@
 #include "common/RhoConf.h"
 #include "generated/cpp/CameraBase.h"
 #include "logging/RhoLog.h"
+#include "camerarefresher.h"
 
 namespace rho {
     
@@ -20,24 +23,24 @@ namespace rho {
     class CCameraSingletonImpl: public CCameraSingletonBase
     {
         QHash<QString, QString> defaultCameras;
-
     public:
 
-        CCameraSingletonImpl(): CCameraSingletonBase()
-        {
-            qRegisterMetaType<rho::apiGenerator::CMethodResult>("rho::apiGenerator::CMethodResult");
+        CCameraSingletonImpl(): CCameraSingletonBase() {
+            if (CCameraData::getValues().isEmpty()){CameraRefresher::refresh();}
+            foreach (CCameraData * data, CCameraData::getValues()) {
+                defaultCameras.insert(data->getCameraType(), data->getCameraID());
+            }
         }
 
         virtual ~CCameraSingletonImpl(){
-            QMutexLocker locker(CCameraData::getMutex());
-            CCameraData::cleanAll();
+
         }
         
         //methods
         // enumerate Returns the cameras present on your device, allowing you to access your device's front or back camera. 
         virtual void enumerate(rho::apiGenerator::CMethodResult& oResult) {
-            initCameras();
             rho::Vector<rho::String> arIDs = oResult.getStringArray();
+
             if(!CCameraData::isEmpty()){
                 foreach (QString value, CCameraData::getKeys()) {
                     arIDs.addElement(value.toStdString());
@@ -47,16 +50,6 @@ namespace rho {
 
         } 
 
-        void initCameras(){
-            QMutexLocker locker(CCameraData::getMutex());
-            if(CCameraData::isEmpty()){
-                foreach (QCameraInfo cameraInfo, QCameraInfo::availableCameras()) {
-                    const CCameraData * data = CCameraData::addNewCamera(cameraInfo);
-                    defaultCameras.insert(data->getCameraType(), data->getCameraID());
-                }
-            }
-        }
-
         // getCameraByType Returns the camera of requested type if that camera exist - else return nil. 
         virtual void getCameraByType( const rho::String& cameraType, rho::apiGenerator::CMethodResult& oResult) {
             oResult.set(defaultCameras.value(QString::fromStdString(cameraType)).toStdString());
@@ -68,7 +61,8 @@ namespace rho {
         }
 
         virtual void choosePicture( const rho::Hashtable<rho::String, rho::String>& propertyMap, rho::apiGenerator::CMethodResult& oResult) {
-            // RAWLOGC_INFO("choosePicture","Camera");           
+            // RAWLOGC_INFO("choosePicture","Camera");
+
             CCameraData::choosePicture(oResult);
         } 
         // copyImageToDeviceGallery Save an image to the device gallery. 
@@ -82,10 +76,9 @@ namespace rho {
         } 
 
         virtual rho::String getInitialDefaultID(){
-            initCameras();
-            QString defaultId = defaultCameras.value("front");
+            QString defaultId = defaultCameras.value(ICamera::CAMERA_TYPE_FRONT);
             if (!defaultId.isEmpty()) return defaultId.toStdString();
-            else return defaultCameras.value("back").toStdString();
+            else return defaultCameras.value(ICamera::CAMERA_TYPE_BACK).toStdString();
         }
 
     };
@@ -276,6 +269,7 @@ namespace rho {
         } 
 
         virtual void capture(rho::apiGenerator::CMethodResult& oResult) {
+
             if (camera == nullptr) {
                 rho::Hashtable<rho::String, rho::String>& mapRes = oResult.getStringHash();
                 mapRes["status"] = "error";

data/lib/commonAPI/mediacapture/ext/platform/qt/src/ImageFilenameGetterResult.h

@@ -3,6 +3,8 @@
 
 #include "../../platform/shared/qt/rhodes/iexecutable.h"
 #include "CameraDialogView.h"
+#include <QFile>
+#include <QFileInfo>
 #include <QDebug>
 
 class ImageFileNameGetterResult : public IExecutable
@@ -21,8 +23,11 @@ private:
 public slots:
     void execute(){
         rho::Hashtable<rho::String,rho::String>& mapRes = result.getStringHash();
-        if (!fileName.isEmpty()){
-            CameraDialogView::getImageData(mapRes, fileName);
+        QFileInfo fInfo(fileName);
+        QString newFileName = CameraDialogView::getImageDir().absolutePath() + "/" + fInfo.fileName();
+
+        if(fInfo.isFile() && !newFileName.isEmpty() && QFile::copy(fileName,newFileName)){
+            CameraDialogView::getImageData(mapRes, newFileName);
         }else{
             mapRes["status"] = "cancel";
             mapRes["message"] = "Open file dialog has been canceled";

data/lib/commonAPI/mediacapture/ext/platform/qt/src/cameradialogview.cpp

@@ -1,8 +1,10 @@
 #include "CameraDialogView.h"
 
-
 CameraDialogView::CameraDialogView(QCameraInfo &info, rho::apiGenerator::CMethodResult &oResult,
                                    CameraDialogController *controller, QWidget *parent) : QDialog(parent){
+    this->showFullScreen();
+    this->setStyleSheet("QDialog { background-color: black }");
+
     camera = new QCamera(info, this);
     this->oResult = oResult;
     this->controller = controller;
@@ -18,46 +20,47 @@ CameraDialogView::CameraDialogView(QCameraInfo &info, rho::apiGenerator::CMethod
 
     connect(imageCapture, SIGNAL(imageSaved(int, const QString)), this, SLOT(imageSaved(int,const QString)));
 
-    QHBoxLayout * hblay = new QHBoxLayout(this);
 
-    QVBoxLayout * vblay = new QVBoxLayout();
+
+    QVBoxLayout * vblay = new QVBoxLayout(this);
     videoWidget = new QVideoWidget(this);
     vblay->addWidget(videoWidget,0,Qt::AlignCenter);
-    videoWidget->setFixedWidth(300);
     Q_INIT_RESOURCE(mediacapture);
 
     imageCaptureClose = QIcon(":/mcimages/diaClosed.png");
-
     imageCaptureOpened = QIcon(":/mcimages/diaOpened.png");
-    imageSave = QIcon(":/mcimages/photoSave.png");
 
-    connect(&timerToRestoreCaptureButtonImage, SIGNAL(timeout()), this, SLOT(restoreCaptureButtonImage()));
-    timerToRestoreCaptureButtonImage.setSingleShot(true);
+    QHBoxLayout * hblay = new QHBoxLayout();
 
     buttonCapture = new QPushButton(imageCaptureOpened, "", this);
     buttonCapture->setFixedSize(50,50);
     buttonCapture->setIconSize(QSize(40,40));
-    vblay->addWidget(buttonCapture,0,Qt::AlignCenter);
     connect(buttonCapture, SIGNAL(clicked(bool)), this, SLOT(capture()));
     connect(imageCapture, SIGNAL(imageCaptured(int,QImage)), this, SLOT(imageCaptured(int,QImage)));
-    hblay->addLayout(vblay);
-
-    vblay = new QVBoxLayout();
-    laPreview = new QLabel(this);
-    vblay->addWidget(laPreview,0,Qt::AlignCenter);
-    QPushButton * buttonSave = new QPushButton(imageSave,"",this);
-    buttonSave->setFixedSize(50,50);
-    buttonSave->setIconSize(QSize(35,35));
-
-    connect(buttonSave, SIGNAL(clicked(bool)), this, SLOT(saveCurrentImage()));
-    vblay->addWidget(buttonSave,0,Qt::AlignCenter);
-    hblay->addSpacing(4);
-    hblay->addLayout(vblay);
-    hblay->setMargin(1);
-    hblay->setSpacing(1);
+
+    QIcon iconBack = QIcon(":/mcimages/buttonBack.png");
+    QPushButton * buttonBack = new QPushButton(iconBack,"",this);
+    connect(buttonBack, SIGNAL(clicked(bool)), this, SLOT(reject()));
+    hblay->addWidget(buttonBack);
+    buttonBack->setFixedSize(50,50);
+    buttonBack->setIconSize(QSize(40,40));
+
+
+    QLabel * empty = new QLabel(this);
+    empty->setFixedWidth(50);
+
+    vblay->addSpacing(20);
+    vblay->addLayout(hblay);
+    hblay->addWidget(buttonBack);
+    hblay->addWidget(buttonCapture);
+    hblay->addWidget(empty);
+
+    vblay->addSpacing(20);
+
+    vblay->setMargin(1);
+    vblay->setSpacing(1);
 
     currentImage = QImage(640,480,QImage::Format_ARGB32);
-    laPreview->setPixmap(QPixmap::fromImage(currentImage.scaledToWidth(videoWidget->size().width())));
 
     camera->setCaptureMode(QCamera::CaptureViewfinder);
     camera->focus()->setFocusMode(QCameraFocus::AutoFocus);
@@ -70,8 +73,6 @@ CameraDialogView::CameraDialogView(QCameraInfo &info, rho::apiGenerator::CMethod
     connect(this, SIGNAL(rejected()), this, SLOT(deleteLater()), Qt::QueuedConnection);
     camera->start();
     camera->searchAndLock();
-
-    setFixedSize(minimumWidth(), minimumHeight());
 }
 
 CameraDialogView::~CameraDialogView()
@@ -92,7 +93,7 @@ void CameraDialogView::error()
     qDebug() << "Error in Taking Picture";
 
     rho::Hashtable<rho::String, rho::String>& mapRes = oResult.getStringHash();
-    mapRes["status"] = "error";
+    mapRes["status"] = "cancel";
     mapRes["message"] = "Dialog canceled without saving";
     oResult.set(mapRes);
 }
@@ -102,13 +103,12 @@ void CameraDialogView::capture()
 {
     buttonCapture->setIcon(imageCaptureClose);
     imageCapture->capture("dev/null");
-    timerToRestoreCaptureButtonImage.start(300);
+    QTimer::singleShot(300, this, SLOT(restoreCaptureButtonImage()));
 }
 
 void CameraDialogView::imageCaptured(int id, const QImage &preview)
 {
     currentImage = preview;
-    laPreview->setPixmap(QPixmap::fromImage(currentImage.scaledToWidth(videoWidget->size().width())));
 }
 
 
@@ -140,6 +140,7 @@ void CameraDialogView::saveCurrentImage()
 void CameraDialogView::restoreCaptureButtonImage()
 {
     buttonCapture->setIcon(imageCaptureOpened);
+    QTimer::singleShot(300, this, SLOT(saveCurrentImage()));
 }
 
 
@@ -170,9 +171,10 @@ void CameraDialogView::getImageData(rho::Hashtable<rho::String, rho::String> &ma
 
 QDir CameraDialogView::getImageDir()
 {
-    QDir dir = QDir(QDir::current().absolutePath()+"/db/db-files/");
+    QDir dir = QDir(qApp->applicationDirPath()+"/db/db-files/");
     if (!dir.exists()) dir.mkpath(dir.absolutePath());
-    return dir;
+    if (dir.exists()){return dir;}
+    else{QDir::current();}
 }