Skip to content

Commit

Permalink
migrate enum settings left over
Browse files Browse the repository at this point in the history
  • Loading branch information
3nids committed Jan 16, 2023
1 parent 6a0d8e8 commit 6765fbc
Show file tree
Hide file tree
Showing 13 changed files with 56 additions and 53 deletions.
4 changes: 2 additions & 2 deletions src/app/gps/qgsappgpsconnection.cpp
Expand Up @@ -82,9 +82,9 @@ void QgsAppGpsConnection::connectGps()
int gpsdPort = 0;
QString gpsdDevice;
QString serialDevice;
if ( QgsGpsConnection::settingsGpsConnectionType.exists() )
if ( QgsGpsConnection::settingsGpsConnectionType->exists() )
{
connectionType = QgsGpsConnection::settingsGpsConnectionType.value();
connectionType = QgsGpsConnection::settingsGpsConnectionType->value();
gpsdHost = QgsGpsConnection::settingsGpsdHostName->value();
gpsdPort = static_cast< int >( QgsGpsConnection::settingsGpsdPortNumber->value() );
gpsdDevice = QgsGpsConnection::settingsGpsdDeviceName->value();
Expand Down
2 changes: 1 addition & 1 deletion src/app/gps/qgsgpscanvasbridge.cpp
Expand Up @@ -188,7 +188,7 @@ void QgsGpsCanvasBridge::gpsSettingsChanged()
updateBearingAppearance();

QgsSettings settings;
if ( QgsGpsConnection::settingsGpsConnectionType.exists() )
if ( QgsGpsConnection::settingsGpsConnectionType->exists() )
{
mBearingFromTravelDirection = QgsGpsConnection::settingGpsBearingFromTravelDirection->value();
mMapExtentMultiplier = static_cast< int >( QgsGpsCanvasBridge::settingMapExtentRecenteringThreshold->value() );
Expand Down
13 changes: 8 additions & 5 deletions src/app/gps/qgsgpstoolbar.cpp
Expand Up @@ -33,6 +33,9 @@
#include <QLabel>
#include <QToolButton>

const QgsSettingsEntryEnumFlag<Qgis::GpsInformationComponents> *QgsGpsToolBar::settingShowInToolbar = new QgsSettingsEntryEnumFlag<Qgis::GpsInformationComponents>( QStringLiteral( "show-in-toolbar" ), QgsSettings::sTreeGps, Qgis::GpsInformationComponent::Location, QStringLiteral( "GPS information components to show in GPS toolbar" ) );


QgsGpsToolBar::QgsGpsToolBar( QgsAppGpsConnection *connection, QgsMapCanvas *canvas, QWidget *parent )
: QToolBar( parent )
, mConnection( connection )
Expand Down Expand Up @@ -226,7 +229,7 @@ void QgsGpsToolBar::updateLocationLabel()

const QgsGpsInformation information = mConnection->lastInformation();

const Qgis::GpsInformationComponents visibleComponents = settingShowInToolbar.value();
const Qgis::GpsInformationComponents visibleComponents = settingShowInToolbar->value();

QStringList parts;
for ( Qgis::GpsInformationComponent component :
Expand Down Expand Up @@ -456,7 +459,7 @@ void QgsGpsToolBar::createLocationWidget()

QMenu *locationMenu = new QMenu( mInformationButton );

const Qgis::GpsInformationComponents visibleComponents = settingShowInToolbar.value();
const Qgis::GpsInformationComponents visibleComponents = settingShowInToolbar->value();

for ( const auto &it : std::vector< std::pair< Qgis::GpsInformationComponent, QString> >
{
Expand All @@ -479,14 +482,14 @@ void QgsGpsToolBar::createLocationWidget()

connect( showComponentAction, &QAction::toggled, this, [ = ]( bool checked )
{
const Qgis::GpsInformationComponents currentVisibleComponents = settingShowInToolbar.value();
const Qgis::GpsInformationComponents currentVisibleComponents = settingShowInToolbar->value();
if ( checked )
{
settingShowInToolbar.setValue( currentVisibleComponents | component );
settingShowInToolbar->setValue( currentVisibleComponents | component );
}
else
{
settingShowInToolbar.setValue( currentVisibleComponents & ~( static_cast< int >( component ) ) );
settingShowInToolbar->setValue( currentVisibleComponents & ~( static_cast< int >( component ) ) );
}
updateLocationLabel();
} );
Expand Down
2 changes: 1 addition & 1 deletion src/app/gps/qgsgpstoolbar.h
Expand Up @@ -38,7 +38,7 @@ class QgsGpsToolBar : public QToolBar

public:

static const inline QgsSettingsEntryEnumFlag<Qgis::GpsInformationComponents> settingShowInToolbar = QgsSettingsEntryEnumFlag<Qgis::GpsInformationComponents>( QStringLiteral( "show-in-toolbar" ), QgsSettings::sTreeGps, Qgis::GpsInformationComponent::Location, QStringLiteral( "GPS information components to show in GPS toolbar" ) );
static const QgsSettingsEntryEnumFlag<Qgis::GpsInformationComponents> *settingShowInToolbar;

QgsGpsToolBar( QgsAppGpsConnection *connection, QgsMapCanvas *canvas, QWidget *parent = nullptr );

Expand Down
20 changes: 10 additions & 10 deletions src/app/options/qgsgpsoptions.cpp
Expand Up @@ -160,9 +160,9 @@ QgsGpsOptionsWidget::QgsGpsOptionsWidget( QWidget *parent )
Qt::TimeSpec timeSpec = Qt::TimeSpec::LocalTime;
QString timeZone;
int offsetFromUtc = 0;
if ( QgsGpsConnection::settingsGpsConnectionType.exists() )
if ( QgsGpsConnection::settingsGpsConnectionType->exists() )
{
connectionType = QgsGpsConnection::settingsGpsConnectionType.value();
connectionType = QgsGpsConnection::settingsGpsConnectionType->value();
gpsdHost = QgsGpsConnection::settingsGpsdHostName->value();
gpsdPort = static_cast< int >( QgsGpsConnection::settingsGpsdPortNumber->value() );
gpsdDevice = QgsGpsConnection::settingsGpsdDeviceName->value();
Expand All @@ -174,13 +174,13 @@ QgsGpsOptionsWidget::QgsGpsOptionsWidget( QWidget *parent )

applyLeapSeconds = QgsGpsConnection::settingGpsApplyLeapSecondsCorrection->value();
leapSeconds = static_cast< int >( QgsGpsConnection::settingGpsLeapSeconds->value() );
timeSpec = QgsGpsConnection::settingsGpsTimeStampSpecification.value();
timeSpec = QgsGpsConnection::settingsGpsTimeStampSpecification->value();
timeZone = QgsGpsConnection::settingsGpsTimeStampTimeZone->value();
offsetFromUtc = static_cast< int >( QgsGpsConnection::settingsGpsTimeStampOffsetFromUtc->value() );

if ( QgsGpsLogger::settingsGpsStoreAttributeInMValues->value() )
{
mComboMValueAttribute->setCurrentIndex( mComboMValueAttribute->findData( QVariant::fromValue( QgsGpsLogger::settingsGpsMValueComponent.value() ) ) );
mComboMValueAttribute->setCurrentIndex( mComboMValueAttribute->findData( QVariant::fromValue( QgsGpsLogger::settingsGpsMValueComponent->value() ) ) );
}
}
else
Expand Down Expand Up @@ -342,19 +342,19 @@ void QgsGpsOptionsWidget::apply()

if ( mRadAutodetect->isChecked() )
{
QgsGpsConnection::settingsGpsConnectionType.setValue( Qgis::GpsConnectionType::Automatic );
QgsGpsConnection::settingsGpsConnectionType->setValue( Qgis::GpsConnectionType::Automatic );
}
else if ( mRadInternal->isChecked() )
{
QgsGpsConnection::settingsGpsConnectionType.setValue( Qgis::GpsConnectionType::Internal );
QgsGpsConnection::settingsGpsConnectionType->setValue( Qgis::GpsConnectionType::Internal );
}
else if ( mRadSerialDevice->isChecked() )
{
QgsGpsConnection::settingsGpsConnectionType.setValue( Qgis::GpsConnectionType::Serial );
QgsGpsConnection::settingsGpsConnectionType->setValue( Qgis::GpsConnectionType::Serial );
}
else
{
QgsGpsConnection::settingsGpsConnectionType.setValue( Qgis::GpsConnectionType::Gpsd );
QgsGpsConnection::settingsGpsConnectionType->setValue( Qgis::GpsConnectionType::Gpsd );
}

QgsGpsConnection::settingsGpsdHostName->setValue( mGpsdHost->text() );
Expand All @@ -368,7 +368,7 @@ void QgsGpsOptionsWidget::apply()
QgsGpsCanvasBridge::settingMapExtentRecenteringThreshold->setValue( mSpinMapExtentMultiplier->value() );
QgsGpsCanvasBridge::settingMapRotateInterval->setValue( mSpinMapRotateInterval->value() );

QgsGpsConnection::settingsGpsTimeStampSpecification.setValue( static_cast< Qt::TimeSpec >( mCboTimestampFormat->currentData( ).toInt() ) );
QgsGpsConnection::settingsGpsTimeStampSpecification->setValue( static_cast< Qt::TimeSpec >( mCboTimestampFormat->currentData( ).toInt() ) );
QgsGpsConnection::settingsGpsTimeStampTimeZone->setValue( mCboTimeZones->currentText() );
QgsGpsConnection::settingGpsApplyLeapSecondsCorrection->setValue( mCbxLeapSeconds->isChecked() );
QgsGpsConnection::settingGpsLeapSeconds->setValue( mLeapSeconds->value() );
Expand All @@ -381,7 +381,7 @@ void QgsGpsOptionsWidget::apply()
else
{
QgsGpsLogger::settingsGpsStoreAttributeInMValues->setValue( true );
QgsGpsLogger::settingsGpsMValueComponent.setValue( mComboMValueAttribute->currentData().value< Qgis::GpsInformationComponent >() );
QgsGpsLogger::settingsGpsMValueComponent->setValue( mComboMValueAttribute->currentData().value< Qgis::GpsInformationComponent >() );
}
}

Expand Down
16 changes: 8 additions & 8 deletions src/app/options/qgsoptions.cpp
Expand Up @@ -1050,13 +1050,13 @@ QgsOptions::QgsOptions( QWidget *parent, Qt::WindowFlags fl, const QList<QgsOpti
QVariant::fromValue( type ) );
}

Qgis::SnappingTypes defaultSnapType = QgsSettingsRegistryCore::settingsDigitizingDefaultSnapType.value();
Qgis::SnappingTypes defaultSnapType = QgsSettingsRegistryCore::settingsDigitizingDefaultSnapType->value();
mDefaultSnapTypeComboBox->setCurrentIndex( mDefaultSnapTypeComboBox->findData( static_cast<int>( defaultSnapType ) ) );
mDefaultSnappingToleranceSpinBox->setValue( QgsSettingsRegistryCore::settingsDigitizingDefaultSnappingTolerance->value() );
mDefaultSnappingToleranceSpinBox->setClearValue( QgsSettingsRegistryCore::settingsDigitizingDefaultSnappingTolerance->defaultValue() );
mSearchRadiusVertexEditSpinBox->setValue( QgsSettingsRegistryCore::settingsDigitizingSearchRadiusVertexEdit->value() );
mSearchRadiusVertexEditSpinBox->setClearValue( QgsSettingsRegistryCore::settingsDigitizingSearchRadiusVertexEdit->defaultValue() );
QgsTolerance::UnitType defSnapUnits = QgsSettingsRegistryCore::settingsDigitizingDefaultSnappingToleranceUnit.value();
QgsTolerance::UnitType defSnapUnits = QgsSettingsRegistryCore::settingsDigitizingDefaultSnappingToleranceUnit->value();
if ( defSnapUnits == QgsTolerance::ProjectUnits || defSnapUnits == QgsTolerance::LayerUnits )
{
index = mDefaultSnappingToleranceComboBox->findText( tr( "map units" ) );
Expand All @@ -1066,7 +1066,7 @@ QgsOptions::QgsOptions( QWidget *parent, Qt::WindowFlags fl, const QList<QgsOpti
index = mDefaultSnappingToleranceComboBox->findText( tr( "pixels" ) );
}
mDefaultSnappingToleranceComboBox->setCurrentIndex( index );
QgsTolerance::UnitType defRadiusUnits = QgsSettingsRegistryCore::settingsDigitizingSearchRadiusVertexEditUnit.value();
QgsTolerance::UnitType defRadiusUnits = QgsSettingsRegistryCore::settingsDigitizingSearchRadiusVertexEditUnit->value();
if ( defRadiusUnits == QgsTolerance::ProjectUnits || defRadiusUnits == QgsTolerance::LayerUnits )
{
index = mSearchRadiusVertexEditComboBox->findText( tr( "map units" ) );
Expand Down Expand Up @@ -1121,7 +1121,7 @@ QgsOptions::QgsOptions( QWidget *parent, Qt::WindowFlags fl, const QList<QgsOpti
mOffsetJoinStyleComboBox->addItem( tr( "Round" ), static_cast< int >( Qgis::JoinStyle::Round ) );
mOffsetJoinStyleComboBox->addItem( tr( "Miter" ), static_cast< int >( Qgis::JoinStyle::Miter ) );
mOffsetJoinStyleComboBox->addItem( tr( "Bevel" ), static_cast< int >( Qgis::JoinStyle::Bevel ) );
Qgis::JoinStyle joinStyleSetting = QgsSettingsRegistryCore::settingsDigitizingOffsetJoinStyle.value();
Qgis::JoinStyle joinStyleSetting = QgsSettingsRegistryCore::settingsDigitizingOffsetJoinStyle->value();
mOffsetJoinStyleComboBox->setCurrentIndex( mOffsetJoinStyleComboBox->findData( static_cast< int >( joinStyleSetting ) ) );
mOffsetQuadSegSpinBox->setValue( QgsSettingsRegistryCore::settingsDigitizingOffsetQuadSeg->value() );
mOffsetQuadSegSpinBox->setClearValue( QgsSettingsRegistryCore::settingsDigitizingOffsetQuadSeg->defaultValue() );
Expand Down Expand Up @@ -1705,12 +1705,12 @@ void QgsOptions::saveOptions()

//default snap mode
QgsSettingsRegistryCore::settingsDigitizingDefaultSnapEnabled->setValue( mSnappingEnabledDefault->isChecked() );
QgsSettingsRegistryCore::settingsDigitizingDefaultSnapType.setValue( static_cast<Qgis::SnappingType>( mDefaultSnapTypeComboBox->currentData().toInt() ) );
QgsSettingsRegistryCore::settingsDigitizingDefaultSnapType->setValue( static_cast<Qgis::SnappingType>( mDefaultSnapTypeComboBox->currentData().toInt() ) );
QgsSettingsRegistryCore::settingsDigitizingDefaultSnappingTolerance->setValue( mDefaultSnappingToleranceSpinBox->value() );
QgsSettingsRegistryCore::settingsDigitizingSearchRadiusVertexEdit->setValue( mSearchRadiusVertexEditSpinBox->value() );
QgsSettingsRegistryCore::settingsDigitizingDefaultSnappingToleranceUnit.setValue(
QgsSettingsRegistryCore::settingsDigitizingDefaultSnappingToleranceUnit->setValue(
( mDefaultSnappingToleranceComboBox->currentIndex() == 0 ? QgsTolerance::ProjectUnits : QgsTolerance::Pixels ) );
QgsSettingsRegistryCore::settingsDigitizingSearchRadiusVertexEditUnit.setValue(
QgsSettingsRegistryCore::settingsDigitizingSearchRadiusVertexEditUnit->setValue(
( mSearchRadiusVertexEditComboBox->currentIndex() == 0 ? QgsTolerance::ProjectUnits : QgsTolerance::Pixels ) );

QgsSettingsRegistryCore::settingsDigitizingSnapColor->setValue( mSnappingMarkerColorButton->color() );
Expand Down Expand Up @@ -1738,7 +1738,7 @@ void QgsOptions::saveOptions()
QgsSettingsRegistryCore::settingsDigitizingDisableEnterAttributeValuesDialog->setValue( chkDisableAttributeValuesDlg->isChecked() );
QgsSettingsRegistryCore::settingsDigitizingValidateGeometries->setValue( mValidateGeometries->currentIndex() );

QgsSettingsRegistryCore::settingsDigitizingOffsetJoinStyle.setValue( mOffsetJoinStyleComboBox->currentData().value<Qgis::JoinStyle>() );
QgsSettingsRegistryCore::settingsDigitizingOffsetJoinStyle->setValue( mOffsetJoinStyleComboBox->currentData().value<Qgis::JoinStyle>() );
QgsSettingsRegistryCore::settingsDigitizingOffsetQuadSeg->setValue( mOffsetQuadSegSpinBox->value() );
QgsSettingsRegistryCore::settingsDigitizingOffsetMiterLimit->setValue( mCurveOffsetMiterLimitComboBox->value() );

Expand Down
12 changes: 6 additions & 6 deletions src/app/qgsmaptooloffsetcurve.cpp
Expand Up @@ -628,10 +628,10 @@ void QgsMapToolOffsetCurve::updateGeometryAndRubberBand( double offset )
}

QgsGeometry offsetGeom;
const Qgis::JoinStyle joinStyle = QgsSettingsRegistryCore::settingsDigitizingOffsetJoinStyle.value();
const Qgis::JoinStyle joinStyle = QgsSettingsRegistryCore::settingsDigitizingOffsetJoinStyle->value();
const int quadSegments = QgsSettingsRegistryCore::settingsDigitizingOffsetQuadSeg->value();
const double miterLimit = QgsSettingsRegistryCore::settingsDigitizingOffsetMiterLimit->value();
const Qgis::EndCapStyle capStyle = QgsSettingsRegistryCore::settingsDigitizingOffsetCapStyle.value();
const Qgis::EndCapStyle capStyle = QgsSettingsRegistryCore::settingsDigitizingOffsetCapStyle->value();


if ( QgsWkbTypes::geometryType( mOriginalGeometry.wkbType() ) == QgsWkbTypes::LineGeometry )
Expand Down Expand Up @@ -679,10 +679,10 @@ QgsOffsetUserWidget::QgsOffsetUserWidget( QWidget *parent )
mCapStyleComboBox->addItem( tr( "Flat" ), static_cast< int >( Qgis::EndCapStyle::Flat ) );
mCapStyleComboBox->addItem( tr( "Square" ), static_cast< int >( Qgis::EndCapStyle::Square ) );

const Qgis::JoinStyle joinStyle = QgsSettingsRegistryCore::settingsDigitizingOffsetJoinStyle.value();
const Qgis::JoinStyle joinStyle = QgsSettingsRegistryCore::settingsDigitizingOffsetJoinStyle->value();
const int quadSegments = QgsSettingsRegistryCore::settingsDigitizingOffsetQuadSeg->value();
const double miterLimit = QgsSettingsRegistryCore::settingsDigitizingOffsetMiterLimit->value();
const Qgis::EndCapStyle capStyle = QgsSettingsRegistryCore::settingsDigitizingOffsetCapStyle.value();
const Qgis::EndCapStyle capStyle = QgsSettingsRegistryCore::settingsDigitizingOffsetCapStyle->value();

mJoinStyleComboBox->setCurrentIndex( mJoinStyleComboBox->findData( static_cast< int >( joinStyle ) ) );
mQuadrantSpinBox->setValue( quadSegments );
Expand All @@ -695,10 +695,10 @@ QgsOffsetUserWidget::QgsOffsetUserWidget( QWidget *parent )
mOffsetSpinBox->installEventFilter( this );
connect( mOffsetSpinBox, static_cast < void ( QDoubleSpinBox::* )( double ) > ( &QDoubleSpinBox::valueChanged ), this, &QgsOffsetUserWidget::offsetChanged );

connect( mJoinStyleComboBox, static_cast < void ( QComboBox::* )( int ) > ( &QComboBox::currentIndexChanged ), this, [ = ] { QgsSettingsRegistryCore::settingsDigitizingOffsetJoinStyle.setValue( static_cast< Qgis::JoinStyle >( mJoinStyleComboBox->currentData().toInt() ) ); emit offsetConfigChanged(); } );
connect( mJoinStyleComboBox, static_cast < void ( QComboBox::* )( int ) > ( &QComboBox::currentIndexChanged ), this, [ = ] { QgsSettingsRegistryCore::settingsDigitizingOffsetJoinStyle->setValue( static_cast< Qgis::JoinStyle >( mJoinStyleComboBox->currentData().toInt() ) ); emit offsetConfigChanged(); } );
connect( mQuadrantSpinBox, static_cast < void ( QSpinBox::* )( int ) > ( &QSpinBox::valueChanged ), this, [ = ]( const int quadSegments ) { QgsSettingsRegistryCore::settingsDigitizingOffsetQuadSeg->setValue( quadSegments ); emit offsetConfigChanged(); } );
connect( mMiterLimitSpinBox, static_cast < void ( QDoubleSpinBox::* )( double ) > ( &QDoubleSpinBox::valueChanged ), this, [ = ]( double miterLimit ) { QgsSettingsRegistryCore::settingsDigitizingOffsetMiterLimit->setValue( miterLimit ); emit offsetConfigChanged(); } );
connect( mCapStyleComboBox, static_cast < void ( QComboBox::* )( int ) > ( &QComboBox::currentIndexChanged ), this, [ = ] { QgsSettingsRegistryCore::settingsDigitizingOffsetCapStyle.setValue( static_cast< Qgis::EndCapStyle >( mCapStyleComboBox->currentData().toInt() ) ); emit offsetConfigChanged(); } );
connect( mCapStyleComboBox, static_cast < void ( QComboBox::* )( int ) > ( &QComboBox::currentIndexChanged ), this, [ = ] { QgsSettingsRegistryCore::settingsDigitizingOffsetCapStyle->setValue( static_cast< Qgis::EndCapStyle >( mCapStyleComboBox->currentData().toInt() ) ); emit offsetConfigChanged(); } );

const bool showAdvanced = QgsSettingsRegistryCore::settingsDigitizingOffsetShowAdvanced->value();
mShowAdvancedButton->setChecked( showAdvanced );
Expand Down
4 changes: 2 additions & 2 deletions src/core/gps/qgsgpsconnection.h
Expand Up @@ -72,7 +72,7 @@ class CORE_EXPORT QgsGpsConnection : public QObject
};

//! Settings entry GPS connection type
static const inline QgsSettingsEntryEnumFlag<Qgis::GpsConnectionType> settingsGpsConnectionType = QgsSettingsEntryEnumFlag<Qgis::GpsConnectionType>( QStringLiteral( "gps-connection-type" ), QgsSettings::sTreeGps, Qgis::GpsConnectionType::Automatic, QStringLiteral( "GPS connection type" ) ) SIP_SKIP;
static const inline QgsSettingsEntryEnumFlag<Qgis::GpsConnectionType> *settingsGpsConnectionType = new QgsSettingsEntryEnumFlag<Qgis::GpsConnectionType>( QStringLiteral( "gps-connection-type" ), QgsSettings::sTreeGps, Qgis::GpsConnectionType::Automatic, QStringLiteral( "GPS connection type" ) ) SIP_SKIP;

//! Settings entry GPSD host name
static const QgsSettingsEntryString *settingsGpsdHostName;
Expand Down Expand Up @@ -102,7 +102,7 @@ class CORE_EXPORT QgsGpsConnection : public QObject
static const QgsSettingsEntryInteger *settingGpsLeapSeconds;

//! Settings entry time specification for GPS time stamps
static const inline QgsSettingsEntryEnumFlag<Qt::TimeSpec> settingsGpsTimeStampSpecification = QgsSettingsEntryEnumFlag<Qt::TimeSpec>( QStringLiteral( "timestamp-time-spec" ), QgsSettings::sTreeGps, Qt::TimeSpec::LocalTime, QStringLiteral( "GPS time stamp specification" ) ) SIP_SKIP;
static const inline QgsSettingsEntryEnumFlag<Qt::TimeSpec> *settingsGpsTimeStampSpecification = new QgsSettingsEntryEnumFlag<Qt::TimeSpec>( QStringLiteral( "timestamp-time-spec" ), QgsSettings::sTreeGps, Qt::TimeSpec::LocalTime, QStringLiteral( "GPS time stamp specification" ) ) SIP_SKIP;

//! Settings entry GPS time stamp time zone
static const QgsSettingsEntryString *settingsGpsTimeStampTimeZone;
Expand Down
6 changes: 3 additions & 3 deletions src/core/gps/qgsgpslogger.cpp
Expand Up @@ -205,18 +205,18 @@ void QgsGpsLogger::resetTrack()
void QgsGpsLogger::updateGpsSettings()
{
int acquisitionInterval = 0;
if ( QgsGpsConnection::settingsGpsTimeStampSpecification.exists() )
if ( QgsGpsConnection::settingsGpsTimeStampSpecification->exists() )
{
acquisitionInterval = static_cast< int >( QgsGpsConnection::settingGpsAcquisitionInterval->value() );
mDistanceThreshold = QgsGpsConnection::settingGpsDistanceThreshold->value();
mApplyLeapSettings = QgsGpsConnection::settingGpsApplyLeapSecondsCorrection->value();
mLeapSeconds = static_cast< int >( QgsGpsConnection::settingGpsLeapSeconds->value() );
mTimeStampSpec = QgsGpsConnection::settingsGpsTimeStampSpecification.value();
mTimeStampSpec = QgsGpsConnection::settingsGpsTimeStampSpecification->value();
mTimeZone = QgsGpsConnection::settingsGpsTimeStampTimeZone->value();
mOffsetFromUtc = static_cast< int >( QgsGpsConnection::settingsGpsTimeStampOffsetFromUtc->value() );

mStoreAttributeInMValues = settingsGpsStoreAttributeInMValues->value();
mMValueComponent = settingsGpsMValueComponent.value();
mMValueComponent = settingsGpsMValueComponent->value();
}
else
{
Expand Down

0 comments on commit 6765fbc

Please sign in to comment.