diff options
| author |  Lubomir I. Ivanov <neolit123@gmail.com> | 2017-10-07 21:39:20 +0300 |
|---|---|---|
| committer | Lubomir I. Ivanov <neolit123@gmail.com> | 2017-10-09 13:38:58 +0300 |
| commit | 56e755b7119b494d2d875c617500d0299ae06a35 (patch) | |
| tree | 72a87c14e54d66465067eab60ec1a07016c39da5 /desktop-widgets | |
| parent | f5f2754b81a6396a681d8aec7eb7bcde3c7ed879 (diff) | |
| download | subsurface-56e755b7119b494d2d875c617500d0299ae06a35.tar.gz | |
Use lrint() for all degrees_t related rounding
In certain places the '(int)' cast is used, while in other the
llrint() or lrint() functions. Make the conversation from degrees
in the 'double' form to the 'int' degrees_t consistent using lrint().
lrint() is the function which should give the best results,
because it accepts a 'double' and results in a 'long'
even if degrees_t is 'int'. If the truncation from 'long' to 'int'
is discarding some of the precision then the next step
would be to turn degrees_t into a 64bit signed integer type.
Possible fix for #625.
Signed-off-by: Lubomir I. Ivanov <neolit123@gmail.com>
Diffstat (limited to 'desktop-widgets')
| -rw-r--r-- | desktop-widgets/locationinformation.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/desktop-widgets/locationinformation.cpp b/desktop-widgets/locationinformation.cpp index 542d268fb..6382378da 100644 --- a/desktop-widgets/locationinformation.cpp +++ b/desktop-widgets/locationinformation.cpp @@ -187,8 +187,8 @@ void LocationInformationWidget::acceptChanges() if (!ui.diveSiteCoordinates->text().isEmpty()) { double lat, lon; parseGpsText(ui.diveSiteCoordinates->text(), &lat, &lon); - currentDs->latitude.udeg = (int)(lat * 1000000.0); - currentDs->longitude.udeg = (int)(lon * 1000000.0); + currentDs->latitude.udeg = lrint(lat * 1000000.0); + currentDs->longitude.udeg = lrint(lon * 1000000.0); } if (dive_site_is_empty(currentDs)) { LocationInformationModel::instance()->removeRow(get_divesite_idx(currentDs)); @@ -265,8 +265,8 @@ void LocationInformationWidget::on_diveSiteCoordinates_textChanged(const QString if (!same_string(qPrintable(text), coords)) { double latitude, longitude; if (parseGpsText(text, &latitude, &longitude)) { - displayed_dive_site.latitude.udeg = (int)(latitude * 1000000); - displayed_dive_site.longitude.udeg = (int)(longitude * 1000000); + displayed_dive_site.latitude.udeg = lrint(latitude * 1000000); + displayed_dive_site.longitude.udeg = lrint(longitude * 1000000); markChangedWidget(ui.diveSiteCoordinates); emit coordinatesChanged(); ui.geoCodeButton->setEnabled(latitude != 0 && longitude != 0); |