Tweaks for Mips Irix compilers.

[flightgear.git] / src / Cockpit / hud_labl.cxx

diff --git a/src/Cockpit/hud_labl.cxx b/src/Cockpit/hud_labl.cxx
index 5380848b58c1a556dea7aeea014d9d81e1c3f6d6..d92f55ceb3d543c731b0a5563a8df7c42a503fab 100644 (file)
--- a/src/Cockpit/hud_labl.cxx
+++ b/src/Cockpit/hud_labl.cxx
@@ -1,23 +1,3 @@
-#ifdef HAVE_CONFIG_H
-#  include <config.h>
-#endif
-
-#ifdef HAVE_WINDOWS_H
-#  include <windows.h>
-#endif
-
-#include <stdlib.h>
-#include <string.h>
-
-#include <simgear/constants.h>
-#include <simgear/fg_random.h>
-#include <simgear/mat3.h>
-#include <simgear/polar3d.hxx>
-
-#include <Aircraft/aircraft.hxx>
-#include <GUI/gui.h>
-#include <Scenery/scenery.hxx>
-#include <Time/fg_timer.hxx>
 
 #include "hud.hxx"
 
@@ -43,15 +23,20 @@ instr_label ::
                       fgLabelJust   justification,
                       int           font_size,
                       int           blinking,
-                      bool          working ):
+                     bool                      latitude,
+                     bool                      longitude,
+                      bool          working):
                            instr_item( x, y, width, height,
-                                       data_source, scale_data,options, working ),
+                                       data_source,scale_data,options, working ),
                            pformat  ( label_format      ),
                            pre_str  ( pre_label_string  ),
                            post_str ( post_label_string ),
                            justify  ( justification     ),
                            fontSize ( font_size         ),
-                           blink    ( blinking          )
+                           blink    ( blinking          ),
+                                                  lat          ( latitude                      ),
+                                                  lon          ( longitude                     )
+
 {
   if( pre_str != NULL) {
     if( post_str != NULL ) {
@@ -83,7 +68,10 @@ instr_label :: instr_label( const instr_label & image) :
                               pformat    ( image.pformat    ),
                               pre_str  ( image.pre_str  ),
                               post_str ( image.post_str ),
-                              blink    ( image.blink    )
+                              blink    ( image.blink    ),
+                                                         lat      ( image.lat          ),
+                                                         lon      ( image.lon          )       
+
 {
   if( pre_str != NULL) {
     if( post_str != NULL ) {
@@ -111,6 +99,10 @@ instr_label & instr_label ::operator = (const instr_label & rhs )
     justify    = rhs.justify;
     pre_str    = rhs.pre_str;
     post_str   = rhs.post_str;
+    lat                   = rhs.lat;
+    lon                   = rhs.lon;
+
+
     strcpy(format_buffer,rhs.format_buffer);   
     }
   return *this;
@@ -130,11 +122,17 @@ draw( void )       // Required method in base class
   RECT  scrn_rect = get_location();
 
   if( data_available() ) {
-    sprintf( label_buffer, format_buffer, get_value() );
+       if(lat)
+               sprintf( label_buffer, format_buffer, coord_format_lat(get_value()) );
+       else
+       if(lon)    
+               sprintf( label_buffer, format_buffer, coord_format_lon(get_value()) );
+       else
+               sprintf( label_buffer, format_buffer, get_value() );
     }
   else {
     sprintf( label_buffer, format_buffer );
-    }
+  }
   
   lenstr = getStringWidth( label_buffer );