GIT_REPOSITORIES/LPP/Users/mperrinel/SciQLop-fork Commit - r1369:b20dcec1c57b

Fix bug time precision with catalogue

perrinel -

r1369:b20dcec1c57b

parent child

Context file:

r1369:b20dcec1c57b

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/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/src/Catalogue/CatalogueEventsModel.cpp +10 -4

                         case CatalogueEventsModel::Column::Name:
                             return event->getName();
                         case CatalogueEventsModel::Column::TStart:
-                            return nbEventProducts(event) > 0 ? DateUtils::dateTime(event->getTStart())
+                            return nbEventProducts(event) > 0
+                                       ? DateUtils::dateTime(event->getTStart())
+                                             .toString(DATETIME_FORMAT_ONE_LINE)
                                        : QVariant{};
                         case CatalogueEventsModel::Column::TEnd:
-                            return nbEventProducts(event) > 0 ? DateUtils::dateTime(event->getTEnd())
+                            return nbEventProducts(event) > 0
+                                       ? DateUtils::dateTime(event->getTEnd())
+                                             .toString(DATETIME_FORMAT_ONE_LINE)
                                        : QVariant{};
                         case CatalogueEventsModel::Column::Product: {
                             auto eventProducts = event->getEventProducts();
                         case CatalogueEventsModel::Column::Name:
                             return eventProduct->getProductId();
                         case CatalogueEventsModel::Column::TStart:
-                            return DateUtils::dateTime(eventProduct->getTStart());
+                            return DateUtils::dateTime(eventProduct->getTStart())
+                                .toString(DATETIME_FORMAT_ONE_LINE);
                         case CatalogueEventsModel::Column::TEnd:
-                            return DateUtils::dateTime(eventProduct->getTEnd());
+                            return DateUtils::dateTime(eventProduct->getTEnd())
+                                .toString(DATETIME_FORMAT_ONE_LINE);
                         case CatalogueEventsModel::Column::Product:
                             return eventProduct->getProductId();
                         case CatalogueEventsModel::Column::Tags:

gui/src/Catalogue/CatalogueEventsWidget.cpp +5 0

                 ui->treeView->setDragDropMode(QAbstractItemView::DragDrop);
                 ui->treeView->setDragEnabled(true);
                 connect(ui->btnTime, &QToolButton::clicked, [this](auto checked) {
                     if (checked) {
                         ui->btnChart->setChecked(false);
                                                              QHeaderView::Interactive);
                 ui->treeView->header()->resizeSection((int)CatalogueEventsModel::Column::Validation,
                                                       VALIDATION_COLUMN_SIZE);
+                ui->treeView->header()->setSectionResizeMode((int)CatalogueEventsModel::Column::TStart,
+                                                             QHeaderView::ResizeToContents);
+                ui->treeView->header()->setSectionResizeMode((int)CatalogueEventsModel::Column::TEnd,
+                                                             QHeaderView::ResizeToContents);
                 ui->treeView->header()->setSortIndicatorShown(true);
                 connect(impl->m_Model, &CatalogueEventsModel::modelSorted, [this]() {

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

                 impl->connectCatalogueUpdateSignals(this, ui);
                 impl->connectEventUpdateSignals(this, ui);
+                ui->dateTimeEventTStart->setDisplayFormat(DATETIME_FORMAT);
+                ui->dateTimeEventTEnd->setDisplayFormat(DATETIME_FORMAT);
             }
             CatalogueInspectorWidget::~CatalogueInspectorWidget()

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/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