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

Signs: if the size is not allowed by the spec, print out a more meaningful warning

Browse Source 
to help identify the problematic line.
This commit is contained in:
Christian Schmitt 2012-09-04 10:27:07 +02:00
parent 78c0419007
commit 836c563c89
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
simgear/scene/tgdb/apt_signs.cxx
View File

@ -376,7 +376,7 @@ void AirportSignBuilder::addSign(const SGGeod& pos, double heading, const std::s
if (n == "@Y") { if (n == "@Y") {
if (size > 3) { if (size > 3) {
size = -1; size = -1;
SG_LOG(SG_TERRAIN, SG_ALERT, SIGN "Wrong size for " << name << ". Allowed values are 1 to 3"); SG_LOG(SG_TERRAIN, SG_ALERT, SIGN << content << " has wrong size. Allowed values are 1 to 3");
} }
sign_height = HT[size < 0 ? 3 : size]; sign_height = HT[size < 0 ? 3 : size];
newmat = "YellowSign"; newmat = "YellowSign";
@ -386,7 +386,7 @@ void AirportSignBuilder::addSign(const SGGeod& pos, double heading, const std::s
} else if (n == "@R") { } else if (n == "@R") {
if (size > 3) { if (size > 3) {
size = -1; size = -1;
SG_LOG(SG_TERRAIN, SG_ALERT, SIGN "Wrong size for " << name << ". Allowed values are 1 to 3"); SG_LOG(SG_TERRAIN, SG_ALERT, SIGN << content << " has wrong size. Allowed values are 1 to 3");
} }
sign_height = HT[size < 0 ? 3 : size]; sign_height = HT[size < 0 ? 3 : size];
newmat = "RedSign"; newmat = "RedSign";
@ -396,7 +396,7 @@ void AirportSignBuilder::addSign(const SGGeod& pos, double heading, const std::s
} else if (n == "@L") { } else if (n == "@L") {
if (size > 3) { if (size > 3) {
size = -1; size = -1;
SG_LOG(SG_TERRAIN, SG_ALERT, SIGN "Wrong size for " << name << ". Allowed values are 1 to 3"); SG_LOG(SG_TERRAIN, SG_ALERT, SIGN << content << " has wrong size. Allowed values are 1 to 3");
} }
sign_height = HT[size < 0 ? 3 : size]; sign_height = HT[size < 0 ? 3 : size];
newmat = "FramedSign"; newmat = "FramedSign";
@ -406,7 +406,7 @@ void AirportSignBuilder::addSign(const SGGeod& pos, double heading, const std::s
} else if (n == "@B") { } else if (n == "@B") {
if ( (size != -1) && (size != 4) && (size != 5) ) { if ( (size != -1) && (size != 4) && (size != 5) ) {
size = -1; size = -1;
SG_LOG(SG_TERRAIN, SG_ALERT, SIGN "Wrong size for " << name << ". Allowed values are 4 or 5"); SG_LOG(SG_TERRAIN, SG_ALERT, SIGN << content << " has wrong size. Allowed values are 4 or 5");
} }
sign_height = HT[size < 0 ? 4 : size]; sign_height = HT[size < 0 ? 4 : size];
newmat = "BlackSign"; newmat = "BlackSign";