API tools faq
paste
Advertisement
Guest User

Untitled

a guest
Jun 27th, 2017
55
0
Never
Add comment
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
C++ 9.32 KB | None | 0 0
raw download clone embed print report
  1. diff --git a/library/components/locationui.cpp b/library/components/locationui.cpp
  2. index 86a29d1..dd9218b 100644
  3. --- a/library/components/locationui.cpp
  4. +++ b/library/components/locationui.cpp
  5. @@ -249,15 +249,16 @@ void LocationUi::setLocation(const LocationData &location)
  6.  
  7.  void LocationUi::setDisplayedLocation(const LocationData &location)
  8.  {
  9. -    mLatitudeEdit->setText(QString::number(location.latitude, 'f', 8));
  10. -    mLongitudeEdit->setText(QString::number(location.longitude, 'f', 8));
  11. -    mAltitudeEdit->setText(QString::number(location.altitude, 'f', 8));
  12. -    mDirectionEdit->setText(QString::number(location.direction, 'f', 8));
  13. -    mGroundSpeedEdit->setText(QString::number(location.groundSpeed, 'f', 8));
  14. -    mVerticalSpeedEdit->setText(QString::number(location.verticalSpeed, 'f', 8));
  15. -    mMagneticVariationEdit->setText(QString::number(location.magneticVariation, 'f', 8));
  16. -    mHorizontalAccuracyEdit->setText(QString::number(location.horizontalAccuracy, 'f', 8));
  17. -    mVerticalAccuracyEdit->setText(QString::number(location.verticalAccuracy, 'f', 8));
  18. +    QLocale locale;
  19. +    mLatitudeEdit->setText(locale.toString(location.latitude, 'f', 8));
  20. +    mLongitudeEdit->setText(locale.toString(location.longitude, 'f', 8));
  21. +    mAltitudeEdit->setText(locale.toString(location.altitude, 'f', 8));
  22. +    mDirectionEdit->setText(locale.toString(location.direction, 'f', 8));
  23. +    mGroundSpeedEdit->setText(locale.toString(location.groundSpeed, 'f', 8));
  24. +    mVerticalSpeedEdit->setText(locale.toString(location.verticalSpeed, 'f', 8));
  25. +    mMagneticVariationEdit->setText(locale.toString(location.magneticVariation, 'f', 8));
  26. +    mHorizontalAccuracyEdit->setText(locale.toString(location.horizontalAccuracy, 'f', 8));
  27. +    mVerticalAccuracyEdit->setText(locale.toString(location.verticalAccuracy, 'f', 8));
  28.      mTimeEdit->setDateTime(location.timestamp);
  29.      mCurrentRadio->setChecked(location.useCurrentTime);
  30.  }
  31. @@ -296,10 +297,11 @@ void LocationUi::showSatelliteInfo()
  32.      if (!editingEnabled)
  33.          return;
  34.  
  35. -    int currentSatellite = satellitePrns->currentText().toInt();
  36. -    satelliteAzimuth->setText(QString::number(mScriptInterface->azimuth(currentSatellite)));
  37. -    satelliteElevation->setText(QString::number(mScriptInterface->elevation(currentSatellite)));
  38. -    satelliteSignalStrength->setText(QString::number(mScriptInterface->signalStrength(currentSatellite)));
  39. +    QLocale locale;
  40. +    int currentSatellite = locale.toInt(satellitePrns->currentText());
  41. +    satelliteAzimuth->setText(locale.toString(mScriptInterface->azimuth(currentSatellite)));
  42. +    satelliteElevation->setText(locale.toString(mScriptInterface->elevation(currentSatellite)));
  43. +    satelliteSignalStrength->setText(locale.toString(mScriptInterface->signalStrength(currentSatellite)));
  44.      satelliteInUse->setChecked(mScriptInterface->inUse(currentSatellite));
  45.  }
  46.  
  47. @@ -308,13 +310,14 @@ void LocationUi::editSatelliteInfo()
  48.      if (satellitePrns->count() == 0)
  49.          return;
  50.  
  51. -    int currentSatellite = satellitePrns->currentText().toInt();
  52. +    QLocale locale;
  53. +    int currentSatellite = locale.toInt(satellitePrns->currentText());
  54.      for (int i = 0; i < mSatelliteData.satellites.count(); i++) {
  55.          SatelliteData::SatelliteInfo info = mSatelliteData.satellites[i];
  56.          if (info.prn == currentSatellite) {
  57. -            info.azimuth = satelliteAzimuth->text().toDouble();
  58. -            info.elevation = satelliteElevation->text().toDouble();
  59. -            info.signalStrength = satelliteSignalStrength->text().toInt();
  60. +            info.azimuth = locale.toDouble(satelliteAzimuth->text());
  61. +            info.elevation = locale.toDouble(satelliteElevation->text());
  62. +            info.signalStrength = locale.toInt(satelliteSignalStrength->text());
  63.              info.inUse = satelliteInUse->isChecked();
  64.              mSatelliteData.satellites[i] = info;
  65.              emitSatelliteDataChange();
  66. @@ -328,7 +331,7 @@ void LocationUi::updateSatelliteList(int satelliteToShow)
  67.      satellitePrns->clear();
  68.      for (int i = 0; i < mSatelliteData.satellites.count(); i++) {
  69.          SatelliteData::SatelliteInfo satelliteInfo = mSatelliteData.satellites.at(i);
  70. -        satellitePrns->addItem(QString::number(satelliteInfo.prn));
  71. +        satellitePrns->addItem(QLocale().toString(satelliteInfo.prn));
  72.  
  73.          if (satelliteInfo.prn == satelliteToShow)
  74.              satellitePrns->setCurrentIndex(i);
  75. @@ -356,7 +359,7 @@ void LocationUi::changeSatellitePrnClicked()
  76.      if (satellitePrns->count() == 0)
  77.          return;
  78.  
  79. -    int oldPrn = satellitePrns->currentText().toInt();
  80. +    int oldPrn = QLocale().toInt(satellitePrns->currentText());
  81.      int newPrn = QInputDialog::getInt(0,
  82.              "Change Satellite's PRN", "Enter the new PRN:",
  83.              oldPrn, 0);
  84. @@ -403,7 +406,7 @@ void LocationUi::removeSatelliteClicked()
  85.      if (satellitePrns->count() == 0)
  86.          return;
  87.  
  88. -    removeDisplayedSatellite(satellitePrns->currentText().toInt());
  89. +    removeDisplayedSatellite(QLocale().toInt(satellitePrns->currentText()));
  90.      emitSatelliteDataChange();
  91.  }
  92.  
  93. @@ -465,117 +468,117 @@ bool LocationScriptInterface::inUse(int satellite) const
  94.  
  95.  double LocationScriptInterface::latitude() const
  96.  {
  97. -    return ui->mLatitudeEdit->text().toDouble();
  98. +    return QLocale().toDouble(ui->mLatitudeEdit->text());
  99.  }
  100.  
  101.  void LocationScriptInterface::setLatitude(double l)
  102.  {
  103.      if (latitude() != l) {
  104. -        ui->mLatitudeEdit->setText(QString::number(l, 'f', 8));
  105. +        ui->mLatitudeEdit->setText(QLocale().toString(l, 'f', 8));
  106.          ui->emitLocationChange();
  107.      }
  108.  }
  109.  
  110.  double LocationScriptInterface::longitude() const
  111.  {
  112. -    return ui->mLongitudeEdit->text().toDouble();
  113. +    return QLocale().toDouble(ui->mLongitudeEdit->text());
  114.  }
  115.  
  116.  void LocationScriptInterface::setLongitude(double l)
  117.  {
  118.      if (longitude() != l) {
  119. -        ui->mLongitudeEdit->setText(QString::number(l, 'f', 8));
  120. +        ui->mLongitudeEdit->setText(QLocale().toString(l, 'f', 8));
  121.          ui->emitLocationChange();
  122.      }
  123.  }
  124.  
  125.  double LocationScriptInterface::altitude() const
  126.  {
  127. -    return ui->mAltitudeEdit->text().toDouble();
  128. +    return QLocale().toDouble(ui->mAltitudeEdit->text());
  129.  }
  130.  
  131.  void LocationScriptInterface::setAltitude(double a)
  132.  {
  133.      if (altitude() != a) {
  134. -        ui->mAltitudeEdit->setText(QString::number(a, 'f', 8));
  135. +        ui->mAltitudeEdit->setText(QLocale().toString(a, 'f', 8));
  136.          ui->emitLocationChange();
  137.      }
  138.  }
  139.  
  140.  qreal LocationScriptInterface::direction() const
  141.  {
  142. -    return ui->mDirectionEdit->text().toDouble();
  143. +    return QLocale().toDouble(ui->mDirectionEdit->text());
  144.  }
  145.  
  146.  void LocationScriptInterface::setDirection(qreal a)
  147.  {
  148.      if (direction() != a) {
  149. -        ui->mDirectionEdit->setText(QString::number(a, 'f', 8));
  150. +        ui->mDirectionEdit->setText(QLocale().toString(a, 'f', 8));
  151.          ui->emitLocationChange();
  152.      }
  153.  }
  154.  
  155.  qreal LocationScriptInterface::groundSpeed() const
  156.  {
  157. -    return ui->mGroundSpeedEdit->text().toDouble();
  158. +    return QLocale().toDouble(ui->mGroundSpeedEdit->text());
  159.  }
  160.  
  161.  void LocationScriptInterface::setGroundSpeed(qreal a)
  162.  {
  163.      if (groundSpeed() != a) {
  164. -        ui->mGroundSpeedEdit->setText(QString::number(a, 'f', 8));
  165. +        ui->mGroundSpeedEdit->setText(QLocale().toString(a, 'f', 8));
  166.          ui->emitLocationChange();
  167.      }
  168.  }
  169.  
  170.  qreal LocationScriptInterface::verticalSpeed() const
  171.  {
  172. -    return ui->mVerticalSpeedEdit->text().toDouble();
  173. +    return QLocale().toDouble(ui->mVerticalSpeedEdit->text());
  174.  }
  175.  
  176.  void LocationScriptInterface::setVerticalSpeed(qreal a)
  177.  {
  178.      if (verticalSpeed() != a) {
  179. -        ui->mVerticalSpeedEdit->setText(QString::number(a, 'f', 8));
  180. +        ui->mVerticalSpeedEdit->setText(QLocale().toString(a, 'f', 8));
  181.          ui->emitLocationChange();
  182.      }
  183.  }
  184.  
  185.  qreal LocationScriptInterface::magneticVariation() const
  186.  {
  187. -    return ui->mMagneticVariationEdit->text().toDouble();
  188. +    return QLocale().toDouble(ui->mMagneticVariationEdit->text());
  189.  }
  190.  
  191.  void LocationScriptInterface::setMagneticVariation(qreal a)
  192.  {
  193.      if (magneticVariation() != a) {
  194. -        ui->mMagneticVariationEdit->setText(QString::number(a, 'f', 8));
  195. +        ui->mMagneticVariationEdit->setText(QLocale().toString(a, 'f', 8));
  196.          ui->emitLocationChange();
  197.      }
  198.  }
  199.  
  200.  qreal LocationScriptInterface::horizontalAccuracy() const
  201.  {
  202. -    return ui->mHorizontalAccuracyEdit->text().toDouble();
  203. +    return QLocale().toDouble(ui->mHorizontalAccuracyEdit->text());
  204.  }
  205.  
  206.  void LocationScriptInterface::setHorizontalAccuracy(qreal a)
  207.  {
  208.      if (horizontalAccuracy() != a) {
  209. -        ui->mHorizontalAccuracyEdit->setText(QString::number(a, 'f', 8));
  210. +        ui->mHorizontalAccuracyEdit->setText(QLocale().toString(a, 'f', 8));
  211.          ui->emitLocationChange();
  212.      }
  213.  }
  214.  
  215.  qreal LocationScriptInterface::verticalAccuracy() const
  216.  {
  217. -    return ui->mVerticalAccuracyEdit->text().toDouble();
  218. +    return QLocale().toDouble(ui->mVerticalAccuracyEdit->text());
  219.  }
  220.  
  221.  void LocationScriptInterface::setVerticalAccuracy(qreal a)
  222.  {
  223.      if (verticalAccuracy() != a) {
  224. -        ui->mVerticalAccuracyEdit->setText(QString::number(a, 'f', 8));
  225. +        ui->mVerticalAccuracyEdit->setText(QLocale().toString(a, 'f', 8));
  226.          ui->emitLocationChange();
  227.      }
  228.  }
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement
Public Pastes
Advertisement
We use cookies for various purposes including analytics. By continuing to use Pastebin, you agree to our use of cookies as described in the Cookies Policy.  OK, I Understand
Not a member of Pastebin yet?
Sign Up, it unlocks many cool features!