flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-07 11:05:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

Minor tweak remove redundant "/' and string message improvements

Browse Source
This commit is contained in:
Klaus Basan
2019-03-09 02:00:26 +01:00
committed by Mat Sutcliffe
parent 360edca4b3
commit c899bfbea7
4 changed files with 31 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/blackcore/aircraftmatcher.cpp
View File

@@ -126,8 +126,9 @@ namespace BlackCore
const QDateTime startTime = QDateTime::currentDateTimeUtc(); const QDateTime startTime = QDateTime::currentDateTimeUtc();
if (log) { log->clear(); } if (log) { log->clear(); }
CMatchingUtils::addLogDetailsToList(log, remoteAircraft, m1.arg(startTime.toString(format))); CMatchingUtils::addLogDetailsToList(log, remoteAircraft, m1.arg(startTime.toString(format)));
CMatchingUtils::addLogDetailsToList(log, remoteAircraft, m2.arg(remoteAircraft.getCallsignAsString(), remoteAircraft.getModel().toQString())); CMatchingUtils::addLogDetailsToList(log, remoteAircraft, m2.arg(remoteAircraft.getCallsignAsString(), removeSurroundingApostrophes(remoteAircraft.getModel().toQString())));
CMatchingUtils::addLogDetailsToList(log, remoteAircraft, m3.arg(modelSet.size()).arg(modelSet.coverageSummaryForModel(remoteAircraft.getModel()))); CMatchingUtils::addLogDetailsToList(log, remoteAircraft, m3.arg(modelSet.size()).arg(modelSet.coverageSummaryForModel(remoteAircraft.getModel())));
CMatchingUtils::addLogDetailsToList(log, remoteAircraft, m4.arg(setup.toQString(true))); CMatchingUtils::addLogDetailsToList(log, remoteAircraft, m4.arg(setup.toQString(true)));

4
src/blackmisc/simulation/aircraftmatchersetup.cpp
View File

@@ -137,8 +137,8 @@ namespace BlackMisc
{ {
static const QString ms("by model string"); static const QString ms("by model string");
static const QString icao("by ICAO"); static const QString icao("by ICAO");
static const QString icaoAircraft("by ICAO, aircraft first"); static const QString icaoAircraft("by ICAO aircraft first");
static const QString icaoAirline("by ICAO, airline first"); static const QString icaoAirline("by ICAO airline first");
static const QString family("by family"); static const QString family("by family");
static const QString forceMil("force military"); static const QString forceMil("force military");
static const QString forceCiv("force civilian"); static const QString forceCiv("force civilian");

21
src/blackmisc/stringutils.cpp
View File

@@ -412,6 +412,27 @@ namespace BlackMisc
} }
return map; return map;
} }
QString removeSurroundingApostrophes(const QString &in)
{
if (in.size() < 2) { return in; }
if (in.startsWith("'") && in.endsWith("'"))
{
return in.mid(1, in.length() - 2);
}
return in;
}
QString removeSurroundingQuotes(const QString &in)
{
if (in.size() < 2) { return in; }
if (in.startsWith("\"") && in.endsWith("\""))
{
return in.mid(1, in.length() - 2);
}
return in;
}
} // ns } // ns
//! \endcond //! \endcond

6
src/blackmisc/stringutils.h
View File

@@ -204,6 +204,12 @@ namespace BlackMisc
//! Return string in quotes //! Return string in quotes
BLACKMISC_EXPORT QString inQuotes(const QString &in, bool ignoreEmpty = false); BLACKMISC_EXPORT QString inQuotes(const QString &in, bool ignoreEmpty = false);
//! Remove surrounding apostrophes 'foo' -> foo
BLACKMISC_EXPORT QString removeSurroundingApostrophes(const QString &in);
//! Remove surrounding quotes "foo" -> foo
BLACKMISC_EXPORT QString removeSurroundingQuotes(const QString &in);
//! Bool to on/off //! Bool to on/off
BLACKMISC_EXPORT const QString &boolToOnOff(bool v); BLACKMISC_EXPORT const QString &boolToOnOff(bool v);