From 292b39c0192b2da8052d346a9b4a5ccbe3140b7e Mon Sep 17 00:00:00 2001 From: Marco Bernasocchi Date: Wed, 25 Apr 2012 09:06:12 +0200 Subject: [PATCH 1/3] added update interval of 1000ms to limit the ammount of positions send --- src/core/gps/qgsqtlocationconnection.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/core/gps/qgsqtlocationconnection.cpp b/src/core/gps/qgsqtlocationconnection.cpp index 97a323753ade..f84e5d51f022 100644 --- a/src/core/gps/qgsqtlocationconnection.cpp +++ b/src/core/gps/qgsqtlocationconnection.cpp @@ -83,6 +83,7 @@ void QgsQtLocationConnection::parseData() //TODO implement dop maybe by getting a //http://developer.android.com/reference/android/location/GpsStatus.NmeaListener.html + //http://doc.qt.nokia.com/qtmobility-1.1/qnmeapositioninfosource.html //into QtLocation and subclass QgsNMEAConnection directly? mLastGPSInformation.pdop; //< Dilution of precision mLastGPSInformation.hdop; //< Horizontal dilution of precision @@ -157,7 +158,7 @@ void QgsQtLocationConnection::startGPS() if ( locationDataSource ) { locationDataSource->setPreferredPositioningMethods( QGeoPositionInfoSource::SatellitePositioningMethods ); //QGeoPositionInfoSource::AllPositioningMethods - // locationDataSource->setUpdateInterval(2000); + // locationDataSource->setUpdateInterval(1000); // Whenever the location data source signals that the current // position is updated, the positionUpdated function is called. QObject::connect( locationDataSource, From 130bf0d354ac98e8f1655437b8b97528eb3a8e4a Mon Sep 17 00:00:00 2001 From: Marco Bernasocchi Date: Sat, 23 Jun 2012 00:16:39 +0200 Subject: [PATCH 2/3] fix unusable WITH_TOUCH cmake switch --- CMakeLists.txt | 37 ++++++++++++++++++------------------- 1 file changed, 18 insertions(+), 19 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 0de3ae818b19..f080c03c6ac4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -89,25 +89,6 @@ IF (WITH_QTMOBILITY) FIND_PACKAGE(QtMobility 1.1.0) ENDIF (WITH_QTMOBILITY) -IF (ANDROID) - SET (DEFAULT_WITH_TOUCH TRUE) -ELSE (ANDROID) - SET (DEFAULT_WITH_TOUCH FALSE) -ENDIF (ANDROID) -#Add a touch mode if Qt has Qt Gestures (starting from 4.6) -IF ( (QT_VERSION_MAJOR EQUAL 4 AND QT_VERSION_MINOR GREATER 5) OR QT_VERSION_MAJOR GREATER 4 ) - SET (WITH_TOUCH ${DEFAULT_WITH_TOUCH} CACHE BOOL "Determines if touch interface related code should be build") -ELSE ( (QT_VERSION_MAJOR EQUAL 4 AND QT_VERSION_MINOR GREATER 5) OR QT_VERSION_MAJOR GREATER 4 ) - SET (WITH_TOUCH FALSE) -ENDIF ( (QT_VERSION_MAJOR EQUAL 4 AND QT_VERSION_MINOR GREATER 5) OR QT_VERSION_MAJOR GREATER 4 ) -IF (WITH_TOUCH) - ADD_DEFINITIONS(-DHAVE_TOUCH) - MESSAGE (STATUS "Touch support enabled") -ELSE (WITH_TOUCH) - MESSAGE (STATUS "Touch support disabled") -ENDIF (WITH_TOUCH) - - SET (WITH_GLOBE FALSE CACHE BOOL "Determines whether Globe plugin should be built") IF (WITH_GLOBE) SET(QT_USE_QTOPENGL 1) @@ -228,6 +209,24 @@ IF(WITH_DESKTOP) ENDIF(NOT QT_QTWEBKIT_FOUND) ENDIF(WITH_DESKTOP) +IF (ANDROID) + SET (DEFAULT_WITH_TOUCH TRUE) +ELSE (ANDROID) + SET (DEFAULT_WITH_TOUCH FALSE) +ENDIF (ANDROID) +#Add a touch mode if Qt has Qt Gestures (starting from 4.6) +IF ( (QT_VERSION_MAJOR EQUAL 4 AND QT_VERSION_MINOR GREATER 5) OR QT_VERSION_MAJOR GREATER 4 ) + SET (WITH_TOUCH ${DEFAULT_WITH_TOUCH} CACHE BOOL "Determines if touch interface related code should be build") +ELSE ( (QT_VERSION_MAJOR EQUAL 4 AND QT_VERSION_MINOR GREATER 5) OR QT_VERSION_MAJOR GREATER 4 ) + SET (WITH_TOUCH FALSE) +ENDIF ( (QT_VERSION_MAJOR EQUAL 4 AND QT_VERSION_MINOR GREATER 5) OR QT_VERSION_MAJOR GREATER 4 ) +IF (WITH_TOUCH) + ADD_DEFINITIONS(-DHAVE_TOUCH) + MESSAGE (STATUS "Touch support enabled") +ELSE (WITH_TOUCH) + MESSAGE (STATUS "Touch support disabled") +ENDIF (WITH_TOUCH) + IF (ENABLE_TESTS) SET( QT_USE_QTTEST TRUE ) ENABLE_TESTING() From 5445178151eddc73481ea18b04c50726ddee8a34 Mon Sep 17 00:00:00 2001 From: Marco Bernasocchi Date: Sat, 23 Jun 2012 00:24:21 +0200 Subject: [PATCH 3/3] activate 1000ms update in qtlocationconnection --- src/core/gps/qgsqtlocationconnection.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/core/gps/qgsqtlocationconnection.cpp b/src/core/gps/qgsqtlocationconnection.cpp index f84e5d51f022..2430ae31f868 100644 --- a/src/core/gps/qgsqtlocationconnection.cpp +++ b/src/core/gps/qgsqtlocationconnection.cpp @@ -158,7 +158,7 @@ void QgsQtLocationConnection::startGPS() if ( locationDataSource ) { locationDataSource->setPreferredPositioningMethods( QGeoPositionInfoSource::SatellitePositioningMethods ); //QGeoPositionInfoSource::AllPositioningMethods - // locationDataSource->setUpdateInterval(1000); + locationDataSource->setUpdateInterval(1000); // Whenever the location data source signals that the current // position is updated, the positionUpdated function is called. QObject::connect( locationDataSource,