FGFS-4.1/simgear
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

simgear/environment/metar.*: getDescription() can now also use single spaces.

Browse Source 
If <tabstop> param is -1, all sequences of tabs are replaced by a single space.
This commit is contained in:
Julian Smith 2019-11-06 19:07:50 +00:00
parent 0c8949e723
commit 1a4568175c
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
simgear/environment/metar.cxx
View File

@ -203,6 +203,14 @@ std::ostream& operator << (std::ostream& out, const Tab& t)
std::ostringstream& out2 = *(std::ostringstream*) &out; std::ostringstream& out2 = *(std::ostringstream*) &out;
std::string s = out2.str(); std::string s = out2.str();
if (t._stops < 0) {
if (!s.size() || s[s.size()-1] != ' ') {
out << ' ';
}
return out;
}
auto nl = s.rfind('\n'); auto nl = s.rfind('\n');
if (nl < 0) nl = 0; if (nl < 0) nl = 0;
int column = 0; int column = 0;

4
simgear/environment/metar.hxx
View File

@ -236,8 +236,8 @@ public:
inline const std::vector<struct Weather> getWeather2() const { return _weather2; } inline const std::vector<struct Weather> getWeather2() const { return _weather2; }
/* Returns human-readable description. If tabtops is 0, we use tab /* Returns human-readable description. If tabtops is 0, we use tab
characters, otherwise we use spaces to pad to multiple of <tabstops>. characters. If +ve we use spaces to pad to multiple of <tabstops>. If
*/ -1 all sequences of tabs are represented by a single space. */
std::string getDescription(int tabstops) const; std::string getDescription(int tabstops) const;
protected: protected: