Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix positioning details not updated when coordinate transform properties change #5992

Merged
merged 4 commits into from
Feb 9, 2025
Merged

Fix positioning details not updated when coordinate transform properties change #5992

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7a3d77c
Fix positioning details not updated when coordinate transform propert…
nirvn Feb 9, 2025
6ef2034
Further reduce size of the wastewater sample project
nirvn Feb 9, 2025
5a3b042
Remove sample project resources we were not using!
nirvn Feb 9, 2025
5ac69d8
Move SUPPORTED_* to qfield.h now that we have one, add supported file…
nirvn Feb 9, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file removed resources/sample_projects/basemaps/buildings_laax.gpkg
View file
Open in desktop
Binary file not shown.
Binary file modified resources/sample_projects/basemaps/laax.gpkg
View file
Open in desktop
Binary file not shown.
Binary file removed resources/sample_projects/basemaps/landscape_laax.gpkg
View file
Open in desktop
Binary file not shown.
Binary file removed resources/sample_projects/basemaps/lines_laax.gpkg
View file
Open in desktop
Binary file not shown.
Binary file modified resources/sample_projects/datasets/qgep_reach.gpkg
View file
Open in desktop
Binary file not shown.
Binary file modified resources/sample_projects/datasets/qgep_wastewater_structure.gpkg
View file
Open in desktop
Binary file not shown.
Binary file modified resources/sample_projects/wastewater.qgz
View file
Open in desktop
Binary file not shown.
4 changes: 2 additions & 2 deletions src/core/localfilesmodel.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@

#include "localfilesmodel.h"
#include "platformutilities.h"
#include "qfield.h"
#include "qfieldcloudutils.h"
#include "qgismobileapp.h"
#include "webdavconnection.h"

#include <QDir>
Expand Down Expand Up @@ -289,7 +289,7 @@ void LocalFilesModel::reloadModel()
{
datasets << Item( ItemMetaType::Dataset, ItemType::RasterDataset, fi.completeBaseName(), suffix, fi.absoluteFilePath(), fi.size() );
}
else if ( suffix == QStringLiteral( "log" ) || suffix == QStringLiteral( "txt" ) )
else if ( SUPPORTED_FILE_EXTENSIONS.contains( suffix ) )
{
files << Item( ItemMetaType::File, ItemType::OtherFile, fi.completeBaseName(), suffix, fi.absoluteFilePath(), fi.size() );
}
Expand Down
2 changes: 0 additions & 2 deletions src/core/localfilesmodel.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,6 @@

#include <QAbstractListModel>

#define SUPPORTED_DATASET_THUMBNAIL QStringList( { QStringLiteral( "zip" ), QStringLiteral( "tif" ), QStringLiteral( "tiff" ), QStringLiteral( "pdf" ), QStringLiteral( "jpg" ), QStringLiteral( "jpeg" ), QStringLiteral( "png" ), QStringLiteral( "jp2" ), QStringLiteral( "webp" ) } )

/**
* \ingroup core
*/
Expand Down
1 change: 0 additions & 1 deletion src/core/platforms/platformutilities.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
#include "projectsource.h"
#include "qfield.h"
#include "qfieldcloudconnection.h"
#include "qgismobileapp.h"
#include "qgsmessagelog.h"
#include "resourcesource.h"
#include "stringutils.h"
Expand Down
42 changes: 36 additions & 6 deletions src/core/positioning/positioning.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -475,8 +475,24 @@ void Positioning::setCoordinateTransformer( QgsQuickCoordinateTransformer *coord
if ( mCoordinateTransformer == coordinateTransformer )
return;

if ( mCoordinateTransformer )
{
disconnect( mCoordinateTransformer, &QgsQuickCoordinateTransformer::destinationCrsChanged, this, &Positioning::processProjectedPosition );
disconnect( mCoordinateTransformer, &QgsQuickCoordinateTransformer::sourceCrsChanged, this, &Positioning::processProjectedPosition );
disconnect( mCoordinateTransformer, &QgsQuickCoordinateTransformer::deltaZChanged, this, &Positioning::processProjectedPosition );
disconnect( mCoordinateTransformer, &QgsQuickCoordinateTransformer::verticalGridChanged, this, &Positioning::processProjectedPosition );
}

mCoordinateTransformer = coordinateTransformer;

if ( mCoordinateTransformer )
{
connect( mCoordinateTransformer, &QgsQuickCoordinateTransformer::destinationCrsChanged, this, &Positioning::processProjectedPosition );
connect( mCoordinateTransformer, &QgsQuickCoordinateTransformer::sourceCrsChanged, this, &Positioning::processProjectedPosition );
connect( mCoordinateTransformer, &QgsQuickCoordinateTransformer::deltaZChanged, this, &Positioning::processProjectedPosition );
connect( mCoordinateTransformer, &QgsQuickCoordinateTransformer::verticalGridChanged, this, &Positioning::processProjectedPosition );
}

emit coordinateTransformerChanged();
}

Expand Down Expand Up @@ -506,9 +522,28 @@ void Positioning::processGnssPositionInformation()
else
{
mSourcePosition.clear();
mProjectedPosition.clear();
}

if ( mCoordinateTransformer )
if ( mPositionInformation.orientationValid() )
{
mPositionInformation.setOrientation( adjustOrientation( mPositionInformation.orientation() ) );
}

if ( mCoordinateTransformer && !mSourcePosition.isEmpty() )
{
// positionInformationChanged() will be emitted in this function
processProjectedPosition();
}
else
{
emit positionInformationChanged();
}
}

void Positioning::processProjectedPosition()
{
if ( !mSourcePosition.isEmpty() )
{
mProjectedPosition = mCoordinateTransformer->transformPosition( mSourcePosition );
mProjectedHorizontalAccuracy = mPositionInformation.hacc();
Expand All @@ -526,10 +561,5 @@ void Positioning::processGnssPositionInformation()
}
}

if ( mPositionInformation.orientationValid() )
{
mPositionInformation.setOrientation( adjustOrientation( mPositionInformation.orientation() ) );
}

emit positionInformationChanged();
}
1 change: 1 addition & 0 deletions src/core/positioning/positioning.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -262,6 +262,7 @@ class Positioning : public QObject
private slots:
void onApplicationStateChanged( Qt::ApplicationState state );
void processGnssPositionInformation();
void processProjectedPosition();

private:
void setupSource();
Expand Down
6 changes: 6 additions & 0 deletions src/core/qfield.h.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,4 +61,10 @@ namespace qfield
#define WITH_SENTRY @WITH_SENTRY@
#define QGIS_PREFIX_PATH "@QGIS_PREFIX_PATH@"

#define SUPPORTED_PROJECT_EXTENSIONS QStringList( { QStringLiteral( "qgs" ), QStringLiteral( "qgz" ) } )
#define SUPPORTED_VECTOR_EXTENSIONS QStringList( { QStringLiteral( "gpkg" ), QStringLiteral( "shp" ), QStringLiteral( "kml" ), QStringLiteral( "kmz" ), QStringLiteral( "geojson" ), QStringLiteral( "json" ), QStringLiteral( "pdf" ), QStringLiteral( "gpx" ), QStringLiteral( "gml" ), QStringLiteral( "mif" ), QStringLiteral( "fgb" ), QStringLiteral( "db" ), QStringLiteral( "sqlite" ), QStringLiteral( "mbtiles" ), QStringLiteral( "vrt" ), QStringLiteral( "zip" ), QStringLiteral( "7z" ), QStringLiteral( "rar" ) } )
#define SUPPORTED_RASTER_EXTENSIONS QStringList( { QStringLiteral( "tif" ), QStringLiteral( "tiff" ), QStringLiteral( "pdf" ), QStringLiteral( "jpg" ), QStringLiteral( "jpeg" ), QStringLiteral( "png" ), QStringLiteral( "gpkg" ), QStringLiteral( "jp2" ), QStringLiteral( "webp" ), QStringLiteral( "mbtiles" ), QStringLiteral( "vrt" ), QStringLiteral( "zip" ), QStringLiteral( "7z" ) } )
#define SUPPORTED_FILE_EXTENSIONS QStringList( { QStringLiteral( "log" ), QStringLiteral( "txt" ), QStringLiteral( "mp4" ), QStringLiteral( "m4a" ), QStringLiteral( "ogg" ), QStringLiteral( "mp3" ) } )
#define SUPPORTED_DATASET_THUMBNAIL QStringList( { QStringLiteral( "zip" ), QStringLiteral( "tif" ), QStringLiteral( "tiff" ), QStringLiteral( "pdf" ), QStringLiteral( "jpg" ), QStringLiteral( "jpeg" ), QStringLiteral( "png" ), QStringLiteral( "jp2" ), QStringLiteral( "webp" ) } )

#endif // QFIELD_H
4 changes: 0 additions & 4 deletions src/core/qgismobileapp.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,10 +60,6 @@ class QgsPrintLayout;

#define REGISTER_SINGLETON( uri, _class, name ) qmlRegisterSingletonType<_class>( uri, 1, 0, name, []( QQmlEngine *engine, QJSEngine *scriptEngine ) -> QObject * { Q_UNUSED(engine); Q_UNUSED(scriptEngine); return new _class(); } )

#define SUPPORTED_PROJECT_EXTENSIONS QStringList( { QStringLiteral( "qgs" ), QStringLiteral( "qgz" ) } )
#define SUPPORTED_VECTOR_EXTENSIONS QStringList( { QStringLiteral( "gpkg" ), QStringLiteral( "shp" ), QStringLiteral( "kml" ), QStringLiteral( "kmz" ), QStringLiteral( "geojson" ), QStringLiteral( "json" ), QStringLiteral( "pdf" ), QStringLiteral( "gpx" ), QStringLiteral( "gml" ), QStringLiteral( "mif" ), QStringLiteral( "fgb" ), QStringLiteral( "db" ), QStringLiteral( "sqlite" ), QStringLiteral( "mbtiles" ), QStringLiteral( "vrt" ), QStringLiteral( "zip" ), QStringLiteral( "7z" ), QStringLiteral( "rar" ) } )
#define SUPPORTED_RASTER_EXTENSIONS QStringList( { QStringLiteral( "tif" ), QStringLiteral( "tiff" ), QStringLiteral( "pdf" ), QStringLiteral( "jpg" ), QStringLiteral( "jpeg" ), QStringLiteral( "png" ), QStringLiteral( "gpkg" ), QStringLiteral( "jp2" ), QStringLiteral( "webp" ), QStringLiteral( "mbtiles" ), QStringLiteral( "vrt" ), QStringLiteral( "zip" ), QStringLiteral( "7z" ) } )

/**
* \defgroup core
* \brief QField C++ classes
Expand Down
2 changes: 1 addition & 1 deletion src/core/recentprojectlistmodel.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
***************************************************************************/

#include "platformutilities.h"
#include "qfield.h"
#include "qfieldcloudutils.h"
#include "qgismobileapp.h"
#include "recentprojectlistmodel.h"

#include <QDir>
Expand Down
Loading