Skip to content
Permalink
Browse files

Formatting

  • Loading branch information
nyalldawson committed Jun 28, 2018
1 parent 2f67bcc commit 4442da21b2712468d9e556b130c64c483b70296b
Showing with 8 additions and 5 deletions.
  1. +6 −4 src/app/gps/qgsgpsinformationwidget.cpp
  2. +2 −1 src/app/gps/qgsgpsinformationwidget.h
@@ -83,7 +83,8 @@ QgsGpsInformationWidget::QgsGpsInformationWidget( QgsMapCanvas *thepCanvas, QWid
mpLastLayer = nullptr;

mLastGpsPosition = QgsPointXY( 0.0, 0.0 );
mLastNmeaPosition.lat = nmea_degree2radian( 0.0 ); mLastNmeaPosition.lon = nmea_degree2radian( 0.0 );
mLastNmeaPosition.lat = nmea_degree2radian( 0.0 );
mLastNmeaPosition.lon = nmea_degree2radian( 0.0 );

mpMapMarker = nullptr;
mpRubberBand = nullptr;
@@ -684,7 +685,8 @@ void QgsGpsInformationWidget::displayGPSInformation( const QgsGpsInformation &in
if ( validFlag )
{
myNewCenter = QgsPointXY( info.longitude, info.latitude );
newNmeaPosition.lat = nmea_degree2radian( info.latitude ); newNmeaPosition.lon = nmea_degree2radian( info.longitude );
newNmeaPosition.lat = nmea_degree2radian( info.latitude );
newNmeaPosition.lon = nmea_degree2radian( info.longitude );
}
else
{
@@ -1205,7 +1207,7 @@ void QgsGpsInformationWidget::setDistanceThreshold( int distance )
mDistanceThreshold = distance;
}

void QgsGpsInformationWidget::cboAcquisitionIntervalActivated( const QString &text )
void QgsGpsInformationWidget::cboAcquisitionIntervalActivated( const QString &text )
{
if ( text == "" )
{
@@ -1219,7 +1221,7 @@ void QgsGpsInformationWidget::cboAcquisitionIntervalActivated( const QString &
}
}

void QgsGpsInformationWidget::cboDistanceThresholdActivated( const QString &text )
void QgsGpsInformationWidget::cboDistanceThresholdActivated( const QString &text )
{
if ( text == "" )
{
@@ -119,7 +119,8 @@ class QgsGpsInformationWidget: public QWidget, private Ui::QgsGpsInformationWidg
QColor mTrackColor;
QIntValidator *mAcquisitionIntValidator = nullptr;
QIntValidator *mDistanceThresholdValidator = nullptr;
QLineEdit *mAcIntervalEdit = nullptr, *mDistThresholdEdit = nullptr;
QLineEdit *mAcIntervalEdit = nullptr;
QLineEdit *mDistThresholdEdit = nullptr;
nmeaPOS mLastNmeaPosition;
std::unique_ptr<QTimer> mAcquisitionTimer;
bool mAcquisitionEnabled = true;

0 comments on commit 4442da2

Please sign in to comment.
You can’t perform that action at this time.