ModelTweak: QA & Bugfix

Update QuickLoad/QuickSave with proper use of Q_INVOKABLE and signals.
Fix default Effect{} on Item3D.

Change-Id: Ib925f69cb4fbffb5f967f81bb1b6fd3c73eb308a
Reviewed-by: Patrick Burke <patrick.burke@nokia.com>

4 files changed, 16 insertions, 14 deletions

diff --git a/util/qt3d/modeltweak/QuickLoad.h b/util/qt3d/modeltweak/QuickLoad.h
index bfa79028..3ad0ee70 100644
--- a/util/qt3d/modeltweak/QuickLoad.h
+++ b/util/qt3d/modeltweak/QuickLoad.h
@@ -7,18 +7,20 @@
 #include <QFileDialog>
 #include <QDebug>
 
-class QuickLoad : public QObject {
+class QuickLoad : public QObject
+{
     Q_OBJECT
 
     QString _filename;
 
-    Q_PROPERTY(QString openModelFile READ openModelFile)
     Q_PROPERTY(QString filename READ filename WRITE setFilename NOTIFY filenameChanged)
+
 public:
     QuickLoad(QObject *parent=0) : QObject(parent) {}
 
-    QString openModelFile() {
-        QString qmlFilename = QFileDialog::getOpenFileName(0, tr("Open Model File"), "",tr("Files (*.*)"));
+    Q_INVOKABLE QString openModelFile()
+    {
+        QString qmlFilename = QFileDialog::getOpenFileName(0, tr("Open Model File"), "",tr("Model Files (*.*)"));
 
         setFilename(qmlFilename);
 
diff --git a/util/qt3d/modeltweak/QuickSave.h b/util/qt3d/modeltweak/QuickSave.h
index ab3a06ee..8e854b20 100644
--- a/util/qt3d/modeltweak/QuickSave.h
+++ b/util/qt3d/modeltweak/QuickSave.h
@@ -7,15 +7,16 @@
 #include <QFileDialog>
 #include <QDebug>
 
-class QuickSave : public QObject {
+class QuickSave : public QObject
+{
     Q_OBJECT
 
     QString _filename;
     QString _data;
 
-    Q_PROPERTY(QString save READ save)
     Q_PROPERTY(QString filename READ filename WRITE setFilename)
     Q_PROPERTY(QString data READ data WRITE setData)
+
 public:
     QuickSave(QObject *parent=0) : QObject(parent) {}
 
@@ -48,14 +49,15 @@ public:
         return QString();
     }
 
-    //TODO: these really should be emitting signals upon changing;
-    //      but we don't display them so it doesn't technically matter
     QString filename() const { return _filename; }
-    void setFilename(const QString filename) { if (_filename != filename) _filename = filename; }
+    void setFilename(const QString filename) { if (_filename != filename) _filename = filename; emit filenameChanged(filename); }
 
     QString data() const { return _data; }
-    void setData(const QString data) { if (_data != data) _data = data; }
+    void setData(const QString data) { if (_data != data) _data = data; emit dataChanged(data); }
 
+signals:
+    void filenameChanged(const QString newFilename);
+    void dataChanged(const QString newData);
 };
 
 #endif // QUICKSAVE_H
diff --git a/util/qt3d/modeltweak/qml/ButtonBarPane.qml b/util/qt3d/modeltweak/qml/ButtonBarPane.qml
index b59874a9..ca792ca9 100644
--- a/util/qt3d/modeltweak/qml/ButtonBarPane.qml
+++ b/util/qt3d/modeltweak/qml/ButtonBarPane.qml
@@ -57,7 +57,6 @@ Flow {
                     "    }\n" +
                     "\n" +
                     "    mesh: source_mesh\n" +
-                    "    effect: Effect {}\n" +
                     "    transform: [\n" +
                     "        transformScale\n" +
                     "        transformRotateX,\n" +
@@ -69,7 +68,7 @@ Flow {
 
             quickSave.filename = source_mesh.source
             quickSave.data = saveData
-            var result = quickSave.save
+            var result = quickSave.save()
             console.log("If there was an error it will be after here:" + result)
         }
     }
@@ -77,7 +76,7 @@ Flow {
     BlenderToggle {
         width: buttonWidth
         buttonText: "Load!"
-        function onClicked() { console.log(quickLoad.openModelFile); }
+        function onClicked() { console.log(quickLoad.openModelFile()); }
     }
 
     BlenderToggle {
diff --git a/util/qt3d/modeltweak/qml/ModelViewport.qml b/util/qt3d/modeltweak/qml/ModelViewport.qml
index c633898e..ce9cfe99 100644
--- a/util/qt3d/modeltweak/qml/ModelViewport.qml
+++ b/util/qt3d/modeltweak/qml/ModelViewport.qml
@@ -64,7 +64,6 @@ Rectangle {
         Item3D {
             id: mainItem
             mesh: source_mesh
-            effect: Effect {}
             transform: [
                 transformScale,
                 transformRotateX,