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

Ref T709, display settings as string/QString (for logging)

Browse Source
This commit is contained in:
Klaus Basan
2019-07-26 16:02:06 +02:00
committed by Mat Sutcliffe
parent 6a2f08b49f
commit d1db1943ae
4 changed files with 33 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/blackmisc/simulation/settings/xswiftbussettings.cpp
View File

@@ -55,7 +55,7 @@ namespace BlackMisc
QString CXSwiftBusSettings::convertToQString(bool i18n) const
{
Q_UNUSED(i18n);
return "";
return QString::fromStdString(CXSwiftBusSettingsQtFree::convertToString());
}
CStatusMessageList CXSwiftBusSettings::validate() const

14
src/blackmisc/simulation/settings/xswiftbussettingsqtfree.cpp
View File

@@ -7,12 +7,16 @@
*/
#include "xswiftbussettingsqtfree.h"
#include "blackmisc/simulation/xplane/qtfreeutils.h"
#include "rapidjson/document.h" // rapidjson's DOM-style API
#include "rapidjson/prettywriter.h" // for stringify JSON
#include <string>
using namespace rapidjson;
using namespace BlackMisc::Simulation::Settings;
using namespace BlackMisc::Simulation::XPlane;
using namespace rapidjson;
//! @cond SWIFT_INTERNAL
constexpr char BlackMisc::Simulation::Settings::CXSwiftBusSettingsQtFree::JsonDBusServerAddress[];
@@ -85,6 +89,14 @@ namespace BlackMisc
const std::string json = sb.GetString();
return json;
}
std::string CXSwiftBusSettingsQtFree::convertToString() const
{
return "DBusServer: " + m_dBusServerAddress +
", drawLabels: " + QtFreeUtils::boolToYesNo(m_drawingLabels) +
", max planes: " + std::to_string(m_maxPlanes) +
", max distance NM: " + std::to_string(m_maxDrawDistanceNM);
}
} // ns
} // ns
} // ns

3
src/blackmisc/simulation/settings/xswiftbussettingsqtfree.h
View File

@@ -57,6 +57,9 @@ namespace BlackMisc
//! As JSON string
std::string toXSwiftBusJsonString() const;
//! Convert to string
std::string convertToString() const;
protected:
//! The JSON members @{
static constexpr char JsonDBusServerAddress[] = "dbusserveradress";

16
src/blackmisc/simulation/xplane/qtfreeutils.h
View File

@@ -139,6 +139,22 @@ namespace BlackMisc
});
}
//! Yes/no from bool
inline const std::string &boolToYesNo(bool t)
{
static const std::string y("yes");
static const std::string n("no");
return t ? y : n;
}
//! True/false from bool
inline const std::string &boolTotrueFalse(bool t)
{
static const std::string tr("true");
static const std::string fa("false");
return t ? tr : fa;
}
//! Trim whitespace from the beginning and end, and replace sequences of whitespace with single space characters
inline std::string simplifyWhitespace(const std::string &s)
{