GIT_REPOSITORIES/LPP/Users/mperrinel/SciQLop-fork Files · gui/src/Catalogue/CatalogueActionManager.cpp

Remove unused pending request of worker since it's already in the VC....

Remove unused pending request of worker since it's already in the VC. Fix bug with progress asynchrone computation

trabillard - - Load All Authors

File last commit:

r1382:eb278710ae3b


                r1395:b136e07f06a8

Download file

             CatalogueActionManager.cpp
        
                    174 lines
            
             | 6.8 KiB
            
                | text/x-c
            
             |
                CppLexer
            
             / gui / src / Catalogue / CatalogueActionManager.cpp
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        trabillard
    
Zone actions to create a new event

              r1195
            
      #include "Catalogue/CatalogueActionManager.h"

      #include <Actions/ActionsGuiController.h>

      #include <Catalogue/CatalogueController.h>

        trabillard
    
Use correct product ID when creating an event

              r1287
            
      #include <DataSource/DataSourceItem.h>

        trabillard
    
Zone actions to create a new event

              r1195
            
      #include <SqpApplication.h>

      #include <Variable/Variable.h>

      #include <Visualization/VisualizationGraphWidget.h>

      #include <Visualization/VisualizationSelectionZoneItem.h>

        trabillard
    
Updates model after an event has been created through the colored zone

              r1286
            
      #include <Catalogue/CatalogueEventsWidget.h>

      #include <Catalogue/CatalogueExplorer.h>

      #include <Catalogue/CatalogueSideBarWidget.h>

        trabillard
    
Zone actions to create a new event

              r1195
            
        trabillard
    
Some fixes

              r1290
            
      #include <CatalogueDao.h>

        trabillard
    
Zone actions to create a new event

              r1195
            
      #include <DBCatalogue.h>

      #include <DBEvent.h>

      #include <DBEventProduct.h>

      #include <QBoxLayout>

      #include <QComboBox>

      #include <QDialog>

      #include <QDialogButtonBox>

      #include <QLineEdit>

      #include <memory>

        trabillard
    
Rework event creation menus without popup dialog

              r1380
            
      const auto CATALOGUE_MENU_NAME = QObject::tr("Catalogues");

        trabillard
    
Refresh catalogue menu when the catalogue list changed

              r1381
            
      const auto CATALOGUE_CREATE_EVENT_MENU_NAME = QObject::tr("New Event...");

        trabillard
    
Rework event creation menus without popup dialog

              r1380
            
        trabillard
    
Refresh catalogue menu when the catalogue list changed

              r1381
            
      const auto DEFAULT_EVENT_NAME = QObject::tr("Event");

      const auto DEFAULT_CATALOGUE_NAME = QObject::tr("Catalogue");

        trabillard
    
Rework event creation menus without popup dialog

              r1380
            
        trabillard
    
Zone actions to create a new event

              r1195
            
      struct CatalogueActionManager::CatalogueActionManagerPrivate {

        trabillard
    
Updates model after an event has been created through the colored zone

              r1286
            
          CatalogueExplorer *m_CatalogueExplorer = nullptr;

        trabillard
    
Refresh catalogue menu when the catalogue list changed

              r1381
            
          QVector<std::shared_ptr<SelectionZoneAction> > m_CreateInCatalogueActions;

        trabillard
    
Updates model after an event has been created through the colored zone

              r1286
            
          CatalogueActionManagerPrivate(CatalogueExplorer *catalogueExplorer)

                  : m_CatalogueExplorer(catalogueExplorer)

          {

          }

        trabillard
    
Zone actions to create a new event

              r1195
            
          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);

        trabillard
    
Link with selection zone on event creation

              r1348
            
                      auto productId

                          = var->metadata().value(DataSourceItem::ID_DATA_KEY, "UnknownID").toString();

        trabillard
    
Zone actions to create a new event

              r1195
            
                      auto zoneRange = zone->range();

                      eventProduct->setTStart(zoneRange.m_TStart);

                      eventProduct->setTEnd(zoneRange.m_TEnd);

        trabillard
    
Link with selection zone on event creation

              r1348
            
                      eventProduct->setProductId(productId);

        trabillard
    
Zone actions to create a new event

              r1195
            
                      productList.push_back(*eventProduct);

                  }

              }

              event->setEventProducts(productList);

        trabillard
    
Adaptation to last version of catalogue controller

              r1196
            
              sqpApp->catalogueController().addEvent(event);

        trabillard
    
Updates model after an event has been created through the colored zone

              r1286
            
        trabillard
    
Zone actions to create a new event

              r1195
            
              if (catalogue) {

        perrinel
    
Add catalogue handling

              r1356
            
                  catalogue->addEvent(event->getUniqId());

                  sqpApp->catalogueController().updateCatalogue(catalogue);

        trabillard
    
Updates model after an event has been created through the colored zone

              r1286
            
                  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);

        trabillard
    
Zone actions to create a new event

              r1195
            
              }

          }

        trabillard
    
Refresh catalogue menu when the catalogue list changed

              r1381
            
          SelectionZoneAction::EnableFunction createEventEnableFuntion() const

          {

              return [](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;

              };

          }

        trabillard
    
Zone actions to create a new event

              r1195
            
      };

        trabillard
    
Updates model after an event has been created through the colored zone

              r1286
            
      CatalogueActionManager::CatalogueActionManager(CatalogueExplorer *catalogueExplorer)

              : impl{spimpl::make_unique_impl<CatalogueActionManagerPrivate>(catalogueExplorer)}

        trabillard
    
Zone actions to create a new event

              r1195
            
      {

      }

      void CatalogueActionManager::installSelectionZoneActions()

      {

          auto &actionController = sqpApp->actionsGuiController();

          auto createEventAction = actionController.addSectionZoneAction(

        trabillard
    
Rework event creation menus without popup dialog

              r1380
            
              {CATALOGUE_MENU_NAME, CATALOGUE_CREATE_EVENT_MENU_NAME}, QObject::tr("Without Catalogue"),

              [this](auto zones) { impl->createEventFromZones(DEFAULT_EVENT_NAME, zones); });

        trabillard
    
Refresh catalogue menu when the catalogue list changed

              r1381
            
          createEventAction->setEnableFunction(impl->createEventEnableFuntion());

        trabillard
    
LineEdit to filter the create catalogue menu

              r1382
            
          createEventAction->setAllowedFiltering(false);

        trabillard
    
Zone actions to create a new event

              r1195
            
        trabillard
    
Rework event creation menus without popup dialog

              r1380
            
          auto createEventInNewCatalogueAction = actionController.addSectionZoneAction(

              {CATALOGUE_MENU_NAME, CATALOGUE_CREATE_EVENT_MENU_NAME}, QObject::tr("In New Catalogue"),

              [this](auto zones) {

        trabillard
    
Zone actions to create a new event

              r1195
            
        trabillard
    
Rework event creation menus without popup dialog

              r1380
            
                  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);

        trabillard
    
Zone actions to create a new event

              r1195
            
              });

        trabillard
    
Refresh catalogue menu when the catalogue list changed

              r1381
            
          createEventInNewCatalogueAction->setEnableFunction(impl->createEventEnableFuntion());

        trabillard
    
LineEdit to filter the create catalogue menu

              r1382
            
          createEventInNewCatalogueAction->setAllowedFiltering(false);

        trabillard
    
Refresh catalogue menu when the catalogue list changed

              r1381
            
          refreshCreateInCatalogueAction();

        trabillard
    
LineEdit to filter the create catalogue menu

              r1382
            
          actionController.addFilterForMenu({CATALOGUE_MENU_NAME, CATALOGUE_CREATE_EVENT_MENU_NAME});

        trabillard
    
Refresh catalogue menu when the catalogue list changed

              r1381
            
      }

      void CatalogueActionManager::refreshCreateInCatalogueAction()

      {

          auto &actionController = sqpApp->actionsGuiController();

        trabillard
    
Rework event creation menus without popup dialog

              r1380
            
        trabillard
    
Refresh catalogue menu when the catalogue list changed

              r1381
            
          for (auto action : impl->m_CreateInCatalogueActions) {

              actionController.removeAction(action);

          }

          impl->m_CreateInCatalogueActions.clear();

        trabillard
    
Rework event creation menus without popup dialog

              r1380
            
          auto allCatalogues

              = impl->m_CatalogueExplorer->sideBarWidget().getCatalogues(REPOSITORY_DEFAULT);

        trabillard
    
Refresh catalogue menu when the catalogue list changed

              r1381
            
        trabillard
    
Rework event creation menus without popup dialog

              r1380
            
          for (auto catalogue : allCatalogues) {

              auto catalogueName = catalogue->getName();

              auto createEventInCatalogueAction = actionController.addSectionZoneAction(

                  {CATALOGUE_MENU_NAME, CATALOGUE_CREATE_EVENT_MENU_NAME},

        trabillard
    
Refresh catalogue menu when the catalogue list changed

              r1381
            
                  QObject::tr("In \"").append(catalogueName).append("\""), [this, catalogue](auto zones) {

        trabillard
    
Rework event creation menus without popup dialog

              r1380
            
                      impl->createEventFromZones(DEFAULT_EVENT_NAME, zones, catalogue);

                  });

        trabillard
    
Refresh catalogue menu when the catalogue list changed

              r1381
            
              createEventInCatalogueAction->setEnableFunction(impl->createEventEnableFuntion());

              impl->m_CreateInCatalogueActions << createEventInCatalogueAction;

        trabillard
    
Rework event creation menus without popup dialog

              r1380
            
          }

        trabillard
    
Zone actions to create a new event

              r1195
            
      }

	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

trabillard Zone actions to create a new event	r1195	#include "Catalogue/CatalogueActionManager.h"

		#include <Actions/ActionsGuiController.h>
		#include <Catalogue/CatalogueController.h>
trabillard Use correct product ID when creating an event	r1287	#include <DataSource/DataSourceItem.h>
trabillard Zone actions to create a new event	r1195	#include <SqpApplication.h>
		#include <Variable/Variable.h>
		#include <Visualization/VisualizationGraphWidget.h>
		#include <Visualization/VisualizationSelectionZoneItem.h>

trabillard Updates model after an event has been created through the colored zone	r1286	#include <Catalogue/CatalogueEventsWidget.h>
		#include <Catalogue/CatalogueExplorer.h>
		#include <Catalogue/CatalogueSideBarWidget.h>
trabillard Zone actions to create a new event	r1195
trabillard Some fixes	r1290	#include <CatalogueDao.h>
trabillard Zone actions to create a new event	r1195	#include <DBCatalogue.h>
		#include <DBEvent.h>
		#include <DBEventProduct.h>

		#include <QBoxLayout>
		#include <QComboBox>
		#include <QDialog>
		#include <QDialogButtonBox>
		#include <QLineEdit>
		#include <memory>

trabillard Rework event creation menus without popup dialog	r1380	const auto CATALOGUE_MENU_NAME = QObject::tr("Catalogues");
trabillard Refresh catalogue menu when the catalogue list changed	r1381	const auto CATALOGUE_CREATE_EVENT_MENU_NAME = QObject::tr("New Event...");
trabillard Rework event creation menus without popup dialog	r1380
trabillard Refresh catalogue menu when the catalogue list changed	r1381	const auto DEFAULT_EVENT_NAME = QObject::tr("Event");
		const auto DEFAULT_CATALOGUE_NAME = QObject::tr("Catalogue");
trabillard Rework event creation menus without popup dialog	r1380
trabillard Zone actions to create a new event	r1195	struct CatalogueActionManager::CatalogueActionManagerPrivate {
trabillard Updates model after an event has been created through the colored zone	r1286
		CatalogueExplorer *m_CatalogueExplorer = nullptr;
trabillard Refresh catalogue menu when the catalogue list changed	r1381	QVector<std::shared_ptr<SelectionZoneAction> > m_CreateInCatalogueActions;
trabillard Updates model after an event has been created through the colored zone	r1286
		CatalogueActionManagerPrivate(CatalogueExplorer *catalogueExplorer)
		: m_CatalogueExplorer(catalogueExplorer)
		{
		}

trabillard Zone actions to create a new event	r1195	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);

trabillard Link with selection zone on event creation	r1348	auto productId
		= var->metadata().value(DataSourceItem::ID_DATA_KEY, "UnknownID").toString();

trabillard Zone actions to create a new event	r1195	auto zoneRange = zone->range();
		eventProduct->setTStart(zoneRange.m_TStart);
		eventProduct->setTEnd(zoneRange.m_TEnd);

trabillard Link with selection zone on event creation	r1348	eventProduct->setProductId(productId);
trabillard Zone actions to create a new event	r1195
		productList.push_back(*eventProduct);
		}
		}

		event->setEventProducts(productList);

trabillard Adaptation to last version of catalogue controller	r1196	sqpApp->catalogueController().addEvent(event);

trabillard Updates model after an event has been created through the colored zone	r1286
trabillard Zone actions to create a new event	r1195	if (catalogue) {
perrinel Add catalogue handling	r1356	catalogue->addEvent(event->getUniqId());
		sqpApp->catalogueController().updateCatalogue(catalogue);
trabillard Updates model after an event has been created through the colored zone	r1286	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);
trabillard Zone actions to create a new event	r1195	}
		}
trabillard Refresh catalogue menu when the catalogue list changed	r1381
		SelectionZoneAction::EnableFunction createEventEnableFuntion() const
		{
		return [](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;
		};
		}
trabillard Zone actions to create a new event	r1195	};

trabillard Updates model after an event has been created through the colored zone	r1286	CatalogueActionManager::CatalogueActionManager(CatalogueExplorer *catalogueExplorer)
		: impl{spimpl::make_unique_impl<CatalogueActionManagerPrivate>(catalogueExplorer)}
trabillard Zone actions to create a new event	r1195	{
		}

		void CatalogueActionManager::installSelectionZoneActions()
		{
		auto &actionController = sqpApp->actionsGuiController();

		auto createEventAction = actionController.addSectionZoneAction(
trabillard Rework event creation menus without popup dialog	r1380	{CATALOGUE_MENU_NAME, CATALOGUE_CREATE_EVENT_MENU_NAME}, QObject::tr("Without Catalogue"),
		[this](auto zones) { impl->createEventFromZones(DEFAULT_EVENT_NAME, zones); });
trabillard Refresh catalogue menu when the catalogue list changed	r1381	createEventAction->setEnableFunction(impl->createEventEnableFuntion());
trabillard LineEdit to filter the create catalogue menu	r1382	createEventAction->setAllowedFiltering(false);
trabillard Zone actions to create a new event	r1195
trabillard Rework event creation menus without popup dialog	r1380	auto createEventInNewCatalogueAction = actionController.addSectionZoneAction(
		{CATALOGUE_MENU_NAME, CATALOGUE_CREATE_EVENT_MENU_NAME}, QObject::tr("In New Catalogue"),
		[this](auto zones) {
trabillard Zone actions to create a new event	r1195
trabillard Rework event creation menus without popup dialog	r1380	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);
trabillard Zone actions to create a new event	r1195	});
trabillard Refresh catalogue menu when the catalogue list changed	r1381	createEventInNewCatalogueAction->setEnableFunction(impl->createEventEnableFuntion());
trabillard LineEdit to filter the create catalogue menu	r1382	createEventInNewCatalogueAction->setAllowedFiltering(false);
trabillard Refresh catalogue menu when the catalogue list changed	r1381
		refreshCreateInCatalogueAction();
trabillard LineEdit to filter the create catalogue menu	r1382
		actionController.addFilterForMenu({CATALOGUE_MENU_NAME, CATALOGUE_CREATE_EVENT_MENU_NAME});
trabillard Refresh catalogue menu when the catalogue list changed	r1381	}

		void CatalogueActionManager::refreshCreateInCatalogueAction()
		{
		auto &actionController = sqpApp->actionsGuiController();
trabillard Rework event creation menus without popup dialog	r1380
trabillard Refresh catalogue menu when the catalogue list changed	r1381	for (auto action : impl->m_CreateInCatalogueActions) {
		actionController.removeAction(action);
		}
		impl->m_CreateInCatalogueActions.clear();
trabillard Rework event creation menus without popup dialog	r1380
		auto allCatalogues
		= impl->m_CatalogueExplorer->sideBarWidget().getCatalogues(REPOSITORY_DEFAULT);
trabillard Refresh catalogue menu when the catalogue list changed	r1381
trabillard Rework event creation menus without popup dialog	r1380	for (auto catalogue : allCatalogues) {
		auto catalogueName = catalogue->getName();
		auto createEventInCatalogueAction = actionController.addSectionZoneAction(
		{CATALOGUE_MENU_NAME, CATALOGUE_CREATE_EVENT_MENU_NAME},
trabillard Refresh catalogue menu when the catalogue list changed	r1381	QObject::tr("In \"").append(catalogueName).append("\""), [this, catalogue](auto zones) {
trabillard Rework event creation menus without popup dialog	r1380	impl->createEventFromZones(DEFAULT_EVENT_NAME, zones, catalogue);
		});
trabillard Refresh catalogue menu when the catalogue list changed	r1381	createEventInCatalogueAction->setEnableFunction(impl->createEventEnableFuntion());
		impl->m_CreateInCatalogueActions << createEventInCatalogueAction;
trabillard Rework event creation menus without popup dialog	r1380	}
trabillard Zone actions to create a new event	r1195	}