HG_REPOSITORIES/LPP/SciQLOP_Repos/SciQLop Commit - r1162:73d5f3ef941a

"Apply" and "cancel" buttons on an event

trabillard -

r1162:73d5f3ef941a

parent child

Context file:

r1162:73d5f3ef941a

gui/include/Catalogue/CatalogueExplorerHelper.h created 644 +13 0

@@ -0,0 +1,13
	1	#ifndef SCIQLOP_CATALOGUEEXPLORERHELPER_H
	2	#define SCIQLOP_CATALOGUEEXPLORERHELPER_H
	3
	4	#include <QWidget>
	5
	6	#include <functional>
	7
	8	struct CatalogueExplorerHelper {
	9	static QWidget buildValidationWidget(QWidget parent, std::function<void()> save,
	10	std::function<void()> discard);
	11	};
	12
	13	#endif // SCIQLOP_CATALOGUEEXPLORERHELPER_H

gui/src/Catalogue/CatalogueExplorerHelper.cpp created 644 +32 0

@@ -0,0 +1,32
	1	#include "Catalogue/CatalogueExplorerHelper.h"
	2
	3	#include <QBoxLayout>
	4	#include <QToolButton>
	5
	6	const auto VALIDATION_BUTTON_ICON_SIZE = 12;
	7
	8	QWidget CatalogueExplorerHelper::buildValidationWidget(QWidget parent, std::function<void()> save,
	9	std::function<void()> discard)
	10	{
	11	auto widget = new QWidget{parent};
	12
	13	auto layout = new QHBoxLayout{widget};
	14	layout->setContentsMargins(0, 0, 0, 0);
	15	layout->setSpacing(0);
	16
	17	auto btnValid = new QToolButton{widget};
	18	btnValid->setIcon(QIcon{":/icones/save"});
	19	btnValid->setIconSize(QSize{VALIDATION_BUTTON_ICON_SIZE, VALIDATION_BUTTON_ICON_SIZE});
	20	btnValid->setAutoRaise(true);
	21	QObject::connect(btnValid, &QToolButton::clicked, save);
	22	layout->addWidget(btnValid);
	23
	24	auto btnDiscard = new QToolButton{widget};
	25	btnDiscard->setIcon(QIcon{":/icones/discard"});
	26	btnDiscard->setIconSize(QSize{VALIDATION_BUTTON_ICON_SIZE, VALIDATION_BUTTON_ICON_SIZE});
	27	btnDiscard->setAutoRaise(true);
	28	QObject::connect(btnDiscard, &QToolButton::clicked, discard);
	29	layout->addWidget(btnDiscard);
	30
	31	return widget;
	32	}

gui/include/Catalogue/CatalogueEventsModel.h +22 0

             #ifndef SCIQLOP_CATALOGUEEVENTSMODEL_H
             #define SCIQLOP_CATALOGUEEVENTSMODEL_H
             #include <Common/spimpl.h>
             #include <QAbstractItemModel>
+            #include <QLoggingCategory>
+            #include <unordered_set>
             class DBEvent;
             class DBEventProduct;
+            Q_DECLARE_LOGGING_CATEGORY(LOG_CatalogueEventsModel)
             class CatalogueEventsModel : public QAbstractItemModel {
+                Q_OBJECT
+            signals:
+                void modelSorted();
             public:
                 CatalogueEventsModel(QObject *parent = nullptr);
+                enum class Column { Name, TStart, TEnd, Tags, Product, Validation, NbColumn };
                 void setEvents(const QVector<std::shared_ptr<DBEvent> > &events);
                 void addEvent(const std::shared_ptr<DBEvent> &event);
                 void removeEvent(const std::shared_ptr<DBEvent> &event);
+                QVector<std::shared_ptr<DBEvent> > events() const;
                 enum class ItemType { Root, Event, EventProduct };
                 ItemType itemTypeOf(const QModelIndex &index) const;
                 std::shared_ptr<DBEvent> getEvent(const QModelIndex &index) const;
                 std::shared_ptr<DBEvent> getParentEvent(const QModelIndex &index) const;
                 std::shared_ptr<DBEventProduct> getEventProduct(const QModelIndex &index) const;
+                /// Refresh the data for the specified event
                 void refreshEvent(const std::shared_ptr<DBEvent> &event);
+                /// Returns a QModelIndex which represent the specified event
+                QModelIndex indexOf(const std::shared_ptr<DBEvent> &event) const;
+                /// Marks a change flag on the specified event to allow sorting on the validation column
+                void setEventHasChanges(const std::shared_ptr<DBEvent> &event, bool hasChanges);
+                /// Returns true if the specified event has unsaved changes
+                bool eventsHasChanges(const std::shared_ptr<DBEvent> &event) const;
                 // Model
                 QModelIndex index(int row, int column, const QModelIndex &parent = QModelIndex()) const;
                 QModelIndex parent(const QModelIndex &index) const;
                 int rowCount(const QModelIndex &parent = QModelIndex()) const override;
                 int columnCount(const QModelIndex &parent = QModelIndex()) const override;
                 Qt::ItemFlags flags(const QModelIndex &index) const override;
                 QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
                 QVariant headerData(int section, Qt::Orientation orientation,
                                     int role = Qt::DisplayRole) const override;
                 void sort(int column, Qt::SortOrder order = Qt::AscendingOrder) override;
                 Qt::DropActions supportedDragActions() const override;
                 QStringList mimeTypes() const override;
                 QMimeData *mimeData(const QModelIndexList &indexes) const override;
             private:
                 class CatalogueEventsModelPrivate;
                 spimpl::unique_impl_ptr<CatalogueEventsModelPrivate> impl;
             };
             #endif // SCIQLOP_CATALOGUEEVENTSMODEL_H

gui/include/Catalogue/CatalogueTreeWidgetItem.h +3 0

             #ifndef SCIQLOP_CATALOGUETREEWIDGETITEM_H
             #define SCIQLOP_CATALOGUETREEWIDGETITEM_H
             #include <Common/spimpl.h>
             #include <QTreeWidgetItem>
             class DBCatalogue;
             class CatalogueTreeWidgetItem : public QTreeWidgetItem {
             public:
                 CatalogueTreeWidgetItem(std::shared_ptr<DBCatalogue> catalogue,
                                         int type = QTreeWidgetItem::Type);
                 QVariant data(int column, int role) const override;
                 void setData(int column, int role, const QVariant &value) override;
                 /// Returns the catalogue represented by the item
                 std::shared_ptr<DBCatalogue> catalogue() const;
                 /// Displays or hides the save and cancel buttons indicating that the catalogue has unsaved
                 /// changes
                 void setHasChanges(bool value);
+                /// Returns true if the widget indicating the event has unsaved changes is displayed
+                bool hasChanges();
                 /// Refreshes the data displayed by the item from the catalogue
                 void refresh();
             private:
                 class CatalogueTreeWidgetItemPrivate;
                 spimpl::unique_impl_ptr<CatalogueTreeWidgetItemPrivate> impl;
             };
             #endif // SCIQLOP_CATALOGUETREEWIDGETITEM_H

gui/meson.build +4 -2

             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/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/CatalogueInspectorWidget.h',
+              'include/Catalogue/CatalogueEventsModel.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'
             ]
             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/CatalogueTreeWidgetItem.cpp',
-              'src/Catalogue/CatalogueEventsModel.cpp'
+              'src/Catalogue/CatalogueEventsModel.cpp',
+              'src/Catalogue/CatalogueExplorerHelper.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/CatalogueEventsModel.cpp +75 -20

             #include "Catalogue/CatalogueEventsModel.h"
             #include <Common/DateUtils.h>
             #include <Common/MimeTypesDef.h>
             #include <DBEvent.h>
             #include <DBEventProduct.h>
             #include <DBTag.h>
             #include <Data/SqpRange.h>
             #include <SqpApplication.h>
             #include <Time/TimeController.h>
             #include <list>
             #include <unordered_map>
             #include <QHash>
             #include <QMimeData>
+            Q_LOGGING_CATEGORY(LOG_CatalogueEventsModel, "CatalogueEventsModel")
             const auto EVENT_ITEM_TYPE = 1;
             const auto EVENT_PRODUCT_ITEM_TYPE = 2;
             struct CatalogueEventsModel::CatalogueEventsModelPrivate {
                 QVector<std::shared_ptr<DBEvent> > m_Events;
                 std::unordered_map<DBEvent *, QVector<std::shared_ptr<DBEventProduct> > > m_EventProducts;
+                std::unordered_set<std::shared_ptr<DBEvent> > m_EventsWithChanges;
-                enum class Column { Name, TStart, TEnd, Tags, Product, NbColumn };
                 QStringList columnNames()
                 {
-                    return QStringList{tr("Event"), tr("TStart"), tr("TEnd"), tr("Tags"), tr("Product")};
+                    return QStringList{tr("Event"), tr("TStart"),  tr("TEnd"),
+                                       tr("Tags"),  tr("Product"), tr("")};
+                }
+                QVariant sortData(int col, const std::shared_ptr<DBEvent> &event) const
+                {
+                    if (col == (int)CatalogueEventsModel::Column::Validation) {
+                        return m_EventsWithChanges.find(event) != m_EventsWithChanges.cend() ? true
+                                                                                             : QVariant();
+                    }
+                    return eventData(col, event);
                 }
                 QVariant eventData(int col, const std::shared_ptr<DBEvent> &event) const
                 {
                     switch (static_cast<Column>(col)) {
-                        case Column::Name:
+                        case CatalogueEventsModel::Column::Name:
                             return event->getName();
-                        case Column::TStart:
+                        case CatalogueEventsModel::Column::TStart:
                             return nbEventProducts(event) > 0 ? DateUtils::dateTime(event->getTStart())
                                                               : QVariant{};
-                        case Column::TEnd:
+                        case CatalogueEventsModel::Column::TEnd:
                             return nbEventProducts(event) > 0 ? DateUtils::dateTime(event->getTEnd())
                                                               : QVariant{};
-                        case Column::Product:
+                        case CatalogueEventsModel::Column::Product:
                             return QString::number(nbEventProducts(event)) + " product(s)";
-                        case Column::Tags: {
+                        case CatalogueEventsModel::Column::Tags: {
                             QString tagList;
                             auto tags = event->getTags();
                             for (auto tag : tags) {
                                 tagList += tag.getName();
                                 tagList += ' ';
                             }
                             return tagList;
                         }
+                        case CatalogueEventsModel::Column::Validation:
+                            return QVariant();
                         default:
                             break;
                     }
                     Q_ASSERT(false);
                     return QStringLiteral("Unknown Data");
                 }
                 void parseEventProduct(const std::shared_ptr<DBEvent> &event)
                 {
                     for (auto product : event->getEventProducts()) {
                         m_EventProducts[event.get()].append(std::make_shared<DBEventProduct>(product));
                     }
                 }
                 int nbEventProducts(const std::shared_ptr<DBEvent> &event) const
                 {
                     auto eventProductsIt = m_EventProducts.find(event.get());
                     if (eventProductsIt != m_EventProducts.cend()) {
                         return m_EventProducts.at(event.get()).count();
                     }
                     else {
                         return 0;
                     }
                 }
                 QVariant eventProductData(int col, const std::shared_ptr<DBEventProduct> &eventProduct) const
                 {
                     switch (static_cast<Column>(col)) {
-                        case Column::Name:
+                        case CatalogueEventsModel::Column::Name:
                             return eventProduct->getProductId();
-                        case Column::TStart:
+                        case CatalogueEventsModel::Column::TStart:
                             return DateUtils::dateTime(eventProduct->getTStart());
-                        case Column::TEnd:
+                        case CatalogueEventsModel::Column::TEnd:
                             return DateUtils::dateTime(eventProduct->getTEnd());
-                        case Column::Product:
+                        case CatalogueEventsModel::Column::Product:
                             return eventProduct->getProductId();
-                        case Column::Tags: {
+                        case CatalogueEventsModel::Column::Tags:
                             return QString();
+                        case CatalogueEventsModel::Column::Validation:
+                            return QVariant();
                         default:
                             break;
                     }
                     Q_ASSERT(false);
                     return QStringLiteral("Unknown Data");
                 }
             };
             CatalogueEventsModel::CatalogueEventsModel(QObject *parent)
                     : QAbstractItemModel(parent), impl{spimpl::make_unique_impl<CatalogueEventsModelPrivate>()}
             {
             }
             void CatalogueEventsModel::setEvents(const QVector<std::shared_ptr<DBEvent> > &events)
             {
                 beginResetModel();
                 impl->m_Events = events;
                 impl->m_EventProducts.clear();
+                impl->m_EventsWithChanges.clear();
                 for (auto event : events) {
                     impl->parseEventProduct(event);
                 }
                 endResetModel();
             }
             std::shared_ptr<DBEvent> CatalogueEventsModel::getEvent(const QModelIndex &index) const
             {
                 if (itemTypeOf(index) == CatalogueEventsModel::ItemType::Event) {
                     return impl->m_Events.value(index.row());
                 }
                 else {
                     return nullptr;
                 }
             }
             std::shared_ptr<DBEvent> CatalogueEventsModel::getParentEvent(const QModelIndex &index) const
             {
                 if (itemTypeOf(index) == CatalogueEventsModel::ItemType::EventProduct) {
                     return getEvent(index.parent());
                 }
                 else {
                     return nullptr;
                 }
             }
             std::shared_ptr<DBEventProduct>
             CatalogueEventsModel::getEventProduct(const QModelIndex &index) const
             {
                 if (itemTypeOf(index) == CatalogueEventsModel::ItemType::EventProduct) {
                     auto event = static_cast<DBEvent *>(index.internalPointer());
                     return impl->m_EventProducts.at(event).value(index.row());
                 }
                 else {
                     return nullptr;
                 }
             }
             void CatalogueEventsModel::addEvent(const std::shared_ptr<DBEvent> &event)
             {
                 beginInsertRows(QModelIndex(), impl->m_Events.count() - 1, impl->m_Events.count() - 1);
                 impl->m_Events.append(event);
                 impl->parseEventProduct(event);
                 endInsertRows();
             }
             void CatalogueEventsModel::removeEvent(const std::shared_ptr<DBEvent> &event)
             {
                 auto index = impl->m_Events.indexOf(event);
                 if (index >= 0) {
                     beginRemoveRows(QModelIndex(), index, index);
                     impl->m_Events.removeAt(index);
                     impl->m_EventProducts.erase(event.get());
+                    impl->m_EventsWithChanges.erase(event);
                     endRemoveRows();
                 }
             }
+            QVector<std::shared_ptr<DBEvent> > CatalogueEventsModel::events() const
+            {
+                return impl->m_Events;
+            }
             void CatalogueEventsModel::refreshEvent(const std::shared_ptr<DBEvent> &event)
             {
-                auto i = impl->m_Events.indexOf(event);
+                auto eventIndex = indexOf(event);
-                if (i >= 0) {
+                if (eventIndex.isValid()) {
-                    auto eventIndex = index(i, 0);
+                    // Refreshes the event line
                     auto colCount = columnCount();
-                    emit dataChanged(eventIndex, index(i, colCount));
+                    emit dataChanged(eventIndex, index(eventIndex.row(), colCount));
+                    // Also refreshes its children event products
                     auto childCount = rowCount(eventIndex);
                     emit dataChanged(index(0, 0, eventIndex), index(childCount, colCount, eventIndex));
                 }
+                else {
+                    qCWarning(LOG_CatalogueEventsModel()) << "refreshEvent: event not found.";
+                }
+            }
+            QModelIndex CatalogueEventsModel::indexOf(const std::shared_ptr<DBEvent> &event) const
+            {
+                auto row = impl->m_Events.indexOf(event);
+                if (row >= 0) {
+                    return index(row, 0);
+                }
+                return QModelIndex();
+            }
+            void CatalogueEventsModel::setEventHasChanges(const std::shared_ptr<DBEvent> &event,
+                                                          bool hasChanges)
+            {
+                if (hasChanges) {
+                    impl->m_EventsWithChanges.insert(event);
+                }
+                else {
+                    impl->m_EventsWithChanges.erase(event);
+                }
+            }
+            bool CatalogueEventsModel::eventsHasChanges(const std::shared_ptr<DBEvent> &event) const
+            {
+                return impl->m_EventsWithChanges.find(event) != impl->m_EventsWithChanges.cend();
             }
             QModelIndex CatalogueEventsModel::index(int row, int column, const QModelIndex &parent) const
             {
                 if (!hasIndex(row, column, parent)) {
                     return QModelIndex();
                 }
                 switch (itemTypeOf(parent)) {
                     case CatalogueEventsModel::ItemType::Root:
                         return createIndex(row, column);
                     case CatalogueEventsModel::ItemType::Event: {
                         auto event = getEvent(parent);
                         return createIndex(row, column, event.get());
                     }
                     case CatalogueEventsModel::ItemType::EventProduct:
                         break;
                     default:
                         break;
                 }
                 return QModelIndex();
             }
             QModelIndex CatalogueEventsModel::parent(const QModelIndex &index) const
             {
                 switch (itemTypeOf(index)) {
                     case CatalogueEventsModel::ItemType::EventProduct: {
                         auto parentEvent = static_cast<DBEvent *>(index.internalPointer());
                         auto it
                             = std::find_if(impl->m_Events.cbegin(), impl->m_Events.cend(),
                                            [parentEvent](auto event) { return event.get() == parentEvent; });
                         if (it != impl->m_Events.cend()) {
                             return createIndex(it - impl->m_Events.cbegin(), 0);
                         }
                         else {
                             return QModelIndex();
                         }
                     }
                     case CatalogueEventsModel::ItemType::Root:
                         break;
                     case CatalogueEventsModel::ItemType::Event:
                         break;
                     default:
                         break;
                 }
                 return QModelIndex();
             }
             int CatalogueEventsModel::rowCount(const QModelIndex &parent) const
             {
                 if (parent.column() > 0) {
                     return 0;
                 }
                 switch (itemTypeOf(parent)) {
                     case CatalogueEventsModel::ItemType::Root:
                         return impl->m_Events.count();
                     case CatalogueEventsModel::ItemType::Event: {
                         auto event = getEvent(parent);
                         return impl->m_EventProducts[event.get()].count();
                     }
                     case CatalogueEventsModel::ItemType::EventProduct:
                         break;
                     default:
                         break;
                 }
                 return 0;
             }
             int CatalogueEventsModel::columnCount(const QModelIndex &parent) const
             {
-                return static_cast<int>(CatalogueEventsModelPrivate::Column::NbColumn);
+                return static_cast<int>(CatalogueEventsModel::Column::NbColumn);
             }
             Qt::ItemFlags CatalogueEventsModel::flags(const QModelIndex &index) const
             {
                 return Qt::ItemIsEnabled | Qt::ItemIsSelectable | Qt::ItemIsDragEnabled;
             }
             QVariant CatalogueEventsModel::data(const QModelIndex &index, int role) const
             {
                 if (index.isValid()) {
                     auto type = itemTypeOf(index);
                     if (type == CatalogueEventsModel::ItemType::Event) {
                         auto event = getEvent(index);
                         switch (role) {
                             case Qt::DisplayRole:
                                 return impl->eventData(index.column(), event);
                                 break;
                         }
                     }
                     else if (type == CatalogueEventsModel::ItemType::EventProduct) {
                         auto product = getEventProduct(index);
                         switch (role) {
                             case Qt::DisplayRole:
                                 return impl->eventProductData(index.column(), product);
                                 break;
                         }
                     }
                 }
                 return QVariant{};
             }
             QVariant CatalogueEventsModel::headerData(int section, Qt::Orientation orientation, int role) const
             {
                 if (orientation == Qt::Horizontal && role == Qt::DisplayRole) {
                     return impl->columnNames().value(section);
                 }
                 return QVariant();
             }
             void CatalogueEventsModel::sort(int column, Qt::SortOrder order)
             {
                 std::sort(impl->m_Events.begin(), impl->m_Events.end(),
                           [this, column, order](auto e1, auto e2) {
-                              auto data1 = impl->eventData(column, e1);
+                              auto data1 = impl->sortData(column, e1);
-                              auto data2 = impl->eventData(column, e2);
+                              auto data2 = impl->sortData(column, e2);
                               auto result = data1.toString() < data2.toString();
                               return order == Qt::AscendingOrder ? result : !result;
                           });
                 emit dataChanged(QModelIndex(), QModelIndex());
+                emit modelSorted();
             }
             Qt::DropActions CatalogueEventsModel::supportedDragActions() const
             {
                 return Qt::CopyAction | Qt::MoveAction;
             }
             QStringList CatalogueEventsModel::mimeTypes() const
             {
                 return {MIME_TYPE_EVENT_LIST, MIME_TYPE_TIME_RANGE};
             }
             QMimeData *CatalogueEventsModel::mimeData(const QModelIndexList &indexes) const
             {
                 auto mimeData = new QMimeData;
                 bool isFirst = true;
                 QVector<std::shared_ptr<DBEvent> > eventList;
                 QVector<std::shared_ptr<DBEventProduct> > eventProductList;
                 SqpRange firstTimeRange;
                 for (const auto &index : indexes) {
                     if (index.column() == 0) { // only the first column
                         auto type = itemTypeOf(index);
                         if (type == ItemType::Event) {
                             auto event = getEvent(index);
                             eventList << event;
                             if (isFirst) {
                                 isFirst = false;
                                 firstTimeRange.m_TStart = event->getTStart();
                                 firstTimeRange.m_TEnd = event->getTEnd();
                             }
                         }
                         else if (type == ItemType::EventProduct) {
                             auto product = getEventProduct(index);
                             eventProductList << product;
                             if (isFirst) {
                                 isFirst = false;
                                 firstTimeRange.m_TStart = product->getTStart();
                                 firstTimeRange.m_TEnd = product->getTEnd();
                             }
                         }
                     }
                 }
                 auto eventsEncodedData
                     = QByteArray{}; // sqpApp->catalogueController().->mimeDataForEvents(eventList); //TODO
                 mimeData->setData(MIME_TYPE_EVENT_LIST, eventsEncodedData);
                 if (eventList.count() + eventProductList.count() == 1) {
                     // No time range MIME data if multiple events are dragged
                     auto timeEncodedData = TimeController::mimeDataForTimeRange(firstTimeRange);
                     mimeData->setData(MIME_TYPE_TIME_RANGE, timeEncodedData);
                 }
                 return mimeData;
             }
             CatalogueEventsModel::ItemType CatalogueEventsModel::itemTypeOf(const QModelIndex &index) const
             {
                 if (!index.isValid()) {
                     return ItemType::Root;
                 }
                 else if (index.internalPointer() == nullptr) {
                     return ItemType::Event;
                 }
                 else {
                     return ItemType::EventProduct;
                 }
             }

gui/src/Catalogue/CatalogueEventsWidget.cpp +35 -3

             #include "Catalogue/CatalogueEventsWidget.h"
             #include "ui_CatalogueEventsWidget.h"
             #include <Catalogue/CatalogueController.h>
             #include <Catalogue/CatalogueEventsModel.h>
+            #include <Catalogue/CatalogueExplorerHelper.h>
             #include <CatalogueDao.h>
             #include <DBCatalogue.h>
             #include <SqpApplication.h>
             #include <Visualization/VisualizationTabWidget.h>
             #include <Visualization/VisualizationWidget.h>
             #include <Visualization/VisualizationZoneWidget.h>
             #include <QDialog>
             #include <QDialogButtonBox>
             #include <QListWidget>
             Q_LOGGING_CATEGORY(LOG_CatalogueEventsWidget, "CatalogueEventsWidget")
-            /// Format of the dates appearing in the label of a cursor
+            /// Fixed size of the validation column
-            const auto DATETIME_FORMAT = QStringLiteral("yyyy/MM/dd hh:mm:ss");
+            const auto VALIDATION_COLUMN_SIZE = 35;
             struct CatalogueEventsWidget::CatalogueEventsWidgetPrivate {
                 CatalogueEventsModel *m_Model = nullptr;
                 QStringList m_ZonesForTimeMode;
                 QString m_ZoneForGraphMode;
                 VisualizationWidget *m_VisualizationWidget = nullptr;
                 void setEvents(const QVector<std::shared_ptr<DBEvent> > &events, QTreeView *treeView)
                 {
                     treeView->setSortingEnabled(false);
                     m_Model->setEvents(events);
                     treeView->setSortingEnabled(true);
                 }
                 void addEvent(const std::shared_ptr<DBEvent> &event, QTreeView *treeView)
                 {
                     treeView->setSortingEnabled(false);
                     m_Model->addEvent(event);
                     treeView->setSortingEnabled(true);
                 }
                 void removeEvent(const std::shared_ptr<DBEvent> &event, QTreeView *treeView)
                 {
                     treeView->setSortingEnabled(false);
                     m_Model->removeEvent(event);
                     treeView->setSortingEnabled(true);
                 }
                 QStringList getAvailableVisualizationZoneList() const
                 {
                     if (m_VisualizationWidget) {
                         if (auto tab = m_VisualizationWidget->currentTabWidget()) {
                             return tab->availableZoneWidgets();
                         }
                     }
                     return QStringList{};
                 }
                 QStringList selectZone(QWidget *parent, const QStringList &selectedZones,
                                        bool allowMultiSelection, const QPoint &location)
                 {
                     auto availableZones = getAvailableVisualizationZoneList();
                     if (availableZones.isEmpty()) {
                         return QStringList{};
                     }
                     QDialog d(parent, Qt::Tool);
                     d.setWindowTitle("Choose a zone");
                     auto layout = new QVBoxLayout{&d};
                     layout->setContentsMargins(0, 0, 0, 0);
                     auto listWidget = new QListWidget{&d};
                     layout->addWidget(listWidget);
                     QSet<QListWidgetItem *> checkedItems;
                     for (auto zone : availableZones) {
                         auto item = new QListWidgetItem{zone};
                         item->setFlags(Qt::ItemIsEnabled | Qt::ItemIsUserCheckable);
                         if (selectedZones.contains(zone)) {
                             item->setCheckState(Qt::Checked);
                             checkedItems << item;
                         }
                         else {
                             item->setCheckState(Qt::Unchecked);
                         }
                         listWidget->addItem(item);
                     }
                     auto buttonBox = new QDialogButtonBox{QDialogButtonBox::Ok, &d};
                     layout->addWidget(buttonBox);
                     QObject::connect(buttonBox, &QDialogButtonBox::accepted, &d, &QDialog::accept);
                     QObject::connect(buttonBox, &QDialogButtonBox::rejected, &d, &QDialog::reject);
                     QObject::connect(listWidget, &QListWidget::itemChanged,
                                      [&checkedItems, allowMultiSelection, listWidget](auto item) {
                                          if (item->checkState() == Qt::Checked) {
                                              if (!allowMultiSelection) {
                                                  for (auto checkedItem : checkedItems) {
                                                      listWidget->blockSignals(true);
                                                      checkedItem->setCheckState(Qt::Unchecked);
                                                      listWidget->blockSignals(false);
                                                  }
                                                  checkedItems.clear();
                                              }
                                              checkedItems << item;
                                          }
                                          else {
                                              checkedItems.remove(item);
                                          }
                                      });
                     QStringList result;
                     d.setMinimumWidth(120);
                     d.resize(d.minimumSizeHint());
                     d.move(location);
                     if (d.exec() == QDialog::Accepted) {
                         for (auto item : checkedItems) {
                             result += item->text();
                         }
                     }
                     else {
                         result = selectedZones;
                     }
                     return result;
                 }
                 void updateForTimeMode(QTreeView *treeView)
                 {
                     auto selectedRows = treeView->selectionModel()->selectedRows();
                     if (selectedRows.count() == 1) {
                         auto event = m_Model->getEvent(selectedRows.first());
                         if (event) {
                             if (m_VisualizationWidget) {
                                 if (auto tab = m_VisualizationWidget->currentTabWidget()) {
                                     for (auto zoneName : m_ZonesForTimeMode) {
                                         if (auto zone = tab->getZoneWithName(zoneName)) {
                                             SqpRange eventRange;
                                             eventRange.m_TStart = event->getTStart();
                                             eventRange.m_TEnd = event->getTEnd();
                                             zone->setZoneRange(eventRange);
                                         }
                                     }
                                 }
                                 else {
                                     qCWarning(LOG_CatalogueEventsWidget())
                                         << "updateTimeZone: no tab found in the visualization";
                                 }
                             }
                             else {
                                 qCWarning(LOG_CatalogueEventsWidget())
                                     << "updateTimeZone: visualization widget not found";
                             }
                         }
                     }
                     else {
                         qCWarning(LOG_CatalogueEventsWidget())
                             << "updateTimeZone: not compatible with multiple events selected";
                     }
                 }
                 void updateForGraphMode(QTreeView *treeView)
                 {
                     auto selectedRows = treeView->selectionModel()->selectedRows();
                     if (selectedRows.count() == 1) {
                         auto event = m_Model->getEvent(selectedRows.first());
                         if (m_VisualizationWidget) {
                             if (auto tab = m_VisualizationWidget->currentTabWidget()) {
                                 if (auto zone = tab->getZoneWithName(m_ZoneForGraphMode)) {
                                     // TODO
                                 }
                             }
                             else {
                                 qCWarning(LOG_CatalogueEventsWidget())
                                     << "updateGraphMode: no tab found in the visualization";
                             }
                         }
                         else {
                             qCWarning(LOG_CatalogueEventsWidget())
                                 << "updateGraphMode: visualization widget not found";
                         }
                     }
                     else {
                         qCWarning(LOG_CatalogueEventsWidget())
                             << "updateGraphMode: not compatible with multiple events selected";
                     }
                 }
             };
             CatalogueEventsWidget::CatalogueEventsWidget(QWidget *parent)
                     : QWidget(parent),
                       ui(new Ui::CatalogueEventsWidget),
                       impl{spimpl::make_unique_impl<CatalogueEventsWidgetPrivate>()}
             {
                 ui->setupUi(this);
                 impl->m_Model = new CatalogueEventsModel{this};
                 ui->treeView->setModel(impl->m_Model);
                 ui->treeView->setSortingEnabled(true);
                 ui->treeView->setDragDropMode(QAbstractItemView::DragDrop);
                 ui->treeView->setDragEnabled(true);
                 connect(ui->btnTime, &QToolButton::clicked, [this](auto checked) {
                     if (checked) {
                         ui->btnChart->setChecked(false);
                         impl->m_ZonesForTimeMode
                             = impl->selectZone(this, impl->m_ZonesForTimeMode, true,
                                                this->mapToGlobal(ui->btnTime->frameGeometry().center()));
                         impl->updateForTimeMode(ui->treeView);
                     }
                 });
                 connect(ui->btnChart, &QToolButton::clicked, [this](auto checked) {
                     if (checked) {
                         ui->btnTime->setChecked(false);
                         impl->m_ZoneForGraphMode
                             = impl->selectZone(this, {impl->m_ZoneForGraphMode}, false,
                                                this->mapToGlobal(ui->btnChart->frameGeometry().center()))
                                   .value(0);
                         impl->updateForGraphMode(ui->treeView);
                     }
                 });
                 auto emitSelection = [this]() {
                     QVector<std::shared_ptr<DBEvent> > events;
                     QVector<QPair<std::shared_ptr<DBEvent>, std::shared_ptr<DBEventProduct> > > eventProducts;
                     for (auto rowIndex : ui->treeView->selectionModel()->selectedRows()) {
                         auto itemType = impl->m_Model->itemTypeOf(rowIndex);
                         if (itemType == CatalogueEventsModel::ItemType::Event) {
                             events << impl->m_Model->getEvent(rowIndex);
                         }
                         else if (itemType == CatalogueEventsModel::ItemType::EventProduct) {
                             eventProducts << qMakePair(impl->m_Model->getParentEvent(rowIndex),
                                                        impl->m_Model->getEventProduct(rowIndex));
                         }
                     }
                     if (!events.isEmpty() && eventProducts.isEmpty()) {
                         emit this->eventsSelected(events);
                     }
                     else if (events.isEmpty() && !eventProducts.isEmpty()) {
                         emit this->eventProductsSelected(eventProducts);
                     }
                     else {
                         emit this->selectionCleared();
                     }
                 };
                 connect(ui->treeView, &QTreeView::clicked, emitSelection);
                 connect(ui->treeView->selectionModel(), &QItemSelectionModel::selectionChanged, emitSelection);
                 connect(ui->treeView->selectionModel(), &QItemSelectionModel::selectionChanged, [this]() {
                     auto isNotMultiSelection = ui->treeView->selectionModel()->selectedRows().count() <= 1;
                     ui->btnChart->setEnabled(isNotMultiSelection);
                     ui->btnTime->setEnabled(isNotMultiSelection);
                     if (isNotMultiSelection && ui->btnTime->isChecked()) {
                         impl->updateForTimeMode(ui->treeView);
                     }
                     else if (isNotMultiSelection && ui->btnChart->isChecked()) {
                         impl->updateForGraphMode(ui->treeView);
                     }
                 });
                 ui->treeView->header()->setSectionResizeMode(QHeaderView::ResizeToContents);
-                ui->treeView->header()->setSectionResizeMode(0, QHeaderView::Stretch);
+                ui->treeView->header()->setSectionResizeMode((int)CatalogueEventsModel::Column::Name,
+                                                             QHeaderView::Stretch);
+                ui->treeView->header()->setSectionResizeMode((int)CatalogueEventsModel::Column::Validation,
+                                                             QHeaderView::Fixed);
+                ui->treeView->header()->resizeSection((int)CatalogueEventsModel::Column::Validation,
+                                                      VALIDATION_COLUMN_SIZE);
                 ui->treeView->header()->setSortIndicatorShown(true);
+                connect(impl->m_Model, &CatalogueEventsModel::modelSorted, [this]() {
+                    auto allEvents = impl->m_Model->events();
+                    for (auto event : allEvents) {
+                        setEventChanges(event, impl->m_Model->eventsHasChanges(event));
+                    }
+                });
             }
             CatalogueEventsWidget::~CatalogueEventsWidget()
             {
                 delete ui;
             }
             void CatalogueEventsWidget::setVisualizationWidget(VisualizationWidget *visualization)
             {
                 impl->m_VisualizationWidget = visualization;
             }
             void CatalogueEventsWidget::setEventChanges(const std::shared_ptr<DBEvent> &event, bool hasChanges)
             {
                 impl->m_Model->refreshEvent(event);
+                auto eventIndex = impl->m_Model->indexOf(event);
+                auto validationIndex
+                    = eventIndex.sibling(eventIndex.row(), (int)CatalogueEventsModel::Column::Validation);
+                if (hasChanges) {
+                    if (ui->treeView->indexWidget(validationIndex) == nullptr) {
+                        auto widget = CatalogueExplorerHelper::buildValidationWidget(
+                            ui->treeView, [this, event]() { setEventChanges(event, false); },
+                            [this, event]() { setEventChanges(event, false); });
+                        ui->treeView->setIndexWidget(validationIndex, widget);
+                    }
+                }
+                else {
+                    // Note: the widget is destroyed
+                    ui->treeView->setIndexWidget(validationIndex, nullptr);
+                }
+                impl->m_Model->setEventHasChanges(event, hasChanges);
             }
             void CatalogueEventsWidget::populateWithCatalogues(
                 const QVector<std::shared_ptr<DBCatalogue> > &catalogues)
             {
                 QSet<QUuid> eventIds;
                 QVector<std::shared_ptr<DBEvent> > events;
                 for (auto catalogue : catalogues) {
                     auto catalogueEvents = sqpApp->catalogueController().retrieveEventsFromCatalogue(catalogue);
                     for (auto event : catalogueEvents) {
                         if (!eventIds.contains(event->getUniqId())) {
                             events << event;
                             eventIds.insert(event->getUniqId());
                         }
                     }
                 }
                 impl->setEvents(events, ui->treeView);
             }
             void CatalogueEventsWidget::populateWithAllEvents()
             {
                 auto allEvents = sqpApp->catalogueController().retrieveAllEvents();
                 QVector<std::shared_ptr<DBEvent> > events;
                 for (auto event : allEvents) {
                     events << event;
                 }
                 impl->setEvents(events, ui->treeView);
             }

gui/src/Catalogue/CatalogueTreeWidgetItem.cpp +11 -27

             #include "Catalogue/CatalogueTreeWidgetItem.h"
+            #include <Catalogue/CatalogueExplorerHelper.h>
             #include <memory>
             #include <DBCatalogue.h>
-            #include <QBoxLayout>
-            #include <QToolButton>
-            const auto VALIDATION_BUTTON_ICON_SIZE = 12;
             /// Column in the tree widget where the apply and cancel buttons must appear
             const auto APPLY_CANCEL_BUTTONS_COLUMN = 1;
             struct CatalogueTreeWidgetItem::CatalogueTreeWidgetItemPrivate {
                 std::shared_ptr<DBCatalogue> m_Catalogue;
                 CatalogueTreeWidgetItemPrivate(std::shared_ptr<DBCatalogue> catalogue) : m_Catalogue(catalogue)
                 {
                 }
             };
             CatalogueTreeWidgetItem::CatalogueTreeWidgetItem(std::shared_ptr<DBCatalogue> catalogue, int type)
                     : QTreeWidgetItem(type),
                       impl{spimpl::make_unique_impl<CatalogueTreeWidgetItemPrivate>(catalogue)}
             {
                 setFlags(Qt::ItemIsEnabled | Qt::ItemIsSelectable | Qt::ItemIsEditable);
             }
             QVariant CatalogueTreeWidgetItem::data(int column, int role) const
             {
                 if (column == 0) {
                     switch (role) {
                         case Qt::EditRole: // fallthrough
                         case Qt::DisplayRole:
                             return impl->m_Catalogue->getName();
                         default:
                             break;
                     }
                 }
                 return QTreeWidgetItem::data(column, role);
             }
             void CatalogueTreeWidgetItem::setData(int column, int role, const QVariant &value)
             {
                 if (role == Qt::EditRole && column == 0) {
                     auto newName = value.toString();
                     if (newName != impl->m_Catalogue->getName()) {
                         setText(0, newName);
                         impl->m_Catalogue->setName(newName);
                         setHasChanges(true);
                     }
                 }
                 else {
                     QTreeWidgetItem::setData(column, role, value);
                 }
             }
             std::shared_ptr<DBCatalogue> CatalogueTreeWidgetItem::catalogue() const
             {
                 return impl->m_Catalogue;
             }
             void CatalogueTreeWidgetItem::setHasChanges(bool value)
             {
                 if (value) {
-                    if (treeWidget()->itemWidget(this, APPLY_CANCEL_BUTTONS_COLUMN) == nullptr) {
+                    if (!hasChanges()) {
-                        auto widet = new QWidget{treeWidget()};
+                        auto widget = CatalogueExplorerHelper::buildValidationWidget(
+                            treeWidget(), [this]() { setHasChanges(false); },
-                        auto layout = new QHBoxLayout{widet};
+                            [this]() { setHasChanges(false); });
-                        layout->setContentsMargins(0, 0, 0, 0);
+                        treeWidget()->setItemWidget(this, APPLY_CANCEL_BUTTONS_COLUMN, widget);
-                        layout->setSpacing(0);
-                        auto btnValid = new QToolButton{widet};
-                        btnValid->setIcon(QIcon{":/icones/save"});
-                        btnValid->setIconSize(QSize{VALIDATION_BUTTON_ICON_SIZE, VALIDATION_BUTTON_ICON_SIZE});
-                        btnValid->setAutoRaise(true);
-                        QObject::connect(btnValid, &QToolButton::clicked, [this]() { setHasChanges(false); });
-                        layout->addWidget(btnValid);
-                        auto btnDiscard = new QToolButton{widet};
-                        btnDiscard->setIcon(QIcon{":/icones/discard"});
-                        btnDiscard->setIconSize(
-                            QSize{VALIDATION_BUTTON_ICON_SIZE, VALIDATION_BUTTON_ICON_SIZE});
-                        btnDiscard->setAutoRaise(true);
-                        QObject::connect(btnDiscard, &QToolButton::clicked, [this]() { setHasChanges(false); });
-                        layout->addWidget(btnDiscard);
-                        treeWidget()->setItemWidget(this, APPLY_CANCEL_BUTTONS_COLUMN, {widet});
                     }
                 }
                 else {
                     // Note: the widget is destroyed
                     treeWidget()->setItemWidget(this, APPLY_CANCEL_BUTTONS_COLUMN, nullptr);
                 }
             }
+            bool CatalogueTreeWidgetItem::hasChanges()
+            {
+                return treeWidget()->itemWidget(this, APPLY_CANCEL_BUTTONS_COLUMN) != nullptr;
+            }
             void CatalogueTreeWidgetItem::refresh()
             {
                 emitDataChanged();
             }

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