Skip to content

Commit

Permalink
Standardise member naming
Browse files Browse the repository at this point in the history
  • Loading branch information
@nyalldawson
nyalldawson committed Jul 31, 2021
1 parent 52ea60a commit 99c7fdf
Show file tree
Hide file tree
Showing 3 changed files with 44 additions and 44 deletions.
4 changes: 2 additions & 2 deletions src/providers/gpx/qgsgpxfeatureiterator.cpp
View file
Expand Up @@ -497,8 +497,8 @@ QgsGeometry *QgsGPXFeatureIterator::readTrackGeometry( const QgsTrack &trk )
QgsGPXFeatureSource::QgsGPXFeatureSource( const QgsGPXProvider *p )
: mFileName( p->mFileName )
, mFeatureType( p->mFeatureType )
, indexToAttr( p->indexToAttr )
, mFields( p->attributeFields )
, indexToAttr( p->mIndexToAttr )
, mFields( p->mAttributeFields )
, mCrs( p->crs() )
{
data = QgsGpsData::getData( mFileName );
Expand Down
78 changes: 39 additions & 39 deletions src/providers/gpx/qgsgpxprovider.cpp
View file
Expand Up @@ -95,14 +95,14 @@ QgsGPXProvider::QgsGPXProvider( const QString &uri, const ProviderOptions &optio
if ( attrUsed[i] & mFeatureType )
{
QString attrTypeName = ( attrType[i] == QVariant::Int ? "int" : ( attrType[i] == QVariant::Double ? "double" : "text" ) );
attributeFields.append( QgsField( ATTR[i], attrType[i], attrTypeName ) );
indexToAttr.append( i );
mAttributeFields.append( QgsField( ATTR[i], attrType[i], attrTypeName ) );
mIndexToAttr.append( i );
}
}

// parse the file
data = QgsGpsData::getData( mFileName );
if ( !data )
mData = QgsGpsData::getData( mFileName );
if ( !mData )
return;

mValid = true;
Expand Down Expand Up @@ -132,8 +132,8 @@ QgsVectorDataProvider::Capabilities QgsGPXProvider::capabilities() const

QgsRectangle QgsGPXProvider::extent() const
{
if ( data )
return data->getExtent();
if ( mData )
return mData->getExtent();
return QgsRectangle();
}

Expand All @@ -150,21 +150,21 @@ QgsWkbTypes::Type QgsGPXProvider::wkbType() const

long long QgsGPXProvider::featureCount() const
{
if ( !data )
if ( !mData )
return static_cast< long long >( Qgis::FeatureCountState::UnknownCount );

if ( mFeatureType == WaypointType )
return data->getNumberOfWaypoints();
return mData->getNumberOfWaypoints();
if ( mFeatureType == RouteType )
return data->getNumberOfRoutes();
return mData->getNumberOfRoutes();
if ( mFeatureType == TrackType )
return data->getNumberOfTracks();
return mData->getNumberOfTracks();
return 0;
}

QgsFields QgsGPXProvider::fields() const
{
return attributeFields;
return mAttributeFields;
}

bool QgsGPXProvider::isValid() const
Expand All @@ -179,7 +179,7 @@ QgsFeatureIterator QgsGPXProvider::getFeatures( const QgsFeatureRequest &request

bool QgsGPXProvider::addFeatures( QgsFeatureList &flist, Flags flags )
{
if ( !data )
if ( !mData )
return false;

// add all the features
Expand All @@ -195,13 +195,13 @@ bool QgsGPXProvider::addFeatures( QgsFeatureList &flist, Flags flags )
if ( !file.open( QIODevice::WriteOnly | QIODevice::Truncate ) )
return false;
QTextStream ostr( &file );
data->writeXml( ostr );
mData->writeXml( ostr );
return true;
}

bool QgsGPXProvider::addFeature( QgsFeature &f, Flags )
{
if ( !data )
if ( !mData )
return false;

QByteArray wkb( f.geometry().asWkb() );
Expand All @@ -223,20 +223,20 @@ bool QgsGPXProvider::addFeature( QgsFeature &f, Flags )
// add waypoint-specific attributes
for ( int i = 0; i < attrs.count(); ++i )
{
if ( indexToAttr.at( i ) == EleAttr )
if ( mIndexToAttr.at( i ) == EleAttr )
{
bool eleIsOK;
double ele = attrs.at( i ).toDouble( &eleIsOK );
if ( eleIsOK )
wpt.ele = ele;
}
else if ( indexToAttr.at( i ) == SymAttr )
else if ( mIndexToAttr.at( i ) == SymAttr )
{
wpt.sym = attrs.at( i ).toString();
}
}

QgsGpsData::WaypointIterator iter = data->addWaypoint( wpt );
QgsGpsData::WaypointIterator iter = mData->addWaypoint( wpt );
success = true;
obj = &( *iter );
}
Expand Down Expand Up @@ -274,7 +274,7 @@ bool QgsGPXProvider::addFeature( QgsFeature &f, Flags )
// add route-specific attributes
for ( int i = 0; i < attrs.count(); ++i )
{
if ( indexToAttr.at( i ) == NumAttr )
if ( mIndexToAttr.at( i ) == NumAttr )
{
bool numIsOK;
long num = attrs.at( i ).toInt( &numIsOK );
Expand All @@ -283,7 +283,7 @@ bool QgsGPXProvider::addFeature( QgsFeature &f, Flags )
}
}

QgsGpsData::RouteIterator iter = data->addRoute( rte );
QgsGpsData::RouteIterator iter = mData->addRoute( rte );
success = true;
obj = &( *iter );
}
Expand Down Expand Up @@ -322,7 +322,7 @@ bool QgsGPXProvider::addFeature( QgsFeature &f, Flags )
// add track-specific attributes
for ( int i = 0; i < attrs.count(); ++i )
{
if ( indexToAttr.at( i ) == NumAttr )
if ( mIndexToAttr.at( i ) == NumAttr )
{
bool numIsOK;
long num = attrs.at( i ).toInt( &numIsOK );
Expand All @@ -332,7 +332,7 @@ bool QgsGPXProvider::addFeature( QgsFeature &f, Flags )
}

trk.segments.push_back( trkseg );
QgsGpsData::TrackIterator iter = data->addTrack( trk );
QgsGpsData::TrackIterator iter = mData->addTrack( trk );
success = true;
obj = &( *iter );
}
Expand All @@ -343,7 +343,7 @@ bool QgsGPXProvider::addFeature( QgsFeature &f, Flags )
{
for ( int i = 0; i < attrs.count(); ++i )
{
switch ( indexToAttr.at( i ) )
switch ( mIndexToAttr.at( i ) )
{
case NameAttr:
obj->name = attrs.at( i ).toString();
Expand Down Expand Up @@ -372,35 +372,35 @@ bool QgsGPXProvider::addFeature( QgsFeature &f, Flags )

bool QgsGPXProvider::deleteFeatures( const QgsFeatureIds &id )
{
if ( !data )
if ( !mData )
return false;

if ( mFeatureType == WaypointType )
data->removeWaypoints( id );
mData->removeWaypoints( id );
else if ( mFeatureType == RouteType )
data->removeRoutes( id );
mData->removeRoutes( id );
else if ( mFeatureType == TrackType )
data->removeTracks( id );
mData->removeTracks( id );

// write back to file
QFile file( mFileName );
if ( !file.open( QIODevice::WriteOnly | QIODevice::Truncate ) )
return false;
QTextStream ostr( &file );
data->writeXml( ostr );
mData->writeXml( ostr );
return true;
}

bool QgsGPXProvider::changeAttributeValues( const QgsChangedAttributesMap &attr_map )
{
if ( !data )
if ( !mData )
return false;

QgsChangedAttributesMap::const_iterator aIter = attr_map.begin();
if ( mFeatureType == WaypointType )
{
QgsGpsData::WaypointIterator wIter = data->waypointsBegin();
for ( ; wIter != data->waypointsEnd() && aIter != attr_map.end(); ++wIter )
QgsGpsData::WaypointIterator wIter = mData->waypointsBegin();
for ( ; wIter != mData->waypointsEnd() && aIter != attr_map.end(); ++wIter )
{
if ( wIter->id == aIter.key() )
{
Expand All @@ -411,8 +411,8 @@ bool QgsGPXProvider::changeAttributeValues( const QgsChangedAttributesMap &attr_
}
else if ( mFeatureType == RouteType )
{
QgsGpsData::RouteIterator rIter = data->routesBegin();
for ( ; rIter != data->routesEnd() && aIter != attr_map.end(); ++rIter )
QgsGpsData::RouteIterator rIter = mData->routesBegin();
for ( ; rIter != mData->routesEnd() && aIter != attr_map.end(); ++rIter )
{
if ( rIter->id == aIter.key() )
{
Expand All @@ -423,8 +423,8 @@ bool QgsGPXProvider::changeAttributeValues( const QgsChangedAttributesMap &attr_
}
if ( mFeatureType == TrackType )
{
QgsGpsData::TrackIterator tIter = data->tracksBegin();
for ( ; tIter != data->tracksEnd() && aIter != attr_map.end(); ++tIter )
QgsGpsData::TrackIterator tIter = mData->tracksBegin();
for ( ; tIter != mData->tracksEnd() && aIter != attr_map.end(); ++tIter )
{
if ( tIter->id == aIter.key() )
{
Expand All @@ -439,7 +439,7 @@ bool QgsGPXProvider::changeAttributeValues( const QgsChangedAttributesMap &attr_
if ( !file.open( QIODevice::WriteOnly | QIODevice::Truncate ) )
return false;
QTextStream ostr( &file );
data->writeXml( ostr );
mData->writeXml( ostr );
return true;
}

Expand All @@ -456,7 +456,7 @@ void QgsGPXProvider::changeAttributeValues( QgsGpsObject &obj, const QgsAttribut
QVariant v = aIter.value();

// common attributes
switch ( indexToAttr.at( i ) )
switch ( mIndexToAttr.at( i ) )
{
case NameAttr:
obj.name = v.toString();
Expand All @@ -481,9 +481,9 @@ void QgsGPXProvider::changeAttributeValues( QgsGpsObject &obj, const QgsAttribut
// waypoint-specific attributes
if ( wpt )
{
if ( indexToAttr.at( i ) == SymAttr )
if ( mIndexToAttr.at( i ) == SymAttr )
wpt->sym = v.toString();
else if ( indexToAttr.at( i ) == EleAttr )
else if ( mIndexToAttr.at( i ) == EleAttr )
{
bool eleIsOK;
double ele = v.toDouble( &eleIsOK );
Expand All @@ -495,7 +495,7 @@ void QgsGPXProvider::changeAttributeValues( QgsGpsObject &obj, const QgsAttribut
// route- and track-specific attributes
if ( ext )
{
if ( indexToAttr.at( i ) == NumAttr )
if ( mIndexToAttr.at( i ) == NumAttr )
{
bool numIsOK;
int num = v.toInt( &numIsOK );
Expand Down
6 changes: 3 additions & 3 deletions src/providers/gpx/qgsgpxprovider.h
View file
Expand Up @@ -97,12 +97,12 @@ class QgsGPXProvider final: public QgsVectorDataProvider

private:

QgsGpsData *data = nullptr;
QgsGpsData *mData = nullptr;

//! Fields
QgsFields attributeFields;
QgsFields mAttributeFields;
//! map from field index to attribute
QVector<int> indexToAttr;
QVector<int> mIndexToAttr;

QString mFileName;

Expand Down

0 comments on commit 99c7fdf

Please sign in to comment.