mirror of
https://github.com/swift-project/pilotclient.git
synced 2026-04-03 15:45:46 +08:00
Formatting and minor tweaks/renamings
This commit is contained in:
committed by
Roland Winklmeier
parent
6d105b9665
commit
7aef1dcbbc
@@ -14,7 +14,6 @@
|
||||
|
||||
#include "blackgui/blackguiexport.h"
|
||||
#include "blackgui/models/listmodeldbobjects.h"
|
||||
|
||||
#include <QString>
|
||||
|
||||
class QObject;
|
||||
|
||||
@@ -535,7 +535,7 @@ namespace BlackMisc
|
||||
return false;
|
||||
}
|
||||
|
||||
const CLength &CAircraftSituation::getGroundElevationDistance() const
|
||||
const CLength &CAircraftSituation::getGroundElevationRadius() const
|
||||
{
|
||||
if (!this->hasGroundElevation()) { return CLength::null(); }
|
||||
return m_groundElevationPlane.getRadius();
|
||||
|
||||
@@ -260,7 +260,7 @@ namespace BlackMisc
|
||||
bool setGroundElevationChecked(const Geo::CElevationPlane &elevationPlane);
|
||||
|
||||
//! Distance of ground elevation
|
||||
const PhysicalQuantities::CLength &getGroundElevationDistance() const;
|
||||
const PhysicalQuantities::CLength &getGroundElevationRadius() const;
|
||||
|
||||
//! Height above ground.
|
||||
PhysicalQuantities::CLength getHeightAboveGround() const;
|
||||
|
||||
@@ -191,7 +191,7 @@ namespace BlackMisc
|
||||
|
||||
private:
|
||||
ReferenceDatum m_datum; //!< MSL or AGL?
|
||||
AltitudeType m_altitudeType = TrueAltitude;
|
||||
AltitudeType m_altitudeType = TrueAltitude; //!< type
|
||||
|
||||
BLACK_METACLASS(
|
||||
CAltitude,
|
||||
|
||||
@@ -47,11 +47,11 @@ namespace BlackMisc
|
||||
*/
|
||||
template <class MU, class PQ> class CPhysicalQuantity :
|
||||
public Mixin::DBusOperators<CPhysicalQuantity<MU, PQ>>,
|
||||
public Mixin::JsonOperators<CPhysicalQuantity<MU, PQ>>,
|
||||
public Mixin::Index<PQ>,
|
||||
public Mixin::MetaType<PQ>,
|
||||
public Mixin::String<PQ>,
|
||||
public Mixin::Icon<CPhysicalQuantity<MU, PQ>>
|
||||
public Mixin::JsonOperators<CPhysicalQuantity<MU, PQ>>,
|
||||
public Mixin::Index<PQ>,
|
||||
public Mixin::MetaType<PQ>,
|
||||
public Mixin::String<PQ>,
|
||||
public Mixin::Icon<CPhysicalQuantity<MU, PQ>>
|
||||
{
|
||||
//! \copydoc CValueObject::compare
|
||||
friend int compare(const PQ &a, const PQ &b) { return compareImpl(a, b); }
|
||||
|
||||
@@ -203,18 +203,9 @@ namespace BlackMisc
|
||||
if (i.isEmpty()) { return None; }
|
||||
|
||||
Simulator s = None;
|
||||
if (i.contains("fsx") || i.contains("fs10"))
|
||||
{
|
||||
s |= FSX;
|
||||
}
|
||||
if (i.contains("fs9") || i.contains("2004"))
|
||||
{
|
||||
s |= FS9;
|
||||
}
|
||||
if (i.contains("plane") || i.contains("xp"))
|
||||
{
|
||||
s |= XPLANE;
|
||||
}
|
||||
if (i.contains("fsx") || i.contains("fs10")) { s |= FSX; }
|
||||
if (i.contains("fs9") || i.contains("2004")) { s |= FS9; }
|
||||
if (i.contains("plane") || i.contains("xp")) { s |= XPLANE; }
|
||||
if (i.contains("3d") || i.contains("prepar") || i.contains("martin") || i.contains("lm") || i.contains("lock"))
|
||||
{
|
||||
s |= P3D;
|
||||
|
||||
Reference in New Issue
Block a user