diff --git a/core/include/Common/DateUtils.h b/core/include/Common/DateUtils.h index 7d80539..b185027 100644 --- a/core/include/Common/DateUtils.h +++ b/core/include/Common/DateUtils.h @@ -5,6 +5,10 @@ #include +/// 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 */ diff --git a/core/src/Variable/VariableModel.cpp b/core/src/Variable/VariableModel.cpp index 490ebc8..be665ef 100644 --- a/core/src/Variable/VariableModel.cpp +++ b/core/src/Variable/VariableModel.cpp @@ -52,9 +52,6 @@ const auto COLUMN_PROPERTIES = QHash{ {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 > &variables) { diff --git a/gui/src/Catalogue/CatalogueEventsModel.cpp b/gui/src/Catalogue/CatalogueEventsModel.cpp index 5914d39..baae51d 100644 --- a/gui/src/Catalogue/CatalogueEventsModel.cpp +++ b/gui/src/Catalogue/CatalogueEventsModel.cpp @@ -48,11 +48,15 @@ struct CatalogueEventsModel::CatalogueEventsModelPrivate { case CatalogueEventsModel::Column::Name: return event->getName(); case CatalogueEventsModel::Column::TStart: - return nbEventProducts(event) > 0 ? DateUtils::dateTime(event->getTStart()) - : QVariant{}; + 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()) - : QVariant{}; + return nbEventProducts(event) > 0 + ? DateUtils::dateTime(event->getTEnd()) + .toString(DATETIME_FORMAT_ONE_LINE) + : QVariant{}; case CatalogueEventsModel::Column::Product: { auto eventProducts = event->getEventProducts(); QStringList eventProductList; @@ -105,9 +109,11 @@ struct CatalogueEventsModel::CatalogueEventsModelPrivate { 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: diff --git a/gui/src/Catalogue/CatalogueEventsWidget.cpp b/gui/src/Catalogue/CatalogueEventsWidget.cpp index 80e0fac..8386041 100644 --- a/gui/src/Catalogue/CatalogueEventsWidget.cpp +++ b/gui/src/Catalogue/CatalogueEventsWidget.cpp @@ -355,6 +355,7 @@ CatalogueEventsWidget::CatalogueEventsWidget(QWidget *parent) ui->treeView->setDragDropMode(QAbstractItemView::DragDrop); ui->treeView->setDragEnabled(true); + connect(ui->btnTime, &QToolButton::clicked, [this](auto checked) { if (checked) { ui->btnChart->setChecked(false); @@ -453,6 +454,10 @@ CatalogueEventsWidget::CatalogueEventsWidget(QWidget *parent) 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]() { diff --git a/gui/src/Catalogue/CatalogueInspectorWidget.cpp b/gui/src/Catalogue/CatalogueInspectorWidget.cpp index f213318..c24cbcc 100644 --- a/gui/src/Catalogue/CatalogueInspectorWidget.cpp +++ b/gui/src/Catalogue/CatalogueInspectorWidget.cpp @@ -28,6 +28,9 @@ CatalogueInspectorWidget::CatalogueInspectorWidget(QWidget *parent) impl->connectCatalogueUpdateSignals(this, ui); impl->connectEventUpdateSignals(this, ui); + + ui->dateTimeEventTStart->setDisplayFormat(DATETIME_FORMAT); + ui->dateTimeEventTEnd->setDisplayFormat(DATETIME_FORMAT); } CatalogueInspectorWidget::~CatalogueInspectorWidget() diff --git a/gui/src/Visualization/AxisRenderingUtils.cpp b/gui/src/Visualization/AxisRenderingUtils.cpp index 7fa33f0..f5ce4cb 100644 --- a/gui/src/Visualization/AxisRenderingUtils.cpp +++ b/gui/src/Visualization/AxisRenderingUtils.cpp @@ -13,8 +13,6 @@ Q_LOGGING_CATEGORY(LOG_AxisRenderingUtils, "AxisRenderingUtils") 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"); diff --git a/gui/src/Visualization/VisualizationMultiZoneSelectionDialog.cpp b/gui/src/Visualization/VisualizationMultiZoneSelectionDialog.cpp index e625b52..aaf9161 100644 --- a/gui/src/Visualization/VisualizationMultiZoneSelectionDialog.cpp +++ b/gui/src/Visualization/VisualizationMultiZoneSelectionDialog.cpp @@ -4,7 +4,7 @@ #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 m_Zones; @@ -46,9 +46,9 @@ void VisualizationMultiZoneSelectionDialog::setZones( } 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()); diff --git a/gui/ui/Catalogue/CatalogueEventsWidget.ui b/gui/ui/Catalogue/CatalogueEventsWidget.ui index 355c5f1..8d23d9e 100644 --- a/gui/ui/Catalogue/CatalogueEventsWidget.ui +++ b/gui/ui/Catalogue/CatalogueEventsWidget.ui @@ -139,7 +139,6 @@ -