GIT_REPOSITORIES/LPP/Users/mperrinel/SciQLop-fork Commit - r1380:04c34c9f216f

Rework event creation menus without popup dialog

trabillard -

r1380:04c34c9f216f

parent child

Context file:

r1380:04c34c9f216f

gui/meson.build +1 -4

             qxorm_dep = dependency('QxOrm', required : true, fallback:['QxOrm','qxorm_dep'])
             catalogueapi_dep = dependency('CatalogueAPI', required : true, fallback:['CatalogueAPI','CatalogueAPI_dep'])
             gui_moc_headers = [
               'include/DataSource/DataSourceWidget.h',
               'include/Settings/SqpSettingsDialog.h',
               'include/Settings/SqpSettingsGeneralWidget.h',
               'include/SidePane/SqpSidePane.h',
               'include/SqpApplication.h',
               'include/DragAndDrop/DragDropScroller.h',
               'include/DragAndDrop/DragDropTabSwitcher.h',
               'include/TimeWidget/TimeWidget.h',
               'include/Variable/VariableInspectorWidget.h',
               'include/Variable/RenameVariableDialog.h',
               'include/Visualization/qcustomplot.h',
               'include/Visualization/VisualizationGraphWidget.h',
               'include/Visualization/VisualizationTabWidget.h',
               'include/Visualization/VisualizationWidget.h',
               'include/Visualization/VisualizationZoneWidget.h',
               'include/Visualization/VisualizationDragDropContainer.h',
               'include/Visualization/VisualizationDragWidget.h',
               'include/Visualization/ColorScaleEditor.h',
               'include/Visualization/VisualizationSelectionZoneItem.h',
               'include/Actions/SelectionZoneAction.h',
               'include/Visualization/VisualizationMultiZoneSelectionDialog.h',
               'include/Catalogue/CatalogueExplorer.h',
               'include/Catalogue/CatalogueEventsWidget.h',
               'include/Catalogue/CatalogueSideBarWidget.h',
               'include/Catalogue/CatalogueInspectorWidget.h',
               'include/Catalogue/CatalogueEventsModel.h',
-              'include/Catalogue/CreateEventDialog.h',
               'include/Catalogue/CatalogueTreeModel.h'
             ]
             gui_ui_files = [
               'ui/DataSource/DataSourceWidget.ui',
               'ui/Settings/SqpSettingsDialog.ui',
               'ui/Settings/SqpSettingsGeneralWidget.ui',
               'ui/SidePane/SqpSidePane.ui',
               'ui/TimeWidget/TimeWidget.ui',
               'ui/Variable/VariableInspectorWidget.ui',
               'ui/Variable/RenameVariableDialog.ui',
               'ui/Variable/VariableMenuHeaderWidget.ui',
               'ui/Visualization/VisualizationGraphWidget.ui',
               'ui/Visualization/VisualizationTabWidget.ui',
               'ui/Visualization/VisualizationWidget.ui',
               'ui/Visualization/VisualizationZoneWidget.ui',
               'ui/Visualization/ColorScaleEditor.ui',
               'ui/Visualization/VisualizationMultiZoneSelectionDialog.ui',
               'ui/Catalogue/CatalogueExplorer.ui',
               'ui/Catalogue/CatalogueEventsWidget.ui',
               'ui/Catalogue/CatalogueSideBarWidget.ui',
-              'ui/Catalogue/CatalogueInspectorWidget.ui',
+              'ui/Catalogue/CatalogueInspectorWidget.ui'
-              'ui/Catalogue/CreateEventDialog.ui'
             ]
             gui_qresources = ['resources/sqpguiresources.qrc']
             rcc_gen = generator(rcc,
                             output  : 'qrc_@BASENAME@.cpp',
                             arguments : [
                              '--output',
                              '@OUTPUT@',
                              '@INPUT@',
                              '@EXTRA_ARGS@'])
             rcc_files = rcc_gen.process(gui_qresources, extra_args : ['-name', 'sqpguiresources'])
             gui_moc_files = qt5.preprocess(moc_headers : gui_moc_headers,
                                            ui_files : gui_ui_files)
             gui_sources = [
               'src/SqpApplication.cpp',
               'src/DragAndDrop/DragDropGuiController.cpp',
               'src/DragAndDrop/DragDropScroller.cpp',
               'src/DragAndDrop/DragDropTabSwitcher.cpp',
               'src/Common/ColorUtils.cpp',
               'src/Common/VisualizationDef.cpp',
               'src/DataSource/DataSourceTreeWidgetItem.cpp',
               'src/DataSource/DataSourceTreeWidgetHelper.cpp',
               'src/DataSource/DataSourceWidget.cpp',
               'src/DataSource/DataSourceTreeWidget.cpp',
               'src/Settings/SqpSettingsDialog.cpp',
               'src/Settings/SqpSettingsGeneralWidget.cpp',
               'src/SidePane/SqpSidePane.cpp',
               'src/TimeWidget/TimeWidget.cpp',
               'src/Variable/VariableInspectorWidget.cpp',
               'src/Variable/VariableInspectorTableView.cpp',
               'src/Variable/VariableMenuHeaderWidget.cpp',
               'src/Variable/RenameVariableDialog.cpp',
               'src/Visualization/VisualizationGraphHelper.cpp',
               'src/Visualization/VisualizationGraphRenderingDelegate.cpp',
               'src/Visualization/VisualizationGraphWidget.cpp',
               'src/Visualization/VisualizationTabWidget.cpp',
               'src/Visualization/VisualizationWidget.cpp',
               'src/Visualization/VisualizationZoneWidget.cpp',
               'src/Visualization/qcustomplot.cpp',
               'src/Visualization/QCustomPlotSynchronizer.cpp',
               'src/Visualization/operations/FindVariableOperation.cpp',
               'src/Visualization/operations/GenerateVariableMenuOperation.cpp',
               'src/Visualization/operations/MenuBuilder.cpp',
               'src/Visualization/operations/RemoveVariableOperation.cpp',
               'src/Visualization/operations/RescaleAxeOperation.cpp',
               'src/Visualization/VisualizationDragDropContainer.cpp',
               'src/Visualization/VisualizationDragWidget.cpp',
               'src/Visualization/AxisRenderingUtils.cpp',
               'src/Visualization/PlottablesRenderingUtils.cpp',
               'src/Visualization/MacScrollBarStyle.cpp',
               'src/Visualization/VisualizationCursorItem.cpp',
               'src/Visualization/ColorScaleEditor.cpp',
               'src/Visualization/SqpColorScale.cpp',
               'src/Visualization/QCPColorMapIterator.cpp',
               'src/Visualization/VisualizationSelectionZoneItem.cpp',
               'src/Visualization/VisualizationSelectionZoneManager.cpp',
               'src/Actions/SelectionZoneAction.cpp',
               'src/Actions/ActionsGuiController.cpp',
               'src/Visualization/VisualizationActionManager.cpp',
               'src/Visualization/VisualizationMultiZoneSelectionDialog.cpp',
               'src/Catalogue/CatalogueExplorer.cpp',
               'src/Catalogue/CatalogueEventsWidget.cpp',
               'src/Catalogue/CatalogueSideBarWidget.cpp',
               'src/Catalogue/CatalogueInspectorWidget.cpp',
               'src/Catalogue/CatalogueTreeItems/CatalogueAbstractTreeItem.cpp',
               'src/Catalogue/CatalogueTreeItems/CatalogueTreeItem.cpp',
               'src/Catalogue/CatalogueTreeItems/CatalogueTextTreeItem.cpp',
               'src/Catalogue/CatalogueEventsModel.cpp',
               'src/Catalogue/CatalogueExplorerHelper.cpp',
               'src/Catalogue/CatalogueActionManager.cpp',
-              'src/Catalogue/CreateEventDialog.cpp',
               'src/Catalogue/CatalogueTreeModel.cpp'
             ]
             gui_inc = include_directories(['include'])
             sciqlop_gui_lib = library('sciqlopgui',
                                    gui_sources,
                                    gui_moc_files,
                                    rcc_files,
                                    include_directories : [gui_inc],
                                    dependencies : [ qt5printsupport, qt5gui, qt5widgets, qt5svg, sciqlop_core, catalogueapi_dep],
                                    install : true
                                    )
             sciqlop_gui = declare_dependency(link_with : sciqlop_gui_lib,
                                             include_directories : gui_inc,
                                             dependencies : [qt5printsupport, qt5gui, qt5widgets, qt5svg, sciqlop_core, catalogueapi_dep])

gui/src/Catalogue/CatalogueActionManager.cpp +33 -25

             #include "Catalogue/CatalogueActionManager.h"
             #include <Actions/ActionsGuiController.h>
             #include <Catalogue/CatalogueController.h>
             #include <DataSource/DataSourceItem.h>
             #include <SqpApplication.h>
             #include <Variable/Variable.h>
             #include <Visualization/VisualizationGraphWidget.h>
             #include <Visualization/VisualizationSelectionZoneItem.h>
             #include <Catalogue/CatalogueEventsWidget.h>
             #include <Catalogue/CatalogueExplorer.h>
             #include <Catalogue/CatalogueSideBarWidget.h>
-            #include <Catalogue/CreateEventDialog.h>
             #include <CatalogueDao.h>
             #include <DBCatalogue.h>
             #include <DBEvent.h>
             #include <DBEventProduct.h>
             #include <QBoxLayout>
             #include <QComboBox>
             #include <QDialog>
             #include <QDialogButtonBox>
             #include <QLineEdit>
             #include <memory>
+            const auto CATALOGUE_MENU_NAME = QObject::tr("Catalogues");
+            const auto CATALOGUE_CREATE_EVENT_MENU_NAME = QObject::tr("New Event");
+            const auto DEFAULT_EVENT_NAME = QObject::tr("New Event");
+            const auto DEFAULT_CATALOGUE_NAME = QObject::tr("New Catalogue");
             struct CatalogueActionManager::CatalogueActionManagerPrivate {
                 CatalogueExplorer *m_CatalogueExplorer = nullptr;
                 CatalogueActionManagerPrivate(CatalogueExplorer *catalogueExplorer)
                         : m_CatalogueExplorer(catalogueExplorer)
                 {
                 }
                 void createEventFromZones(const QString &eventName,
                                           const QVector<VisualizationSelectionZoneItem *> &zones,
                                           const std::shared_ptr<DBCatalogue> &catalogue = nullptr)
                 {
                     auto event = std::make_shared<DBEvent>();
                     event->setName(eventName);
                     std::list<DBEventProduct> productList;
                     for (auto zone : zones) {
                         auto graph = zone->parentGraphWidget();
                         for (auto var : graph->variables()) {
                             auto eventProduct = std::make_shared<DBEventProduct>();
                             eventProduct->setEvent(*event);
                             auto productId
                                 = var->metadata().value(DataSourceItem::ID_DATA_KEY, "UnknownID").toString();
                             auto zoneRange = zone->range();
                             eventProduct->setTStart(zoneRange.m_TStart);
                             eventProduct->setTEnd(zoneRange.m_TEnd);
                             eventProduct->setProductId(productId);
                             productList.push_back(*eventProduct);
                         }
                     }
                     event->setEventProducts(productList);
                     sqpApp->catalogueController().addEvent(event);
                     if (catalogue) {
                         catalogue->addEvent(event->getUniqId());
                         sqpApp->catalogueController().updateCatalogue(catalogue);
                         m_CatalogueExplorer->sideBarWidget().setCatalogueChanges(catalogue, true);
                         if (m_CatalogueExplorer->eventsWidget().displayedCatalogues().contains(catalogue)) {
                             m_CatalogueExplorer->eventsWidget().addEvent(event);
                             m_CatalogueExplorer->eventsWidget().setEventChanges(event, true);
                         }
                     }
                     else if (m_CatalogueExplorer->eventsWidget().isAllEventsDisplayed()) {
                         m_CatalogueExplorer->eventsWidget().addEvent(event);
                         m_CatalogueExplorer->eventsWidget().setEventChanges(event, true);
                     }
                 }
             };
             CatalogueActionManager::CatalogueActionManager(CatalogueExplorer *catalogueExplorer)
                     : impl{spimpl::make_unique_impl<CatalogueActionManagerPrivate>(catalogueExplorer)}
             {
             }
             void CatalogueActionManager::installSelectionZoneActions()
             {
                 auto &actionController = sqpApp->actionsGuiController();
                 auto createEventEnableFuntion = [](auto zones) {
                     // Checks that all variables in the zones doesn't refer to the same product
                     QSet<QString> usedDatasource;
                     for (auto zone : zones) {
                         auto graph = zone->parentGraphWidget();
                         auto variables = graph->variables();
                         for (auto var : variables) {
                             auto datasourceId = var->metadata().value(DataSourceItem::ID_DATA_KEY).toString();
                             if (!usedDatasource.contains(datasourceId)) {
                                 usedDatasource.insert(datasourceId);
                             }
                             else {
                                 return false;
                             }
                         }
                     }
                     return true;
                 };
                 auto createEventAction = actionController.addSectionZoneAction(
-                    {QObject::tr("Catalogues")}, QObject::tr("New Event..."), [this](auto zones) {
+                    {CATALOGUE_MENU_NAME, CATALOGUE_CREATE_EVENT_MENU_NAME}, QObject::tr("Without Catalogue"),
-                        CreateEventDialog dialog(
+                    [this](auto zones) { impl->createEventFromZones(DEFAULT_EVENT_NAME, zones); });
-                            impl->m_CatalogueExplorer->sideBarWidget().getCatalogues(REPOSITORY_DEFAULT));
-                        dialog.hideCatalogueChoice();
-                        if (dialog.exec() == QDialog::Accepted) {
-                            impl->createEventFromZones(dialog.eventName(), zones);
-                    });
                 createEventAction->setEnableFunction(createEventEnableFuntion);
-                auto createEventInCatalogueAction = actionController.addSectionZoneAction(
+                auto createEventInNewCatalogueAction = actionController.addSectionZoneAction(
-                    {QObject::tr("Catalogues")}, QObject::tr("New Event in Catalogue..."), [this](auto zones) {
+                    {CATALOGUE_MENU_NAME, CATALOGUE_CREATE_EVENT_MENU_NAME}, QObject::tr("In New Catalogue"),
-                        CreateEventDialog dialog(
+                    [this](auto zones) {
-                            impl->m_CatalogueExplorer->sideBarWidget().getCatalogues(REPOSITORY_DEFAULT));
-                        if (dialog.exec() == QDialog::Accepted) {
-                            auto selectedCatalogue = dialog.selectedCatalogue();
-                            if (!selectedCatalogue) {
-                                selectedCatalogue = std::make_shared<DBCatalogue>();
-                                selectedCatalogue->setName(dialog.catalogueName());
-                                sqpApp->catalogueController().addCatalogue(selectedCatalogue);
-                                impl->m_CatalogueExplorer->sideBarWidget().addCatalogue(selectedCatalogue,
-                                                                                        REPOSITORY_DEFAULT);
-                            impl->createEventFromZones(dialog.eventName(), zones, selectedCatalogue);
+                        auto newCatalogue = std::make_shared<DBCatalogue>();
+                        newCatalogue->setName(DEFAULT_CATALOGUE_NAME);
+                        sqpApp->catalogueController().addCatalogue(newCatalogue);
+                        impl->m_CatalogueExplorer->sideBarWidget().addCatalogue(newCatalogue,
+                                                                                REPOSITORY_DEFAULT);
+                        impl->createEventFromZones(DEFAULT_EVENT_NAME, zones, newCatalogue);
                     });
-                createEventInCatalogueAction->setEnableFunction(createEventEnableFuntion);
+                createEventInNewCatalogueAction->setEnableFunction(createEventEnableFuntion);
+                auto allCatalogues
+                    = impl->m_CatalogueExplorer->sideBarWidget().getCatalogues(REPOSITORY_DEFAULT);
+                for (auto catalogue : allCatalogues) {
+                    auto catalogueName = catalogue->getName();
+                    auto createEventInCatalogueAction = actionController.addSectionZoneAction(
+                        {CATALOGUE_MENU_NAME, CATALOGUE_CREATE_EVENT_MENU_NAME},
+                        QObject::tr("In ").append(catalogueName), [this, catalogue](auto zones) {
+                            impl->createEventFromZones(DEFAULT_EVENT_NAME, zones, catalogue);
+                        });
+                    createEventInCatalogueAction->setEnableFunction(createEventEnableFuntion);
+                }
             }

gui/include/Catalogue/CreateEventDialog.h removed 0 -36

NO CONTENT: file was removed

gui/src/Catalogue/CreateEventDialog.cpp removed 0 -59

NO CONTENT: file was removed

gui/ui/Catalogue/CreateEventDialog.ui removed 0 -55

NO CONTENT: file was removed

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