HG_REPOSITORIES/LPP/SciQLOP_Repos/SciQLop Commit - r1319:989011859ba2

Merge branch 'feature/FixCatalogue' into develop

perrinel -

r1319:989011859ba2

parent child

Context file:

r1319:989011859ba2

core/include/Common/DateUtils.h +4 0

             #include <QDateTime>
+            /// Format for datetimes
+            const auto DATETIME_FORMAT = QStringLiteral("dd/MM/yyyy \nhh:mm:ss:zzz");
+            const auto DATETIME_FORMAT_ONE_LINE = QStringLiteral("dd/MM/yyyy hh:mm:ss:zzz");
             /**
              * Utility class with methods for dates
              */

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

             {
                 impl->saveCatalogue(catalogue, true);
                 impl->m_KeysWithChanges.remove(impl->catalogueUniqueKey(catalogue));
+                // remove key of events of the catalogue
+                if (catalogue->getType() == CatalogueType::STATIC) {
+                    auto events = this->retrieveEventsFromCatalogue(catalogue);
+                    for (auto event : events) {
+                        impl->m_KeysWithChanges.remove(impl->eventUniqueKey(event));
+                    }
+                }
             }
             void CatalogueController::discardCatalogue(std::shared_ptr<DBCatalogue> catalogue, bool &removed)

core/src/Variable/VariableModel.cpp 0 -3

                 {UNIT_COLUMN, {QObject::tr("Unit")}},      {MISSION_COLUMN, {QObject::tr("Mission")}},
                 {PLUGIN_COLUMN, {QObject::tr("Plugin")}}};
-            /// Format for datetimes
-            const auto DATETIME_FORMAT = QStringLiteral("dd/MM/yyyy \nhh:mm:ss:zzz");
             QString uniqueName(const QString &defaultName,
                                const std::vector<std::shared_ptr<Variable> > &variables)
             {

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

                 void selectionZoneAdded(const std::shared_ptr<DBEvent> &event, const QString &productId,
                                         VisualizationSelectionZoneItem *selectionZone);
+                void eventCataloguesModified(const QVector<std::shared_ptr<DBCatalogue> > &catalogues);
             public:
                 explicit CatalogueEventsWidget(QWidget *parent = 0);
                 virtual ~CatalogueEventsWidget();
                 void addEvent(const std::shared_ptr<DBEvent> &event);
                 void setEventChanges(const std::shared_ptr<DBEvent> &event, bool hasChanges);
+                void setEventsChanges(const std::shared_ptr<DBEvent> &event, bool hasChanges);
                 QVector<std::shared_ptr<DBCatalogue> > displayedCatalogues() const;
                 bool isAllEventsDisplayed() const;
                 void clear();
                 void refresh();
+                // QWidget interface
+            protected:
+                void keyPressEvent(QKeyEvent *event);
             private:
                 Ui::CatalogueEventsWidget *ui;

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

                 void allEventsSelected();
                 void trashSelected();
                 void selectionCleared();
+                void catalogueSaved(const std::shared_ptr<DBCatalogue> &catalogue);
             public:
                 explicit CatalogueSideBarWidget(QWidget *parent = 0);
                 QVector<std::shared_ptr<DBCatalogue> > getCatalogues(const QString &repository) const;
+                // QWidget interface
+            protected:
+                void keyPressEvent(QKeyEvent *event);
             private slots:
                 void emitSelection();

gui/resources/icones/discard.png 644 ➡ 755 binary 0 0

NO CONTENT: modified file chmod 100644 => 100755, binary diff hidden

gui/src/Catalogue/CatalogueEventsModel.cpp +20 -8

@@ -48,13 +48,23 struct CatalogueEventsModel::CatalogueEventsModelPrivate {
48	case CatalogueEventsModel::Column::Name:	48	case CatalogueEventsModel::Column::Name:
49	return event->getName();	49	return event->getName();
50	case CatalogueEventsModel::Column::TStart:	50	case CatalogueEventsModel::Column::TStart:
51	return nbEventProducts(event) > 0 ? ~~DateUtils~~::~~dateTime~~(~~event~~->~~getTStart())~~	51	return nbEventProducts(event) > 0
52	: QVariant{};	52	? DateUtils::dateTime(event->getTStart())
		53	.toString(DATETIME_FORMAT_ONE_LINE)
		54	: QVariant{};
53	case CatalogueEventsModel::Column::TEnd:	55	case CatalogueEventsModel::Column::TEnd:
54	return nbEventProducts(event) > 0 ? ~~DateUtils~~::~~dateTime~~(~~event~~->~~getTEnd())~~	56	return nbEventProducts(event) > 0
55	: QVariant{};	57	? DateUtils::dateTime(event->getTEnd())
56	case CatalogueEventsModel::Column::Product:	58	.toString(DATETIME_FORMAT_ONE_LINE)
57	return QString::number(nbEventProducts(event)) + " product(s)";	59	: QVariant{};
		60	case CatalogueEventsModel::Column::Product: {
		61	auto eventProducts = event->getEventProducts();
		62	QStringList eventProductList;
		63	for (auto evtProduct : eventProducts) {
		64	eventProductList << evtProduct.getProductId();
		65	}
		66	return eventProductList.join(";");
		67	}
58	case CatalogueEventsModel::Column::Tags: {	68	case CatalogueEventsModel::Column::Tags: {
59	QString tagList;	69	QString tagList;
60	auto tags = event->getTags();	70	auto tags = event->getTags();
@@ -99,9 +109,11 struct CatalogueEventsModel::CatalogueEventsModelPrivate {
99	case CatalogueEventsModel::Column::Name:	109	case CatalogueEventsModel::Column::Name:
100	return eventProduct->getProductId();	110	return eventProduct->getProductId();
101	case CatalogueEventsModel::Column::TStart:	111	case CatalogueEventsModel::Column::TStart:
102	return DateUtils::dateTime(eventProduct->getTStart());	112	return DateUtils::dateTime(eventProduct->getTStart())
		113	.toString(DATETIME_FORMAT_ONE_LINE);
103	case CatalogueEventsModel::Column::TEnd:	114	case CatalogueEventsModel::Column::TEnd:
104	return DateUtils::dateTime(eventProduct->getTEnd());	115	return DateUtils::dateTime(eventProduct->getTEnd())
		116	.toString(DATETIME_FORMAT_ONE_LINE);
105	case CatalogueEventsModel::Column::Product:	117	case CatalogueEventsModel::Column::Product:
106	return eventProduct->getProductId();	118	return eventProduct->getProductId();
107	case CatalogueEventsModel::Column::Tags:	119	case CatalogueEventsModel::Column::Tags:

gui/src/Catalogue/CatalogueEventsWidget.cpp +48 -13

             #include <QDialog>
             #include <QDialogButtonBox>
+            #include <QKeyEvent>
             #include <QListWidget>
             #include <QMessageBox>
             Q_LOGGING_CATEGORY(LOG_CatalogueEventsWidget, "CatalogueEventsWidget")
-            /// Fixed size of the validation column
-            const auto VALIDATION_COLUMN_SIZE = 35;
             /// Percentage added to the range of a event when it is displayed
             const auto EVENT_RANGE_MARGE = 30; // in %
                 ui->treeView->setDragDropMode(QAbstractItemView::DragDrop);
                 ui->treeView->setDragEnabled(true);
                 connect(ui->btnTime, &QToolButton::clicked, [this](auto checked) {
                     if (checked) {
                         ui->btnChart->setChecked(false);
                     if (!events.isEmpty() && eventProducts.isEmpty()) {
-                        if (QMessageBox::warning(this, tr("Remove Event(s)"),
+                        auto canRemoveEvent
-                                                 tr("The selected event(s) will be permanently removed "
+                            = !this->isAllEventsDisplayed()
-                                                    "from the repository!\nAre you sure you want to continue?"),
+                              || (QMessageBox::warning(
-                                                 QMessageBox::Yes | QMessageBox::No, QMessageBox::No)
+                                      this, tr("Remove Event(s)"),
-                            == QMessageBox::Yes) {
+                                      tr("The selected event(s) will be permanently removed "
+                                         "from the repository!\nAre you sure you want to continue?"),
+                                      QMessageBox::Yes | QMessageBox::No, QMessageBox::No)
+                                  == QMessageBox::Yes);
+                        if (canRemoveEvent) {
                             for (auto event : events) {
-                                sqpApp->catalogueController().removeEvent(event);
+                                if (this->isAllEventsDisplayed()) {
-                                impl->removeEvent(event, ui->treeView);
+                                    sqpApp->catalogueController().removeEvent(event);
+                                    impl->removeEvent(event, ui->treeView);
+                                }
+                                else {
+                                    QVector<std::shared_ptr<DBCatalogue> > modifiedCatalogues;
+                                    for (auto catalogue : this->displayedCatalogues()) {
+                                        if (catalogue->removeEvent(event->getUniqId())) {
+                                            sqpApp->catalogueController().updateCatalogue(catalogue);
+                                            modifiedCatalogues << catalogue;
+                                        }
+                                    }
+                                    if (!modifiedCatalogues.empty()) {
+                                        emit eventCataloguesModified(modifiedCatalogues);
+                                    }
+                                }
+                                impl->m_Model->removeEvent(event);
                             }
                             emit this->eventsRemoved(events);
                         }
                     }
                 ui->treeView->header()->setSectionResizeMode((int)CatalogueEventsModel::Column::Tags,
                                                              QHeaderView::Stretch);
                 ui->treeView->header()->setSectionResizeMode((int)CatalogueEventsModel::Column::Validation,
-                                                             QHeaderView::Fixed);
+                                                             QHeaderView::ResizeToContents);
                 ui->treeView->header()->setSectionResizeMode((int)CatalogueEventsModel::Column::Name,
                                                              QHeaderView::Interactive);
-                ui->treeView->header()->resizeSection((int)CatalogueEventsModel::Column::Validation,
+                ui->treeView->header()->setSectionResizeMode((int)CatalogueEventsModel::Column::TStart,
-                                                      VALIDATION_COLUMN_SIZE);
+                                                             QHeaderView::ResizeToContents);
+                ui->treeView->header()->setSectionResizeMode((int)CatalogueEventsModel::Column::TEnd,
+                                                             QHeaderView::ResizeToContents);
                 ui->treeView->header()->setSortIndicatorShown(true);
                 connect(impl->m_Model, &CatalogueEventsModel::modelSorted, [this]() {
                                     emitSelection();
                                 });
                             ui->treeView->setIndexWidget(validationIndex, widget);
+                            ui->treeView->header()->resizeSection((int)CatalogueEventsModel::Column::Validation,
+                                                                  QHeaderView::ResizeToContents);
                         }
                     }
                     else {
                     emit selectionCleared();
                 }
             }
+            void CatalogueEventsWidget::keyPressEvent(QKeyEvent *event)
+            {
+                switch (event->key()) {
+                    case Qt::Key_Delete: {
+                        ui->btnRemove->click();
+                    }
+                    default:
+                        break;
+                }
+            }

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

                     ui->events->clear();
                 });
+                connect(ui->catalogues, &CatalogueSideBarWidget::catalogueSaved, ui->events,
+                        &CatalogueEventsWidget::refresh);
                 // Updates the inspectot when something is selected in the events
                 connect(ui->events, &CatalogueEventsWidget::eventsSelected, [this](auto events) {
                     if (events.count() == 1) {
                             sqpApp->catalogueController().updateEventProduct(eventProduct);
                             ui->events->setEventChanges(event, true);
                         });
+                connect(ui->events, &CatalogueEventsWidget::eventCataloguesModified,
+                        [this](const QVector<std::shared_ptr<DBCatalogue> > &catalogues) {
+                            for (auto catalogue : catalogues) {
+                                ui->catalogues->setCatalogueChanges(catalogue, true);
+                            }
+                        });
             }
             CatalogueExplorer::~CatalogueExplorer()

gui/src/Catalogue/CatalogueExplorerHelper.cpp +3 -5

             #include <QBoxLayout>
             #include <QToolButton>
-            const auto VALIDATION_BUTTON_ICON_SIZE = 12;
             QWidget *CatalogueExplorerHelper::buildValidationWidget(QWidget *parent, std::function<void()> save,
                                                                     std::function<void()> discard)
                 auto widget = new QWidget{parent};
                 auto layout = new QHBoxLayout{widget};
-                layout->setContentsMargins(0, 0, 0, 0);
-                layout->setSpacing(0);
                 auto btnValid = new QToolButton{widget};
                 btnValid->setIcon(QIcon{":/icones/save"});
-                btnValid->setIconSize(QSize{VALIDATION_BUTTON_ICON_SIZE, VALIDATION_BUTTON_ICON_SIZE});
                 btnValid->setAutoRaise(true);
                 QObject::connect(btnValid, &QToolButton::clicked, save);
                 layout->addWidget(btnValid);
                 auto btnDiscard = new QToolButton{widget};
                 btnDiscard->setIcon(QIcon{":/icones/discard"});
-                btnDiscard->setIconSize(QSize{VALIDATION_BUTTON_ICON_SIZE, VALIDATION_BUTTON_ICON_SIZE});
                 btnDiscard->setAutoRaise(true);
                 QObject::connect(btnDiscard, &QToolButton::clicked, discard);
                 layout->addWidget(btnDiscard);
+                layout->setContentsMargins(0, 0, 0, 0);
+                layout->setSpacing(0);
                 return widget;
             }

gui/src/Catalogue/CatalogueInspectorWidget.cpp +11 -2

                 impl->connectCatalogueUpdateSignals(this, ui);
                 impl->connectEventUpdateSignals(this, ui);
+                ui->dateTimeEventTStart->setDisplayFormat(DATETIME_FORMAT);
+                ui->dateTimeEventTEnd->setDisplayFormat(DATETIME_FORMAT);
             }
             CatalogueInspectorWidget::~CatalogueInspectorWidget()
                 ui->leEventName->setEnabled(true);
                 ui->leEventName->setText(event->getName());
                 ui->leEventProduct->setEnabled(false);
-                ui->leEventProduct->setText(
-                    QString::number(event->getEventProducts().size()).append(" product(s)"));
+                auto eventProducts = event->getEventProducts();
+                QStringList eventProductList;
+                for (auto evtProduct : eventProducts) {
+                    eventProductList << evtProduct.getProductId();
+                }
+                ui->leEventProduct->setText(eventProductList.join(";"));
                 QString tagList;
                 auto tags = event->getTagsNames();

gui/src/Catalogue/CatalogueSideBarWidget.cpp +19 -1

             #include <ComparaisonPredicate.h>
             #include <DBCatalogue.h>
+            #include <QKeyEvent>
             #include <QMenu>
             #include <QMessageBox>
             #include <QMimeData>
                 ui->treeView->header()->setStretchLastSection(false);
                 ui->treeView->header()->setSectionResizeMode(QHeaderView::ResizeToContents);
-                ui->treeView->header()->setSectionResizeMode(0, QHeaderView::Stretch);
+                ui->treeView->header()->setSectionResizeMode((int)CatalogueTreeModel::Column::Name,
+                                                             QHeaderView::Stretch);
                 connect(ui->treeView, &QTreeView::clicked, this, &CatalogueSideBarWidget::emitSelection);
                 connect(ui->treeView->selectionModel(), &QItemSelectionModel::currentChanged, this,
                                     catalogueToItem.second,
                                     impl->m_TreeModel->indexOf(catalogueToItem.second->parent()));
                             }
+                            emitSelection();
                         }
                     }
                 });
                             [this, validationIndex, sideBarWidget, catalogue]() {
                                 if (catalogue) {
                                     sqpApp->catalogueController().saveCatalogue(catalogue);
+                                    emit sideBarWidget->catalogueSaved(catalogue);
                                 }
                                 setHasChanges(false, validationIndex, sideBarWidget);
                             },
                                 }
                             });
                         sideBarWidget->ui->treeView->setIndexWidget(validationIndex, widget);
+                        sideBarWidget->ui->treeView->header()->resizeSection(
+                            (int)CatalogueTreeModel::Column::Validation, QHeaderView::ResizeToContents);
                     }
                 }
                 else {
                 auto validationIndex = index.sibling(index.row(), (int)CatalogueTreeModel::Column::Validation);
                 return treeView->indexWidget(validationIndex) != nullptr;
             }
+            void CatalogueSideBarWidget::keyPressEvent(QKeyEvent *event)
+            {
+                switch (event->key()) {
+                    case Qt::Key_Delete: {
+                        ui->btnRemove->click();
+                    }
+                    default:
+                        break;
+                }
+            }

gui/src/Catalogue/CatalogueTreeItems/CatalogueTreeItem.cpp +2 -5

                     if (action == Qt::MoveAction) {
                         for (auto catalogue : sourceCatalogues) {
                             catalogue->removeEvent(event->getUniqId());
+                            sqpApp->catalogueController().updateCatalogue(catalogue);
                         }
                     }
                     impl->m_Catalogue->addEvent(event->getUniqId());
+                    sqpApp->catalogueController().updateCatalogue(impl->m_Catalogue);
                 }
-                for (auto catalogue : sourceCatalogues) {
-                    sqpApp->catalogueController().updateCatalogue(catalogue);
-                sqpApp->catalogueController().updateCatalogue(impl->m_Catalogue);
             }
             std::shared_ptr<DBCatalogue> CatalogueTreeItem::catalogue() const

gui/src/Visualization/AxisRenderingUtils.cpp 0 -2

             namespace {
-            const auto DATETIME_FORMAT = QStringLiteral("yyyy/MM/dd hh:mm:ss:zzz");
             /// Format for datetimes on a axis
             const auto DATETIME_TICKER_FORMAT = QStringLiteral("yyyy/MM/dd \nhh:mm:ss");

gui/src/Visualization/VisualizationMultiZoneSelectionDialog.cpp +3 -3

             #include "Common/DateUtils.h"
             #include "Visualization/VisualizationSelectionZoneItem.h"
-            const auto DATETIME_FORMAT = QStringLiteral("yyyy/MM/dd hh:mm:ss");
+            const auto DATETIME_FORMAT_S = QStringLiteral("yyyy/MM/dd hh:mm:ss");
             struct VisualizationMultiZoneSelectionDialog::VisualizationMultiZoneSelectionDialogPrivate {
                 QVector<VisualizationSelectionZoneItem *> m_Zones;
                     }
                     auto range = zone->range();
-                    name += DateUtils::dateTime(range.m_TStart).toString(DATETIME_FORMAT);
+                    name += DateUtils::dateTime(range.m_TStart).toString(DATETIME_FORMAT_S);
                     name += " - ";
-                    name += DateUtils::dateTime(range.m_TEnd).toString(DATETIME_FORMAT);
+                    name += DateUtils::dateTime(range.m_TEnd).toString(DATETIME_FORMAT_S);
                     auto item = new QListWidgetItem(name, ui->listWidget);
                     item->setSelected(zone->selected());

gui/src/Visualization/VisualizationZoneWidget.cpp +4 -4

                                     break;
                             }
                             graphChild->setFlags(GraphFlag::DisableAll);
-                            qCDebug(LOG_VisualizationZoneWidget())
+                            qCDebug(LOG_VisualizationZoneWidget()) << tr("TORM: Range before: ")
-                                << tr("TORM: Range before: ") << graphChild->graphRange();
+                                                                   << graphChild->graphRange();
-                            qCDebug(LOG_VisualizationZoneWidget())
+                            qCDebug(LOG_VisualizationZoneWidget()) << tr("TORM: Range after : ")
-                                << tr("TORM: Range after : ") << graphChildRange;
+                                                                   << graphChildRange;
                             qCDebug(LOG_VisualizationZoneWidget())
                                 << tr("TORM: child dt") << graphChildRange.m_TEnd - graphChildRange.m_TStart;
                             graphChild->setGraphRange(graphChildRange);

gui/ui/Catalogue/CatalogueEventsWidget.ui 0 -1

              </widget>
              <resources>
               <include location="../../resources/sqpguiresources.qrc"/>
-              <include location="../../resources/sqpguiresources.qrc"/>
              </resources>
              <connections/>
             </ui>

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