flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-02 06:35:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

refs #707, refactoring geo interfaces

Browse Source 
* added compare functions (also to ATC list)
* renamed to relative position, e.g. station.setRelativeDistance
* delegate set/get/compare to correct interface
This commit is contained in:
Klaus Basan
2016-07-12 03:01:50 +02:00
parent 64cee7fba8
commit b959972e0c
20 changed files with 302 additions and 129 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/blackmisc/testing.cpp
View File

@@ -35,7 +35,6 @@ namespace BlackMisc
{
namespace Aviation
{
CAtcStationList CTesting::createAtcStations(int number, bool byPropertyIndex)
{
CAtcStationList atcs;
@@ -71,14 +70,14 @@ namespace BlackMisc
station.setPropertyByIndex(CAtcStation::IndexIsOnline, CVariant::from(false));
station.setPropertyByIndex(CAtcStation::IndexBookedFrom, CVariant::from(dtFrom));
station.setPropertyByIndex(CAtcStation::IndexBookedUntil, CVariant::from(dtUntil));
station.setPropertyByIndex(CAtcStation::IndexDistanceToOwnAircraft, CVariant::from(CLength(index + 1, CLengthUnit::NM())));
station.setPropertyByIndex(CAtcStation::IndexRelativeDistance, CVariant::from(CLength(index + 1, CLengthUnit::NM())));
}
else
{
station = CAtcStation(CCallsign(cs), user,
CFrequency(f, CFrequencyUnit::MHz()),
geoPos, CLength(50, CLengthUnit::km()), false, dtFrom, dtUntil);
station.setDistanceToOwnAircraft(CLength(index + 1, CLengthUnit::NM()));
station.setRelativeDistance(CLength(index + 1, CLengthUnit::NM()));
}
station.setVoiceRoomUrl("vvl://foo.bar.baz/room" + QString::number(index));
@@ -102,7 +101,7 @@ namespace BlackMisc
r.append(station.propertyByIndex({ CAtcStation::IndexController, CUser::IndexRealName}).toQString());
r.append(station.propertyByIndex({ CAtcStation::IndexPosition, CCoordinateGeodetic::IndexLatitudeAsString}).toQString());
r.append(station.propertyByIndex({ CAtcStation::IndexPosition, CCoordinateGeodetic::IndexLongitudeAsString}).toQString());
r.append(station.propertyByIndex({ CAtcStation::IndexDistanceToOwnAircraft, CLength::IndexValueRounded2DigitsWithUnit}).toQString());
r.append(station.propertyByIndex({ CAtcStation::IndexRelativeDistance, CLength::IndexValueRounded2DigitsWithUnit}).toQString());
r.append(station.propertyByIndex({ CAtcStation::IndexBookedFrom}).toDateTime().toString("YYYY-mm-dd hh:mm"));
r.append(station.propertyByIndex({ CAtcStation::IndexBookedUntil}).toDateTime().toString("YYYY-mm-dd hh:mm"));
}
@@ -112,7 +111,7 @@ namespace BlackMisc
r.append(station.getController().getRealName());
r.append(station.getPosition().latitudeAsString());
r.append(station.getPosition().longitudeAsString());
r.append(station.getDistanceToOwnAircraft().toQString(true));
r.append(station.getRelativeDistance().toQString(true));
r.append(station.getBookedFromUtc().toString("YYYY-mm-dd hh:mm"));
r.append(station.getBookedUntilUtc().toString("YYYY-mm-dd hh:mm"));
}
@@ -138,7 +137,7 @@ namespace BlackMisc
for (int i = 0; i < n; i++)
{
int p = i % s;
atc.calculcateDistanceToOwnAircraft(pos.at(p));
atc.calculcateAndUpdateRelativeDistance(pos.at(p));
}
}
@@ -172,6 +171,5 @@ namespace BlackMisc
c = CCoordinateGeodetic::fromWgs84(wgsLatLng.at(idx), wgsLatLng.at(idx + 1), h);
}
}
} // namespace
} // namespace