flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-01 13:36:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

Ref T77, tooltip for models (HTML Summary)

Browse Source
This commit is contained in:
Klaus Basan
2017-05-08 02:57:34 +02:00
parent afbb87298f
commit a4100d7efa
6 changed files with 63 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/blackmisc/simulation/aircraftmodel.cpp
View File

@@ -105,7 +105,7 @@ namespace BlackMisc
QJsonObject CAircraftModel::toMemoizedJson(MemoHelper::CMemoizer &helper) const
{
QJsonObject json;
auto meta = introspect<CAircraftModel>().without(MetaFlags<DisabledForJson>());
const auto meta = introspect<CAircraftModel>().without(MetaFlags<DisabledForJson>());
meta.forEachMember([ &, this ](auto member)
{
auto &&maybeMemo = helper.maybeMemoize(member.in(*this));
@@ -116,7 +116,7 @@ namespace BlackMisc
void CAircraftModel::convertFromMemoizedJson(const QJsonObject &json, const MemoHelper::CUnmemoizer &helper)
{
auto meta = introspect<CAircraftModel>().without(MetaFlags<DisabledForJson>());
const auto meta = introspect<CAircraftModel>().without(MetaFlags<DisabledForJson>());
meta.forEachMember([ &, this ](auto member)
{
auto it = json.find(CExplicitLatin1String(member.latin1Name()));
@@ -126,10 +126,12 @@ namespace BlackMisc
QString CAircraftModel::asHtmlSummary(const QString &separator) const
{
static const QString html = "Model: %1%2Aircraft ICAO: %3%4Livery: %5";
return html.arg(this->getModelStringAndDbKey(), separator,
this->getAircraftIcaoCode().asHtmlSummary(), separator,
this->getLivery().asHtmlSummary());
static const QString html = "Model: %1 changed: %2%3Simulator: %4 Mode: %5 Distributor: %6%7Aircraft ICAO: %8%9Livery: %10";
return html
.arg(this->getModelStringAndDbKey(), this->getFormattedUtcTimestampYmdhms() , separator,
this->getSimulator().toQString(true), this->getModelModeAsString(), this->getDistributor().getIdAndDescription(), separator,
this->getAircraftIcaoCode().asHtmlSummary(), separator)
.arg(this->getLivery().asHtmlSummary("&nbsp;")).replace(" ", "&nbsp;");
}
bool CAircraftModel::canInitializeFromFsd() const

10
src/blackmisc/simulation/distributor.cpp
View File

@@ -33,6 +33,16 @@ namespace BlackMisc
this->setDbKey(id);
}
const QString CDistributor::getIdAndDescription() const
{
if (!this->getDbKey().isEmpty() && !this->getDescription().isEmpty())
{
return this->getDbKey() + " " + this->getDescription();
}
if (!this->getDbKey().isEmpty()) { return this->getDbKey(); }
return "";
}
bool CDistributor::matchesKeyOrAlias(const QString &keyOrAlias) const
{
QString s(keyOrAlias.trimmed().toUpper());

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

@@ -58,6 +58,9 @@ namespace BlackMisc
//! Get description
const QString &getDescription() const { return this->m_description;}
//! Get id and description
const QString getIdAndDescription() const;
//! Set description
void setDescription(const QString &description) { this->m_description = description.trimmed(); }