From 78b453249a445ee7864adbe02ab6e864abcb8fb0 Mon Sep 17 00:00:00 2001 From: AdenKoperczak Date: Fri, 11 Oct 2024 11:03:36 -0400 Subject: [PATCH] Change cordinates to be displayed in a consistent format --- scwx-qt/source/scwx/qt/model/marker_model.cpp | 20 ++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/scwx-qt/source/scwx/qt/model/marker_model.cpp b/scwx-qt/source/scwx/qt/model/marker_model.cpp index 9a046954..3ea77ecc 100644 --- a/scwx-qt/source/scwx/qt/model/marker_model.cpp +++ b/scwx-qt/source/scwx/qt/model/marker_model.cpp @@ -1,3 +1,4 @@ +#include #include #include #include @@ -92,7 +93,7 @@ QVariant MarkerModel::data(const QModelIndex& index, int role) const { static const char COORDINATE_FORMAT = 'g'; - static const int COORDINATE_PRECISION = 6; + static const int COORDINATE_PRECISION = 10; if (!index.isValid() || index.row() < 0) { @@ -119,8 +120,12 @@ QVariant MarkerModel::data(const QModelIndex& index, int role) const case static_cast(Column::Latitude): if (role == Qt::ItemDataRole::DisplayRole || - role == Qt::ItemDataRole::ToolTipRole || - role == Qt::ItemDataRole::EditRole) + role == Qt::ItemDataRole::ToolTipRole) + { + return QString::fromStdString( + common::GetLatitudeString(markerInfo->latitude)); + } + else if (role == Qt::ItemDataRole::EditRole) { return QString::number( markerInfo->latitude, COORDINATE_FORMAT, COORDINATE_PRECISION); @@ -129,13 +134,18 @@ QVariant MarkerModel::data(const QModelIndex& index, int role) const case static_cast(Column::Longitude): if (role == Qt::ItemDataRole::DisplayRole || - role == Qt::ItemDataRole::ToolTipRole || - role == Qt::ItemDataRole::EditRole) + role == Qt::ItemDataRole::ToolTipRole) + { + return QString::fromStdString( + common::GetLongitudeString(markerInfo->longitude)); + } + else if (role == Qt::ItemDataRole::EditRole) { return QString::number( markerInfo->longitude, COORDINATE_FORMAT, COORDINATE_PRECISION); } break; + break; default: break;