flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-03-30 20:15:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

Ref T241, hint asString function (less info, shorter message)

Browse Source
This commit is contained in:
Klaus Basan
2018-02-04 08:42:57 +01:00
parent 0addfa8281
commit 7c7ee65ddc
5 changed files with 26 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/blackmisc/simulation/interpolationhints.cpp
View File

@@ -143,17 +143,27 @@ namespace BlackMisc
} }
QString CInterpolationHints::convertToQString(bool i18n) const QString CInterpolationHints::convertToQString(bool i18n) const
{
Q_UNUSED(i18n);
return this->asString(true, true);
}
QString CInterpolationHints::asString(bool withParts, bool withElevationPlane) const
{ {
return return
QStringLiteral("VTOL: ") % boolToYesNo(m_isVtol) % QStringLiteral("VTOL: ") % boolToYesNo(m_isVtol) %
QStringLiteral(" parts: ") % boolToYesNo(m_hasParts) % QStringLiteral(" parts: ") % boolToYesNo(m_hasParts) %
( (
m_hasParts ? withParts && m_hasParts ?
QStringLiteral(" parts: ") % m_aircraftParts.toQString(i18n) : QStringLiteral(" parts: ") % m_aircraftParts.toQString(true) :
QStringLiteral("") QStringLiteral("")
) % ) %
QStringLiteral(" CG: ") % m_cgAboveGround.valueRoundedWithUnit(CLengthUnit::m(), 1) % QStringLiteral(" CG: ") % m_cgAboveGround.valueRoundedWithUnit(CLengthUnit::m(), 1) %
QStringLiteral(" elv.plane: ") % m_elevationPlane.toQString(i18n) % (
withElevationPlane ?
QStringLiteral(" elv.plane: ") % m_elevationPlane.toQString(true) :
QStringLiteral(" elv.plane: ") % boolToNullNotNull(m_elevationPlane.isNull())
) %
QStringLiteral(" elv.pr.: ") % boolToYesNo(m_elevationProvider ? true : false); QStringLiteral(" elv.pr.: ") % boolToYesNo(m_elevationProvider ? true : false);
} }

3
src/blackmisc/simulation/interpolationhints.h
View File

@@ -127,6 +127,9 @@ namespace BlackMisc
//! \copydoc BlackMisc::Mixin::String::toQString //! \copydoc BlackMisc::Mixin::String::toQString
QString convertToQString(bool i18n = false) const; QString convertToQString(bool i18n = false) const;
//! Formatted as string
QString asString(bool withParts, bool withElevationPlane) const;
//! For debugging //! For debugging
QString debugInfo(const Geo::CElevationPlane &deltaElevation) const; QString debugInfo(const Geo::CElevationPlane &deltaElevation) const;

2
src/blackmisc/simulation/interpolationlogger.cpp
View File

@@ -421,7 +421,7 @@ namespace BlackMisc
QStringLiteral(" | #nw.sit.: ") % QString::number(noNetworkSituations) % QStringLiteral(" | #nw.sit.: ") % QString::number(noNetworkSituations) %
( (
withHints ? withHints ?
separator % QStringLiteral("hints: ") % usedHints.toQString(true) : separator % QStringLiteral("hints: ") % usedHints.asString(false, true) :
QStringLiteral("") QStringLiteral("")
) % ) %
( (

8
src/blackmisc/simulation/interpolationrenderingsetup.cpp
View File

@@ -167,8 +167,8 @@ namespace BlackMisc
{ {
Q_UNUSED(i18n); Q_UNUSED(i18n);
return return
QStringLiteral("Debug sim: ") % boolToYesNo(m_simulatorDebugMessages) % QStringLiteral("Dbg.sim.msgs: ") % boolToYesNo(m_simulatorDebugMessages) %
QStringLiteral(" debug interpolator: ") % boolToYesNo(m_interpolatorDebugMessage) % QStringLiteral(" dbg.inter.msgs.: ") % boolToYesNo(m_interpolatorDebugMessages) %
QStringLiteral(" force full interpolation: ") % boolToYesNo(m_forceFullInterpolation) % QStringLiteral(" force full interpolation: ") % boolToYesNo(m_forceFullInterpolation) %
QStringLiteral(" max.aircraft:") % QString::number(m_maxRenderedAircraft) % QStringLiteral(" max.aircraft:") % QString::number(m_maxRenderedAircraft) %
QStringLiteral(" max.distance:") % m_maxRenderedDistance.valueRoundedWithUnit(CLengthUnit::NM(), 2); QStringLiteral(" max.distance:") % m_maxRenderedDistance.valueRoundedWithUnit(CLengthUnit::NM(), 2);
@@ -180,7 +180,7 @@ namespace BlackMisc
const ColumnIndex i = index.frontCasted<ColumnIndex>(); const ColumnIndex i = index.frontCasted<ColumnIndex>();
switch (i) switch (i)
{ {
case IndexInterpolatorDebugMessages: return CVariant::fromValue(m_interpolatorDebugMessage); case IndexInterpolatorDebugMessages: return CVariant::fromValue(m_interpolatorDebugMessages);
case IndexSimulatorDebugMessages: return CVariant::fromValue(m_simulatorDebugMessages); case IndexSimulatorDebugMessages: return CVariant::fromValue(m_simulatorDebugMessages);
case IndexForceFullInterpolation: return CVariant::fromValue(m_forceFullInterpolation); case IndexForceFullInterpolation: return CVariant::fromValue(m_forceFullInterpolation);
case IndexMaxRenderedAircraft: return CVariant::fromValue(m_maxRenderedAircraft); case IndexMaxRenderedAircraft: return CVariant::fromValue(m_maxRenderedAircraft);
@@ -200,7 +200,7 @@ namespace BlackMisc
const ColumnIndex i = index.frontCasted<ColumnIndex>(); const ColumnIndex i = index.frontCasted<ColumnIndex>();
switch (i) switch (i)
{ {
case IndexInterpolatorDebugMessages: m_interpolatorDebugMessage = variant.toBool(); break; case IndexInterpolatorDebugMessages: m_interpolatorDebugMessages = variant.toBool(); break;
case IndexSimulatorDebugMessages: m_simulatorDebugMessages = variant.toBool(); break; case IndexSimulatorDebugMessages: m_simulatorDebugMessages = variant.toBool(); break;
case IndexForceFullInterpolation: m_forceFullInterpolation = variant.toBool(); break; case IndexForceFullInterpolation: m_forceFullInterpolation = variant.toBool(); break;
case IndexMaxRenderedAircraft: m_maxRenderedAircraft = variant.toInt(); break; case IndexMaxRenderedAircraft: m_maxRenderedAircraft = variant.toInt(); break;

10
src/blackmisc/simulation/interpolationrenderingsetup.h
View File

@@ -126,17 +126,17 @@ namespace BlackMisc
void setPropertyByIndex(const CPropertyIndex &index, const CVariant &variant); void setPropertyByIndex(const CPropertyIndex &index, const CVariant &variant);
private: private:
bool m_interpolatorDebugMessage = false; //! Debug messages in interpolator bool m_interpolatorDebugMessages = false; //! Debug messages in interpolator
bool m_simulatorDebugMessages = false; //! Debug messages of simulator (aka plugin) bool m_simulatorDebugMessages = false; //! Debug messages of simulator (aka plugin)
bool m_forceFullInterpolation = false; //! always do a full interpolation, even if aircraft is not moving bool m_forceFullInterpolation = false; //! always do a full interpolation, even if aircraft is not moving
bool m_enabledAircraftParts = true; //! Update aircraft parts bool m_enabledAircraftParts = true; //! Update aircraft parts
int m_maxRenderedAircraft = InfiniteAircraft(); //!< max.rendered aircraft int m_maxRenderedAircraft = InfiniteAircraft(); //!< max.rendered aircraft
PhysicalQuantities::CLength m_maxRenderedDistance { 0, nullptr }; //!< max.distance for rendering PhysicalQuantities::CLength m_maxRenderedDistance { 0, nullptr }; //!< max.distance for rendering
Aviation::CCallsignSet m_callsignsToLog; Aviation::CCallsignSet m_callsignsToLog;
BLACK_METACLASS( BLACK_METACLASS(
CInterpolationAndRenderingSetup, CInterpolationAndRenderingSetup,
BLACK_METAMEMBER(interpolatorDebugMessage), BLACK_METAMEMBER(interpolatorDebugMessages),
BLACK_METAMEMBER(simulatorDebugMessages), BLACK_METAMEMBER(simulatorDebugMessages),
BLACK_METAMEMBER(forceFullInterpolation), BLACK_METAMEMBER(forceFullInterpolation),
BLACK_METAMEMBER(enabledAircraftParts), BLACK_METAMEMBER(enabledAircraftParts),