Add configuration option to handle distance rounding

Author: mitxel-m

changelog.txt

@@ -4,6 +4,7 @@ V1.17.1
 [QMS-623] remove use of QTimer in BRouter startup error detection
 [QMS-630] BRouter on-the-fly routing cannot be canceled
 [QMS-649] Replace proj strings by EPSG code in CRS definitions
+[QMS-651] Add configuration option to handle distance rounding
 [QMS-654] MacOS build (changes to build scripts)
 
 V1.17.0

src/qmapshack/units/CUnitImperial.cpp

@@ -18,12 +18,18 @@
 **********************************************************************************************/
 
 #include "units/CUnitImperial.h"
+#include "helpers/CSettings.h"
 
 CUnitImperial::CUnitImperial(QObject* parent)
     : IUnit(eTypeImperial, "ft", footPerMeter, "mi/h", meterPerSecToMilePerHour, "ft", footPerMeter, parent) {}
 
 void CUnitImperial::meter2distance(qreal meter, QString& val, QString& unit) const /* override */
 {
+  qint32 roundLimit;
+  {
+  SETTINGS;
+  roundLimit = cfg.value("Units/roundLimit", 20).toInt();
+  }
   if (meter == NOFLOAT) {
     val = "-";
     unit.clear();
@@ -33,10 +39,10 @@ void CUnitImperial::meter2distance(qreal meter, QString& val, QString& unit) con
   } else if (meter < 1600) {
     val = QString::asprintf("%1.0f", meter * footPerMeter);
     unit = "ft";
-  } else if (meter < 16000) {
+  } else if (meter < (roundLimit * 1600 / 2)) {
     val = QString::asprintf("%1.2f", meter * milePerMeter);
     unit = "mi";
-  } else if (meter < 32000) {
+  } else if (meter < (roundLimit * 1600)) {
     val = QString::asprintf("%1.1f", meter * milePerMeter);
     unit = "mi";
   } else {

src/qmapshack/units/CUnitMetric.cpp

@@ -17,11 +17,17 @@
 
 **********************************************************************************************/
 #include "units/CUnitMetric.h"
+#include "helpers/CSettings.h"
 
 CUnitMetric::CUnitMetric(QObject* parent) : IUnit(eTypeMetric, "m", 1.0, "km/h", 3.6, "m", 1.0, parent) {}
 
 void CUnitMetric::meter2distance(qreal meter, QString& val, QString& unit) const /* override */
 {
+  qint32 roundLimit;
+  {
+  SETTINGS;
+  roundLimit = cfg.value("Units/roundLimit", 20).toInt();
+  }
   if (meter == NOFLOAT) {
     val = "-";
     unit.clear();
@@ -31,10 +37,10 @@ void CUnitMetric::meter2distance(qreal meter, QString& val, QString& unit) const
   } else if (meter < 1000) {
     val = QString::asprintf("%1.0f", meter);
     unit = "m";
-  } else if (meter < 10000) {
+  } else if (meter < (roundLimit * 1000 / 2)) {
     val = QString::asprintf("%1.2f", meter / 1000);
     unit = "km";
-  } else if (meter < 20000) {
+  } else if (meter < (roundLimit * 1000)) {
     val = QString::asprintf("%1.1f", meter / 1000);
     unit = "km";
   } else {

src/qmapshack/units/CUnitsSetup.cpp

@@ -21,6 +21,8 @@
 #include "CMainWindow.h"
 #include "units/IUnit.h"
 
+#include "helpers/CSettings.h"
+
 CUnitsSetup::CUnitsSetup(QWidget* parent) : QDialog(parent) {
   setupUi(this);
 
@@ -51,6 +53,11 @@ CUnitsSetup::CUnitsSetup(QWidget* parent) : QDialog(parent) {
       radioPercent->setChecked(true);
       break;
   }
+  
+  SETTINGS;
+  cfg.beginGroup("Units");
+  spinRoundLimit->setValue(cfg.value("roundLimit", 20).toInt());
+  cfg.endGroup();
 
   adjustSize();
 }
@@ -71,5 +78,11 @@ void CUnitsSetup::accept() {
   } else if (radioPercent->isChecked()) {
     IUnit::setSlopeMode(IUnit::eSlopePercent);
   }
+
+  SETTINGS;
+  cfg.beginGroup("Units");
+  cfg.setValue("roundLimit", spinRoundLimit->value());
+  cfg.endGroup();
+
   QDialog::accept();
 }

src/qmapshack/units/IUnitsSetup.ui

@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>269</width>
-    <height>229</height>
+    <width>430</width>
+    <height>340</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -52,6 +52,56 @@
          </property>
         </widget>
        </item>
+       <item>
+        <widget class="Line" name="line">
+         <property name="orientation">
+          <enum>Qt::Horizontal</enum>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <layout class="QHBoxLayout" name="horizontalLayout">
+         <item>
+          <widget class="QLabel" name="RoundText">
+           <property name="text">
+            <string>Round distances above</string>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QSpinBox" name="spinRoundLimit">
+           <property name="maximumSize">
+            <size>
+             <width>60</width>
+             <height>16777215</height>
+            </size>
+           </property>
+           <property name="layoutDirection">
+            <enum>Qt::LeftToRight</enum>
+           </property>
+           <property name="alignment">
+            <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+           </property>
+           <property name="minimum">
+            <number>20</number>
+           </property>
+           <property name="maximum">
+            <number>1000</number>
+           </property>
+           <property name="singleStep">
+            <number>10</number>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QLabel" name="RoundUnit">
+           <property name="text">
+            <string>Km | mi</string>
+           </property>
+          </widget>
+         </item>
+        </layout>
+       </item>
       </layout>
      </widget>
      <widget class="QWidget" name="tabSlope">