qmlui: improve Scene editor fixture selection

mcallegari · Nov 24, 2024 · 97756c0 · 97756c0
1 parent 456f228
commit 97756c0
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 31 deletions.
diff --git a/qmlui/modelselector.cpp b/qmlui/modelselector.cpp
@@ -40,6 +40,8 @@ void ModelSelector::selectSingleItem(int index, ListModel *model)
     model->setDataWithRole(idx, "isSelected", true);
     m_selectedIndices.append(index);
     m_itemsCount++;
+
+    emit itemSelectionChanged(index, true);
 }
 
 void ModelSelector::selectItem(int index, ListModel *model, int keyModifiers)
@@ -78,6 +80,7 @@ void ModelSelector::resetSelection(ListModel *model)
     {
         QModelIndex idx = model->index(int(sidx), 0, QModelIndex());
         model->setDataWithRole(idx, "isSelected", false);
+        emit itemSelectionChanged(sidx, false);
     }
 
     m_selectedIndices.clear();

diff --git a/qmlui/modelselector.h b/qmlui/modelselector.h
@@ -55,6 +55,7 @@ class ModelSelector : public QObject
 
 signals:
     void itemsCountChanged(int itemsCount);
+    void itemSelectionChanged(int itemIndex, bool selected);
 
 private:
     /** List of the currently selected item indices */

diff --git a/qmlui/qml/fixturesfunctions/SceneEditor.qml b/qmlui/qml/fixturesfunctions/SceneEditor.qml
@@ -58,7 +58,17 @@ Rectangle
     ModelSelector
     {
         id: seSelector
-        onItemsCountChanged: console.log("Scene Editor selected items changed!")
+        //onItemsCountChanged: console.log("Scene Editor selected items changed!")
+        onItemSelectionChanged:
+        {
+            var item = sfxList.itemAtIndex(itemIndex)
+            if (item.itemType === App.FixtureDragItem)
+            {
+                contextManager.setFixtureIDSelection(item.itemId, selected)
+                if (selected)
+                    sceneEditor.setFixtureSelection(item.itemId)
+            }
+        }
     }
 
     TimeEditTool
@@ -238,6 +248,7 @@ Rectangle
                         color: "transparent"
 
                         property int itemType: model.type
+                        property int itemId: model.cRef.id
 
                         Rectangle
                         {
@@ -273,44 +284,17 @@ Rectangle
 
                                 onClicked:
                                 {
-                                    seSelector.selectItem(index, sfxList.model, mouse.modifiers)
-
                                     if (compDelegate.itemType === App.FixtureDragItem)
                                     {
-                                        if (!(mouse.modifiers & Qt.ControlModifier))
+                                        if (!mouse.modifiers)
                                             contextManager.resetFixtureSelection()
-
-                                        contextManager.setFixtureIDSelection(model.cRef.id, true)
-                                        sceneEditor.setFixtureSelection(model.cRef.id)
                                     }
-                                }
-                                //onDoubleClicked: fxDelegate.mouseEvent(App.DoubleClicked, cRef.id, cRef.type, fxDelegate, -1)
-                            }
-                        }
-                    }
-    /*
-                    FixtureDelegate
-                    {
-                        cRef: model.cRef
-                        width: seContainer.width
-                        isSelected: model.isSelected
-                        Component.onCompleted: contextManager.setFixtureIDSelection(cRef.id, true)
-                        Component.onDestruction: if (contextManager) contextManager.setFixtureIDSelection(cRef.id, false)
-                        onMouseEvent:
-                        {
-                            if (type === App.Clicked)
-                            {
-                                seSelector.selectItem(index, sfxList.model, mouseMods)
-
-                                if (!(mouseMods & Qt.ControlModifier))
-                                    contextManager.resetFixtureSelection()
 
-                                contextManager.setFixtureIDSelection(cRef.id, true)
-                                sceneEditor.setFixtureSelection(cRef.id)
+                                    seSelector.selectItem(index, sfxList.model, mouse.modifiers)
+                                }
                             }
                         }
                     }
-    */
 
                 DropArea
                 {