flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-03-22 14:55:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

Use CCoordinateGeodetic instead of CLatitude and CLongitude

Browse Source 
refs #612
This commit is contained in:
Roland Winklmeier
2016-03-26 21:08:49 +01:00
parent a1f7270494
commit f72c8e878b
9 changed files with 27 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
samples/weatherdata/reader.cpp
View File

@@ -41,7 +41,8 @@ void CLineReader::run()
longitudeValue += match.captured(4).toDouble() / 10;
const CLatitude latitude(latitudeValue, CAngleUnit::deg());
const CLongitude longitude(longitudeValue, CAngleUnit::deg());
emit weatherDataRequest(latitude, longitude);
const CCoordinateGeodetic position { latitude, longitude, {0} };
emit weatherDataRequest(position);
}
else
{

5
samples/weatherdata/reader.h
View File

@@ -13,8 +13,7 @@
//! \file
//! \ingroup sampleweatherdata
#include "blackmisc/geo/latitude.h"
#include "blackmisc/geo/longitude.h"
#include "blackmisc/geo/coordinategeodetic.h"
#include <QThread>
#include <QString>
@@ -35,7 +34,7 @@ protected:
signals:
//! User is asking for weather data
void weatherDataRequest(const BlackMisc::Geo::CLatitude &lat, const BlackMisc::Geo::CLongitude &lon);
void weatherDataRequest(const BlackMisc::Geo::CCoordinateGeodetic &position);
//! User is asking to quit
void quit();

4
samples/weatherdata/weatherdataprinter.cpp
View File

@@ -51,8 +51,8 @@ void CWeatherDataPrinter::ps_printWeatherData()
CWeatherGrid weatherGrid = m_weatherData->getWeatherData();
for (const CGridPoint &gridPoint : weatherGrid)
{
qtout << "Latitude:" << gridPoint.getLatitude().toQString() << endl;
qtout << "Longitude:" << gridPoint.getLongitude().toQString() << endl;
qtout << "Latitude:" << gridPoint.getPosition().latitude().toQString() << endl;
qtout << "Longitude:" << gridPoint.getPosition().longitude().toQString() << endl;
CTemperatureLayerList temperatureLayers = gridPoint.getTemperatureLayers();
temperatureLayers.sort([](const CTemperatureLayer &a, const CTemperatureLayer &b) { return a.getLevel() < b.getLevel(); });

2
samples/weatherdata/weatherdataprinter.h
View File

@@ -32,7 +32,7 @@ public:
public slots:
//! Fetch new weather data for given position and print it once received
void fetchAndPrintWetherData(const BlackMisc::Geo::CLatitude &lat, const BlackMisc::Geo::CLongitude &lon);
void fetchAndPrintWetherData(const BlackMisc::Geo::CCoordinateGeodetic &position);
private slots:
//! Print weather data to stdout

3
src/blackcore/weatherdata.h
View File

@@ -13,8 +13,7 @@
#define BLACKCORE_WEATHERDATA_H
#include "blackcoreexport.h"
#include "blackmisc/geo/latitude.h"
#include "blackmisc/geo/longitude.h"
#include "blackmisc/geo/coordinategeodetic.h"
#include "blackmisc/weather/gridpoint.h"
#include "blackmisc/weather/weathergrid.h"
#include <QObject>

16
src/blackmisc/weather/gridpoint.cpp
View File

@@ -18,12 +18,12 @@ namespace BlackMisc
{
namespace Weather
{
CGridPoint::CGridPoint(const Geo::CLatitude &latitude, const Geo::CLongitude longitude,
CGridPoint::CGridPoint(const Geo::CCoordinateGeodetic &position,
const CCloudLayerList &cloudLayers,
const CTemperatureLayerList &temperatureLayers,
const CVisibilityLayerList &visibilityLayers,
const CWindLayerList &windLayers) :
m_latitude(latitude), m_longitude(longitude), m_cloudLayers(cloudLayers),
m_position(position), m_cloudLayers(cloudLayers),
m_temperatureLayers(temperatureLayers), m_visibilityLayers(visibilityLayers),
m_windLayers(windLayers)
{ }
@@ -34,10 +34,8 @@ namespace BlackMisc
ColumnIndex i = index.frontCasted<ColumnIndex>();
switch (i)
{
case IndexLatitude:
return CVariant::fromValue(m_latitude);
case IndexLongitude:
return CVariant::fromValue(m_longitude);
case IndexPosition:
return CVariant::fromValue(m_position);
case IndexCloudLayers:
return CVariant::fromValue(m_cloudLayers);
case IndexTemperatureLayers:
@@ -55,11 +53,9 @@ namespace BlackMisc
ColumnIndex i = index.frontCasted<ColumnIndex>();
switch (i)
{
case IndexLatitude:
setLatitude(variant.value<CLatitude>());
case IndexPosition:
setPosition(variant.value<CCoordinateGeodetic>());
break;
case IndexLongitude:
setLongitude(variant.value<CLongitude>());
break;
case IndexCloudLayers:
setCloudLayers(variant.value<CCloudLayerList>());

28
src/blackmisc/weather/gridpoint.h
View File

@@ -15,8 +15,7 @@
#include "blackmisc/blackmiscexport.h"
#include "blackmisc/valueobject.h"
#include "blackmisc/propertyindex.h"
#include "blackmisc/geo/latitude.h"
#include "blackmisc/geo/longitude.h"
#include "blackmisc/geo/coordinategeodetic.h"
#include "blackmisc/weather/cloudlayerlist.h"
#include "blackmisc/weather/temperaturelayerlist.h"
#include "blackmisc/weather/visibilitylayerlist.h"
@@ -35,8 +34,7 @@ namespace BlackMisc
//! Properties by index
enum ColumnIndex
{
IndexLatitude = BlackMisc::CPropertyIndex::GlobalIndexCGridPoint,
IndexLongitude,
IndexPosition = BlackMisc::CPropertyIndex::GlobalIndexCGridPoint,
IndexCloudLayers,
IndexTemperatureLayers,
IndexWindLayers
@@ -46,23 +44,17 @@ namespace BlackMisc
CGridPoint() = default;
//! Constructor
CGridPoint(const Geo::CLatitude &latitude, const Geo::CLongitude longitude,
CGridPoint(const Geo::CCoordinateGeodetic &position,
const CCloudLayerList &cloudLayers,
const CTemperatureLayerList &temperatureLayers,
const CVisibilityLayerList &visibilityLayers,
const CWindLayerList &windLayers);
//! Set latitude
void setLatitude(const Geo::CLatitude &latitude) { m_latitude = latitude; }
//! Set position
void setPosition(const BlackMisc::Geo::CCoordinateGeodetic &position) { m_position = position; }
//! Get latitude
Geo::CLatitude getLatitude() const { return m_latitude; }
//! Set longitude
void setLongitude(const Geo::CLongitude &longitude) { m_longitude = longitude; }
//! Get longitude
Geo::CLongitude getLongitude() const { return m_longitude; }
//! Get position
const BlackMisc::Geo::CCoordinateGeodetic getPosition() const { return m_position; }
//! Set cloud layers
void setCloudLayers(const CCloudLayerList &cloudLayers) { m_cloudLayers = cloudLayers; }
@@ -98,8 +90,7 @@ namespace BlackMisc
QString convertToQString(bool i18n = false) const;
private:
Geo::CLatitude m_latitude;
Geo::CLongitude m_longitude;
BlackMisc::Geo::CCoordinateGeodetic m_position;
CCloudLayerList m_cloudLayers;
CTemperatureLayerList m_temperatureLayers;
CVisibilityLayerList m_visibilityLayers;
@@ -107,8 +98,7 @@ namespace BlackMisc
BLACK_METACLASS(
CGridPoint,
BLACK_METAMEMBER(latitude),
BLACK_METAMEMBER(longitude),
BLACK_METAMEMBER(position),
BLACK_METAMEMBER(cloudLayers),
BLACK_METAMEMBER(temperatureLayers),
BLACK_METAMEMBER(visibilityLayers),

4
src/blackmisc/weather/weathergrid.cpp
View File

@@ -47,7 +47,7 @@ namespace BlackMisc
static const CGridPoint gridPointGLOB =
{
{}, {},
{},
CCloudLayerList { cloudLayer },
CTemperatureLayerList { temperatureLayer },
CVisibilityLayerList { visibilityLayer } ,
@@ -97,7 +97,7 @@ namespace BlackMisc
static const CGridPoint gridPointGLOB
{
{}, {},
{},
CCloudLayerList { cloudLayer1, cloudLayer2 },
CTemperatureLayerList { temperatureLayer },
CVisibilityLayerList { visibilityLayer },

3
src/plugins/weatherdata/gfs/weatherdatagfs.cpp
View File

@@ -270,7 +270,8 @@ namespace BlackWxPlugin
CLatitude latitude(gfsGridPoint.latitude, CAngleUnit::deg());
CLongitude longitude(gfsGridPoint.longitude, CAngleUnit::deg());
BlackMisc::Weather::CGridPoint gridPoint(latitude, longitude, cloudLayers, temperatureLayers, {}, windLayers);
auto position = CCoordinateGeodetic { latitude, longitude, {0} };
BlackMisc::Weather::CGridPoint gridPoint(position, cloudLayers, temperatureLayers, {}, windLayers);
m_weatherGrid.insert(gridPoint);
}
}