GIT_REPOSITORIES/LPP/Users/mperrinel/SciQLop-fork Commit - r1370:8af4c223fdc1

Save a statical catalogue now remove events save gui button

perrinel -

r1370:8af4c223fdc1

parent child

Context file:

r1370:8af4c223fdc1

core/src/Catalogue/CatalogueController.cpp +8 0

             #include <Catalogue/CatalogueController.h>
             #include <Variable/Variable.h>
             #include <CatalogueDao.h>
             #include <ComparaisonPredicate.h>
             #include <CompoundPredicate.h>
             #include <DBCatalogue.h>
             #include <DBEvent.h>
             #include <DBEventProduct.h>
             #include <DBTag.h>
             #include <IRequestPredicate.h>
             #include <QDataStream>
             #include <QMutex>
             #include <QThread>
             #include <QDir>
             #include <QStandardPaths>
             Q_LOGGING_CATEGORY(LOG_CatalogueController, "CatalogueController")
             namespace {
             static QString REPOSITORY_WORK_SUFFIX = QString{"_work"};
             static QString REPOSITORY_TRASH_SUFFIX = QString{"_trash"};
             }
             /**
              * Possible types of an repository
              */
             enum class DBType { SYNC, WORK, TRASH };
             class CatalogueController::CatalogueControllerPrivate {
             public:
                 explicit CatalogueControllerPrivate(CatalogueController *parent) : m_Q{parent} {}
                 CatalogueDao m_CatalogueDao;
                 QStringList m_RepositoryList;
                 CatalogueController *m_Q;
                 QSet<QString> m_KeysWithChanges;
                 QString eventUniqueKey(const std::shared_ptr<DBEvent> &event) const;
                 QString catalogueUniqueKey(const std::shared_ptr<DBCatalogue> &catalogue) const;
                 void copyDBtoDB(const QString &dbFrom, const QString &dbTo);
                 QString toWorkRepository(QString repository);
                 QString toSyncRepository(QString repository);
                 void savAllDB();
                 void saveEvent(std::shared_ptr<DBEvent> event, bool persist = true);
                 void saveCatalogue(std::shared_ptr<DBCatalogue> catalogue, bool persist = true);
                 std::shared_ptr<IRequestPredicate> createFinder(const QUuid &uniqId, const QString &repository,
                                                                 DBType type);
             };
             CatalogueController::CatalogueController(QObject *parent)
                     : impl{spimpl::make_unique_impl<CatalogueControllerPrivate>(this)}
             {
                 qCDebug(LOG_CatalogueController()) << tr("CatalogueController construction")
                                                    << QThread::currentThread();
             }
             CatalogueController::~CatalogueController()
             {
                 qCDebug(LOG_CatalogueController()) << tr("CatalogueController destruction")
                                                    << QThread::currentThread();
             }
             QStringList CatalogueController::getRepositories() const
             {
                 return impl->m_RepositoryList;
             }
             void CatalogueController::addDB(const QString &dbPath)
             {
                 QDir dbDir(dbPath);
                 if (dbDir.exists()) {
                     auto dirName = dbDir.dirName();
                     if (std::find(impl->m_RepositoryList.cbegin(), impl->m_RepositoryList.cend(), dirName)
                         != impl->m_RepositoryList.cend()) {
                         qCCritical(LOG_CatalogueController())
                             << tr("Impossible to addDB that is already loaded");
                     }
                     if (!impl->m_CatalogueDao.addDB(dbPath, dirName)) {
                         qCCritical(LOG_CatalogueController())
                             << tr("Impossible to addDB %1 from %2 ").arg(dirName, dbPath);
                     }
                     else {
                         impl->m_RepositoryList << dirName;
                         impl->copyDBtoDB(dirName, impl->toWorkRepository(dirName));
                     }
                 }
                 else {
                     qCCritical(LOG_CatalogueController()) << tr("Impossible to addDB that not exists: ")
                                                           << dbPath;
                 }
             }
             void CatalogueController::saveDB(const QString &destinationPath, const QString &repository)
             {
                 if (!impl->m_CatalogueDao.saveDB(destinationPath, repository)) {
                     qCCritical(LOG_CatalogueController())
                         << tr("Impossible to saveDB %1 from %2 ").arg(repository, destinationPath);
                 }
             }
             std::list<std::shared_ptr<DBEvent> >
             CatalogueController::retrieveEvents(const QString &repository) const
             {
                 QString dbDireName = repository.isEmpty() ? REPOSITORY_DEFAULT : repository;
                 auto eventsShared = std::list<std::shared_ptr<DBEvent> >{};
                 auto events = impl->m_CatalogueDao.getEvents(impl->toWorkRepository(dbDireName));
                 for (auto event : events) {
                     eventsShared.push_back(std::make_shared<DBEvent>(event));
                 }
                 return eventsShared;
             }
             std::list<std::shared_ptr<DBEvent> > CatalogueController::retrieveAllEvents() const
             {
                 auto eventsShared = std::list<std::shared_ptr<DBEvent> >{};
                 for (auto repository : impl->m_RepositoryList) {
                     eventsShared.splice(eventsShared.end(), retrieveEvents(repository));
                 }
                 return eventsShared;
             }
             std::list<std::shared_ptr<DBEvent> >
             CatalogueController::retrieveEventsFromCatalogue(std::shared_ptr<DBCatalogue> catalogue) const
             {
                 auto eventsShared = std::list<std::shared_ptr<DBEvent> >{};
                 auto events = impl->m_CatalogueDao.getCatalogueEvents(*catalogue);
                 for (auto event : events) {
                     eventsShared.push_back(std::make_shared<DBEvent>(event));
                 }
                 return eventsShared;
             }
             void CatalogueController::updateEvent(std::shared_ptr<DBEvent> event)
             {
                 event->setRepository(impl->toWorkRepository(event->getRepository()));
                 auto uniqueId = impl->eventUniqueKey(event);
                 impl->m_KeysWithChanges.insert(uniqueId);
                 impl->m_CatalogueDao.updateEvent(*event);
             }
             void CatalogueController::updateEventProduct(std::shared_ptr<DBEventProduct> eventProduct)
             {
                 impl->m_CatalogueDao.updateEventProduct(*eventProduct);
             }
             void CatalogueController::removeEvent(std::shared_ptr<DBEvent> event)
             {
                 // Remove it from both repository and repository_work
                 event->setRepository(impl->toWorkRepository(event->getRepository()));
                 impl->m_CatalogueDao.removeEvent(*event);
                 event->setRepository(impl->toSyncRepository(event->getRepository()));
                 impl->m_CatalogueDao.removeEvent(*event);
                 impl->savAllDB();
             }
             void CatalogueController::addEvent(std::shared_ptr<DBEvent> event)
             {
                 event->setRepository(impl->toWorkRepository(event->getRepository()));
                 auto eventTemp = *event;
                 impl->m_CatalogueDao.addEvent(eventTemp);
                 // Call update is necessary at the creation of add Event if it has some tags or some event
                 // products
                 if (!event->getEventProducts().empty() || !event->getTags().empty()) {
                     auto eventProductsTemp = eventTemp.getEventProducts();
                     auto eventProductTempUpdated = std::list<DBEventProduct>{};
                     for (auto eventProductTemp : eventProductsTemp) {
                         eventProductTemp.setEvent(eventTemp);
                         eventProductTempUpdated.push_back(eventProductTemp);
                     }
                     eventTemp.setEventProducts(eventProductTempUpdated);
                     impl->m_CatalogueDao.updateEvent(eventTemp);
                 }
                 auto workPred = impl->createFinder(event->getUniqId(), event->getRepository(), DBType::WORK);
                 auto workEvent = impl->m_CatalogueDao.getEvent(workPred);
                 *event = workEvent;
                 auto uniqueId = impl->eventUniqueKey(event);
                 impl->m_KeysWithChanges.insert(uniqueId);
             }
             void CatalogueController::saveEvent(std::shared_ptr<DBEvent> event)
             {
                 impl->saveEvent(event, true);
                 impl->m_KeysWithChanges.remove(impl->eventUniqueKey(event));
             }
             void CatalogueController::discardEvent(std::shared_ptr<DBEvent> event, bool &removed)
             {
                 auto syncPred = impl->createFinder(event->getUniqId(), event->getRepository(), DBType::SYNC);
                 auto workPred = impl->createFinder(event->getUniqId(), event->getRepository(), DBType::WORK);
                 auto syncEvent = impl->m_CatalogueDao.getEvent(syncPred);
                 if (!syncEvent.getUniqId().isNull()) {
                     removed = false;
                     impl->m_CatalogueDao.copyEvent(syncEvent, impl->toWorkRepository(event->getRepository()),
                                                    true);
                     auto workEvent = impl->m_CatalogueDao.getEvent(workPred);
                     *event = workEvent;
                     impl->m_KeysWithChanges.remove(impl->eventUniqueKey(event));
                 }
                 else {
                     removed = true;
                     // Since the element wasn't in sync repository. Discard it means remove it
                     event->setRepository(impl->toWorkRepository(event->getRepository()));
                     impl->m_CatalogueDao.removeEvent(*event);
                 }
             }
             bool CatalogueController::eventHasChanges(std::shared_ptr<DBEvent> event) const
             {
                 return impl->m_KeysWithChanges.contains(impl->eventUniqueKey(event));
             }
             std::list<std::shared_ptr<DBCatalogue> >
             CatalogueController::retrieveCatalogues(const QString &repository) const
             {
                 QString dbDireName = repository.isEmpty() ? REPOSITORY_DEFAULT : repository;
                 auto cataloguesShared = std::list<std::shared_ptr<DBCatalogue> >{};
                 auto catalogues = impl->m_CatalogueDao.getCatalogues(impl->toWorkRepository(dbDireName));
                 for (auto catalogue : catalogues) {
                     cataloguesShared.push_back(std::make_shared<DBCatalogue>(catalogue));
                 }
                 return cataloguesShared;
             }
             void CatalogueController::addCatalogue(std::shared_ptr<DBCatalogue> catalogue)
             {
                 catalogue->setRepository(impl->toWorkRepository(catalogue->getRepository()));
                 auto catalogueTemp = *catalogue;
                 impl->m_CatalogueDao.addCatalogue(catalogueTemp);
                 auto workPred
                     = impl->createFinder(catalogue->getUniqId(), catalogue->getRepository(), DBType::WORK);
                 auto workCatalogue = impl->m_CatalogueDao.getCatalogue(workPred);
                 *catalogue = workCatalogue;
                 auto uniqueId = impl->catalogueUniqueKey(catalogue);
                 impl->m_KeysWithChanges.insert(uniqueId);
             }
             void CatalogueController::updateCatalogue(std::shared_ptr<DBCatalogue> catalogue)
             {
                 catalogue->setRepository(impl->toWorkRepository(catalogue->getRepository()));
                 auto uniqueId = impl->catalogueUniqueKey(catalogue);
                 impl->m_KeysWithChanges.insert(uniqueId);
                 impl->m_CatalogueDao.updateCatalogue(*catalogue);
             }
             void CatalogueController::removeCatalogue(std::shared_ptr<DBCatalogue> catalogue)
             {
                 // Remove it from both repository and repository_work
                 catalogue->setRepository(impl->toWorkRepository(catalogue->getRepository()));
                 impl->m_CatalogueDao.removeCatalogue(*catalogue);
                 catalogue->setRepository(impl->toSyncRepository(catalogue->getRepository()));
                 impl->m_CatalogueDao.removeCatalogue(*catalogue);
                 impl->savAllDB();
             }
             void CatalogueController::saveCatalogue(std::shared_ptr<DBCatalogue> catalogue)
             {
                 impl->saveCatalogue(catalogue, true);
                 impl->m_KeysWithChanges.remove(impl->catalogueUniqueKey(catalogue));
+                // remove key of events of the catalogue
+                if (catalogue->getType() == CatalogueType::STATIC) {
+                    auto events = this->retrieveEventsFromCatalogue(catalogue);
+                    for (auto event : events) {
+                        impl->m_KeysWithChanges.remove(impl->eventUniqueKey(event));
+                    }
+                }
             }
             void CatalogueController::discardCatalogue(std::shared_ptr<DBCatalogue> catalogue, bool &removed)
             {
                 auto syncPred
                     = impl->createFinder(catalogue->getUniqId(), catalogue->getRepository(), DBType::SYNC);
                 auto workPred
                     = impl->createFinder(catalogue->getUniqId(), catalogue->getRepository(), DBType::WORK);
                 auto syncCatalogue = impl->m_CatalogueDao.getCatalogue(syncPred);
                 if (!syncCatalogue.getUniqId().isNull()) {
                     removed = false;
                     impl->m_CatalogueDao.copyCatalogue(
                         syncCatalogue, impl->toWorkRepository(catalogue->getRepository()), true);
                     auto workCatalogue = impl->m_CatalogueDao.getCatalogue(workPred);
                     *catalogue = workCatalogue;
                     impl->m_KeysWithChanges.remove(impl->catalogueUniqueKey(catalogue));
                 }
                 else {
                     removed = true;
                     // Since the element wasn't in sync repository. Discard it means remove it
                     catalogue->setRepository(impl->toWorkRepository(catalogue->getRepository()));
                     impl->m_CatalogueDao.removeCatalogue(*catalogue);
                 }
             }
             void CatalogueController::saveAll()
             {
                 for (auto repository : impl->m_RepositoryList) {
                     // Save Event
                     auto events = this->retrieveEvents(repository);
                     for (auto event : events) {
                         impl->saveEvent(event, false);
                     }
                     // Save Catalogue
                     auto catalogues = this->retrieveCatalogues(repository);
                     for (auto catalogue : catalogues) {
                         impl->saveCatalogue(catalogue, false);
                     }
                 }
                 impl->savAllDB();
                 impl->m_KeysWithChanges.clear();
             }
             bool CatalogueController::hasChanges() const
             {
                 return !impl->m_KeysWithChanges.isEmpty();
             }
             QByteArray
             CatalogueController::mimeDataForEvents(const QVector<std::shared_ptr<DBEvent> > &events) const
             {
                 auto encodedData = QByteArray{};
                 QMap<QString, QVariantList> idsPerRepository;
                 for (auto event : events) {
                     idsPerRepository[event->getRepository()] << event->getUniqId();
                 }
                 QDataStream stream{&encodedData, QIODevice::WriteOnly};
                 stream << idsPerRepository;
                 return encodedData;
             }
             QVector<std::shared_ptr<DBEvent> >
             CatalogueController::eventsForMimeData(const QByteArray &mimeData) const
             {
                 auto events = QVector<std::shared_ptr<DBEvent> >{};
                 QDataStream stream{mimeData};
                 QMap<QString, QVariantList> idsPerRepository;
                 stream >> idsPerRepository;
                 for (auto it = idsPerRepository.cbegin(); it != idsPerRepository.cend(); ++it) {
                     auto repository = it.key();
                     auto allRepositoryEvent = retrieveEvents(repository);
                     for (auto uuid : it.value()) {
                         for (auto repositoryEvent : allRepositoryEvent) {
                             if (uuid.toUuid() == repositoryEvent->getUniqId()) {
                                 events << repositoryEvent;
                             }
                         }
                     }
                 }
                 return events;
             }
             QByteArray CatalogueController::mimeDataForCatalogues(
                 const QVector<std::shared_ptr<DBCatalogue> > &catalogues) const
             {
                 auto encodedData = QByteArray{};
                 QMap<QString, QVariantList> idsPerRepository;
                 for (auto catalogue : catalogues) {
                     idsPerRepository[catalogue->getRepository()] << catalogue->getUniqId();
                 }
                 QDataStream stream{&encodedData, QIODevice::WriteOnly};
                 stream << idsPerRepository;
                 return encodedData;
             }
             QVector<std::shared_ptr<DBCatalogue> >
             CatalogueController::cataloguesForMimeData(const QByteArray &mimeData) const
             {
                 auto catalogues = QVector<std::shared_ptr<DBCatalogue> >{};
                 QDataStream stream{mimeData};
                 QMap<QString, QVariantList> idsPerRepository;
                 stream >> idsPerRepository;
                 for (auto it = idsPerRepository.cbegin(); it != idsPerRepository.cend(); ++it) {
                     auto repository = it.key();
                     auto allRepositoryCatalogues = retrieveCatalogues(repository);
                     for (auto uuid : it.value()) {
                         for (auto repositoryCatalogues : allRepositoryCatalogues) {
                             if (uuid.toUuid() == repositoryCatalogues->getUniqId()) {
                                 catalogues << repositoryCatalogues;
                             }
                         }
                     }
                 }
                 return catalogues;
             }
             void CatalogueController::initialize()
             {
                 qCDebug(LOG_CatalogueController()) << tr("CatalogueController init")
                                                    << QThread::currentThread();
                 impl->m_CatalogueDao.initialize();
                 auto defaultRepositoryLocation
                     = QStandardPaths::writableLocation(QStandardPaths::AppDataLocation);
                 QDir defaultRepositoryLocationDir;
                 if (defaultRepositoryLocationDir.mkpath(defaultRepositoryLocation)) {
                     defaultRepositoryLocationDir.cd(defaultRepositoryLocation);
                     auto defaultRepository = defaultRepositoryLocationDir.absoluteFilePath(REPOSITORY_DEFAULT);
                     qCInfo(LOG_CatalogueController()) << tr("Persistant data loading from: ")
                                                       << defaultRepository;
                     QDir dbDir(defaultRepository);
                     impl->m_RepositoryList << REPOSITORY_DEFAULT;
                     if (dbDir.exists()) {
                         auto dirName = dbDir.dirName();
                         if (impl->m_CatalogueDao.addDB(defaultRepository, dirName)) {
                             impl->copyDBtoDB(dirName, impl->toWorkRepository(dirName));
                         }
                     }
                     else {
                         qCInfo(LOG_CatalogueController()) << tr("Initialisation of Default repository detected")
                                                           << defaultRepository;
                     }
                 }
                 else {
                     qCWarning(LOG_CatalogueController())
                         << tr("Cannot load the persistent default repository from ")
                         << defaultRepositoryLocation;
                 }
                 qCDebug(LOG_CatalogueController()) << tr("CatalogueController init END");
             }
             QString CatalogueController::CatalogueControllerPrivate::eventUniqueKey(
                 const std::shared_ptr<DBEvent> &event) const
             {
                 return event->getUniqId().toString().append(event->getRepository());
             }
             QString CatalogueController::CatalogueControllerPrivate::catalogueUniqueKey(
                 const std::shared_ptr<DBCatalogue> &catalogue) const
             {
                 return catalogue->getUniqId().toString().append(catalogue->getRepository());
             }
             void CatalogueController::CatalogueControllerPrivate::copyDBtoDB(const QString &dbFrom,
                                                                              const QString &dbTo)
             {
                 //    auto cataloguesShared = std::list<std::shared_ptr<DBCatalogue> >{};
                 auto catalogues = m_CatalogueDao.getCatalogues(dbFrom);
                 auto events = m_CatalogueDao.getEvents(dbFrom);
                 for (auto catalogue : catalogues) {
                     m_CatalogueDao.copyCatalogue(catalogue, dbTo, true);
                 }
                 for (auto event : events) {
                     m_CatalogueDao.copyEvent(event, dbTo, true);
                 }
             }
             QString CatalogueController::CatalogueControllerPrivate::toWorkRepository(QString repository)
             {
                 auto syncRepository = toSyncRepository(repository);
                 return QString("%1%2").arg(syncRepository, REPOSITORY_WORK_SUFFIX);
             }
             QString CatalogueController::CatalogueControllerPrivate::toSyncRepository(QString repository)
             {
                 auto syncRepository = repository;
                 if (repository.endsWith(REPOSITORY_WORK_SUFFIX)) {
                     syncRepository.remove(REPOSITORY_WORK_SUFFIX);
                 }
                 else if (repository.endsWith(REPOSITORY_TRASH_SUFFIX)) {
                     syncRepository.remove(REPOSITORY_TRASH_SUFFIX);
                 }
                 return syncRepository;
             }
             void CatalogueController::CatalogueControllerPrivate::savAllDB()
             {
                 for (auto repository : m_RepositoryList) {
                     auto defaultRepositoryLocation
                         = QStandardPaths::writableLocation(QStandardPaths::AppDataLocation);
                     m_CatalogueDao.saveDB(defaultRepositoryLocation, repository);
                 }
             }
             void CatalogueController::CatalogueControllerPrivate::saveEvent(std::shared_ptr<DBEvent> event,
                                                                             bool persist)
             {
                 m_CatalogueDao.copyEvent(*event, toSyncRepository(event->getRepository()), true);
                 if (persist) {
                     savAllDB();
                 }
             }
             void CatalogueController::CatalogueControllerPrivate::saveCatalogue(
                 std::shared_ptr<DBCatalogue> catalogue, bool persist)
             {
                 m_CatalogueDao.copyCatalogue(*catalogue, toSyncRepository(catalogue->getRepository()), true);
                 if (persist) {
                     savAllDB();
                 }
             }
             std::shared_ptr<IRequestPredicate> CatalogueController::CatalogueControllerPrivate::createFinder(
                 const QUuid &uniqId, const QString &repository, DBType type)
             {
                 // update catalogue parameter
                 auto uniqIdPredicate = std::make_shared<ComparaisonPredicate>(QString{"uniqId"}, uniqId,
                                                                               ComparaisonOperation::EQUALEQUAL);
                 auto repositoryType = repository;
                 switch (type) {
                     case DBType::SYNC:
                         repositoryType = toSyncRepository(repositoryType);
                         break;
                     case DBType::WORK:
                         repositoryType = toWorkRepository(repositoryType);
                         break;
                     case DBType::TRASH:
                     default:
                         break;
                 }
                 auto repositoryPredicate = std::make_shared<ComparaisonPredicate>(
                     QString{"repository"}, repositoryType, ComparaisonOperation::EQUALEQUAL);
                 auto finderPred = std::make_shared<CompoundPredicate>(CompoundOperation::AND);
                 finderPred->AddRequestPredicate(uniqIdPredicate);
                 finderPred->AddRequestPredicate(repositoryPredicate);
                 return finderPred;
             }

gui/include/Catalogue/CatalogueEventsWidget.h +1 0

             #ifndef SCIQLOP_CATALOGUEEVENTSWIDGET_H
             #define SCIQLOP_CATALOGUEEVENTSWIDGET_H
             #include <Common/spimpl.h>
             #include <QLoggingCategory>
             #include <QWidget>
             class DBCatalogue;
             class DBEvent;
             class DBEventProduct;
             class VisualizationWidget;
             class VisualizationSelectionZoneItem;
             namespace Ui {
             class CatalogueEventsWidget;
             }
             Q_DECLARE_LOGGING_CATEGORY(LOG_CatalogueEventsWidget)
             class CatalogueEventsWidget : public QWidget {
                 Q_OBJECT
             signals:
                 void eventsSelected(const QVector<std::shared_ptr<DBEvent> > &event);
                 void eventsRemoved(const QVector<std::shared_ptr<DBEvent> > &event);
                 void eventProductsSelected(
                     const QVector<QPair<std::shared_ptr<DBEvent>, std::shared_ptr<DBEventProduct> > >
                         &eventproducts);
                 void selectionCleared();
                 void selectionZoneAdded(const std::shared_ptr<DBEvent> &event, const QString &productId,
                                         VisualizationSelectionZoneItem *selectionZone);
                 void eventCataloguesModified(const QVector<std::shared_ptr<DBCatalogue> > &catalogues);
             public:
                 explicit CatalogueEventsWidget(QWidget *parent = 0);
                 virtual ~CatalogueEventsWidget();
                 void setVisualizationWidget(VisualizationWidget *visualization);
                 void addEvent(const std::shared_ptr<DBEvent> &event);
                 void setEventChanges(const std::shared_ptr<DBEvent> &event, bool hasChanges);
+                void setEventsChanges(const std::shared_ptr<DBEvent> &event, bool hasChanges);
                 QVector<std::shared_ptr<DBCatalogue> > displayedCatalogues() const;
                 bool isAllEventsDisplayed() const;
                 bool isEventDisplayed(const std::shared_ptr<DBEvent> &event) const;
                 void refreshEvent(const std::shared_ptr<DBEvent> &event);
             public slots:
                 void populateWithCatalogues(const QVector<std::shared_ptr<DBCatalogue> > &catalogues);
                 void populateWithAllEvents();
                 void clear();
                 void refresh();
                 // QWidget interface
             protected:
                 void keyPressEvent(QKeyEvent *event);
             private:
                 Ui::CatalogueEventsWidget *ui;
                 class CatalogueEventsWidgetPrivate;
                 spimpl::unique_impl_ptr<CatalogueEventsWidgetPrivate> impl;
             private slots:
                 void emitSelection();
             };
             #endif // SCIQLOP_CATALOGUEEVENTSWIDGET_H

gui/include/Catalogue/CatalogueSideBarWidget.h +1 0

             #ifndef SCIQLOP_CATALOGUESIDEBARWIDGET_H
             #define SCIQLOP_CATALOGUESIDEBARWIDGET_H
             #include <Common/spimpl.h>
             #include <QLoggingCategory>
             #include <QTreeWidgetItem>
             #include <QWidget>
             class CatalogueAbstractTreeItem;
             class DBCatalogue;
             namespace Ui {
             class CatalogueSideBarWidget;
             }
             Q_DECLARE_LOGGING_CATEGORY(LOG_CatalogueSideBarWidget)
             class CatalogueSideBarWidget : public QWidget {
                 Q_OBJECT
             signals:
                 void catalogueSelected(const QVector<std::shared_ptr<DBCatalogue> > &catalogues);
                 void databaseSelected(const QStringList &databases);
                 void allEventsSelected();
                 void trashSelected();
                 void selectionCleared();
+                void catalogueSaved(const std::shared_ptr<DBCatalogue> &catalogue);
             public:
                 explicit CatalogueSideBarWidget(QWidget *parent = 0);
                 virtual ~CatalogueSideBarWidget();
                 CatalogueAbstractTreeItem *addCatalogue(const std::shared_ptr<DBCatalogue> &catalogue,
                                                         const QString &repository);
                 void setCatalogueChanges(const std::shared_ptr<DBCatalogue> &catalogue, bool hasChanges);
                 QVector<std::shared_ptr<DBCatalogue> > getCatalogues(const QString &repository) const;
                 // QWidget interface
             protected:
                 void keyPressEvent(QKeyEvent *event);
             private slots:
                 void emitSelection();
             private:
                 Ui::CatalogueSideBarWidget *ui;
                 class CatalogueSideBarWidgetPrivate;
                 spimpl::unique_impl_ptr<CatalogueSideBarWidgetPrivate> impl;
             private slots:
                 void onContextMenuRequested(const QPoint &pos);
             };
             #endif // SCIQLOP_CATALOGUESIDEBARWIDGET_H

gui/src/Catalogue/CatalogueExplorer.cpp +3 0

             #include "Catalogue/CatalogueExplorer.h"
             #include "ui_CatalogueExplorer.h"
             #include <Catalogue/CatalogueActionManager.h>
             #include <Catalogue/CatalogueController.h>
             #include <SqpApplication.h>
             #include <Visualization/VisualizationGraphWidget.h>
             #include <Visualization/VisualizationSelectionZoneItem.h>
             #include <Visualization/VisualizationWidget.h>
             #include <DBCatalogue.h>
             #include <DBEvent.h>
             #include <DBEventProduct.h>
             #include <unordered_map>
             struct CatalogueExplorer::CatalogueExplorerPrivate {
                 CatalogueActionManager m_ActionManager;
                 std::unordered_map<std::shared_ptr<DBEvent>, QVector<VisualizationSelectionZoneItem *> >
                     m_SelectionZonesPerEvents;
                 QMetaObject::Connection m_Conn;
                 CatalogueExplorerPrivate(CatalogueExplorer *catalogueExplorer)
                         : m_ActionManager(catalogueExplorer)
                 {
                 }
             };
             CatalogueExplorer::CatalogueExplorer(QWidget *parent)
                     : QDialog(parent, Qt::Dialog | Qt::WindowMinMaxButtonsHint | Qt::WindowCloseButtonHint),
                       ui(new Ui::CatalogueExplorer),
                       impl{spimpl::make_unique_impl<CatalogueExplorerPrivate>(this)}
             {
                 ui->setupUi(this);
                 impl->m_ActionManager.installSelectionZoneActions();
                 // Updates events and inspector when something is selected in the catalogue widget
                 connect(ui->catalogues, &CatalogueSideBarWidget::catalogueSelected, [this](auto catalogues) {
                     if (catalogues.count() == 1) {
                         ui->inspector->setCatalogue(catalogues.first());
                     }
                     else {
                         ui->inspector->showPage(CatalogueInspectorWidget::Page::Empty);
                     }
                     ui->events->populateWithCatalogues(catalogues);
                 });
                 connect(ui->catalogues, &CatalogueSideBarWidget::databaseSelected, [this](auto databases) {
                     ui->inspector->showPage(CatalogueInspectorWidget::Page::Empty);
                 });
                 connect(ui->catalogues, &CatalogueSideBarWidget::trashSelected, [this]() {
                     ui->inspector->showPage(CatalogueInspectorWidget::Page::Empty);
                     ui->events->clear();
                 });
                 connect(ui->catalogues, &CatalogueSideBarWidget::allEventsSelected, [this]() {
                     ui->inspector->showPage(CatalogueInspectorWidget::Page::Empty);
                     ui->events->populateWithAllEvents();
                 });
                 connect(ui->catalogues, &CatalogueSideBarWidget::databaseSelected, [this](auto databaseList) {
                     QVector<std::shared_ptr<DBCatalogue> > catalogueList;
                     for (auto database : databaseList) {
                         catalogueList.append(ui->catalogues->getCatalogues(database));
                     }
                     ui->events->populateWithCatalogues(catalogueList);
                     ui->inspector->showPage(CatalogueInspectorWidget::Page::Empty);
                 });
                 connect(ui->catalogues, &CatalogueSideBarWidget::selectionCleared, [this]() {
                     ui->inspector->showPage(CatalogueInspectorWidget::Page::Empty);
                     ui->events->clear();
                 });
+                connect(ui->catalogues, &CatalogueSideBarWidget::catalogueSaved, ui->events,
+                        &CatalogueEventsWidget::refresh);
                 // Updates the inspectot when something is selected in the events
                 connect(ui->events, &CatalogueEventsWidget::eventsSelected, [this](auto events) {
                     if (events.count() == 1) {
                         ui->inspector->setEvent(events.first());
                     }
                     else {
                         ui->inspector->showPage(CatalogueInspectorWidget::Page::Empty);
                     }
                 });
                 connect(ui->events, &CatalogueEventsWidget::eventProductsSelected, [this](auto eventProducts) {
                     if (eventProducts.count() == 1) {
                         ui->inspector->setEventProduct(eventProducts.first().first,
                                                        eventProducts.first().second);
                     }
                     else {
                         ui->inspector->showPage(CatalogueInspectorWidget::Page::Empty);
                     }
                 });
                 connect(ui->events, &CatalogueEventsWidget::selectionCleared,
                         [this]() { ui->inspector->showPage(CatalogueInspectorWidget::Page::Empty); });
                 // Manage Selection Zones associated to events
                 connect(ui->events, &CatalogueEventsWidget::selectionZoneAdded,
                         [this](auto event, auto productId, auto zone) {
                             this->addSelectionZoneItem(event, productId, zone);
                         });
                 connect(ui->events, &CatalogueEventsWidget::eventsRemoved, [this](auto events) {
                     for (auto event : events) {
                         auto associatedSelectionZonesIt = impl->m_SelectionZonesPerEvents.find(event);
                         if (associatedSelectionZonesIt != impl->m_SelectionZonesPerEvents.cend()) {
                             for (auto selectionZone : associatedSelectionZonesIt->second) {
                                 auto parentGraph = selectionZone->parentGraphWidget();
                                 parentGraph->removeSelectionZone(selectionZone);
                             }
                             impl->m_SelectionZonesPerEvents.erase(event);
                         }
                     }
                 });
                 // Updates changes from the inspector
                 connect(ui->inspector, &CatalogueInspectorWidget::catalogueUpdated, [this](auto catalogue) {
                     sqpApp->catalogueController().updateCatalogue(catalogue);
                     ui->catalogues->setCatalogueChanges(catalogue, true);
                 });
                 connect(ui->inspector, &CatalogueInspectorWidget::eventUpdated, [this](auto event) {
                     sqpApp->catalogueController().updateEvent(event);
                     ui->events->setEventChanges(event, true);
                 });
                 connect(ui->inspector, &CatalogueInspectorWidget::eventProductUpdated,
                         [this](auto event, auto eventProduct) {
                             sqpApp->catalogueController().updateEventProduct(eventProduct);
                             ui->events->setEventChanges(event, true);
                         });
                 connect(ui->events, &CatalogueEventsWidget::eventCataloguesModified,
                         [this](const QVector<std::shared_ptr<DBCatalogue> > &catalogues) {
                             for (auto catalogue : catalogues) {
                                 ui->catalogues->setCatalogueChanges(catalogue, true);
                             }
                         });
             }
             CatalogueExplorer::~CatalogueExplorer()
             {
                 disconnect(impl->m_Conn);
                 delete ui;
             }
             void CatalogueExplorer::setVisualizationWidget(VisualizationWidget *visualization)
             {
                 ui->events->setVisualizationWidget(visualization);
             }
             CatalogueEventsWidget &CatalogueExplorer::eventsWidget() const
             {
                 return *ui->events;
             }
             CatalogueSideBarWidget &CatalogueExplorer::sideBarWidget() const
             {
                 return *ui->catalogues;
             }
             void CatalogueExplorer::clearSelectionZones()
             {
                 impl->m_SelectionZonesPerEvents.clear();
             }
             void CatalogueExplorer::addSelectionZoneItem(const std::shared_ptr<DBEvent> &event,
                                                          const QString &productId,
                                                          VisualizationSelectionZoneItem *selectionZone)
             {
                 impl->m_SelectionZonesPerEvents[event] << selectionZone;
                 connect(selectionZone, &VisualizationSelectionZoneItem::rangeEdited,
                         [event, productId, this](auto range) {
                             auto productList = event->getEventProducts();
                             for (auto &product : productList) {
                                 if (product.getProductId() == productId) {
                                     product.setTStart(range.m_TStart);
                                     product.setTEnd(range.m_TEnd);
                                 }
                             }
                             event->setEventProducts(productList);
                             sqpApp->catalogueController().updateEvent(event);
                             ui->events->refreshEvent(event);
                             ui->events->setEventChanges(event, true);
                             ui->inspector->refresh();
                         });
                 impl->m_Conn = connect(selectionZone, &VisualizationSelectionZoneItem::destroyed,
                                        [event, selectionZone, this]() {
                                            if (!impl->m_SelectionZonesPerEvents.empty()) {
                                                impl->m_SelectionZonesPerEvents[event].removeAll(selectionZone);
                                            }
                                        });
             }

gui/src/Catalogue/CatalogueSideBarWidget.cpp +1 0

             #include "Catalogue/CatalogueSideBarWidget.h"
             #include "ui_CatalogueSideBarWidget.h"
             #include <SqpApplication.h>
             #include <Catalogue/CatalogueController.h>
             #include <Catalogue/CatalogueExplorerHelper.h>
             #include <Catalogue/CatalogueTreeItems/CatalogueTextTreeItem.h>
             #include <Catalogue/CatalogueTreeItems/CatalogueTreeItem.h>
             #include <Catalogue/CatalogueTreeModel.h>
             #include <CatalogueDao.h>
             #include <Common/MimeTypesDef.h>
             #include <ComparaisonPredicate.h>
             #include <DBCatalogue.h>
             #include <QKeyEvent>
             #include <QMenu>
             #include <QMessageBox>
             #include <QMimeData>
             Q_LOGGING_CATEGORY(LOG_CatalogueSideBarWidget, "CatalogueSideBarWidget")
             constexpr auto ALL_EVENT_ITEM_TYPE = CatalogueAbstractTreeItem::DEFAULT_TYPE + 1;
             constexpr auto TRASH_ITEM_TYPE = CatalogueAbstractTreeItem::DEFAULT_TYPE + 2;
             constexpr auto CATALOGUE_ITEM_TYPE = CatalogueAbstractTreeItem::DEFAULT_TYPE + 3;
             constexpr auto DATABASE_ITEM_TYPE = CatalogueAbstractTreeItem::DEFAULT_TYPE + 4;
             struct CatalogueSideBarWidget::CatalogueSideBarWidgetPrivate {
                 CatalogueTreeModel *m_TreeModel = nullptr;
                 void configureTreeWidget(QTreeView *treeView);
                 QModelIndex addDatabaseItem(const QString &name);
                 CatalogueAbstractTreeItem *getDatabaseItem(const QString &name);
                 CatalogueAbstractTreeItem *addCatalogueItem(const std::shared_ptr<DBCatalogue> &catalogue,
                                                             const QModelIndex &databaseIndex);
                 CatalogueTreeItem *getCatalogueItem(const std::shared_ptr<DBCatalogue> &catalogue) const;
                 void setHasChanges(bool value, const QModelIndex &index, CatalogueSideBarWidget *sideBarWidget);
                 bool hasChanges(const QModelIndex &index, QTreeView *treeView);
                 int selectionType(QTreeView *treeView) const
                 {
                     auto selectedItems = treeView->selectionModel()->selectedRows();
                     if (selectedItems.isEmpty()) {
                         return CatalogueAbstractTreeItem::DEFAULT_TYPE;
                     }
                     else {
                         auto firstIndex = selectedItems.first();
                         auto firstItem = m_TreeModel->item(firstIndex);
                         if (!firstItem) {
                             Q_ASSERT(false);
                             return CatalogueAbstractTreeItem::DEFAULT_TYPE;
                         }
                         auto selectionType = firstItem->type();
                         for (auto itemIndex : selectedItems) {
                             auto item = m_TreeModel->item(itemIndex);
                             if (!item || item->type() != selectionType) {
                                 // Incoherent multi selection
                                 selectionType = CatalogueAbstractTreeItem::DEFAULT_TYPE;
                                 break;
                             }
                         }
                         return selectionType;
                     }
                 }
                 QVector<std::shared_ptr<DBCatalogue> > selectedCatalogues(QTreeView *treeView) const
                 {
                     QVector<std::shared_ptr<DBCatalogue> > catalogues;
                     auto selectedItems = treeView->selectionModel()->selectedRows();
                     for (auto itemIndex : selectedItems) {
                         auto item = m_TreeModel->item(itemIndex);
                         if (item && item->type() == CATALOGUE_ITEM_TYPE) {
                             catalogues.append(static_cast<CatalogueTreeItem *>(item)->catalogue());
                         }
                     }
                     return catalogues;
                 }
                 QStringList selectedRepositories(QTreeView *treeView) const
                 {
                     QStringList repositories;
                     auto selectedItems = treeView->selectionModel()->selectedRows();
                     for (auto itemIndex : selectedItems) {
                         auto item = m_TreeModel->item(itemIndex);
                         if (item && item->type() == DATABASE_ITEM_TYPE) {
                             repositories.append(item->text());
                         }
                     }
                     return repositories;
                 }
             };
             CatalogueSideBarWidget::CatalogueSideBarWidget(QWidget *parent)
                     : QWidget(parent),
                       ui(new Ui::CatalogueSideBarWidget),
                       impl{spimpl::make_unique_impl<CatalogueSideBarWidgetPrivate>()}
             {
                 ui->setupUi(this);
                 impl->m_TreeModel = new CatalogueTreeModel(this);
                 ui->treeView->setModel(impl->m_TreeModel);
                 impl->configureTreeWidget(ui->treeView);
                 ui->treeView->header()->setStretchLastSection(false);
                 ui->treeView->header()->setSectionResizeMode(QHeaderView::ResizeToContents);
                 ui->treeView->header()->setSectionResizeMode(0, QHeaderView::Stretch);
                 connect(ui->treeView, &QTreeView::clicked, this, &CatalogueSideBarWidget::emitSelection);
                 connect(ui->treeView->selectionModel(), &QItemSelectionModel::currentChanged, this,
                         &CatalogueSideBarWidget::emitSelection);
                 connect(ui->btnAdd, &QToolButton::clicked, [this]() {
                     auto catalogue = std::make_shared<DBCatalogue>();
                     catalogue->setName(QString("Cat"));
                     sqpApp->catalogueController().addCatalogue(catalogue);
                     auto item = this->addCatalogue(catalogue, REPOSITORY_DEFAULT);
                     this->setCatalogueChanges(catalogue, true);
                     ui->treeView->edit(impl->m_TreeModel->indexOf(item));
                 });
                 connect(impl->m_TreeModel, &CatalogueTreeModel::itemDropped,
                         [this](auto index, auto mimeData, auto action) {
                             auto item = impl->m_TreeModel->item(index);
                             if (item && item->type() == CATALOGUE_ITEM_TYPE) {
                                 auto catalogue = static_cast<CatalogueTreeItem *>(item)->catalogue();
                                 this->setCatalogueChanges(catalogue, true);
                             }
                             if (action == Qt::MoveAction) {
                                 /// Display a save button on source catalogues
                                 auto sourceCatalogues = sqpApp->catalogueController().cataloguesForMimeData(
                                     mimeData->data(MIME_TYPE_SOURCE_CATALOGUE_LIST));
                                 for (auto catalogue : sourceCatalogues) {
                                     if (auto catalogueItem = impl->getCatalogueItem(catalogue)) {
                                         this->setCatalogueChanges(catalogue, true);
                                     }
                                 }
                             }
                         });
                 connect(ui->btnRemove, &QToolButton::clicked, [this]() {
                     QVector<QPair<std::shared_ptr<DBCatalogue>, CatalogueAbstractTreeItem *> >
                         cataloguesToItems;
                     auto selectedIndexes = ui->treeView->selectionModel()->selectedRows();
                     for (auto index : selectedIndexes) {
                         auto item = impl->m_TreeModel->item(index);
                         if (item && item->type() == CATALOGUE_ITEM_TYPE) {
                             auto catalogue = static_cast<CatalogueTreeItem *>(item)->catalogue();
                             cataloguesToItems << qMakePair(catalogue, item);
                         }
                     }
                     if (!cataloguesToItems.isEmpty()) {
                         if (QMessageBox::warning(this, tr("Remove Catalogue(s)"),
                                                  tr("The selected catalogues(s) will be completly removed "
                                                     "from the repository!\nAre you sure you want to continue?"),
                                                  QMessageBox::Yes | QMessageBox::No, QMessageBox::No)
                             == QMessageBox::Yes) {
                             for (auto catalogueToItem : cataloguesToItems) {
                                 sqpApp->catalogueController().removeCatalogue(catalogueToItem.first);
                                 impl->m_TreeModel->removeChildItem(
                                     catalogueToItem.second,
                                     impl->m_TreeModel->indexOf(catalogueToItem.second->parent()));
                             }
                         }
                     }
                 });
                 connect(impl->m_TreeModel, &CatalogueTreeModel::itemRenamed, [this](auto index) {
                     auto selectedIndexes = ui->treeView->selectionModel()->selectedRows();
                     if (selectedIndexes.contains(index)) {
                         this->emitSelection();
                     }
                     impl->setHasChanges(true, index, this);
                 });
                 ui->treeView->setContextMenuPolicy(Qt::CustomContextMenu);
                 connect(ui->treeView, &QTreeView::customContextMenuRequested, this,
                         &CatalogueSideBarWidget::onContextMenuRequested);
             }
             CatalogueSideBarWidget::~CatalogueSideBarWidget()
             {
                 delete ui;
             }
             CatalogueAbstractTreeItem *
             CatalogueSideBarWidget::addCatalogue(const std::shared_ptr<DBCatalogue> &catalogue,
                                                  const QString &repository)
             {
                 auto repositoryItem = impl->getDatabaseItem(repository);
                 return impl->addCatalogueItem(catalogue, impl->m_TreeModel->indexOf(repositoryItem));
             }
             void CatalogueSideBarWidget::setCatalogueChanges(const std::shared_ptr<DBCatalogue> &catalogue,
                                                              bool hasChanges)
             {
                 if (auto catalogueItem = impl->getCatalogueItem(catalogue)) {
                     auto index = impl->m_TreeModel->indexOf(catalogueItem);
                     impl->setHasChanges(hasChanges, index, this);
                     // catalogueItem->refresh();
                 }
             }
             QVector<std::shared_ptr<DBCatalogue> >
             CatalogueSideBarWidget::getCatalogues(const QString &repository) const
             {
                 QVector<std::shared_ptr<DBCatalogue> > result;
                 auto repositoryItem = impl->getDatabaseItem(repository);
                 for (auto child : repositoryItem->children()) {
                     if (child->type() == CATALOGUE_ITEM_TYPE) {
                         auto catalogueItem = static_cast<CatalogueTreeItem *>(child);
                         result << catalogueItem->catalogue();
                     }
                     else {
                         qCWarning(LOG_CatalogueSideBarWidget()) << "getCatalogues: invalid structure";
                     }
                 }
                 return result;
             }
             void CatalogueSideBarWidget::emitSelection()
             {
                 auto selectionType = impl->selectionType(ui->treeView);
                 switch (selectionType) {
                     case CATALOGUE_ITEM_TYPE:
                         emit this->catalogueSelected(impl->selectedCatalogues(ui->treeView));
                         break;
                     case DATABASE_ITEM_TYPE:
                         emit this->databaseSelected(impl->selectedRepositories(ui->treeView));
                         break;
                     case ALL_EVENT_ITEM_TYPE:
                         emit this->allEventsSelected();
                         break;
                     case TRASH_ITEM_TYPE:
                         emit this->trashSelected();
                         break;
                     default:
                         emit this->selectionCleared();
                         break;
                 }
             }
             void CatalogueSideBarWidget::onContextMenuRequested(const QPoint &pos)
             {
                 QMenu menu{this};
                 auto currentIndex = ui->treeView->currentIndex();
                 auto currentItem = impl->m_TreeModel->item(currentIndex);
                 if (!currentItem) {
                     return;
                 }
                 switch (currentItem->type()) {
                     case CATALOGUE_ITEM_TYPE:
                         menu.addAction("Rename", [this, currentIndex]() { ui->treeView->edit(currentIndex); });
                         break;
                     case DATABASE_ITEM_TYPE:
                         break;
                     case ALL_EVENT_ITEM_TYPE:
                         break;
                     case TRASH_ITEM_TYPE:
                         menu.addAction("Empty Trash", []() {
                             // TODO
                         });
                         break;
                     default:
                         break;
                 }
                 if (!menu.isEmpty()) {
                     menu.exec(ui->treeView->mapToGlobal(pos));
                 }
             }
             void CatalogueSideBarWidget::CatalogueSideBarWidgetPrivate::configureTreeWidget(QTreeView *treeView)
             {
                 auto allEventsItem = new CatalogueTextTreeItem{QIcon{":/icones/allEvents.png"}, "All Events",
                                                                ALL_EVENT_ITEM_TYPE};
                 auto allEventIndex = m_TreeModel->addTopLevelItem(allEventsItem);
                 treeView->setCurrentIndex(allEventIndex);
                 auto trashItem
                     = new CatalogueTextTreeItem{QIcon{":/icones/trash.png"}, "Trash", TRASH_ITEM_TYPE};
                 m_TreeModel->addTopLevelItem(trashItem);
                 auto separator = new QFrame{treeView};
                 separator->setFrameShape(QFrame::HLine);
                 auto separatorItem
                     = new CatalogueTextTreeItem{QIcon{}, QString{}, CatalogueAbstractTreeItem::DEFAULT_TYPE};
                 separatorItem->setEnabled(false);
                 auto separatorIndex = m_TreeModel->addTopLevelItem(separatorItem);
                 treeView->setIndexWidget(separatorIndex, separator);
                 auto repositories = sqpApp->catalogueController().getRepositories();
                 for (auto dbname : repositories) {
                     auto dbIndex = addDatabaseItem(dbname);
                     auto catalogues = sqpApp->catalogueController().retrieveCatalogues(dbname);
                     for (auto catalogue : catalogues) {
                         addCatalogueItem(catalogue, dbIndex);
                     }
                 }
                 treeView->expandAll();
             }
             QModelIndex
             CatalogueSideBarWidget::CatalogueSideBarWidgetPrivate::addDatabaseItem(const QString &name)
             {
                 auto databaseItem
                     = new CatalogueTextTreeItem{QIcon{":/icones/database.png"}, {name}, DATABASE_ITEM_TYPE};
                 auto databaseIndex = m_TreeModel->addTopLevelItem(databaseItem);
                 return databaseIndex;
             }
             CatalogueAbstractTreeItem *
             CatalogueSideBarWidget::CatalogueSideBarWidgetPrivate::getDatabaseItem(const QString &name)
             {
                 for (auto item : m_TreeModel->topLevelItems()) {
                     if (item->type() == DATABASE_ITEM_TYPE && item->text() == name) {
                         return item;
                     }
                 }
                 return nullptr;
             }
             CatalogueAbstractTreeItem *CatalogueSideBarWidget::CatalogueSideBarWidgetPrivate::addCatalogueItem(
                 const std::shared_ptr<DBCatalogue> &catalogue, const QModelIndex &databaseIndex)
             {
                 auto catalogueItem
                     = new CatalogueTreeItem{catalogue, QIcon{":/icones/catalogue.png"}, CATALOGUE_ITEM_TYPE};
                 m_TreeModel->addChildItem(catalogueItem, databaseIndex);
                 return catalogueItem;
             }
             CatalogueTreeItem *CatalogueSideBarWidget::CatalogueSideBarWidgetPrivate::getCatalogueItem(
                 const std::shared_ptr<DBCatalogue> &catalogue) const
             {
                 for (auto item : m_TreeModel->topLevelItems()) {
                     if (item->type() == DATABASE_ITEM_TYPE) {
                         for (auto childItem : item->children()) {
                             if (childItem->type() == CATALOGUE_ITEM_TYPE) {
                                 auto catalogueItem = static_cast<CatalogueTreeItem *>(childItem);
                                 if (catalogueItem->catalogue()->getUniqId() == catalogue->getUniqId()) {
                                     return catalogueItem;
                                 }
                             }
                             else {
                                 qCWarning(LOG_CatalogueSideBarWidget()) << "getCatalogueItem: Invalid tree "
                                                                            "structure. A database item should "
                                                                            "only contain catalogues.";
                                 Q_ASSERT(false);
                             }
                         }
                     }
                 }
                 return nullptr;
             }
             void CatalogueSideBarWidget::CatalogueSideBarWidgetPrivate::setHasChanges(
                 bool value, const QModelIndex &index, CatalogueSideBarWidget *sideBarWidget)
             {
                 std::shared_ptr<DBCatalogue> catalogue = nullptr;
                 auto item = m_TreeModel->item(index);
                 if (item && item->type() == CATALOGUE_ITEM_TYPE) {
                     catalogue = static_cast<CatalogueTreeItem *>(item)->catalogue();
                 }
                 auto validationIndex = index.sibling(index.row(), (int)CatalogueTreeModel::Column::Validation);
                 if (value) {
                     if (!hasChanges(validationIndex, sideBarWidget->ui->treeView)) {
                         auto widget = CatalogueExplorerHelper::buildValidationWidget(
                             sideBarWidget->ui->treeView,
                             [this, validationIndex, sideBarWidget, catalogue]() {
                                 if (catalogue) {
                                     sqpApp->catalogueController().saveCatalogue(catalogue);
+                                    emit sideBarWidget->catalogueSaved(catalogue);
                                 }
                                 setHasChanges(false, validationIndex, sideBarWidget);
                             },
                             [this, validationIndex, sideBarWidget, catalogue, item]() {
                                 if (catalogue) {
                                     bool removed;
                                     sqpApp->catalogueController().discardCatalogue(catalogue, removed);
                                     if (removed) {
                                         m_TreeModel->removeChildItem(item,
                                                                      m_TreeModel->indexOf(item->parent()));
                                     }
                                     else {
                                         m_TreeModel->refresh(m_TreeModel->indexOf(item));
                                         setHasChanges(false, validationIndex, sideBarWidget);
                                     }
                                     sideBarWidget->emitSelection();
                                 }
                             });
                         sideBarWidget->ui->treeView->setIndexWidget(validationIndex, widget);
                     }
                 }
                 else {
                     // Note: the widget is destroyed
                     sideBarWidget->ui->treeView->setIndexWidget(validationIndex, nullptr);
                 }
             }
             bool CatalogueSideBarWidget::CatalogueSideBarWidgetPrivate::hasChanges(const QModelIndex &index,
                                                                                    QTreeView *treeView)
             {
                 auto validationIndex = index.sibling(index.row(), (int)CatalogueTreeModel::Column::Validation);
                 return treeView->indexWidget(validationIndex) != nullptr;
             }
             void CatalogueSideBarWidget::keyPressEvent(QKeyEvent *event)
             {
                 switch (event->key()) {
                     case Qt::Key_Delete: {
                         ui->btnRemove->click();
                     }
                     default:
                         break;
                 }
             }

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages