mirror of
				https://github.com/ciphervance/supercell-wx.git
				synced 2025-10-31 03:20:05 +00:00 
			
		
		
		
	Change cordinates to be displayed in a consistent format
This commit is contained in:
		
							parent
							
								
									60a059078c
								
							
						
					
					
						commit
						78b453249a
					
				
					 1 changed files with 15 additions and 5 deletions
				
			
		|  | @ -1,3 +1,4 @@ | ||||||
|  | #include <scwx/common/geographic.hpp> | ||||||
| #include <scwx/qt/model/marker_model.hpp> | #include <scwx/qt/model/marker_model.hpp> | ||||||
| #include <scwx/qt/manager/marker_manager.hpp> | #include <scwx/qt/manager/marker_manager.hpp> | ||||||
| #include <scwx/qt/types/marker_types.hpp> | #include <scwx/qt/types/marker_types.hpp> | ||||||
|  | @ -92,7 +93,7 @@ QVariant MarkerModel::data(const QModelIndex& index, int role) const | ||||||
| { | { | ||||||
| 
 | 
 | ||||||
|    static const char COORDINATE_FORMAT    = 'g'; |    static const char COORDINATE_FORMAT    = 'g'; | ||||||
|    static const int  COORDINATE_PRECISION = 6; |    static const int  COORDINATE_PRECISION = 10; | ||||||
| 
 | 
 | ||||||
|    if (!index.isValid() || index.row() < 0) |    if (!index.isValid() || index.row() < 0) | ||||||
|    { |    { | ||||||
|  | @ -119,8 +120,12 @@ QVariant MarkerModel::data(const QModelIndex& index, int role) const | ||||||
| 
 | 
 | ||||||
|    case static_cast<int>(Column::Latitude): |    case static_cast<int>(Column::Latitude): | ||||||
|       if (role == Qt::ItemDataRole::DisplayRole || |       if (role == Qt::ItemDataRole::DisplayRole || | ||||||
|           role == Qt::ItemDataRole::ToolTipRole || |           role == Qt::ItemDataRole::ToolTipRole) | ||||||
|           role == Qt::ItemDataRole::EditRole) |       { | ||||||
|  |          return QString::fromStdString( | ||||||
|  |             common::GetLatitudeString(markerInfo->latitude)); | ||||||
|  |       } | ||||||
|  |       else if (role == Qt::ItemDataRole::EditRole) | ||||||
|       { |       { | ||||||
|          return QString::number( |          return QString::number( | ||||||
|             markerInfo->latitude, COORDINATE_FORMAT, COORDINATE_PRECISION); |             markerInfo->latitude, COORDINATE_FORMAT, COORDINATE_PRECISION); | ||||||
|  | @ -129,13 +134,18 @@ QVariant MarkerModel::data(const QModelIndex& index, int role) const | ||||||
| 
 | 
 | ||||||
|    case static_cast<int>(Column::Longitude): |    case static_cast<int>(Column::Longitude): | ||||||
|       if (role == Qt::ItemDataRole::DisplayRole || |       if (role == Qt::ItemDataRole::DisplayRole || | ||||||
|           role == Qt::ItemDataRole::ToolTipRole || |           role == Qt::ItemDataRole::ToolTipRole) | ||||||
|           role == Qt::ItemDataRole::EditRole) |       { | ||||||
|  |          return QString::fromStdString( | ||||||
|  |             common::GetLongitudeString(markerInfo->longitude)); | ||||||
|  |       } | ||||||
|  |       else if (role == Qt::ItemDataRole::EditRole) | ||||||
|       { |       { | ||||||
|          return QString::number( |          return QString::number( | ||||||
|             markerInfo->longitude, COORDINATE_FORMAT, COORDINATE_PRECISION); |             markerInfo->longitude, COORDINATE_FORMAT, COORDINATE_PRECISION); | ||||||
|       } |       } | ||||||
|       break; |       break; | ||||||
|  |       break; | ||||||
| 
 | 
 | ||||||
|    default: |    default: | ||||||
|       break; |       break; | ||||||
|  |  | ||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue
	
	 AdenKoperczak
						AdenKoperczak