From 69f9d8f9023c450cddd214eb59b56ae7d3047f8f Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Fri, 13 Jan 2012 00:22:47 +0000 Subject: [PATCH] Class kml_printer is now Kml_Printer, following the coding style. git-svn-id: https://svn.code.sf.net/p/gnss-sdr/code/trunk@124 64b25241-fba3-4117-9849-534c7e92360d --- .../PVT/gnuradio_blocks/gps_l1_ca_pvt_cc.h | 2 +- src/algorithms/PVT/libs/kml_printer.cc | 17 ++++++++++++----- src/algorithms/PVT/libs/kml_printer.h | 6 +++--- src/algorithms/PVT/libs/rinex_printer.cc | 3 --- 4 files changed, 16 insertions(+), 12 deletions(-) diff --git a/src/algorithms/PVT/gnuradio_blocks/gps_l1_ca_pvt_cc.h b/src/algorithms/PVT/gnuradio_blocks/gps_l1_ca_pvt_cc.h index 175a392e1..e0d544123 100644 --- a/src/algorithms/PVT/gnuradio_blocks/gps_l1_ca_pvt_cc.h +++ b/src/algorithms/PVT/gnuradio_blocks/gps_l1_ca_pvt_cc.h @@ -78,7 +78,7 @@ private: long unsigned int d_sample_counter; - kml_printer d_kml_dump; + Kml_Printer d_kml_dump; concurrent_queue *d_nav_queue; // Navigation ephemeris queue Gps_Navigation_Message d_last_nav_msg; // Last navigation message diff --git a/src/algorithms/PVT/libs/kml_printer.cc b/src/algorithms/PVT/libs/kml_printer.cc index 92306db1a..bf5ee59c8 100644 --- a/src/algorithms/PVT/libs/kml_printer.cc +++ b/src/algorithms/PVT/libs/kml_printer.cc @@ -34,7 +34,7 @@ #include #include -bool kml_printer::set_headers(std::string filename) +bool Kml_Printer::set_headers(std::string filename) { time_t rawtime; struct tm * timeinfo; @@ -79,7 +79,7 @@ bool kml_printer::set_headers(std::string filename) } -bool kml_printer::print_position(gps_l1_ca_ls_pvt* position,bool print_average_values) +bool Kml_Printer::print_position(gps_l1_ca_ls_pvt* position,bool print_average_values) { double latitude; double longitude; @@ -108,7 +108,9 @@ bool kml_printer::print_position(gps_l1_ca_ls_pvt* position,bool print_average_v } } -bool kml_printer::close_file() + + +bool Kml_Printer::close_file() { if (kml_file.is_open()) { @@ -126,6 +128,11 @@ bool kml_printer::close_file() } } -kml_printer::kml_printer () {} -kml_printer::~kml_printer () {} + +Kml_Printer::Kml_Printer () {} + + + +Kml_Printer::~Kml_Printer () {} + diff --git a/src/algorithms/PVT/libs/kml_printer.h b/src/algorithms/PVT/libs/kml_printer.h index bd8a7c009..4fa2e6d74 100644 --- a/src/algorithms/PVT/libs/kml_printer.h +++ b/src/algorithms/PVT/libs/kml_printer.h @@ -43,7 +43,7 @@ * * See http://www.opengeospatial.org/standards/kml */ -class kml_printer +class Kml_Printer { private: @@ -57,8 +57,8 @@ public: bool close_file(); - kml_printer(); - ~kml_printer(); + Kml_Printer(); + ~Kml_Printer(); }; #endif diff --git a/src/algorithms/PVT/libs/rinex_printer.cc b/src/algorithms/PVT/libs/rinex_printer.cc index b1efb4884..853fc0266 100644 --- a/src/algorithms/PVT/libs/rinex_printer.cc +++ b/src/algorithms/PVT/libs/rinex_printer.cc @@ -55,7 +55,6 @@ DEFINE_string(RINEX_version, "3.01", "Specifies the RINEX version (2.11 or 3.01) Rinex_Printer::Rinex_Printer() { - Rinex_Printer::navFile.open(Rinex_Printer::createFilename("RINEX_FILE_TYPE_GPS_NAV"), std::ios::out | std::ios::app); Rinex_Printer::obsFile.open(Rinex_Printer::createFilename("RINEX_FILE_TYPE_OBS"), std::ios::out | std::ios::app); @@ -986,7 +985,6 @@ void Rinex_Printer::log_rinex_obs(std::ofstream& out, Gps_Navigation_Message nav std::string year (timestring, 2, 2); line += std::string(1, ' '); line += year; - LOG_AT_LEVEL(INFO) << "year:" << year; line += std::string(1, ' '); if (month.compare(0, 1 , "0") == 0) { @@ -997,7 +995,6 @@ void Rinex_Printer::log_rinex_obs(std::ofstream& out, Gps_Navigation_Message nav { line += month; } - LOG_AT_LEVEL(INFO) << "line:" << line; line += std::string(1, ' '); if (day.compare(0, 1 , "0") == 0) {