Fix bugs in qml plugin

cweiland · May 19, 2014 · e9dc03b · e9dc03b
1 parent dfe4d80
commit e9dc03b
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 14 deletions.
diff --git a/src/examples/example11/GLC_Quick.qml b/src/examples/example11/GLC_Quick.qml
@@ -27,9 +27,9 @@ Rectangle {
                 source: ":model/Democles.dae"
                 spacePartitionningEnabled: true
                 onSelectionChanged : {
-                    if (!view1.selection.isEmpty)
+                    if (!view1.selection.isEmpty())
                     {
-                        selectionInfo.text= view1.selection.first.id;
+                        selectionInfo.text= view1.selection.first().id;
                     }
                     else
                     {

diff --git a/src/lib/qml/glc_quickitem.h b/src/lib/qml/glc_quickitem.h
@@ -72,7 +72,7 @@ class GLC_LIB_EXPORT GLC_QuickItem : public QQuickItem
     Q_PROPERTY(QVector3D defaultUpVector READ defaultUpVector WRITE setDefaultUpVector)
 
     //! Current selection
-    Q_PROPERTY(GLC_QuickSelection* selection READ selection NOTIFY selectionChanged)
+    Q_PROPERTY(GLC_QuickSelection* selection READ selection)
 
 
 //////////////////////////////////////////////////////////////////////

diff --git a/src/lib/qml/glc_quickselection.h b/src/lib/qml/glc_quickselection.h
@@ -18,31 +18,24 @@
 class GLC_LIB_EXPORT GLC_QuickSelection : public QObject
 {
     Q_OBJECT
-    Q_PROPERTY(QList<GLC_QuickOccurrence*> occurrences READ occurrences)
-    Q_PROPERTY(int count READ count)
-    Q_PROPERTY(GLC_QuickOccurrence* first READ first)
-    Q_PROPERTY(bool isEmpty READ isEmpty)
 
 public:
     explicit GLC_QuickSelection(QObject *parent = 0);
     virtual ~GLC_QuickSelection();
 
 public:
-    QList<GLC_QuickOccurrence*> occurrences() const
-    {return m_Occurrences;}
-
-    int count() const
+    Q_INVOKABLE int count() const
     {return m_Occurrences.count();}
 
-    GLC_QuickOccurrence* first() const
+    Q_INVOKABLE GLC_QuickOccurrence* first() const
     {return m_Occurrences.first();}
 
     Q_INVOKABLE GLC_QuickOccurrence* at(int i) const
     {return m_Occurrences.at(i);}
 
     void setWorld(const GLC_World& world);
 
-    bool isEmpty()
+    Q_INVOKABLE bool isEmpty() const
     {return m_Occurrences.isEmpty();}
 
 signals:

diff --git a/src/plugins/GLC_ViewerItem/glc_vieweritem_plugin.cpp b/src/plugins/GLC_ViewerItem/glc_vieweritem_plugin.cpp
@@ -11,8 +11,8 @@ void GLC_ViewerItemPlugin::registerTypes(const char *uri)
     // @uri glclib
     qmlRegisterType<GLC_QuickItem>(uri, 1, 0, "GLC_QuickItem");
     qmlRegisterType<GLC_QuickCamera>();
-    qmlRegisterType<GLC_QuickSelection>();
     qmlRegisterType<GLC_QuickOccurrence>();
+    qmlRegisterType<GLC_QuickSelection>();
 }