Implement navigation by characters for script breakdown module

+ add ability to reorder top-level location objects
story-apps · Mar 9, 2023 · 7163f7a · 7163f7a
1 parent 4ec4f4b
commit 7163f7a
Show file tree

Hide file tree

Showing 22 changed files with 624 additions and 217 deletions.
diff --git a/src/core/management_layer/content/project/project_manager.cpp b/src/core/management_layer/content/project/project_manager.cpp
@@ -1913,7 +1913,8 @@ ProjectManager::ProjectManager(QObject* _parent, QWidget* _parentWidget,
                                           Domain::DocumentObjectType::Character, _name, _content);
             });
     connect(&d->modelsFacade, &ProjectModelsFacade::moveCharacterRequested,
-            d->projectStructureModel, &BusinessLayer::StructureModel::moveCharacter);
+            d->projectStructureModel,
+            qOverload<const QUuid&, int>(&BusinessLayer::StructureModel::moveItem));
     connect(&d->modelsFacade, &ProjectModelsFacade::characterNameChanged, this,
             [this](BusinessLayer::AbstractModel* _character, const QString& _newName,
                    const QString& _oldName) {
@@ -2086,6 +2087,8 @@ ProjectManager::ProjectManager(QObject* _parent, QWidget* _parentWidget,
                 d->addDocumentToContainer(Domain::DocumentObjectType::Locations,
                                           Domain::DocumentObjectType::Location, _name, _content);
             });
+    connect(&d->modelsFacade, &ProjectModelsFacade::moveLocationRequested, d->projectStructureModel,
+            qOverload<const QUuid&, int>(&BusinessLayer::StructureModel::moveItem));
     connect(&d->modelsFacade, &ProjectModelsFacade::locationNameChanged, this,
             [this](BusinessLayer::AbstractModel* _location, const QString& _newName,
                    const QString& _oldName) {

diff --git a/src/core/management_layer/content/project/project_models_facade.cpp b/src/core/management_layer/content/project/project_models_facade.cpp
@@ -1028,6 +1028,8 @@ BusinessLayer::AbstractModel* ProjectModelsFacade::modelFor(Domain::DocumentObje
 
             connect(locationsModel, &BusinessLayer::LocationsModel::createLocationRequested, this,
                     &ProjectModelsFacade::createLocationRequested);
+            connect(locationsModel, &BusinessLayer::LocationsModel::moveLocationRequested, this,
+                    &ProjectModelsFacade::moveLocationRequested);
 
             model = locationsModel;
             break;

diff --git a/src/core/management_layer/content/project/project_models_facade.h b/src/core/management_layer/content/project/project_models_facade.h
@@ -190,6 +190,11 @@ class ProjectModelsFacade : public QObject
      */
     void createLocationRequested(const QString& _name, const QByteArray& _content);
 
+    /**
+     * @brief Необходимо переставить локацию в новое место
+     */
+    void moveLocationRequested(const QUuid& _uuid, int _to);
+
     /**
      * @brief Изменилось название локации
      */

diff --git a/src/core/management_layer/plugins/screenplay_breakdown b/src/core/management_layer/plugins/screenplay_breakdown
diff --git a/...ay_breakdown_structure/business_layer/screenplay_breakdown_structure_characters_model.cpp b/...ay_breakdown_structure/business_layer/screenplay_breakdown_structure_characters_model.cpp
@@ -15,8 +15,6 @@
 #include <QMimeData>
 #include <QPointer>
 
-#include <set>
-
 
 namespace BusinessLayer {
 
@@ -139,7 +137,6 @@ QModelIndex ScreenplayBreakdownStructureCharactersModel::Implementation::indexFo
 
 void ScreenplayBreakdownStructureCharactersModel::Implementation::clear()
 {
-    charactersToSave.clear();
     lastHighlightedItems.clear();
 
     if (!rootItem->hasChildren()) {
@@ -342,6 +339,7 @@ void ScreenplayBreakdownStructureCharactersModel::setSourceModel(ScreenplayTextM
     if (!d->model.isNull()) {
         disconnect(d->model);
         d->clear();
+        d->charactersToSave.clear();
     }
 
     d->model = _model;
@@ -377,9 +375,6 @@ void ScreenplayBreakdownStructureCharactersModel::sortBy(ScreenplayBreakdownSort
     for (int index = 0; index < d->rootItem->childCount(); ++index) {
         characters.append(d->rootItem->childAt(index));
     }
-    //
-    // ... если понадобится порядок следования в сценарии, определим его
-    //
     std::sort(characters.begin(), characters.end(),
               [_sortOrder](ScreenplayBreakdownStructureModelItem* _lhs,
                            ScreenplayBreakdownStructureModelItem* _rhs) {