fly/flightgear
1
0
Fork 0
Code Activity

Fix encoding / C++11 compliance

Browse source 
- convert text encoding to UTF-8
- C++11 requires a space between literal and identifier
This commit is contained in:
James Turner 2015-02-11 16:44:05 +00:00
parent 211a4982c8
commit 1cffd2b8c0
1 changed files with 16 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
src/Main/metar_main.cxx
View file

@ -42,8 +42,7 @@ using namespace std;
using namespace simgear; using namespace simgear;
// text color // text color
#if defined(__linux__) || defined(__sun) || defined(__CYGWIN__) \ #if defined(__linux__) || defined(__sun) || defined(__CYGWIN__) || defined( __FreeBSD__ ) || defined ( sgi )
|| defined( __FreeBSD__ ) || defined ( sgi )
# define R "\033[31;1m" // red # define R "\033[31;1m" // red
# define G "\033[32;1m" // green # define G "\033[32;1m" // green
# define Y "\033[33;1m" // yellow # define Y "\033[33;1m" // yellow
@ -188,7 +187,7 @@ void printReport(SGMetar *m)
if ((i = m->getWindDir()) == -1) if ((i = m->getWindDir()) == -1)
cout << "from variable directions"; cout << "from variable directions";
else else
cout << "from the " << azimuthName(i) << " (" << i << "°)"; cout << "from the " << azimuthName(i) << " (" << i << "°)";
cout << " at " << rnd(d, -1) << " km/h"; cout << " at " << rnd(d, -1) << " km/h";
cout << "\t\t" << rnd(m->getWindSpeed_kt(), -1) << " kt"; cout << "\t\t" << rnd(m->getWindSpeed_kt(), -1) << " kt";
@ -209,19 +208,19 @@ void printReport(SGMetar *m)
if (from != to) { if (from != to) {
cout << "\t\t\tvariable from " << azimuthName(from); cout << "\t\t\tvariable from " << azimuthName(from);
cout << " to " << azimuthName(to); cout << " to " << azimuthName(to);
cout << " (" << from << "°--" << to << "°)" << endl; cout << " (" << from << "°--" << to << "°)" << endl;
} }
} }
// temperature/humidity/air pressure // temperature/humidity/air pressure
if ((d = m->getTemperature_C()) != NaN) { if ((d = m->getTemperature_C()) != NaN) {
cout << "Temperature:\t\t" << d << "°C\t\t\t\t\t"; cout << "Temperature:\t\t" << d << "°C\t\t\t\t\t";
cout << rnd(m->getTemperature_F(), -1) << "°F" << endl; cout << rnd(m->getTemperature_F(), -1) << "°F" << endl;
if ((d = m->getDewpoint_C()) != NaN) { if ((d = m->getDewpoint_C()) != NaN) {
cout << "Dewpoint:\t\t" << d << "°C\t\t\t\t\t"; cout << "Dewpoint:\t\t" << d << "°C\t\t\t\t\t";
cout << rnd(m->getDewpoint_F(), -1) << "°F" << endl; cout << rnd(m->getDewpoint_F(), -1) << "°F" << endl;
cout << "Rel. Humidity:\t\t" << rnd(m->getRelHumidity()) << "%" << endl; cout << "Rel. Humidity:\t\t" << rnd(m->getRelHumidity()) << "%" << endl;
} }
} }
@ -424,7 +423,7 @@ void printArgs(SGMetar *m, double airport_elevation)
sprintf(&buf[strlen(buf)], ":%.0lf", gust_speed); sprintf(&buf[strlen(buf)], ":%.0lf", gust_speed);
args.push_back(buf); args.push_back(buf);
} }
// output everything // output everything
//cout << "fgfs" << endl; //cout << "fgfs" << endl;
@ -510,10 +509,10 @@ int main(int argc, char *argv[])
getproxy(proxy_host, proxy_port); getproxy(proxy_host, proxy_port);
Socket::initSockets(); Socket::initSockets();
HTTP::Client http; HTTP::Client http;
http.setProxy(proxy_host, atoi(proxy_port.c_str())); http.setProxy(proxy_host, atoi(proxy_port.c_str()));
for (int i = 1; i < argc; i++) { for (int i = 1; i < argc; i++) {
if (!strcmp(argv[i], "-h") || !strcmp(argv[i], "--help")) if (!strcmp(argv[i], "-h") || !strcmp(argv[i], "--help"))
usage(); usage();
@ -548,7 +547,7 @@ int main(int argc, char *argv[])
); );
HTTP::Request_ptr own(mr); HTTP::Request_ptr own(mr);
http.makeRequest(mr); http.makeRequest(mr);
// spin until the request completes, fails or times out // spin until the request completes, fails or times out
SGTimeStamp start(SGTimeStamp::now()); SGTimeStamp start(SGTimeStamp::now());
while (start.elapsedMSec() < 8000) { while (start.elapsedMSec() < 8000) {
@ -557,7 +556,7 @@ int main(int argc, char *argv[])
break; break;
SGTimeStamp::sleepForMSec(1); SGTimeStamp::sleepForMSec(1);
} }
if( !mr->isComplete() ) if( !mr->isComplete() )
throw sg_io_exception("metar download timed out"); throw sg_io_exception("metar download timed out");
if( mr->responseCode() != 200 ) if( mr->responseCode() != 200 )
@ -571,15 +570,15 @@ int main(int argc, char *argv[])
} }
SGMetar *m = new SGMetar(mr->responseBody()); SGMetar *m = new SGMetar(mr->responseBody());
//SGMetar *m = new SGMetar("2004/01/11 01:20\nLOWG 110120Z AUTO VRB01KT 0050 1600N R35/0600 FG M06/M06 Q1019 88//////\n"); //SGMetar *m = new SGMetar("2004/01/11 01:20\nLOWG 110120Z AUTO VRB01KT 0050 1600N R35/0600 FG M06/M06 Q1019 88//////\n");
if (verbose) { if (verbose) {
cerr << G"INPUT: " << m->getData() << ""N << endl; cerr << G "INPUT: " << m->getData() << "" N << endl;
const char *unused = m->getUnusedData(); const char *unused = m->getUnusedData();
if (*unused) if (*unused)
cerr << R"UNUSED: " << unused << ""N << endl; cerr << R "UNUSED: " << unused << "" N << endl;
} }
if (report) if (report)
@ -589,7 +588,7 @@ int main(int argc, char *argv[])
delete m; delete m;
} catch (const sg_io_exception& e) { } catch (const sg_io_exception& e) {
cerr << R"ERROR: " << e.getFormattedMessage().c_str() << ""N << endl << endl; cerr << R "ERROR: " << e.getFormattedMessage().c_str() << "" N << endl << endl;
} }
} }
} }