Commit 8efa3464 authored by Don Gagne's avatar Don Gagne

Merge pull request #2989 from shadow1runner/upstream

Fix #2987: QGroundControlQmlGlobal.h: flightMapZoom should be a doubl…
parents 687468cf b6a5050e
......@@ -78,7 +78,7 @@ public:
Q_PROPERTY(QGeoCoordinate lastKnownHomePosition READ lastKnownHomePosition CONSTANT)
Q_PROPERTY(QGeoCoordinate flightMapPosition MEMBER _flightMapPosition NOTIFY flightMapPositionChanged)
Q_PROPERTY(int flightMapZoom MEMBER _flightMapZoom NOTIFY flightMapZoomChanged)
Q_PROPERTY(double flightMapZoom MEMBER _flightMapZoom NOTIFY flightMapZoomChanged)
Q_PROPERTY(QString parameterFileExtension READ parameterFileExtension CONSTANT)
Q_PROPERTY(QString missionFileExtension READ missionFileExtension CONSTANT)
......@@ -161,7 +161,7 @@ signals:
void isVersionCheckEnabledChanged (bool enabled);
void mavlinkSystemIDChanged (int id);
void flightMapPositionChanged (QGeoCoordinate flightMapPosition);
void flightMapZoomChanged (int flightMapZoom);
void flightMapZoomChanged (double flightMapZoom);
void experimentalSurveyChanged (bool experimentalSurvey);
private:
......@@ -175,7 +175,7 @@ private:
bool _virtualTabletJoystick;
QGeoCoordinate _flightMapPosition;
int _flightMapZoom;
double _flightMapZoom;
SettingsFact _offlineEditingFirmwareTypeFact;
FactMetaData _offlineEditingFirmwareTypeMetaData;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment