From 5da5dc29bedd05231bbfd661f82cc98b9b14b593 Mon Sep 17 00:00:00 2001 From: Christian Schmitt Date: Sun, 13 May 2012 09:07:55 +0200 Subject: [PATCH] Add signs size support to the STG files --- src/Airports/GenAirports850/airport.cxx | 3 ++- src/Airports/GenAirports850/linked_objects.hxx | 5 +++++ src/Lib/Output/output.cxx | 6 +++--- src/Lib/Output/output.hxx | 2 +- 4 files changed, 11 insertions(+), 5 deletions(-) diff --git a/src/Airports/GenAirports850/airport.cxx b/src/Airports/GenAirports850/airport.cxx index ccb86031..6f1961c8 100644 --- a/src/Airports/GenAirports850/airport.cxx +++ b/src/Airports/GenAirports850/airport.cxx @@ -1792,7 +1792,8 @@ void Airport::BuildBtg(const string& root, const string_list& elev_src ) { write_object_sign( objpath, b, taxisigns_nodes[i], signs[i]->GetDefinition(), - signs[i]->GetHeading() ); + signs[i]->GetHeading(), + signs[i]->GetSize() ); } // write out water buoys diff --git a/src/Airports/GenAirports850/linked_objects.hxx b/src/Airports/GenAirports850/linked_objects.hxx index bea7c837..13dd9f1c 100644 --- a/src/Airports/GenAirports850/linked_objects.hxx +++ b/src/Airports/GenAirports850/linked_objects.hxx @@ -83,6 +83,11 @@ public: { return sgn_def; } + + int GetSize() + { + return size; + } }; typedef std::vector SignList; diff --git a/src/Lib/Output/output.cxx b/src/Lib/Output/output.cxx index f6678df8..3fff04a3 100644 --- a/src/Lib/Output/output.cxx +++ b/src/Lib/Output/output.cxx @@ -117,7 +117,7 @@ void write_index_shared( const string &base, const SGBucket &b, void write_object_sign( const string &base, const SGBucket &b, const Point3D &p, const string& sign, - const double &heading ) + const double &heading, const int &size) { string dir = base + "/" + b.gen_base_path(); SGPath sgp( dir ); @@ -134,8 +134,8 @@ void write_object_sign( const string &base, const SGBucket &b, exit(-1); } - fprintf( fp, "OBJECT_SIGN %s %.6f %.6f %.1f %.2f\n", sign.c_str(), - p.lon(), p.lat(), p.elev(), heading ); + fprintf( fp, "OBJECT_SIGN %s %.6f %.6f %.1f %.2f %u\n", sign.c_str(), + p.lon(), p.lat(), p.elev(), heading, size ); fclose( fp ); } diff --git a/src/Lib/Output/output.hxx b/src/Lib/Output/output.hxx index 616f49e3..474a4335 100644 --- a/src/Lib/Output/output.hxx +++ b/src/Lib/Output/output.hxx @@ -57,7 +57,7 @@ void write_index_shared( const std::string &base, const SGBucket &b, // scenery build) void write_object_sign( const std::string &base, const SGBucket &b, const Point3D &p, const std::string& sign, - const double &heading ); + const double &heading, const int &size ); void write_boundary( const std::string& base, const SGBucket& b, const TGPolygon& bounds, long int p_index );