- fix more cases of scale tick aliasing to get smooth scale movements

- remove trailing spaces, fix indentation, unify coding style, ...

diff --git a/src/Cockpit/hud_card.cxx b/src/Cockpit/hud_card.cxx
index b958b2cc0124c0290efc63ea7f36649e8783f21a..af5825e3e9fdc5cbcad85669081c3e57b1c84f8b 100644 (file)
--- a/src/Cockpit/hud_card.cxx
+++ b/src/Cockpit/hud_card.cxx
@@ -7,21 +7,19 @@
 #include "hud.hxx"
 
 #ifdef USE_HUD_TextList
 #include "hud.hxx"
 
 #ifdef USE_HUD_TextList

-#define textString( x , y, text, digit)  TextString( text, x , y ,digit ) //suma
+#define textString(x, y, text, digit)  TextString(text, x , y ,digit)

 #else
 #else

-#define textString( x , y, text, digit )  puDrawString ( guiFnt, text, x, y ); //suma
+#define textString(x, y, text, digit)  puDrawString(guiFnt, text, x, y)

 #endif
 
 //========== Top of hud_card class member definitions =============
 #endif
 
 //========== Top of hud_card class member definitions =============

-//begin suma
-#include<math.h>
+#include <math.h>

 #include <stdlib.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdio.h>

-//end suma

 
 
 
 

-hud_card ::
-hud_card( int       x,
+hud_card::hud_card(
+          int       x,

           int       y,
           UINT      width,
           UINT      height,
           int       y,
           UINT      width,
           UINT      height,


@@ -35,33 +33,32 @@ hud_card( int       x,
           UINT      modulus,  // 360
           int       dp_showing,
           float     value_span,
           UINT      modulus,  // 360
           int       dp_showing,
           float     value_span,

-         string    card_type,
-         bool      tick_bottom,
-         bool      tick_top,
-         bool      tick_right,
-         bool      tick_left,
-         bool      cap_bottom,
-         bool      cap_top,
-         bool      cap_right,
-         bool      cap_left,
-         float     mark_offset,
-         bool      pointer_enable,
-         string    type_pointer,
-         string    type_tick,//hud
-         string    length_tick,//hud
+          string    card_type,
+          bool      tick_bottom,
+          bool      tick_top,
+          bool      tick_right,
+          bool      tick_left,
+          bool      cap_bottom,
+          bool      cap_top,
+          bool      cap_right,
+          bool      cap_left,
+          float     mark_offset,
+          bool      pointer_enable,
+          string    type_pointer,
+          string    type_tick,//hud
+          string    length_tick,//hud

           bool      working,
           bool      working,

-         float     rad,//suma
-         int           divs, //suma
-         int           zooms //suma
-          ) :  //suma
-    instr_scale( x,y,width,height,
+          float     rad,
+          int       divs,
+          int       zooms) :
+    instr_scale(x,y,width,height,

                  data_source, options,
                  value_span,
                  max_value, min_value, disp_scaling,
                  major_divs, minor_divs, modulus,
                  working),
                  data_source, options,
                  value_span,
                  max_value, min_value, disp_scaling,
                  major_divs, minor_divs, modulus,
                  working),

-    val_span            ( value_span),
-    type             ( card_type),
+    val_span         (value_span),
+    type             (card_type),

     draw_tick_bottom (tick_bottom),
     draw_tick_top    (tick_top),
     draw_tick_right  (tick_right),
     draw_tick_bottom (tick_bottom),
     draw_tick_top    (tick_top),
     draw_tick_right  (tick_right),


@@ -73,18 +70,18 @@ hud_card( int       x,
     marker_offset    (mark_offset),
     pointer          (pointer_enable),
     pointer_type     (type_pointer),
     marker_offset    (mark_offset),
     pointer          (pointer_enable),
     pointer_type     (type_pointer),

-    tick_type       (type_tick), //hud
-    tick_length             (length_tick), //hud
-    Maj_div         (major_divs), //suma
-    Min_div         (minor_divs) //suma
+    tick_type        (type_tick), //hud
+    tick_length      (length_tick), //hud
+    Maj_div          (major_divs),
+    Min_div          (minor_divs)

 
 {
     half_width_units = range_to_show() / 2.0;
 
 {
     half_width_units = range_to_show() / 2.0;

-    radius=rad; //suma
-    maxValue=max_value; //suma
-    minValue=min_value; //suma
-    divisions=divs; //suma
-    zoom = zooms; //suma
+    radius = rad;
+    maxValue = max_value;
+    minValue = min_value;
+    divisions = divs;
+    zoom = zooms;

 
     //  UINT options     = get_options();
     //  huds_both = (options & HUDS_BOTH) == HUDS_BOTH;
 
     //  UINT options     = get_options();
     //  huds_both = (options & HUDS_BOTH) == HUDS_BOTH;


@@ -96,13 +93,13 @@ hud_card( int       x,
     //  huds_bottom = options & HUDS_BOTTOM;
 }
 
     //  huds_bottom = options & HUDS_BOTTOM;
 }
 

-hud_card ::
-~hud_card() { }

 
 

-hud_card ::
-hud_card( const hud_card & image):
-    instr_scale( (const instr_scale & ) image),
-    val_span( image.val_span),
+hud_card::~hud_card() { }
+
+
+hud_card::hud_card(const hud_card & image) :
+    instr_scale((const instr_scale &) image),
+    val_span(image.val_span),

     type(image.type),
     half_width_units (image.half_width_units),
     draw_tick_bottom (image.draw_tick_bottom),
     type(image.type),
     half_width_units (image.half_width_units),
     draw_tick_bottom (image.draw_tick_bottom),


@@ -118,8 +115,8 @@ hud_card( const hud_card & image):
     pointer_type (image.pointer_type),
     tick_type(image.tick_type), //hud
     tick_length(image.tick_length), //hud
     pointer_type (image.pointer_type),
     tick_type(image.tick_type), //hud
     tick_length(image.tick_length), //hud

-    Maj_div(image.Maj_div), //suma
-    Min_div(image.Min_div)//suma
+    Maj_div(image.Maj_div),
+    Min_div(image.Min_div)

 
 {
     //  UINT options     = get_options();
 
 {
     //  UINT options     = get_options();


@@ -132,39 +129,37 @@ hud_card( const hud_card & image):
     //  huds_bottom = options & HUDS_BOTTOM;
 }
 
     //  huds_bottom = options & HUDS_BOTTOM;
 }
 

-hud_card & hud_card ::
-operator = (const hud_card & rhs )
+
+hud_card & hud_card::operator=(const hud_card & rhs)

 {
 {

-    if( !( this == &rhs)){
+    if (!(this == &rhs)) {

         instr_scale::operator = (rhs);
         val_span = rhs.val_span;
         half_width_units = rhs.half_width_units;
         instr_scale::operator = (rhs);
         val_span = rhs.val_span;
         half_width_units = rhs.half_width_units;

-       draw_tick_bottom = rhs.draw_tick_bottom;
-       draw_tick_top    = rhs.draw_tick_top;
-       draw_tick_right  = rhs.draw_tick_right;
-       draw_tick_left   = rhs.draw_tick_left;
-       draw_cap_bottom  = rhs.draw_cap_bottom;
-       draw_cap_top     = rhs.draw_cap_top;
-       draw_cap_right   = rhs.draw_cap_right;
-       draw_cap_left    = rhs.draw_cap_left;
-       marker_offset    = rhs.marker_offset;
-       type             = rhs.type;
-       pointer                  = rhs.pointer;
-       pointer_type     = rhs.pointer_type;
-       tick_type                = rhs.tick_type;
-       tick_length              = rhs.tick_length;
-       Maj_div                  = rhs.Maj_div; //suma
-       Min_div                  = rhs.Min_div; //suma
-
+        draw_tick_bottom = rhs.draw_tick_bottom;
+        draw_tick_top    = rhs.draw_tick_top;
+        draw_tick_right  = rhs.draw_tick_right;
+        draw_tick_left   = rhs.draw_tick_left;
+        draw_cap_bottom  = rhs.draw_cap_bottom;
+        draw_cap_top     = rhs.draw_cap_top;
+        draw_cap_right   = rhs.draw_cap_right;
+        draw_cap_left    = rhs.draw_cap_left;
+        marker_offset    = rhs.marker_offset;
+        type             = rhs.type;
+        pointer          = rhs.pointer;
+        pointer_type     = rhs.pointer_type;
+        tick_type        = rhs.tick_type;
+        tick_length      = rhs.tick_length;
+        Maj_div          = rhs.Maj_div;
+        Min_div          = rhs.Min_div;

     }
 
     return *this;
 }
 
     }
 
     return *this;
 }
 

-void hud_card ::
-draw( void ) //  (HUD_scale * pscale )
-{

 
 

+void hud_card::draw(void) //  (HUD_scale * pscale)
+{

     float vmin = 0.0, vmax = 0.0;
     float marker_xs;
     float marker_xe;
     float vmin = 0.0, vmax = 0.0;
     float marker_xs;
     float marker_xe;


@@ -181,80 +176,78 @@ draw( void ) //  (HUD_scale * pscale )
 
     POINT mid_scr    = get_centroid();
     float cur_value  = get_value();
 
     POINT mid_scr    = get_centroid();
     float cur_value  = get_value();

-    
-    if (!((int)maxValue%2) )
-        oddtype =0; //draw ticks at even values
+
+    if (!((int)maxValue%2))
+        oddtype = 0; //draw ticks at even values

     else
     else

-        oddtype = 1;//draw ticks at odd values
+        oddtype = 1; //draw ticks at odd values

 
 

-    RECT   scrn_rect = get_location();
-    UINT options     = get_options();
+    RECT scrn_rect = get_location();
+    UINT options = get_options();

 
 

-    height = scrn_rect.top  + scrn_rect.bottom;
+    height = scrn_rect.top + scrn_rect.bottom;

     width = scrn_rect.left + scrn_rect.right;
 
     width = scrn_rect.left + scrn_rect.right;
 

-    //begin suma

     // if type=gauge then display dial
     // if type=gauge then display dial

-    if(type=="gauge") {
+    if (type == "gauge") {

         float x,y;
         float i;
         float x,y;
         float i;

-        y=(float)(scrn_rect.top);
-        x=(float)(scrn_rect.left);
+        y = (float)(scrn_rect.top);
+        x = (float)(scrn_rect.left);

         glEnable(GL_POINT_SMOOTH);
         glPointSize(3.0);
 
         glEnable(GL_POINT_SMOOTH);
         glPointSize(3.0);
 

-        float incr= 360.0/divisions;  
-        for(i=0.0;i<360.0;i+=incr) {
-            float i1=i*SGD_DEGREES_TO_RADIANS;
-            float x1=x+radius*cos(i1);
-            float y1=y+radius*sin(i1);
-               
+        float incr = 360.0 / divisions;
+        for (i = 0.0; i < 360.0; i += incr) {
+            float i1 = i * SGD_DEGREES_TO_RADIANS;
+            float x1 = x + radius*cos(i1);
+            float y1 = y + radius*sin(i1);
+

             glBegin(GL_POINTS);
             glBegin(GL_POINTS);

-            glVertex2f(x1,y1);
+            glVertex2f(x1, y1);

             glEnd();
         }
         glPointSize(1.0);
         glDisable(GL_POINT_SMOOTH);
             glEnd();
         }
         glPointSize(1.0);
         glDisable(GL_POINT_SMOOTH);

-        
-        
-        if(data_available()) {  
-            float offset = 90.0*SGD_DEGREES_TO_RADIANS;
-            float r1=10.0; //size of carrot
-            float theta= get_value();
-
-            float theta1= -theta*SGD_DEGREES_TO_RADIANS+offset;
-            float x1=x+radius*cos(theta1);
-            float y1=y+radius*sin(theta1);
-            float x2=x1-r1*cos(theta1-30.0*SGD_DEGREES_TO_RADIANS);
-            float y2=y1-r1*sin(theta1-30.0*SGD_DEGREES_TO_RADIANS);
-            float x3=x1-r1*cos(theta1+30.0*SGD_DEGREES_TO_RADIANS);
-            float y3=y1-r1*sin(theta1+30.0*SGD_DEGREES_TO_RADIANS);
-                      
-            // draw carrot  
+
+
+        if (data_available()) {
+            float offset = 90.0 * SGD_DEGREES_TO_RADIANS;
+            float r1 = 10.0; //size of carrot
+            float theta = get_value();
+
+            float theta1 = -theta*SGD_DEGREES_TO_RADIANS+offset;
+            float x1 = x+radius*cos(theta1);
+            float y1 = y+radius*sin(theta1);
+            float x2 = x1-r1*cos(theta1-30.0*SGD_DEGREES_TO_RADIANS);
+            float y2 = y1-r1*sin(theta1-30.0*SGD_DEGREES_TO_RADIANS);
+            float x3 = x1-r1*cos(theta1+30.0*SGD_DEGREES_TO_RADIANS);
+            float y3 = y1-r1*sin(theta1+30.0*SGD_DEGREES_TO_RADIANS);
+
+            // draw carrot

             drawOneLine(x1,y1,x2,y2);
             drawOneLine(x1,y1,x3,y3);
             sprintf(TextScale,"%3.1f\n",theta);
             drawOneLine(x1,y1,x2,y2);
             drawOneLine(x1,y1,x3,y3);
             sprintf(TextScale,"%3.1f\n",theta);

-                
+

             // draw value
             int l = abs((int)theta);
             if (l) {
             // draw value
             int l = abs((int)theta);
             if (l) {

-                if( l<10)
-                    textString (x,y,TextScale,0 );
-                else if(l<100)
-                    textString (x-1.0,y,TextScale,0 );
-                else if( l<360 )
-                    textString (x-2.0,y,TextScale,0 );
+                if (l < 10)
+                    textString(x, y, TextScale, 0);
+                else if (l < 100)
+                    textString(x-1.0, y, TextScale, 0);
+                else if (l<360)
+                    textString(x-2.0, y, TextScale, 0);

             }
             }

-                        
-        }
-      
-        //end type=gauge
+        } //end type=gauge
+

     } else {
         // if its not explicitly a gauge default to tape
     } else {
         // if its not explicitly a gauge default to tape

-        if(pointer) { 
-            if(pointer_type=="moving") { 
+        if (pointer) {
+            if (pointer_type=="moving") {

                 vmin = minValue;
                 vmax = maxValue;
                 vmin = minValue;
                 vmax = maxValue;

+

             } else {
                 // default to fixed
                 vmin   = cur_value - half_width_units; // width units == needle travel
             } else {
                 // default to fixed
                 vmin   = cur_value - half_width_units; // width units == needle travel


@@ -262,168 +255,178 @@ draw( void ) //  (HUD_scale * pscale )
                 text_x = mid_scr.x;
                 text_y = mid_scr.y;
             }
                 text_x = mid_scr.x;
                 text_y = mid_scr.y;
             }

+

         } else {
             vmin   = cur_value - half_width_units; // width units == needle travel
             vmax   = cur_value + half_width_units; // or picture unit span.
             text_x = mid_scr.x;
             text_y = mid_scr.y;
         }
         } else {
             vmin   = cur_value - half_width_units; // width units == needle travel
             vmax   = cur_value + half_width_units; // or picture unit span.
             text_x = mid_scr.x;
             text_y = mid_scr.y;
         }

-    
+

         // Draw the basic markings for the scale...
         // Draw the basic markings for the scale...

-  
-        if( huds_vert(options) ) { // Vertical scale
+
+        if (huds_vert(options)) { // Vertical scale

             if (draw_tick_bottom) {
             if (draw_tick_bottom) {

-                drawOneLine( scrn_rect.left,     // Bottom tick bar
-                             scrn_rect.top,
-                             width,
-                             scrn_rect.top);
+                drawOneLine(scrn_rect.left,     // Bottom tick bar
+                            scrn_rect.top,
+                            width,
+                            scrn_rect.top);

             } // endif draw_tick_bottom
             } // endif draw_tick_bottom

+

             if (draw_tick_top) {
             if (draw_tick_top) {

-                drawOneLine( scrn_rect.left,    // Top tick bar
-                             height,
-                             width,
-                             height );
+                drawOneLine(scrn_rect.left,    // Top tick bar
+                            height,
+                            width,
+                            height);

             } // endif draw_tick_top
             } // endif draw_tick_top

-      
+

             marker_xs = scrn_rect.left;  // x start
             marker_xs = scrn_rect.left;  // x start

-            marker_xe = width;  // x extent
+            marker_xe = width;           // x extent

             marker_ye = height;
 
             //    glBegin(GL_LINES);
             marker_ye = height;
 
             //    glBegin(GL_LINES);

-      
+

             // Bottom tick bar
             // Bottom tick bar

-            //    glVertex2f( marker_xs, scrn_rect.top);
-            //    glVertex2f( marker_xe, scrn_rect.top);
+            //    glVertex2f(marker_xs, scrn_rect.top);
+            //    glVertex2f(marker_xe, scrn_rect.top);

 
             // Top tick bar
 
             // Top tick bar

-            //    glVertex2f( marker_xs, marker_ye);
-            //    glVertex2f( marker_xe, marker_ye );
+            //    glVertex2f(marker_xs, marker_ye);
+            //    glVertex2f(marker_xe, marker_ye);

             //    glEnd();
 
 
             // We do not use else in the following so that combining the
             // two options produces a "caged" display with double
             // carrots. The same is done for horizontal card indicators.
             //    glEnd();
 
 
             // We do not use else in the following so that combining the
             // two options produces a "caged" display with double
             // carrots. The same is done for horizontal card indicators.

-        
+

             // begin vertical/left
             //First draw capping lines and pointers
             // begin vertical/left
             //First draw capping lines and pointers

-            if( huds_left(options) ) {    // Calculate x marker offset
-                       
+            if (huds_left(options)) {    // Calculate x marker offset
+

                 if (draw_cap_right) {
                 if (draw_cap_right) {

-                         
-                    drawOneLine( marker_xe, scrn_rect.top,
+                    drawOneLine(marker_xe, scrn_rect.top,

                                  marker_xe, marker_ye); // Cap right side
                 } //endif cap_right
 
                 marker_xs  = marker_xe - scrn_rect.right / 3;   // Adjust tick xs
 
                                  marker_xe, marker_ye); // Cap right side
                 } //endif cap_right
 
                 marker_xs  = marker_xe - scrn_rect.right / 3;   // Adjust tick xs
 

-                // drawOneLine( marker_xs, mid_scr.y,
+                // drawOneLine(marker_xs, mid_scr.y,

                 //              marker_xe, mid_scr.y + scrn_rect.right / 6);
                 //              marker_xe, mid_scr.y + scrn_rect.right / 6);

-                // drawOneLine( marker_xs, mid_scr.y,
+                // drawOneLine(marker_xs, mid_scr.y,

                 //              marker_xe, mid_scr.y - scrn_rect.right / 6);
 
                 // draw pointer
                 //              marker_xe, mid_scr.y - scrn_rect.right / 6);
 
                 // draw pointer

-                if(pointer) {
-                    if(pointer_type=="moving") {
-                        if(zoom == 0) {
-                            //Code for Moving Type Pointer included by suma.
+                if (pointer) {
+                    if (pointer_type=="moving") {
+                        if (zoom == 0) {
+                            //Code for Moving Type Pointer

                             float ycentre, ypoint,xpoint;
                             int range,wth;
                             float ycentre, ypoint,xpoint;
                             int range,wth;

-                            if(cur_value > maxValue) cur_value = maxValue;
-                            if(cur_value < minValue) cur_value = minValue;
-                            if (minValue >= 0.0) 
+                            if (cur_value > maxValue)
+                                cur_value = maxValue;
+                            if (cur_value < minValue)
+                                cur_value = minValue;
+
+                            if (minValue >= 0.0)

                                 ycentre = scrn_rect.top;
                             else if (maxValue + minValue == 0.0)
                                 ycentre = mid_scr.y;
                             else
                                 ycentre = scrn_rect.top;
                             else if (maxValue + minValue == 0.0)
                                 ycentre = mid_scr.y;
                             else

-                                if (oddtype == 1) 
+                                if (oddtype == 1)

                                     ycentre = scrn_rect.top + (1.0-minValue)*scrn_rect.bottom/(maxValue-minValue);
                                 else
                                     ycentre = scrn_rect.top + minValue*scrn_rect.bottom/(maxValue-minValue);
                                     ycentre = scrn_rect.top + (1.0-minValue)*scrn_rect.bottom/(maxValue-minValue);
                                 else
                                     ycentre = scrn_rect.top + minValue*scrn_rect.bottom/(maxValue-minValue);

+

                             range = scrn_rect.bottom;
                             wth   = scrn_rect.left + scrn_rect.right;
                             range = scrn_rect.bottom;
                             wth   = scrn_rect.left + scrn_rect.right;

+

                             if (oddtype == 1)
                                 ypoint = ycentre + ((cur_value-1.0) * range / val_span);
                             else
                                 ypoint = ycentre + (cur_value * range / val_span);
                             if (oddtype == 1)
                                 ypoint = ycentre + ((cur_value-1.0) * range / val_span);
                             else
                                 ypoint = ycentre + (cur_value * range / val_span);

+

                             xpoint = wth + marker_offset;
                             drawOneLine(xpoint,ycentre,xpoint,ypoint);
                             drawOneLine(xpoint,ypoint,xpoint-marker_offset,ypoint);
                             drawOneLine(xpoint-marker_offset,ypoint,xpoint-5.0,ypoint+5.0);
                             drawOneLine(xpoint-marker_offset,ypoint,xpoint-5.0,ypoint-5.0);
                             xpoint = wth + marker_offset;
                             drawOneLine(xpoint,ycentre,xpoint,ypoint);
                             drawOneLine(xpoint,ypoint,xpoint-marker_offset,ypoint);
                             drawOneLine(xpoint-marker_offset,ypoint,xpoint-5.0,ypoint+5.0);
                             drawOneLine(xpoint-marker_offset,ypoint,xpoint-5.0,ypoint-5.0);

-                        }//zoom=0
+                        } //zoom=0
+

                     } else {
                         // default to fixed
                     } else {
                         // default to fixed

-                        fixed(marker_offset+marker_xe, text_y + scrn_rect.right / 6, 
-                              marker_offset+marker_xs, text_y,marker_offset+marker_xe, 
+                        fixed(marker_offset+marker_xe, text_y + scrn_rect.right / 6,
+                              marker_offset+marker_xs, text_y,marker_offset+marker_xe,

                               text_y - scrn_rect.right / 6);
                     }//end pointer type
                               text_y - scrn_rect.right / 6);
                     }//end pointer type

+                } //if pointer
+            } //end vertical/left

 
 

-                } //if pointer 
-            }  //end vertical/left
-               

             // begin vertical/right
             //First draw capping lines and pointers
             // begin vertical/right
             //First draw capping lines and pointers

-            if( huds_right(options) ) {  // We'll default this for now.
+            if (huds_right(options)) {  // We'll default this for now.

                 if (draw_cap_left) {
                 if (draw_cap_left) {

-                    drawOneLine( scrn_rect.left, scrn_rect.top,
-                                 scrn_rect.left, marker_ye );  // Cap left side
+                    drawOneLine(scrn_rect.left, scrn_rect.top,
+                                 scrn_rect.left, marker_ye);  // Cap left side

                 } //endif cap_left
 
                 marker_xe = scrn_rect.left + scrn_rect.right / 3;     // Adjust tick xe
                 // Indicator carrot
                 } //endif cap_left
 
                 marker_xe = scrn_rect.left + scrn_rect.right / 3;     // Adjust tick xe
                 // Indicator carrot

-                // drawOneLine( scrn_rect.left, mid_scr.y +  scrn_rect.right / 6,
-                //              marker_xe, mid_scr.y );
-                // drawOneLine( scrn_rect.left, mid_scr.y -  scrn_rect.right / 6,
+                // drawOneLine(scrn_rect.left, mid_scr.y +  scrn_rect.right / 6,
+                //              marker_xe, mid_scr.y);
+                // drawOneLine(scrn_rect.left, mid_scr.y -  scrn_rect.right / 6,

                 //              marker_xe, mid_scr.y);
 
                 // draw pointer
                 //              marker_xe, mid_scr.y);
 
                 // draw pointer

-                if(pointer) {
-                    if(pointer_type=="moving") {   
-                        if(zoom == 0) {
+                if (pointer) {
+                    if (pointer_type == "moving") {
+                        if (zoom == 0) {

                             //type-fixed & zoom=1, behaviour to be defined
                             //type-fixed & zoom=1, behaviour to be defined

-                            // Code for Moving Type Pointer included by suma.
+                            // Code for Moving Type Pointer

                             float ycentre, ypoint,xpoint;
                             int range;
                             float ycentre, ypoint,xpoint;
                             int range;

-                                                       
-                            if(cur_value > maxValue)
+
+                            if (cur_value > maxValue)

                                 cur_value = maxValue;
                                 cur_value = maxValue;

-                            if(cur_value < minValue)
+                            if (cur_value < minValue)

                                 cur_value = minValue;
                                 cur_value = minValue;

-                                                       
-                            if (minValue >= 0.0) 
+
+                            if (minValue >= 0.0)

                                 ycentre = scrn_rect.top;
                             else if (maxValue + minValue == 0.0)
                                 ycentre = mid_scr.y;
                             else
                                 ycentre = scrn_rect.top;
                             else if (maxValue + minValue == 0.0)
                                 ycentre = mid_scr.y;
                             else

-                                if (oddtype == 1) 
+                                if (oddtype == 1)

                                     ycentre = scrn_rect.top + (1.0-minValue)*scrn_rect.bottom/(maxValue-minValue);
                                 else
                                     ycentre = scrn_rect.top + minValue*scrn_rect.bottom/(maxValue-minValue);
                                     ycentre = scrn_rect.top + (1.0-minValue)*scrn_rect.bottom/(maxValue-minValue);
                                 else
                                     ycentre = scrn_rect.top + minValue*scrn_rect.bottom/(maxValue-minValue);

+

                             range = scrn_rect.bottom;
                             range = scrn_rect.bottom;

-                                                       
+

                             if (oddtype == 1)
                                 ypoint = ycentre + ((cur_value-1.0) * range / val_span);
                             else
                                 ypoint = ycentre + (cur_value * range / val_span);
                             if (oddtype == 1)
                                 ypoint = ycentre + ((cur_value-1.0) * range / val_span);
                             else
                                 ypoint = ycentre + (cur_value * range / val_span);

+

                             xpoint = scrn_rect.left - marker_offset;
                             drawOneLine(xpoint,ycentre,xpoint,ypoint);
                             drawOneLine(xpoint,ypoint,xpoint+marker_offset,ypoint);
                             drawOneLine(xpoint+marker_offset,ypoint,xpoint+5.0,ypoint+5.0);
                             drawOneLine(xpoint+marker_offset,ypoint,xpoint+5.0,ypoint-5.0);
                         }
                             xpoint = scrn_rect.left - marker_offset;
                             drawOneLine(xpoint,ycentre,xpoint,ypoint);
                             drawOneLine(xpoint,ypoint,xpoint+marker_offset,ypoint);
                             drawOneLine(xpoint+marker_offset,ypoint,xpoint+5.0,ypoint+5.0);
                             drawOneLine(xpoint+marker_offset,ypoint,xpoint+5.0,ypoint-5.0);
                         }

+

                     } else {
                         // default to fixed
                     } else {
                         // default to fixed

-                        fixed( -marker_offset+scrn_rect.left, text_y +  scrn_rect.right / 6,
-                               -marker_offset+marker_xe, text_y,-marker_offset+scrn_rect.left, 
-                               text_y -  scrn_rect.right / 6);                    
+                        fixed(-marker_offset+scrn_rect.left, text_y +  scrn_rect.right / 6,
+                               -marker_offset+marker_xe, text_y,-marker_offset+scrn_rect.left,
+                               text_y -  scrn_rect.right / 6);

                     }
                 } //if pointer
             }  //end vertical/right
 
             // At this point marker x_start and x_end values are transposed.
             // To keep this from confusing things they are now interchanged.
                     }
                 } //if pointer
             }  //end vertical/right
 
             // At this point marker x_start and x_end values are transposed.
             // To keep this from confusing things they are now interchanged.

-            if(huds_both(options)) {
+            if (huds_both(options)) {

                 marker_ye = marker_xs;
                 marker_xs = marker_xe;
                 marker_xe = marker_ye;
                 marker_ye = marker_xs;
                 marker_xs = marker_xe;
                 marker_xe = marker_ye;


@@ -431,250 +434,253 @@ draw( void ) //  (HUD_scale * pscale )
 
             // Work through from bottom to top of scale. Calculating where to put
             // minor and major ticks.
 
             // Work through from bottom to top of scale. Calculating where to put
             // minor and major ticks.

-            
+

             // draw scale or tape
             // draw scale or tape

-               
+

 //            last = FloatToInt(vmax)+1;
 //            i = FloatToInt(vmin);
             last = (int)vmax + 1; // N
             i = (int)vmin; // N
 
 //            last = FloatToInt(vmax)+1;
 //            i = FloatToInt(vmin);
             last = (int)vmax + 1; // N
             i = (int)vmin; // N
 

-            if(zoom ==1) { 
-                zoomed_scale((int)vmin,(int)vmax); //suma
+            if (zoom == 1) {
+                zoomed_scale((int)vmin, (int)vmax);

             } else {
             } else {

-                for( ; i <last ; i++ ) {
+                for (; i < last; i++) {

                     condition = true;
                     condition = true;

-                    if( !modulo()) {
-                        if( i < min_val()) {
+                    if (!modulo()) {
+                        if (i < min_val()) {

                             condition = false;
                         }
                     }
 
                             condition = false;
                         }
                     }
 

-                    if( condition ) {  // Show a tick if necessary
+                    if (condition) {  // Show a tick if necessary

                         // Calculate the location of this tick
                         // Calculate the location of this tick

-                        marker_ys = scrn_rect.top + (i - vmin) * factor()/*+.5f*/;
+                        marker_ys = scrn_rect.top + ((i - vmin) * factor()/*+.5f*/);

                         // marker_ys = scrn_rect.top + (int)((i - vmin) * factor() + .5);
                         // Block calculation artifact from drawing ticks below min coordinate.
                         // Calculation here accounts for text height.
 
                         // marker_ys = scrn_rect.top + (int)((i - vmin) * factor() + .5);
                         // Block calculation artifact from drawing ticks below min coordinate.
                         // Calculation here accounts for text height.
 

-                        if(( marker_ys < (scrn_rect.top + 4)) |
-                           ( marker_ys > (height - 4)))
-                        {
+                        if ((marker_ys < (scrn_rect.top + 4))
+                                | (marker_ys > (height - 4))) {

                             // Magic numbers!!!
                             continue;
                         }
 
                             // Magic numbers!!!
                             continue;
                         }
 

-                        if (oddtype == 1) 
+                        if (oddtype == 1)

                             k = i+1; //enable ticks at odd values
                         else
                             k = i;
 
                         // Minor ticks
                             k = i+1; //enable ticks at odd values
                         else
                             k = i;
 
                         // Minor ticks

-                        if( div_min()) { 
-                            // if( (i%div_min()) == 0) {
-                            if( !(k%(int)div_min())) {             
-                                if((( marker_ys - 5) > scrn_rect.top ) &&
-                                   (( marker_ys + 5) < (height))) {
-                            
-                                //vertical/left OR vertical/right
-                                if( huds_both(options) ) {
-                                    if(tick_type=="line") {
-                                        if(tick_length=="variable") {
-                                            drawOneLine( scrn_rect.left, marker_ys,
-                                                         marker_xs,      marker_ys );
-                                            drawOneLine( marker_xe,      marker_ys,
-                                                         width,  marker_ys );
-                                        } else {
-                                            drawOneLine( scrn_rect.left, marker_ys,
-                                                         marker_xs,      marker_ys );
-                                            drawOneLine( marker_xe,      marker_ys,
-                                                         width,  marker_ys );
-                                        }
-                                    } else if(tick_type=="circle") // begin suma  this func. is written below
-                                        circles(scrn_rect.left,(float)marker_ys,3.0); //end suma
-
-                                    else {
-                                        // if neither line nor circle draw default as line
-                                        drawOneLine( scrn_rect.left, marker_ys,
-                                                     marker_xs,      marker_ys );
-                                        drawOneLine( marker_xe,      marker_ys,
-                                                     width,  marker_ys );
-                                    }
-                                    // glBegin(GL_LINES);
-                                    // glVertex2f( scrn_rect.left, marker_ys );
-                                    // glVertex2f( marker_xs,      marker_ys );
-                                    // glVertex2f( marker_xe,      marker_ys);
-                                    // glVertex2f( scrn_rect.left + scrn_rect.right,  marker_ys );
-                                    // glEnd();
-                                    // anything other than huds_both
-                                } else {
-                                    if( huds_left(options) ) {
-                                        if(tick_type=="line") {
-                                            if(tick_length=="variable") {
-                                                drawOneLine( marker_xs + 4, marker_ys,
-                                                             marker_xe,     marker_ys );
+                        if (div_min()) {
+                            // if ((i%div_min()) == 0) {
+                            if (!(k%(int)div_min())) {
+                                if (((marker_ys - 5) > scrn_rect.top)
+                                        && ((marker_ys + 5) < (height))) {
+
+                                    //vertical/left OR vertical/right
+                                    if (huds_both(options)) {
+                                        if (tick_type=="line") {
+                                            if (tick_length=="variable") {
+                                                drawOneLine(scrn_rect.left, marker_ys,
+                                                            marker_xs,      marker_ys);
+                                                drawOneLine(marker_xe,      marker_ys,
+                                                            width,  marker_ys);

                                             } else {
                                             } else {

-                                                drawOneLine( marker_xs , marker_ys,
-                                                             marker_xe,     marker_ys );
-                                            } 
-                                        } else if(tick_type=="circle") // begin suma
-                                            circles((float)marker_xs + 4, (float)marker_ys,3.0); //end suma
-                                                                          
-                                        else { 
-                                            drawOneLine( marker_xs + 4, marker_ys,
-                                                         marker_xe,     marker_ys );
-                                        } 
-                                    }  else {
-                                        if(tick_type=="line") {
-                                            if(tick_length=="variable") {
-                                                drawOneLine( marker_xs,     marker_ys,
-                                                             marker_xe - 4, marker_ys );
-                                            } else { 
-                                                drawOneLine( marker_xs,     marker_ys,
-                                                             marker_xe , marker_ys );
-                                            } 
-                                        } else if(tick_type=="circle") //begin suma
-                                            circles((float)marker_xe - 4, (float)marker_ys,3.0);  //end suma
-                                        else { 
-                                            drawOneLine( marker_xs,     marker_ys,
-                                                         marker_xe - 4, marker_ys );
-                                        } 
-                                    } 
-                                } //end huds both
-                              }
+                                                drawOneLine(scrn_rect.left, marker_ys,
+                                                            marker_xs,      marker_ys);
+                                                drawOneLine(marker_xe,      marker_ys,
+                                                            width,  marker_ys);
+                                            }
+                                        } else if (tick_type == "circle")
+                                            circles(scrn_rect.left,(float)marker_ys,3.0);
+
+                                        else {
+                                            // if neither line nor circle draw default as line
+                                            drawOneLine(scrn_rect.left, marker_ys,
+                                                        marker_xs,      marker_ys);
+                                            drawOneLine(marker_xe,      marker_ys,
+                                                        width,  marker_ys);
+                                        }
+                                        // glBegin(GL_LINES);
+                                        // glVertex2f(scrn_rect.left, marker_ys);
+                                        // glVertex2f(marker_xs,      marker_ys);
+                                        // glVertex2f(marker_xe,      marker_ys);
+                                        // glVertex2f(scrn_rect.left + scrn_rect.right,  marker_ys);
+                                        // glEnd();
+                                        // anything other than huds_both
+
+                                    } else {
+                                        if (huds_left(options)) {
+                                            if (tick_type=="line") {
+                                                if (tick_length=="variable") {
+                                                    drawOneLine(marker_xs + 4, marker_ys,
+                                                                marker_xe,     marker_ys);
+                                                } else {
+                                                    drawOneLine(marker_xs , marker_ys,
+                                                                marker_xe,     marker_ys);
+                                                }
+                                            } else if (tick_type=="circle")
+                                                circles((float)marker_xs + 4, (float)marker_ys,3.0);
+
+                                            else {
+                                                drawOneLine(marker_xs + 4, marker_ys,
+                                                            marker_xe,     marker_ys);
+                                            }
+                                        }  else {
+                                            if (tick_type=="line") {
+                                                if (tick_length=="variable") {
+                                                    drawOneLine(marker_xs,     marker_ys,
+                                                                marker_xe - 4, marker_ys);
+                                                } else {
+                                                    drawOneLine(marker_xs,     marker_ys,
+                                                                marker_xe , marker_ys);
+                                                }
+                                            } else if (tick_type=="circle")
+                                                circles((float)marker_xe - 4, (float)marker_ys,3.0);
+                                            else {
+                                                drawOneLine(marker_xs,     marker_ys,
+                                                            marker_xe - 4, marker_ys);
+                                            }
+                                        }
+                                    } //end huds both
+                                }

                             } //end draw minor ticks
                         }  //end minor ticks
 
                         // Major ticks
                             } //end draw minor ticks
                         }  //end minor ticks
 
                         // Major ticks

-                        if( div_max() ) {
-                                       
-                            if( !(k%(int)div_max()) ) {
-                                if(modulo()) {
+                        if (div_max()) {
+                            if (!(k%(int)div_max())) {
+                                if (modulo()) {

                                     disp_val = i % (int) modulo(); // ?????????
                                     disp_val = i % (int) modulo(); // ?????????

-                                    if( disp_val < 0) {
-                                        while(disp_val < 0)
+                                    if (disp_val < 0) {
+                                        while (disp_val < 0)

                                             disp_val += modulo();
                                     }
                                 } else {
                                     disp_val = i;
                                             disp_val += modulo();
                                     }
                                 } else {
                                     disp_val = i;

-                                } 
+                                }

 
 

-                                lenstr = sprintf( TextScale, "%d",
-                                                  FloatToInt(disp_val * data_scaling()/*+.5*/));
+                                lenstr = sprintf(TextScale, "%d",
+                                                 FloatToInt(disp_val * data_scaling()/*+.5*/));

                                 // (int)(disp_val  * data_scaling() +.5));
                                 // (int)(disp_val  * data_scaling() +.5));

-                                /* if(( (marker_ys - 8 ) > scrn_rect.top ) &&
-                                   ( (marker_ys + 8) < (height))){ */ //suma
+                                /* if (((marker_ys - 8) > scrn_rect.top) &&
+                                   ((marker_ys + 8) < (height))){ */

                                 // huds_both
                                 // huds_both

-                                if( huds_both(options) ) {
-                                    // drawOneLine( scrn_rect.left, marker_ys,
+                                if (huds_both(options)) {
+                                    // drawOneLine(scrn_rect.left, marker_ys,

                                     //              marker_xs,      marker_ys);
                                     //              marker_xs,      marker_ys);

-                                    // drawOneLine( marker_xs, marker_ys,
+                                    // drawOneLine(marker_xs, marker_ys,

                                     //              scrn_rect.left + scrn_rect.right,
                                     //              marker_ys);
                                     //              scrn_rect.left + scrn_rect.right,
                                     //              marker_ys);

-                                    if(tick_type=="line") {
+                                    if (tick_type == "line") {

                                         glBegin(GL_LINE_STRIP);
                                         glBegin(GL_LINE_STRIP);

-                                        glVertex2f( scrn_rect.left, marker_ys );
-                                        glVertex2f( marker_xs, marker_ys);
-                                        glVertex2f( width, marker_ys);
+                                        glVertex2f(scrn_rect.left, marker_ys);
+                                        glVertex2f(marker_xs, marker_ys);
+                                        glVertex2f(width, marker_ys);

                                         glEnd();
                                         glEnd();

-                                    } else if(tick_type=="circle") //begin suma
-                                        circles(scrn_rect.left, (float)marker_ys,5.0); //end suma
-                                    else { 
+                                    } else if (tick_type == "circle") {
+                                        circles(scrn_rect.left, (float)marker_ys,5.0);
+                                    } else {

                                         glBegin(GL_LINE_STRIP);
                                         glBegin(GL_LINE_STRIP);

-                                        glVertex2f( scrn_rect.left, marker_ys );
-                                        glVertex2f( marker_xs, marker_ys);
-                                        glVertex2f( width, marker_ys);
+                                        glVertex2f(scrn_rect.left, marker_ys);
+                                        glVertex2f(marker_xs, marker_ys);
+                                        glVertex2f(width, marker_ys);

                                         glEnd();
                                         glEnd();

-                                    } 
-                                                               
-                                    if( !huds_notext(options)) {
-                                        textString ( marker_xs + 2,  marker_ys,
-                                                     TextScale,0 );
-                                    } 
-                                } else { 
-                                    //begin suma 
-                                    /* Changes are made to draw a circle when tick_type="circle" */                                                    
+                                    }
+
+                                    if (!huds_notext(options)) {
+                                        textString (marker_xs + 2,  marker_ys,
+                                                    TextScale,0);
+                                    }
+
+                                } else {
+                                    /* Changes are made to draw a circle when tick_type="circle" */

                                     // anything other than huds_both
                                     // anything other than huds_both

-                                    if(tick_type=="line") {
-                                        drawOneLine( marker_xs, marker_ys, marker_xe, marker_ys );
-                                    } else if(tick_type=="circle")
-                                        circles((float)marker_xs + 4, (float)marker_ys,5.0);//end suma
-                                    else {
-                                        drawOneLine( marker_xs, marker_ys, marker_xe, marker_ys );
-                                    } 
-                                    if( !huds_notext(options) ) {
-                                        if( huds_left(options) ) { 
-                                            textString( marker_xs -  8 * lenstr - 2,
-                                                        marker_ys - 4,
-                                                        TextScale, 0 );                                                                                 
-                                        } else { 
-                                            textString( marker_xe + 3 * lenstr,
-                                                        marker_ys - 4,
-                                                        TextScale, 0 );
+                                    if (tick_type=="line") {
+                                        drawOneLine(marker_xs, marker_ys, marker_xe, marker_ys);
+                                    } else if (tick_type=="circle") {
+                                        circles((float)marker_xs + 4, (float)marker_ys,5.0);
+                                    } else {
+                                        drawOneLine(marker_xs, marker_ys, marker_xe, marker_ys);
+                                    }
+
+                                    if (!huds_notext(options)) {
+                                        if (huds_left(options)) {
+                                            textString(marker_xs -  8 * lenstr - 2,
+                                                       marker_ys - 4,
+                                                       TextScale, 0);
+                                        } else {
+                                            textString(marker_xe + 3 * lenstr,
+                                                       marker_ys - 4,
+                                                       TextScale, 0);

                                         } //End if huds_left
                                     } //End if !huds_notext
                                 }  //End if huds-both
                             }  // End if draw major ticks
                         }   // End if major ticks
                     }  // End condition
                                         } //End if huds_left
                                     } //End if !huds_notext
                                 }  //End if huds-both
                             }  // End if draw major ticks
                         }   // End if major ticks
                     }  // End condition

-                }  // End for 
+                }  // End for

             }  //end of zoom
             // End if VERTICAL SCALE TYPE (tape loop yet to be closed)
             }  //end of zoom
             // End if VERTICAL SCALE TYPE (tape loop yet to be closed)

+

         } else {
             // Horizontal scale by default
             // left tick bar
             if (draw_tick_left) {
         } else {
             // Horizontal scale by default
             // left tick bar
             if (draw_tick_left) {

-                drawOneLine( scrn_rect.left, scrn_rect.top,
-                             scrn_rect.left, height);
+                drawOneLine(scrn_rect.left, scrn_rect.top,
+                            scrn_rect.left, height);

             }  // endif draw_tick_left
             // right tick bar
             if (draw_tick_right) {
             }  // endif draw_tick_left
             // right tick bar
             if (draw_tick_right) {

-                drawOneLine( width, scrn_rect.top,
-                             width,
-                             height );
+                drawOneLine(width, scrn_rect.top,
+                            width,
+                            height);

             }  // endif draw_tick_right
 
             marker_ys = scrn_rect.top;           // Starting point for
             marker_ye = height;                  // tick y location calcs
             marker_xe = width;
             }  // endif draw_tick_right
 
             marker_ys = scrn_rect.top;           // Starting point for
             marker_ye = height;                  // tick y location calcs
             marker_xe = width;

-            marker_xs = scrn_rect.left + FloatToInt((cur_value - vmin) * factor() /*+ .5f*/);
-                 
+            marker_xs = scrn_rect.left + ((cur_value - vmin) * factor() /*+ .5f*/);

 
             //    glBegin(GL_LINES);
             // left tick bar
 
             //    glBegin(GL_LINES);
             // left tick bar

-            //    glVertex2f( scrn_rect.left, scrn_rect.top);
-            //    glVertex2f( scrn_rect.left, marker_ye);
+            //    glVertex2f(scrn_rect.left, scrn_rect.top);
+            //    glVertex2f(scrn_rect.left, marker_ye);

 
             // right tick bar
 
             // right tick bar

-            //    glVertex2f( marker_xe, scrn_rect.top);
-            //    glVertex2f( marker_xe, marker_ye );
+            //    glVertex2f(marker_xe, scrn_rect.top);
+            //    glVertex2f(marker_xe, marker_ye);

             //    glEnd();
 
             //    glEnd();
 

-            if( huds_top(options) ) {
+            if (huds_top(options)) {

                 if (draw_cap_bottom) {
                     // Bottom box line
                 if (draw_cap_bottom) {
                     // Bottom box line

-                    drawOneLine( scrn_rect.left,
-                                 scrn_rect.top,
-                                 width,
-                                 scrn_rect.top);
+                    drawOneLine(scrn_rect.left,
+                                scrn_rect.top,
+                                width,
+                                scrn_rect.top);

                 }  //endif cap_bottom
 
                 // Tick point adjust
                 marker_ye  = scrn_rect.top + scrn_rect.bottom / 2;
                 // Bottom arrow
                 }  //endif cap_bottom
 
                 // Tick point adjust
                 marker_ye  = scrn_rect.top + scrn_rect.bottom / 2;
                 // Bottom arrow

-                // drawOneLine( mid_scr.x, marker_ye,
+                // drawOneLine(mid_scr.x, marker_ye,

                 //              mid_scr.x - scrn_rect.bottom / 4, scrn_rect.top);
                 //              mid_scr.x - scrn_rect.bottom / 4, scrn_rect.top);

-                // drawOneLine( mid_scr.x, marker_ye,
+                // drawOneLine(mid_scr.x, marker_ye,

                 //              mid_scr.x + scrn_rect.bottom / 4, scrn_rect.top);
                 // draw pointer
                 //              mid_scr.x + scrn_rect.bottom / 4, scrn_rect.top);
                 // draw pointer

-                if(pointer) {
-                    if(pointer_type=="moving") { 
-                        if (zoom ==0) {
-                            //Code for Moving Type Pointer included by suma.
+                if (pointer) {
+                    if (pointer_type == "moving") {
+                        if (zoom == 0) {
+                            //Code for Moving Type Pointer

                             // static float xcentre,xpoint,ypoint;
                             // static int range;
                             // static float xcentre,xpoint,ypoint;
                             // static int range;

-                            if(cur_value > maxValue) cur_value = maxValue;
-                            if(cur_value < minValue) cur_value = minValue;
+                            if (cur_value > maxValue)
+                                cur_value = maxValue;
+                            if (cur_value < minValue)
+                                cur_value = minValue;
+

                             float xcentre = mid_scr.x;
                             int range = scrn_rect.right;
                             float xpoint = xcentre + (cur_value * range / val_span);
                             float xcentre = mid_scr.x;
                             int range = scrn_rect.right;
                             float xpoint = xcentre + (cur_value * range / val_span);


@@ -683,41 +689,44 @@ draw( void ) //  (HUD_scale * pscale )
                             drawOneLine(xpoint,ypoint,xpoint,ypoint+marker_offset);
                             drawOneLine(xpoint,ypoint+marker_offset,xpoint+5.0,ypoint+5.0);
                             drawOneLine(xpoint,ypoint+marker_offset,xpoint-5.0,ypoint+5.0);
                             drawOneLine(xpoint,ypoint,xpoint,ypoint+marker_offset);
                             drawOneLine(xpoint,ypoint+marker_offset,xpoint+5.0,ypoint+5.0);
                             drawOneLine(xpoint,ypoint+marker_offset,xpoint-5.0,ypoint+5.0);

-                        } 
-                    } else { 
+                        }
+                    } else {

                         //default to fixed
                         //default to fixed

-                        fixed( marker_xs - scrn_rect.bottom / 4, scrn_rect.top,
+                        fixed(marker_xs - scrn_rect.bottom / 4, scrn_rect.top,

                                marker_xs, marker_ye, marker_xs + scrn_rect.bottom / 4,scrn_rect.top);
                                marker_xs, marker_ye, marker_xs + scrn_rect.bottom / 4,scrn_rect.top);

-                    } 
+                    }

                 }  //if pointer
             } //End Horizontal scale/top
 
                 }  //if pointer
             } //End Horizontal scale/top
 

-            if( huds_bottom(options) ) {
+            if (huds_bottom(options)) {

                 // Top box line
                 if (draw_cap_top) {
                 // Top box line
                 if (draw_cap_top) {

-                    drawOneLine( scrn_rect.left, height,
+                    drawOneLine(scrn_rect.left, height,

                                  width, height);
                 }  //endif cap_top
 
                 // Tick point adjust
                                  width, height);
                 }  //endif cap_top
 
                 // Tick point adjust

-                marker_ys = height - scrn_rect.bottom  / 2;
+                marker_ys = height - scrn_rect.bottom / 2;

                 // Top arrow
                 // Top arrow

-                //      drawOneLine( mid_scr.x + scrn_rect.bottom / 4,
+                //      drawOneLine(mid_scr.x + scrn_rect.bottom / 4,

                 //                   scrn_rect.top + scrn_rect.bottom,
                 //                   scrn_rect.top + scrn_rect.bottom,

-                //                   mid_scr.x, marker_ys );
-                //      drawOneLine( mid_scr.x - scrn_rect.bottom / 4,
+                //                   mid_scr.x, marker_ys);
+                //      drawOneLine(mid_scr.x - scrn_rect.bottom / 4,

                 //                   scrn_rect.top + scrn_rect.bottom,
                 //                   scrn_rect.top + scrn_rect.bottom,

-                //                   mid_scr.x , marker_ys );
-            
+                //                   mid_scr.x , marker_ys);
+

                 // draw pointer
                 // draw pointer

-                if(pointer) {
-                    if(pointer_type=="moving") { 
-                        if(zoom == 0) { 
-                            //Code for Moving Type Pointer included by suma.
+                if (pointer) {
+                    if (pointer_type =="moving") {
+                        if (zoom == 0) {
+                            //Code for Moving Type Pointer

                             // static float xcentre,xpoint,ypoint;
                             // static int range,hgt;
                             // static float xcentre,xpoint,ypoint;
                             // static int range,hgt;

-                            if(cur_value > maxValue) cur_value = maxValue;
-                            if(cur_value < minValue) cur_value = minValue;
+                            if (cur_value > maxValue)
+                                cur_value = maxValue;
+                            if (cur_value < minValue)
+                                cur_value = minValue;
+

                             float xcentre = mid_scr.x ;
                             int range = scrn_rect.right;
                             int hgt   = scrn_rect.top + scrn_rect.bottom;
                             float xcentre = mid_scr.x ;
                             int range = scrn_rect.right;
                             int hgt   = scrn_rect.top + scrn_rect.bottom;


@@ -727,146 +736,150 @@ draw( void ) //  (HUD_scale * pscale )
                             drawOneLine(xpoint,ypoint,xpoint,ypoint-marker_offset);
                             drawOneLine(xpoint,ypoint-marker_offset,xpoint+5.0,ypoint-5.0);
                             drawOneLine(xpoint,ypoint-marker_offset,xpoint-5.0,ypoint-5.0);
                             drawOneLine(xpoint,ypoint,xpoint,ypoint-marker_offset);
                             drawOneLine(xpoint,ypoint-marker_offset,xpoint+5.0,ypoint-5.0);
                             drawOneLine(xpoint,ypoint-marker_offset,xpoint-5.0,ypoint-5.0);

-                        } 
-                    } else { 
-                        fixed( marker_xs + scrn_rect.bottom / 4, height, marker_xs, marker_ys,
-                               marker_xs - scrn_rect.bottom / 4, height);
-                                }  
+                        }
+                    } else {
+                        fixed(marker_xs + scrn_rect.bottom / 4, height, marker_xs, marker_ys,
+                              marker_xs - scrn_rect.bottom / 4, height);
+                    }

                 } //if pointer
             }  //end horizontal scale bottom
 
                 } //if pointer
             }  //end horizontal scale bottom
 

-            //    if(( options & HUDS_BOTTOM) == HUDS_BOTTOM ) {
+            //    if ((options & HUDS_BOTTOM) == HUDS_BOTTOM) {

             //      marker_xe = marker_ys;
             //      marker_ys = marker_ye;
             //      marker_ye = marker_xe;
             //      }
 
             // printf("vmin = %d  vmax = %d\n", (int)vmin, (int)vmax);
             //      marker_xe = marker_ys;
             //      marker_ys = marker_ye;
             //      marker_ye = marker_xe;
             //      }
 
             // printf("vmin = %d  vmax = %d\n", (int)vmin, (int)vmax);

-            
+

             //  last = FloatToInt(vmax)+1;
             //  i    = FloatToInt(vmin);
 
             //  last = FloatToInt(vmax)+1;
             //  i    = FloatToInt(vmin);
 

-            if(zoom ==1) {  
-                zoomed_scale((int)vmin,(int)vmax); //suma
-            } else  { 
+            if (zoom == 1) {
+                zoomed_scale((int)vmin,(int)vmax);
+            } else {

                 //default to zoom=0
                 last = (int)vmax + 1;
                 i = (int)vmin;
                 //default to zoom=0
                 last = (int)vmax + 1;
                 i = (int)vmin;

-                for(; i <last ; i++ ) {
-                    // for( i = (int)vmin; i <= (int)vmax; i++ )     {
+                for (; i < last; i++) {
+                    // for (i = (int)vmin; i <= (int)vmax; i++)     {

                     // printf("<*> i = %d\n", i);
                     condition = true;
                     // printf("<*> i = %d\n", i);
                     condition = true;

-                    if( !modulo()) {
-                        if( i < min_val()) {
+                    if (!modulo()) {
+                        if (i < min_val()) {

                             condition = false;
                         }
                             condition = false;
                         }

-                    } 
+                    }

                     // printf("<**> i = %d\n", i);
                     // printf("<**> i = %d\n", i);

-                    if( condition )        {
+                    if (condition) {

                         // marker_xs = scrn_rect.left + (int)((i - vmin) * factor() + .5);
                         // marker_xs = scrn_rect.left + (int)((i - vmin) * factor() + .5);

-                        marker_xs = scrn_rect.left + FloatToInt(((i - vmin) * factor()/*+ .5f*/));
+                        marker_xs = scrn_rect.left + (((i - vmin) * factor()/*+ .5f*/));

 
 

-                        if (oddtype == 1) 
+                        if (oddtype == 1)

                             k = i+1; //enable ticks at odd values
                         else
                             k = i;
 
                             k = i+1; //enable ticks at odd values
                         else
                             k = i;
 

-                        if( div_min()) {
-                            //          if( (i%(int)div_min()) == 0 ) {
+                        if (div_min()) {
+                            //          if ((i%(int)div_min()) == 0) {

                             //draw minor ticks
                             //draw minor ticks

-                            if( !(k%(int)div_min() )) {           
+                            if (!(k%(int)div_min())) {

                                 // draw in ticks only if they aren't too close to the edge.
                                 // draw in ticks only if they aren't too close to the edge.

-                                if((( marker_xs - 5) > scrn_rect.left ) &&
-                                  (( marker_xs + 5 )< (scrn_rect.left + scrn_rect.right))){
-                            
-                                if( huds_both(options) ) { 
-                                    if(tick_length=="variable") { 
-                                        drawOneLine( marker_xs, scrn_rect.top,
-                                                     marker_xs, marker_ys - 4);
-                                        drawOneLine( marker_xs, marker_ye + 4,
-                                                     marker_xs, height);
-                                    } else { 
-                                        drawOneLine( marker_xs, scrn_rect.top,
-                                                     marker_xs, marker_ys);
-                                        drawOneLine( marker_xs, marker_ye,
-                                                     marker_xs, height);
-                                    } 
-                                    // glBegin(GL_LINES);
-                                    // glVertex2f( marker_xs, scrn_rect.top);
-                                    // glVertex2f( marker_xs, marker_ys - 4);
-                                    // glVertex2f( marker_xs, marker_ye + 4);
-                                                // glVertex2f( marker_xs, scrn_rect.top + scrn_rect.bottom);
-                                    // glEnd();
-                                }  else {
-                                    if( huds_top(options)) {
-                                        //draw minor ticks
-                                        if(tick_length=="variable")
-                                            drawOneLine(marker_xs,marker_ys,marker_xs,marker_ye-4);
-                                        else
-                                            drawOneLine(marker_xs,marker_ys,marker_xs,marker_ye);
-                                    } else  
-                                        if(tick_length=="variable")
-                                            drawOneLine(marker_xs,marker_ys+4,marker_xs,marker_ye);
-                                        else
-                                            drawOneLine(marker_xs,marker_ys,marker_xs,marker_ye);
-                                }
-                              }
-                            } //end draw minor ticks
-                        } //end minor ticks
-                        //major ticks
-                        if( div_max()) {
-                            // printf("i = %d\n", i);
-                            //          if( (i%(int)div_max())==0 ) {
-                            //draw major ticks
-                            if( !(k%(int)div_max()) ) {           
-                                if(modulo()) {
-                                    disp_val = i % (int) modulo(); // ?????????
-                                    if( disp_val < 0) {
-                                        while(disp_val<0)
-                                            disp_val += modulo();
-                                    } 
-                                } else {
-                                    disp_val = i;
-                                } 
-                                // printf("disp_val = %d\n", disp_val);
-                                // printf("%d\n", (int)(disp_val  * (double)data_scaling() + 0.5));
-                                lenstr = sprintf( TextScale, "%d",
-                                                  // (int)(disp_val  * data_scaling() +.5));
-                                                  FloatToInt(disp_val * data_scaling()/*+.5*/));
-                                // Draw major ticks and text only if far enough from the edge.
-                                if(( (marker_xs - 10)> scrn_rect.left ) &&
-                                          ( (marker_xs + 10) < (scrn_rect.left + scrn_rect.right))){
-                                if( huds_both(options) ) {
-                                    // drawOneLine( marker_xs, scrn_rect.top,
-                                    //              marker_xs, marker_ys);
-                                    // drawOneLine( marker_xs, marker_ye,
-                                    //              marker_xs, scrn_rect.top + scrn_rect.bottom);
-                                    glBegin(GL_LINE_STRIP);
-                                    glVertex2f( marker_xs, scrn_rect.top);
-                                    glVertex2f( marker_xs, marker_ye);
-                                    glVertex2f( marker_xs, height);
-                                    glEnd();
-                                    if( !huds_notext(options) ) {
-                                        textString ( marker_xs - 4 * lenstr,
-                                                     marker_ys + 4,
-                                                             TextScale, 0 ); //suma
-                                    } 
-                                } else {
-                                    drawOneLine( marker_xs, marker_ys,
-                                                 marker_xs, marker_ye );
-                                    if( !huds_notext(options)) {
-                                        if( huds_top(options) )              {
-                                            textString ( marker_xs - 4 * lenstr,
-                                                         height - 10,
-                                                         TextScale, 0 ); //suma
-                                        }  else  {
-                                            textString( marker_xs - 4 * lenstr,
-                                                        scrn_rect.top,
-                                                        TextScale, 0 ); //suma
-                                        } 
-                                    } 
+                                if (((marker_xs - 5) > scrn_rect.left)
+                                        && ((marker_xs + 5)< (scrn_rect.left + scrn_rect.right))) {
+
+                                    if (huds_both(options)) {
+                                        if (tick_length == "variable") {
+                                            drawOneLine(marker_xs, scrn_rect.top,
+                                                        marker_xs, marker_ys - 4);
+                                            drawOneLine(marker_xs, marker_ye + 4,
+                                                        marker_xs, height);
+                                        } else {
+                                            drawOneLine(marker_xs, scrn_rect.top,
+                                                        marker_xs, marker_ys);
+                                            drawOneLine(marker_xs, marker_ye,
+                                                        marker_xs, height);
+                                        }
+                                        // glBegin(GL_LINES);
+                                        // glVertex2f(marker_xs, scrn_rect.top);
+                                        // glVertex2f(marker_xs, marker_ys - 4);
+                                        // glVertex2f(marker_xs, marker_ye + 4);
+                                        // glVertex2f(marker_xs, scrn_rect.top + scrn_rect.bottom);
+                                        // glEnd();
+
+                                    } else {
+                                        if (huds_top(options)) {
+                                            //draw minor ticks
+                                            if (tick_length=="variable")
+                                                drawOneLine(marker_xs,marker_ys,marker_xs,marker_ye-4);
+                                            else
+                                                drawOneLine(marker_xs,marker_ys,marker_xs,marker_ye);
+
+                                        } else
+                                            if (tick_length=="variable")
+                                                drawOneLine(marker_xs,marker_ys+4,marker_xs,marker_ye);
+                                            else
+                                                drawOneLine(marker_xs,marker_ys,marker_xs,marker_ye);
+                                        }
+                                    }
+                                } //end draw minor ticks
+                            } //end minor ticks
+
+                            //major ticks
+                            if (div_max()) {
+                                // printf("i = %d\n", i);
+                                // if ((i%(int)div_max())==0) {
+                                //     draw major ticks
+
+                                if (!(k%(int)div_max())) {
+                                    if (modulo()) {
+                                        disp_val = i % (int) modulo(); // ?????????
+                                        if (disp_val < 0) {
+                                            while (disp_val<0)
+                                                disp_val += modulo();
+                                        }
+                                    } else {
+                                        disp_val = i;
+                                    }
+                                    // printf("disp_val = %d\n", disp_val);
+                                    // printf("%d\n", (int)(disp_val  * (double)data_scaling() + 0.5));
+                                    lenstr = sprintf(TextScale, "%d",
+                                            // (int)(disp_val  * data_scaling() +.5));
+                                            FloatToInt(disp_val * data_scaling()/*+.5*/));
+
+                                    // Draw major ticks and text only if far enough from the edge.
+                                    if (((marker_xs - 10)> scrn_rect.left)
+                                            && ((marker_xs + 10) < (scrn_rect.left + scrn_rect.right))) {
+                                        if (huds_both(options)) {
+                                            // drawOneLine(marker_xs, scrn_rect.top,
+                                            //              marker_xs, marker_ys);
+                                            // drawOneLine(marker_xs, marker_ye,
+                                            //              marker_xs, scrn_rect.top + scrn_rect.bottom);
+                                            glBegin(GL_LINE_STRIP);
+                                            glVertex2f(marker_xs, scrn_rect.top);
+                                            glVertex2f(marker_xs, marker_ye);
+                                            glVertex2f(marker_xs, height);
+                                            glEnd();
+
+                                            if (!huds_notext(options)) {
+                                                textString(marker_xs - 4 * lenstr,
+                                                           marker_ys + 4, TextScale, 0);
+                                            }
+                                        } else {
+                                            drawOneLine(marker_xs, marker_ys, marker_xs, marker_ye);
+
+                                        if (!huds_notext(options)) {
+                                            if (huds_top(options)) {
+                                                textString(marker_xs - 4 * lenstr,
+                                                           height - 10, TextScale, 0);
+
+                                            }  else  {
+                                                textString(marker_xs - 4 * lenstr,
+                                                           scrn_rect.top, TextScale, 0);
+                                            }
+                                        }
+                                    }

                                 }
                                 }

-                              }

                             }  //end draw major ticks
                         } //endif major ticks
                     }   //end condition
                             }  //end draw major ticks
                         } //endif major ticks
                     }   //end condition


@@ -877,55 +890,51 @@ draw( void ) //  (HUD_scale * pscale )
 } //draw
 
 
 } //draw
 
 

-//begin suma

 
 

-void hud_card :: 
-circles(float x,float y,float size)
+void hud_card::circles(float x,float y,float size)

 {
     glEnable(GL_POINT_SMOOTH);
 {
     glEnable(GL_POINT_SMOOTH);

-    glPointSize(size); 
+    glPointSize(size);

 
     glBegin(GL_POINTS);
     glVertex2f(x,y);
     glEnd();
 
     glBegin(GL_POINTS);
     glVertex2f(x,y);
     glEnd();

-                                                                                 
+

     glPointSize(1.0);
     glPointSize(1.0);

-    glDisable(GL_POINT_SMOOTH); 
+    glDisable(GL_POINT_SMOOTH);

 }
 }

- 
-//end suma

 
 

-void hud_card ::
-fixed(float x1, float y1, float x2, float y2, float x3, float y3)
+
+void hud_card::fixed(float x1, float y1, float x2, float y2, float x3, float y3)

 {
     glBegin(GL_LINE_STRIP);
     glVertex2f(x1, y1);
     glVertex2f(x2, y2);
 {
     glBegin(GL_LINE_STRIP);
     glVertex2f(x1, y1);
     glVertex2f(x2, y2);

-    glVertex2f(x3, y3);   
+    glVertex2f(x3, y3);

     glEnd();
 }
 
 
     glEnd();
 }
 
 

-void hud_card ::
-zoomed_scale(int first, int last)
+void hud_card::zoomed_scale(int first, int last)

 {
 {

-       

     POINT mid_scr    = get_centroid();
     RECT   scrn_rect = get_location();
     UINT options     = get_options();
     char TextScale[80];
     // int disp_val = 0;
     int data[80];
     POINT mid_scr    = get_centroid();
     RECT   scrn_rect = get_location();
     UINT options     = get_options();
     char TextScale[80];
     // int disp_val = 0;
     int data[80];

- 
+

     float x,y,w,h,bottom;
     float cur_value=get_value();
     float x,y,w,h,bottom;
     float cur_value=get_value();

-    if(cur_value > maxValue) cur_value = maxValue;
-    if(cur_value < minValue) cur_value = minValue;
-       
+    if (cur_value > maxValue)
+        cur_value = maxValue;
+    if (cur_value < minValue)
+        cur_value = minValue;
+

     int a=0;
     int a=0;

-       
-    while(first <= last) {
-        if((first % (int)Maj_div) == 0) {   
+
+    while (first <= last) {
+        if ((first % (int)Maj_div) == 0) {

             data[a] = first;
             a++ ;
         }
             data[a] = first;
             a++ ;
         }


@@ -933,190 +942,186 @@ zoomed_scale(int first, int last)
     }
     int centre =a/2;
 
     }
     int centre =a/2;
 

-       
-    if( huds_vert(options) ) {
-
+    if (huds_vert(options)) {

         x=scrn_rect.left;
         y=scrn_rect.top;
         w=scrn_rect.left+scrn_rect.right;
         h=scrn_rect.top+scrn_rect.bottom;
         bottom=scrn_rect.bottom;
         x=scrn_rect.left;
         y=scrn_rect.top;
         w=scrn_rect.left+scrn_rect.right;
         h=scrn_rect.top+scrn_rect.bottom;
         bottom=scrn_rect.bottom;

-           
-        float xstart, yfirst, ycentre, ysecond; 
+
+        float xstart, yfirst, ycentre, ysecond;

 
         float hgt = bottom * 20.0 /100.0;  // 60% of height should be zoomed
         yfirst = mid_scr.y - hgt;
         ycentre = mid_scr.y;
         ysecond = mid_scr.y + hgt;
         float range = hgt * 2;
 
         float hgt = bottom * 20.0 /100.0;  // 60% of height should be zoomed
         yfirst = mid_scr.y - hgt;
         ycentre = mid_scr.y;
         ysecond = mid_scr.y + hgt;
         float range = hgt * 2;

-               
+

         int i;
         float factor = range /10.0;
         int i;
         float factor = range /10.0;

-       
+

         float hgt1 = bottom * 30.0 /100.0;
         int  incrs = ((int)val_span - (Maj_div * 2)) / Maj_div ;
         int  incr = incrs / 2;
         float factors = hgt1 / incr;
 
         float hgt1 = bottom * 30.0 /100.0;
         int  incrs = ((int)val_span - (Maj_div * 2)) / Maj_div ;
         int  incr = incrs / 2;
         float factors = hgt1 / incr;
 

-
-

         // begin
         // begin

-        //this is for moving type pointer 
+        //this is for moving type pointer

         static float ycent, ypoint,xpoint;
         static int wth;
         static float ycent, ypoint,xpoint;
         static int wth;

-                
+

         ycent = mid_scr.y;
         wth=scrn_rect.left+scrn_rect.right;
         ycent = mid_scr.y;
         wth=scrn_rect.left+scrn_rect.right;

-                
-        if(cur_value <= data[centre+1])
-            if(cur_value > data[centre]) {  
+
+        if (cur_value <= data[centre+1])
+            if (cur_value > data[centre]) {

                 ypoint = ycent + ((cur_value - data[centre]) * hgt/Maj_div);
                 ypoint = ycent + ((cur_value - data[centre]) * hgt/Maj_div);

-            }                                                     
+            }

 
 

-        if(cur_value >= data[centre-1])
-            if(cur_value <= data[centre]) { 
+        if (cur_value >= data[centre-1])
+            if (cur_value <= data[centre]) {

                 ypoint = ycent - ((data[centre]-cur_value) * hgt/Maj_div);
                 ypoint = ycent - ((data[centre]-cur_value) * hgt/Maj_div);

-            } 
+            }

 
 

-        if(cur_value < data[centre-1])
-            if(cur_value >= minValue) {   
+        if (cur_value < data[centre-1])
+            if (cur_value >= minValue) {

                 float diff  = minValue  - data[centre-1];
                 float diff1 = cur_value - data[centre-1];
                 float val = (diff1 * hgt1) / diff;
                 float diff  = minValue  - data[centre-1];
                 float diff1 = cur_value - data[centre-1];
                 float val = (diff1 * hgt1) / diff;

-                         
+

                 ypoint = ycent - hgt -  val;
                 ypoint = ycent - hgt -  val;

-            }                                                     
-               
+            }

 
 

-        if(cur_value > data[centre+1])
-            if(cur_value <= maxValue) {    
+        if (cur_value > data[centre+1])
+            if (cur_value <= maxValue) {

                 float diff  = maxValue  - data[centre+1];
                 float diff1 = cur_value - data[centre+1];
                 float val = (diff1 * hgt1) / diff;
                 float diff  = maxValue  - data[centre+1];
                 float diff1 = cur_value - data[centre+1];
                 float val = (diff1 * hgt1) / diff;

-                         
+

                 ypoint = ycent + hgt +  val;
                 ypoint = ycent + hgt +  val;

-            }           
-                                  
-        if(huds_left(options)) { 
+            }
+
+        if (huds_left(options)) {

             xstart = w;
 
             xstart = w;
 

-            drawOneLine( xstart, ycentre, xstart - 5.0, ycentre); //centre tick
-          
+            drawOneLine(xstart, ycentre, xstart - 5.0, ycentre); //centre tick
+

             sprintf(TextScale,"%3.0f\n",(float)(data[centre] * data_scaling()));
 
             sprintf(TextScale,"%3.0f\n",(float)(data[centre] * data_scaling()));
 

-            if( !huds_notext(options)) { 
-                textString (x, ycentre, TextScale, 0 );
-            } 
-       
-            for(i=1;i<5;i++) {  
+            if (!huds_notext(options)) {
+                textString (x, ycentre, TextScale, 0);
+            }
+
+            for (i = 1; i < 5; i++) {

                 yfirst  += factor;
                 ycentre += factor;
                 circles(xstart-2.5,yfirst, 3.0);
                 circles(xstart-2.5,ycentre,3.0);
                 yfirst  += factor;
                 ycentre += factor;
                 circles(xstart-2.5,yfirst, 3.0);
                 circles(xstart-2.5,ycentre,3.0);

-            } 
-                                               
+            }
+

             yfirst = mid_scr.y - hgt;
 
             yfirst = mid_scr.y - hgt;
 

-            for(i=0;i<=incr;i++) { 
-                drawOneLine( xstart, yfirst, xstart - 5.0, yfirst);
-                drawOneLine( xstart,ysecond, xstart - 5.0,ysecond);
-                
+            for (i = 0; i <= incr; i++) {
+                drawOneLine(xstart, yfirst, xstart - 5.0, yfirst);
+                drawOneLine(xstart,ysecond, xstart - 5.0,ysecond);
+

                 sprintf(TextScale,"%3.0f\n",(float)(data[centre-i-1] * data_scaling()));
 
                 sprintf(TextScale,"%3.0f\n",(float)(data[centre-i-1] * data_scaling()));
 

-                if( !huds_notext(options)) 
-                    textString (x, yfirst, TextScale, 0 );
-                  
+                if (!huds_notext(options))
+                    textString (x, yfirst, TextScale, 0);
+

                 sprintf(TextScale,"%3.0f\n",(float)(data[centre+i+1] * data_scaling()));
 
                 sprintf(TextScale,"%3.0f\n",(float)(data[centre+i+1] * data_scaling()));
 

-                if( !huds_notext(options)) 
-                    textString (x, ysecond, TextScale, 0 );
-                  
+                if (!huds_notext(options))
+                    textString (x, ysecond, TextScale, 0);

 
                 yfirst    -= factors;
                 ysecond   += factors;
 
 
                 yfirst    -= factors;
                 ysecond   += factors;
 

-            } 
+            }
+

             //to draw moving type pointer for left option
             //to draw moving type pointer for left option

-            //begin            
+            //begin

             xpoint = wth + 10.0;
             xpoint = wth + 10.0;

-       
-            if(pointer_type == "moving") { 
+
+            if (pointer_type == "moving") {

                 drawOneLine(xpoint,ycent,xpoint,ypoint);
                 drawOneLine(xpoint,ypoint,xpoint-10.0,ypoint);
                 drawOneLine(xpoint-10.0,ypoint,xpoint-5.0,ypoint+5.0);
                 drawOneLine(xpoint-10.0,ypoint,xpoint-5.0,ypoint-5.0);
                 drawOneLine(xpoint,ycent,xpoint,ypoint);
                 drawOneLine(xpoint,ypoint,xpoint-10.0,ypoint);
                 drawOneLine(xpoint-10.0,ypoint,xpoint-5.0,ypoint+5.0);
                 drawOneLine(xpoint-10.0,ypoint,xpoint-5.0,ypoint-5.0);

-            } 
+            }

             //end
             //end

-       
-        } else { 
+
+        } else {

             //huds_right
             xstart = (x+w)/2;
             //huds_right
             xstart = (x+w)/2;

-          
-            drawOneLine( xstart, ycentre, xstart + 5.0, ycentre); //centre tick
-          
+
+            drawOneLine(xstart, ycentre, xstart + 5.0, ycentre); //centre tick
+

             sprintf(TextScale,"%3.0f\n",(float)(data[centre] * data_scaling()));
 
             sprintf(TextScale,"%3.0f\n",(float)(data[centre] * data_scaling()));
 

-            if( !huds_notext(options)) { 
-                textString (w, ycentre, TextScale, 0 );
-            } 
-       
-            for(i=1;i<5;i++) {  
+            if (!huds_notext(options)) {
+                textString (w, ycentre, TextScale, 0);
+            }
+
+            for (i = 1; i < 5; i++) {

                 yfirst  += factor;
                 ycentre += factor;
                 circles(xstart+2.5,yfirst, 3.0);
                 circles(xstart+2.5,ycentre,3.0);
                 yfirst  += factor;
                 ycentre += factor;
                 circles(xstart+2.5,yfirst, 3.0);
                 circles(xstart+2.5,ycentre,3.0);

-            } 
-                                               
+            }
+

             yfirst = mid_scr.y - hgt;
 
             yfirst = mid_scr.y - hgt;
 

-            for(i=0;i<=incr;i++) { 
-                drawOneLine( xstart, yfirst, xstart + 5.0, yfirst);
-                drawOneLine( xstart,ysecond, xstart + 5.0,ysecond);
-                 
+            for (i = 0; i <= incr; i++) {
+                drawOneLine(xstart, yfirst, xstart + 5.0, yfirst);
+                drawOneLine(xstart,ysecond, xstart + 5.0,ysecond);
+

                 sprintf(TextScale,"%3.0f\n",(float)(data[centre-i-1] * data_scaling()));
 
                 sprintf(TextScale,"%3.0f\n",(float)(data[centre-i-1] * data_scaling()));
 

-                if( !huds_notext(options)) 
-                    textString (w, yfirst, TextScale, 0 );
-                  
+                if (!huds_notext(options))
+                    textString(w, yfirst, TextScale, 0);
+

                 sprintf(TextScale,"%3.0f\n",(float)(data[centre+i+1] * data_scaling()));
 
                 sprintf(TextScale,"%3.0f\n",(float)(data[centre+i+1] * data_scaling()));
 

-                if( !huds_notext(options)) 
-                    textString (w, ysecond, TextScale, 0 );
-                  
+                if (!huds_notext(options))
+                    textString(w, ysecond, TextScale, 0);
+

                 yfirst -= factors;
                 yfirst -= factors;

-                ysecond   += factors;
+                ysecond += factors;

 
 

-            } 
+            }

 
             // to draw moving type pointer for right option
 
             // to draw moving type pointer for right option

-            //begin              
+            //begin

             xpoint = scrn_rect.left;
             xpoint = scrn_rect.left;

-               
-            if(pointer_type == "moving") { 
+
+            if (pointer_type == "moving") {

                 drawOneLine(xpoint,ycent,xpoint,ypoint);
                 drawOneLine(xpoint,ypoint,xpoint+10.0,ypoint);
                 drawOneLine(xpoint+10.0,ypoint,xpoint+5.0,ypoint+5.0);
                 drawOneLine(xpoint+10.0,ypoint,xpoint+5.0,ypoint-5.0);
                 drawOneLine(xpoint,ycent,xpoint,ypoint);
                 drawOneLine(xpoint,ypoint,xpoint+10.0,ypoint);
                 drawOneLine(xpoint+10.0,ypoint,xpoint+5.0,ypoint+5.0);
                 drawOneLine(xpoint+10.0,ypoint,xpoint+5.0,ypoint-5.0);

-            } 
-            //end                                       
+            }
+            //end

         }//end huds_right /left
         }//end huds_right /left

-       //end of vertical scale
-    } else { 
+        //end of vertical scale
+
+    } else {

         //horizontal scale
         x=scrn_rect.left;
         y=scrn_rect.top;
         w=scrn_rect.left+scrn_rect.right;
         h=scrn_rect.top+scrn_rect.bottom;
         bottom=scrn_rect.right;
         //horizontal scale
         x=scrn_rect.left;
         y=scrn_rect.top;
         w=scrn_rect.left+scrn_rect.right;
         h=scrn_rect.top+scrn_rect.bottom;
         bottom=scrn_rect.right;

-           
-        float ystart, xfirst, xcentre, xsecond; 
+
+        float ystart, xfirst, xcentre, xsecond;

 
         float hgt = bottom * 20.0 /100.0;  // 60% of height should be zoomed
         xfirst = mid_scr.x - hgt;
         xcentre = mid_scr.x;
         xsecond = mid_scr.x + hgt;
         float range = hgt * 2;
 
         float hgt = bottom * 20.0 /100.0;  // 60% of height should be zoomed
         xfirst = mid_scr.x - hgt;
         xcentre = mid_scr.x;
         xsecond = mid_scr.x + hgt;
         float range = hgt * 2;

-               
+

         int i;
         float factor = range /10.0;
 
         int i;
         float factor = range /10.0;
 


@@ -1125,151 +1130,148 @@ zoomed_scale(int first, int last)
         int  incr = incrs / 2;
         float factors = hgt1 / incr;
 
         int  incr = incrs / 2;
         float factors = hgt1 / incr;
 

-               
+

         //Code for Moving Type Pointer
         //begin
         static float xcent,xpoint,ypoint;
         //Code for Moving Type Pointer
         //begin
         static float xcent,xpoint,ypoint;

-               
+

         xcent = mid_scr.x;
         xcent = mid_scr.x;

-                
-        if(cur_value <= data[centre+1])
-            if(cur_value > data[centre]) {   
+
+        if (cur_value <= data[centre+1])
+            if (cur_value > data[centre]) {

                 xpoint = xcent + ((cur_value - data[centre]) * hgt/Maj_div);
                 xpoint = xcent + ((cur_value - data[centre]) * hgt/Maj_div);

-            }                                                     
-        
-        if(cur_value >= data[centre-1])
-            if(cur_value <= data[centre]) {   
+            }
+
+        if (cur_value >= data[centre-1])
+            if (cur_value <= data[centre]) {

                 xpoint = xcent - ((data[centre]-cur_value) * hgt/Maj_div);
                 xpoint = xcent - ((data[centre]-cur_value) * hgt/Maj_div);

-            }    
-                  
-        if(cur_value < data[centre-1])
-            if(cur_value >= minValue) {   
+            }
+
+        if (cur_value < data[centre-1])
+            if (cur_value >= minValue) {

                 float diff  = minValue  - data[centre-1];
                 float diff1 = cur_value - data[centre-1];
                 float val = (diff1 * hgt1) / diff;
                 float diff  = minValue  - data[centre-1];
                 float diff1 = cur_value - data[centre-1];
                 float val = (diff1 * hgt1) / diff;

-                         
+

                 xpoint = xcent - hgt -  val;
             }
                 xpoint = xcent - hgt -  val;
             }

-               
-           
-        if(cur_value > data[centre+1])
-            if(cur_value <= maxValue) {   
+
+
+        if (cur_value > data[centre+1])
+            if (cur_value <= maxValue) {

                 float diff  = maxValue  - data[centre+1];
                 float diff1 = cur_value - data[centre+1];
                 float val = (diff1 * hgt1) / diff;
                 float diff  = maxValue  - data[centre+1];
                 float diff1 = cur_value - data[centre+1];
                 float val = (diff1 * hgt1) / diff;

-                         
+

                 xpoint = xcent + hgt +  val;
                 xpoint = xcent + hgt +  val;

-            }                                                     
-               
+            }
+

         //end
         //end

-        if(huds_top(options)) { 
+        if (huds_top(options)) {

 
             ystart =h;
 
             ystart =h;

-          
-            drawOneLine( xcentre, ystart, xcentre, ystart - 5.0); //centre tick
-          
+
+            drawOneLine(xcentre, ystart, xcentre, ystart - 5.0); //centre tick
+

             sprintf(TextScale,"%3.0f\n",(float)(data[centre] * data_scaling()));
 
             sprintf(TextScale,"%3.0f\n",(float)(data[centre] * data_scaling()));
 

-            if( !huds_notext(options)) { 
-                textString (xcentre-10.0, y, TextScale, 0 );
-            } 
-       
-            for(i=1;i<5;i++) {  
+            if (!huds_notext(options)) {
+                textString (xcentre-10.0, y, TextScale, 0);
+            }
+
+            for (i = 1; i < 5; i++) {

                 xfirst  += factor;
                 xcentre += factor;
                 circles(xfirst,  ystart-2.5, 3.0);
                 circles(xcentre, ystart-2.5, 3.0);
                 xfirst  += factor;
                 xcentre += factor;
                 circles(xfirst,  ystart-2.5, 3.0);
                 circles(xcentre, ystart-2.5, 3.0);

-            } 
-                                               
-            xfirst = mid_scr.x - hgt;                          
-          
-            for(i=0;i<=incr;i++) { 
-                drawOneLine( xfirst,  ystart, xfirst,  ystart - 5.0);
-                drawOneLine( xsecond, ystart, xsecond, ystart - 5.0);
-                 
+            }
+
+            xfirst = mid_scr.x - hgt;
+
+            for (i = 0; i <= incr; i++) {
+                drawOneLine(xfirst,  ystart, xfirst,  ystart - 5.0);
+                drawOneLine(xsecond, ystart, xsecond, ystart - 5.0);
+

                 sprintf(TextScale,"%3.0f\n",(float)(data[centre-i-1] * data_scaling()));
 
                 sprintf(TextScale,"%3.0f\n",(float)(data[centre-i-1] * data_scaling()));
 

-                if( !huds_notext(options)) 
-                    textString (xfirst-10.0, y, TextScale, 0 );
-                  
+                if (!huds_notext(options))
+                    textString (xfirst-10.0, y, TextScale, 0);
+

                 sprintf(TextScale,"%3.0f\n",(float)(data[centre+i+1] * data_scaling()));
                 sprintf(TextScale,"%3.0f\n",(float)(data[centre+i+1] * data_scaling()));

-                            
-                if( !huds_notext(options)) 
-                    textString (xsecond-10.0, y, TextScale, 0 );
-                  
+
+                if (!huds_notext(options))
+                    textString (xsecond-10.0, y, TextScale, 0);
+

 
                 xfirst -= factors;
 
                 xfirst -= factors;

-                xsecond   += factors;
-                
-            } 
+                xsecond += factors;
+            }

             //this is for moving pointer for top option
             //begin
             //this is for moving pointer for top option
             //begin

-               
+

             ypoint = scrn_rect.top + scrn_rect.bottom + 10.0;
 
             ypoint = scrn_rect.top + scrn_rect.bottom + 10.0;
 

-            if(pointer_type == "moving") { 
+            if (pointer_type == "moving") {

                 drawOneLine(xcent, ypoint,xpoint,ypoint);
                 drawOneLine(xpoint,ypoint,xpoint,ypoint-10.0);
                 drawOneLine(xpoint,ypoint-10.0,xpoint+5.0,ypoint-5.0);
                 drawOneLine(xpoint,ypoint-10.0,xpoint-5.0,ypoint-5.0);
                 drawOneLine(xcent, ypoint,xpoint,ypoint);
                 drawOneLine(xpoint,ypoint,xpoint,ypoint-10.0);
                 drawOneLine(xpoint,ypoint-10.0,xpoint+5.0,ypoint-5.0);
                 drawOneLine(xpoint,ypoint-10.0,xpoint-5.0,ypoint-5.0);

-            } 
+            }

             //end of top option
             //end of top option

-        } else { 
+
+        } else {

             //else huds_bottom
             //else huds_bottom

-            ystart = (y+h)/2;
-                       
-            //drawOneLine( xstart, yfirst,  xstart - 5.0, yfirst );
-            drawOneLine( xcentre, ystart, xcentre, ystart + 5.0); //centre tick
-          
+            ystart = (y + h) / 2;
+
+            //drawOneLine(xstart, yfirst,  xstart - 5.0, yfirst);
+            drawOneLine(xcentre, ystart, xcentre, ystart + 5.0); //centre tick
+

             sprintf(TextScale,"%3.0f\n",(float)(data[centre] * data_scaling()));
             sprintf(TextScale,"%3.0f\n",(float)(data[centre] * data_scaling()));

-            
-            if( !huds_notext(options)) { 
-                textString (xcentre-10.0, h, TextScale, 0 );
-            } 
-       
-            for(i=1;i<5;i++) {  
+
+            if (!huds_notext(options)) {
+                textString (xcentre-10.0, h, TextScale, 0);
+            }
+
+            for (i = 1; i < 5; i++) {

                 xfirst  += factor;
                 xcentre += factor;
                 circles(xfirst,  ystart+2.5, 3.0);
                 circles(xcentre, ystart+2.5,3.0);
                 xfirst  += factor;
                 xcentre += factor;
                 circles(xfirst,  ystart+2.5, 3.0);
                 circles(xcentre, ystart+2.5,3.0);

-            } 
-                                               
+            }
+

             xfirst = mid_scr.x - hgt;
             xfirst = mid_scr.x - hgt;

-               
-            for(i=0;i<=incr;i++) { 
-                drawOneLine( xfirst, ystart, xfirst, ystart + 5.0);
-                drawOneLine( xsecond,ystart, xsecond,ystart + 5.0);
-                
+
+            for (i = 0; i <= incr; i++) {
+                drawOneLine(xfirst, ystart, xfirst, ystart + 5.0);
+                drawOneLine(xsecond,ystart, xsecond,ystart + 5.0);
+

                 sprintf(TextScale,"%3.0f\n",(float)(data[centre-i-1] * data_scaling()));
 
                 sprintf(TextScale,"%3.0f\n",(float)(data[centre-i-1] * data_scaling()));
 

-                if( !huds_notext(options)) 
-                    textString (xfirst-10.0,h, TextScale, 0 );
-                  
+                if (!huds_notext(options))
+                    textString (xfirst-10.0,h, TextScale, 0);
+

                 sprintf(TextScale,"%3.0f\n",(float)(data[centre+i+1] * data_scaling()));
 
                 sprintf(TextScale,"%3.0f\n",(float)(data[centre+i+1] * data_scaling()));
 

-                if( !huds_notext(options)) 
-                    textString (xsecond-10.0,h, TextScale, 0 );
-                  
+                if (!huds_notext(options))
+                    textString (xsecond-10.0,h, TextScale, 0);
+

 
                 xfirst -= factors;
                 xsecond   += factors;
 
 
                 xfirst -= factors;
                 xsecond   += factors;
 

-            } 
+            }

             //this is for movimg pointer for bottom option
             //begin
             //this is for movimg pointer for bottom option
             //begin

-       
+

             ypoint = scrn_rect.top - 10.0;
             ypoint = scrn_rect.top - 10.0;

-            if(pointer_type == "moving") { 
+            if (pointer_type == "moving") {

                 drawOneLine(xcent, ypoint,xpoint,ypoint);
                 drawOneLine(xpoint,ypoint,xpoint,ypoint+10.0);
                 drawOneLine(xpoint,ypoint+10.0,xpoint+5.0,ypoint+5.0);
                 drawOneLine(xpoint,ypoint+10.0,xpoint-5.0,ypoint+5.0);
                 drawOneLine(xcent, ypoint,xpoint,ypoint);
                 drawOneLine(xpoint,ypoint,xpoint,ypoint+10.0);
                 drawOneLine(xpoint,ypoint+10.0,xpoint+5.0,ypoint+5.0);
                 drawOneLine(xpoint,ypoint+10.0,xpoint-5.0,ypoint+5.0);

-            } 
-
-               
-            //end                      
-        }//end hud_top or hud_bottom 
-
+            }
+        }//end hud_top or hud_bottom

     }  //end of horizontal/vertical scales
     }  //end of horizontal/vertical scales

-

 }//end draw
 }//end draw

+
+

diff --git a/src/Cockpit/hud_gaug.cxx b/src/Cockpit/hud_gaug.cxx
index e72b6c7a41b9267b277cab5791fcd7be3482da90..a934ed01aac2eef71361450941aed8f37f283d08 100644 (file)
--- a/src/Cockpit/hud_gaug.cxx
+++ b/src/Cockpit/hud_gaug.cxx
@@ -3,55 +3,55 @@
 
 
 #ifdef USE_HUD_TextList
 
 
 #ifdef USE_HUD_TextList

-#define textString( x , y, text, digit )  TextString( text, x , y,digit )  //suma
+#define textString( x , y, text, digit )  TextString( text, x , y,digit )

 #else
 #else

-#define textString( x , y, text, digit )  puDrawString ( guiFnt, text, x, y ); //suma
+#define textString( x , y, text, digit )  puDrawString ( guiFnt, text, x, y )

 #endif
 
 //============== Top of gauge_instr class member definitions ==============
 
 #endif
 
 //============== Top of gauge_instr class member definitions ==============
 

-gauge_instr ::
-gauge_instr( int          x,
-            int          y,
-            UINT         width,
-            UINT         height,
-            FLTFNPTR     load_fn,
-            UINT         options,
-            float       disp_scale,
-            float       maxValue,
-            float       minValue,
-            UINT         major_divs,
-            UINT         minor_divs,
-            int          dp_showing,
-            UINT         modulus,
-            bool         working) :
+gauge_instr::gauge_instr(
+             int      x,
+             int      y,
+             UINT     width,
+             UINT     height,
+             FLTFNPTR load_fn,
+             UINT     options,
+             float    disp_scale,
+             float    maxValue,
+             float    minValue,
+             UINT     major_divs,
+             UINT     minor_divs,
+             int      dp_showing,
+             UINT     modulus,
+             bool     working) :

     instr_scale( x, y, width, height,
     instr_scale( x, y, width, height,

-                load_fn, options,
-                (maxValue - minValue), // Always shows span?
-                maxValue, minValue,
-                disp_scale,
-                major_divs, minor_divs,
-                modulus, dp_showing,
-                working)
+                 load_fn, options,
+                 (maxValue - minValue), // Always shows span?
+                 maxValue, minValue,
+                 disp_scale,
+                 major_divs, minor_divs,
+                 modulus, dp_showing,
+                 working)

 {
     //  UINT options = get_options();
     //  huds_vert    = options & HUDS_VERT;
     //  huds_left    = options & HUDS_LEFT;
     //  huds_right   = options & HUDS_RIGHT;
     //  huds_both    = (options & HUDS_BOTH) == HUDS_BOTH;
 {
     //  UINT options = get_options();
     //  huds_vert    = options & HUDS_VERT;
     //  huds_left    = options & HUDS_LEFT;
     //  huds_right   = options & HUDS_RIGHT;
     //  huds_both    = (options & HUDS_BOTH) == HUDS_BOTH;

-    // huds_noticks = options & HUDS_NOTICKS;
+    //  huds_noticks = options & HUDS_NOTICKS;

     //  huds_notext  = options & HUDS_NOTEXT;
     //  huds_top     = options & HUDS_TOP;
     //  huds_bottom  = options & HUDS_BOTTOM;
 }
 
     //  huds_notext  = options & HUDS_NOTEXT;
     //  huds_top     = options & HUDS_TOP;
     //  huds_bottom  = options & HUDS_BOTTOM;
 }
 

-gauge_instr ::
-~gauge_instr()
+
+gauge_instr::~gauge_instr()

 {
 }
 
 {
 }
 

-gauge_instr ::
-gauge_instr( const gauge_instr & image):
+
+gauge_instr::gauge_instr( const gauge_instr & image) :

     instr_scale( (instr_scale &) image)
 {
     //  UINT options = get_options();
     instr_scale( (instr_scale &) image)
 {
     //  UINT options = get_options();


@@ -65,25 +65,26 @@ gauge_instr( const gauge_instr & image):
     //  huds_bottom =  options & HUDS_BOTTOM;
 }
 
     //  huds_bottom =  options & HUDS_BOTTOM;
 }
 

-gauge_instr & gauge_instr ::
-operator = (const gauge_instr & rhs )
+
+gauge_instr & gauge_instr::operator=(const gauge_instr & rhs)

 {
 {

-    if( !(this == &rhs)) {
-       instr_scale::operator = (rhs);
+    if (!(this == &rhs)) {
+        instr_scale::operator = (rhs);

     }
     return *this;
 }
 
     }
     return *this;
 }
 

+

 // As implemented, draw only correctly draws a horizontal or vertical
 // scale. It should contain a variation that permits clock type displays.
 // Now is supports "tickless" displays such as control surface indicators.
 // This routine should be worked over before using. Current value would be
 // fetched and not used if not commented out. Clearly that is intollerable.
 
 // As implemented, draw only correctly draws a horizontal or vertical
 // scale. It should contain a variation that permits clock type displays.
 // Now is supports "tickless" displays such as control surface indicators.
 // This routine should be worked over before using. Current value would be
 // fetched and not used if not commented out. Clearly that is intollerable.
 

-void gauge_instr :: draw (void)
+void gauge_instr::draw (void)

 {
 {

-    int marker_xs, marker_xe;
-    int marker_ys, marker_ye;
+    float marker_xs, marker_xe;
+    float marker_ys, marker_ye;

     int text_x, text_y;
     int width, height, bottom_4;
     int lenstr;
     int text_x, text_y;
     int width, height, bottom_4;
     int lenstr;


@@ -100,280 +101,281 @@ void gauge_instr :: draw (void)
 
     width = scrn_rect.left + scrn_rect.right;
     height = scrn_rect.top  + scrn_rect.bottom,
 
     width = scrn_rect.left + scrn_rect.right;
     height = scrn_rect.top  + scrn_rect.bottom,

-       bottom_4 = scrn_rect.bottom / 4;
+    bottom_4 = scrn_rect.bottom / 4;

     // Draw the basic markings for the scale...
 
     // Draw the basic markings for the scale...
 

-    if( huds_vert(options) ) { // Vertical scale
-       drawOneLine( scrn_rect.left,     // Bottom tick bar
-                    scrn_rect.top,
-                    width,
-                    scrn_rect.top);
-
-       drawOneLine( scrn_rect.left,    // Top tick bar
-                    height,
-                    width,
-                    height );
-
-       marker_xs = scrn_rect.left;
-       marker_xe = width;
-
-       if( huds_left(options) ) {     // Read left, so line down right side
-           drawOneLine( width,
-                        scrn_rect.top,
-                        width,
-                        height);
-         
-           marker_xs  = marker_xe - scrn_rect.right / 3;   // Adjust tick xs
-       }
-       
-       if( huds_right(options) ) {     // Read  right, so down left sides
-           drawOneLine( scrn_rect.left,
-                        scrn_rect.top,
-                        scrn_rect.left,
-                        height);
-         
-           marker_xe = scrn_rect.left + scrn_rect.right / 3;     // Adjust tick xe
-       }
-
-       // At this point marker x_start and x_end values are transposed.
-       // To keep this from confusing things they are now interchanged.
-       if( huds_both(options) ) {
-           marker_ye = marker_xs;
-           marker_xs = marker_xe;
-           marker_xe = marker_ye;
-       }
-
-       // Work through from bottom to top of scale. Calculating where to put
-       // minor and major ticks.
-
-       if( !huds_noticks(options)) {    // If not no ticks...:)
-           // Calculate x marker offsets
-           int last = (int)vmax + 1; //FloatToInt(vmax)+1;
-           i = (int)vmin; //FloatToInt(vmin);
-           for(; i <last ; i++ )      {
-               //      for( i = (int)vmin; i <= (int)vmax; i++ ) {
-
-               // Calculate the location of this tick
-               marker_ys = scrn_rect.top + FloatToInt((i - vmin) * factor()/* +.5f*/);
-
-               // We compute marker_ys even though we don't know if we will use
-               // either major or minor divisions. Simpler.
-
-               if( div_min()) {                  // Minor tick marks
-                   if( !(i%(int)div_min()) ) {
-                       if( huds_left(options) && huds_right(options) ) {
-                           drawOneLine( scrn_rect.left, marker_ys,
-                                        marker_xs - 3, marker_ys );
-                           drawOneLine( marker_xe + 3, marker_ys,
-                                        width, marker_ys );
-                       }
-                       else {
-                           if( huds_left(options) ) {
-                               drawOneLine( marker_xs + 3, marker_ys, marker_xe, marker_ys );
-                           }
-                           else {
-                               drawOneLine( marker_xs, marker_ys, marker_xe - 3, marker_ys );
-                           }
-                       }
-                   }
-               }
-
-               // Now we work on the major divisions. Since these are also labeled
-               // and no labels are drawn otherwise, we label inside this if
-               // statement.
-
-               if( div_max()) {                  // Major tick mark
-                   if( !(i%(int)div_max()) )            {
-                       if( huds_left(options) && huds_right(options) ) {
-                           drawOneLine( scrn_rect.left, marker_ys,
-                                        marker_xs, marker_ys );
-                           drawOneLine( marker_xe, marker_ys,
-                                        width, marker_ys );
-                       }
-                       else {
-                           drawOneLine( marker_xs, marker_ys, marker_xe, marker_ys );
-                       }
-
-                       if( !huds_notext(options) ) {
-                           disp_val = i;
-                           sprintf( TextScale, "%d",
-                                    FloatToInt(disp_val * data_scaling()/*+.5*/ ));
-
-                           lenstr = getStringWidth( TextScale );
-                                               
-                           if( huds_left(options) && huds_right(options) ) {
-                               text_x = mid_scr.x -  lenstr/2 ;
-                           }
-                           else {
-                               if( huds_left(options) )              {
-                                   text_x = marker_xs - lenstr;
-                               }
-                               else {
-                                   text_x = marker_xe - lenstr;
-                               }
-                           }
-                           // Now we know where to put the text.
-                           text_y = marker_ys;
-                           textString( text_x, text_y, TextScale, 0 ); //suma
-                       }
-                   }
-               }  //
-           }  //
-       }  //
-       // Now that the scale is drawn, we draw in the pointer(s). Since labels
-       // have been drawn, text_x and text_y may be recycled. This is used
-       // with the marker start stops to produce a pointer for each side reading
-
-       text_y = scrn_rect.top + FloatToInt((cur_value - vmin) * factor() /*+.5f*/);
-       //    text_x = marker_xs - scrn_rect.left;
-
-       if( huds_right(options) ) {
-           glBegin(GL_LINE_STRIP);
-           glVertex2f( scrn_rect.left, text_y + 5);
-           glVertex2f( marker_xe,      text_y);
-           glVertex2f( scrn_rect.left, text_y - 5);
-           glEnd();
-       }
-       if( huds_left(options) ) {
-           glBegin(GL_LINE_STRIP);
-           glVertex2f( width,      text_y + 5);
-           glVertex2f( marker_xs,  text_y);
-           glVertex2f( width,      text_y - 5);
-           glEnd();
-       }
-    }  // End if VERTICAL SCALE TYPE
-    else {                                // Horizontal scale by default
-       drawOneLine( scrn_rect.left,     // left tick bar
-                    scrn_rect.top,
-                    scrn_rect.left,
-                    height);
-
-       drawOneLine( width,    // right tick bar
-                    scrn_rect.top,
-                    width,
-                    height );
-
-       marker_ys = scrn_rect.top;                       // Starting point for
-       marker_ye = height;                              // tick y location calcs
-       marker_xs = scrn_rect.left + FloatToInt((cur_value - vmin) * factor() /*+ .5f*/);
-
-       if( huds_top(options) ) {
-           drawOneLine( scrn_rect.left,
-                        scrn_rect.top,
-                        width,
-                        scrn_rect.top);                    // Bottom box line
-         
-           marker_ye  = scrn_rect.top + scrn_rect.bottom / 2;   // Tick point adjust
-           // Bottom arrow
-           glBegin(GL_LINE_STRIP);
-           glVertex2f( marker_xs - bottom_4, scrn_rect.top);
-           glVertex2f( marker_xs, marker_ye);
-           glVertex2f( marker_xs + bottom_4, scrn_rect.top);
-           glEnd();
-       }
-       if( huds_bottom(options) ) {
-           // Top box line
-           drawOneLine( scrn_rect.left, height, width, height);
-           // Tick point adjust
-           marker_ys = height - scrn_rect.bottom  / 2;
-
-           // Top arrow
-           glBegin(GL_LINE_STRIP);
-           glVertex2f( marker_xs + bottom_4, height);
-           glVertex2f( marker_xs, marker_ys );
-           glVertex2f( marker_xs - bottom_4, height);
-           glEnd();
-       }
-
-       
-       int last = (int)vmax + 1; //FloatToInt(vmax)+1;
-       i = (int)vmin; //FloatToInt(vmin);
-       for( ; i <last ; i++ )      {
-           condition = true;
-           if( !modulo()) {
-               if( i < min_val()) {
-                   condition = false;
-               }
-           }
-           if( condition )        {
-               marker_xs = scrn_rect.left + FloatToInt((i - vmin) * factor()/* +.5f*/);
-               //        marker_xs = scrn_rect.left + (int)((i - vmin) * factor() + .5f);
-               if( div_min()){
-                   if( !(i%(int)div_min()) ) {                 
-                       // draw in ticks only if they aren't too close to the edge.
-                       if((( marker_xs + 5) > scrn_rect.left ) ||
-                          (( marker_xs - 5 )< (width))){
-
-                           if( huds_both(options) ) {
-                               drawOneLine( marker_xs, scrn_rect.top,
-                                            marker_xs, marker_ys - 4);
-                               drawOneLine( marker_xs, marker_ye + 4,
-                                            marker_xs, height);
-                           }
-                           else {
-                               if( huds_top(options) ) {
-                                   drawOneLine( marker_xs, marker_ys,
-                                                marker_xs, marker_ye - 4);
-                               }
-                               else {
-                                   drawOneLine( marker_xs, marker_ys + 4,
-                                                marker_xs, marker_ye);
-                               }
-                           }
-                       }
-                   }
-               }
-               if( div_max()) {
-                   if( !(i%(int)div_max()) ) {                 
-                       if(modulo()) {
-                           if( disp_val < 0) {
-                               while( disp_val < 0 ) {
-                                   disp_val += modulo();
-                               }       
-                           }
-                           disp_val = i % (int)modulo();
-                       } else {
-                           disp_val = i;
-                       }
-                       sprintf( TextScale, "%d",
-                                FloatToInt(disp_val  * data_scaling()/* +.5*/ ));
-                       lenstr = getStringWidth( TextScale);
-                                               
-                       // Draw major ticks and text only if far enough from the edge.
-                       if(( (marker_xs - 10)> scrn_rect.left ) &&
-                          ( (marker_xs + 10) < width )){
-                           if( huds_both(options) ) {
-                               drawOneLine( marker_xs, scrn_rect.top,
-                                            marker_xs, marker_ys);
-                               drawOneLine( marker_xs, marker_ye,
-                                            marker_xs, height);
-
-                               if( !huds_notext(options) ) {
-                                   textString ( marker_xs - lenstr, marker_ys + 4,
-                                                TextScale ,0); //suma
-                               }
-                           }
-                           else {
-                               drawOneLine( marker_xs, marker_ys,
-                                            marker_xs, marker_ye );
-                               
-                               if( !huds_notext(options) ) {
-                                   if( huds_top(options) )              {
-                                       textString ( marker_xs - lenstr,
-                                                    height - 10,
-                                                    TextScale, 0 ); //suma
-                                   }
-                                   else  {
-                                       textString( marker_xs - lenstr, scrn_rect.top,
-                                                   TextScale, 0 );  //suma
-                                   }            
-                               }
-                           }
-                       }
-                   }
-               }
-           }
-       }
+    if ( huds_vert(options) ) { // Vertical scale
+        drawOneLine( scrn_rect.left,     // Bottom tick bar
+                     scrn_rect.top,
+                     width,
+                     scrn_rect.top);
+
+        drawOneLine( scrn_rect.left,    // Top tick bar
+                     height,
+                     width,
+                     height );
+
+        marker_xs = scrn_rect.left;
+        marker_xe = width;
+
+        if ( huds_left(options) ) {     // Read left, so line down right side
+            drawOneLine( width,
+                         scrn_rect.top,
+                         width,
+                         height);
+
+            marker_xs  = marker_xe - scrn_rect.right / 3.0;   // Adjust tick xs
+        }
+
+        if ( huds_right(options) ) {     // Read  right, so down left sides
+            drawOneLine( scrn_rect.left,
+                         scrn_rect.top,
+                         scrn_rect.left,
+                         height);
+
+            marker_xe = scrn_rect.left + scrn_rect.right / 3.0;     // Adjust tick xe
+        }
+
+        // At this point marker x_start and x_end values are transposed.
+        // To keep this from confusing things they are now interchanged.
+        if ( huds_both(options) ) {
+            marker_ye = marker_xs;
+            marker_xs = marker_xe;
+            marker_xe = marker_ye;
+        }
+
+        // Work through from bottom to top of scale. Calculating where to put
+        // minor and major ticks.
+
+        if ( !huds_noticks(options)) {    // If not no ticks...:)
+            // Calculate x marker offsets
+            int last = (int)vmax + 1; //FloatToInt(vmax)+1;
+            i = (int)vmin; //FloatToInt(vmin);
+            for (; i < last; i++) {
+                // for ( i = (int)vmin; i <= (int)vmax; i++ ) {
+
+                // Calculate the location of this tick
+                marker_ys = scrn_rect.top + (i - vmin) * factor()/* +.5f*/;
+
+                // We compute marker_ys even though we don't know if we will use
+                // either major or minor divisions. Simpler.
+
+                if ( div_min()) {                  // Minor tick marks
+                    if ( !(i%(int)div_min()) ) {
+                        if ( huds_left(options) && huds_right(options) ) {
+                            drawOneLine( scrn_rect.left, marker_ys,
+                                         marker_xs - 3, marker_ys );
+                            drawOneLine( marker_xe + 3, marker_ys,
+                                         width, marker_ys );
+                        }
+                        else {
+                            if ( huds_left(options) ) {
+                                drawOneLine( marker_xs + 3, marker_ys, marker_xe, marker_ys );
+                            }
+                            else {
+                                drawOneLine( marker_xs, marker_ys, marker_xe - 3, marker_ys );
+                            }
+                        }
+                    }
+                }
+
+                // Now we work on the major divisions. Since these are also labeled
+                // and no labels are drawn otherwise, we label inside this if
+                // statement.
+
+                if ( div_max()) {                  // Major tick mark
+                    if ( !(i%(int)div_max()) )            {
+                        if ( huds_left(options) && huds_right(options) ) {
+                            drawOneLine( scrn_rect.left, marker_ys,
+                                         marker_xs, marker_ys );
+                            drawOneLine( marker_xe, marker_ys,
+                                         width, marker_ys );
+                        }
+                        else {
+                            drawOneLine( marker_xs, marker_ys, marker_xe, marker_ys );
+                        }
+
+                        if ( !huds_notext(options) ) {
+                            disp_val = i;
+                            sprintf( TextScale, "%d",
+                                     FloatToInt(disp_val * data_scaling()/*+.5*/ ));
+
+                            lenstr = getStringWidth( TextScale );
+
+                            if ( huds_left(options) && huds_right(options) ) {
+                                text_x = mid_scr.x -  lenstr/2 ;
+                            }
+                            else {
+                                if ( huds_left(options) )              {
+                                    text_x = FloatToInt(marker_xs - lenstr);
+                                }
+                                else {
+                                    text_x = FloatToInt(marker_xe - lenstr);
+                                }
+                            }
+                            // Now we know where to put the text.
+                            text_y = FloatToInt(marker_ys);
+                            textString( text_x, text_y, TextScale, 0 );
+                        }
+                    }
+                }  //
+            }  //
+        }  //
+        // Now that the scale is drawn, we draw in the pointer(s). Since labels
+        // have been drawn, text_x and text_y may be recycled. This is used
+        // with the marker start stops to produce a pointer for each side reading
+
+        text_y = scrn_rect.top + FloatToInt((cur_value - vmin) * factor() /*+.5f*/);
+        //    text_x = marker_xs - scrn_rect.left;
+
+        if ( huds_right(options) ) {
+            glBegin(GL_LINE_STRIP);
+            glVertex2f( scrn_rect.left, text_y + 5);
+            glVertex2f( FloatToInt(marker_xe),      text_y);
+            glVertex2f( scrn_rect.left, text_y - 5);
+            glEnd();
+        }
+        if ( huds_left(options) ) {
+            glBegin(GL_LINE_STRIP);
+            glVertex2f( width,      text_y + 5);
+            glVertex2f( FloatToInt(marker_xs),  text_y);
+            glVertex2f( width,      text_y - 5);
+            glEnd();
+        }
+        // End if VERTICAL SCALE TYPE
+
+    } else {                             // Horizontal scale by default
+        drawOneLine( scrn_rect.left,     // left tick bar
+                     scrn_rect.top,
+                     scrn_rect.left,
+                     height);
+
+        drawOneLine( width,    // right tick bar
+                     scrn_rect.top,
+                     width,
+                     height );
+
+        marker_ys = scrn_rect.top;                       // Starting point for
+        marker_ye = height;                              // tick y location calcs
+        marker_xs = scrn_rect.left + (cur_value - vmin) * factor() /*+ .5f*/;
+
+        if ( huds_top(options) ) {
+            drawOneLine( scrn_rect.left,
+                         scrn_rect.top,
+                         width,
+                         scrn_rect.top);                    // Bottom box line
+
+            marker_ye  = scrn_rect.top + scrn_rect.bottom / 2.0;   // Tick point adjust
+            // Bottom arrow
+            glBegin(GL_LINE_STRIP);
+            glVertex2f( marker_xs - bottom_4, scrn_rect.top);
+            glVertex2f( marker_xs, marker_ye);
+            glVertex2f( marker_xs + bottom_4, scrn_rect.top);
+            glEnd();
+        }
+        if ( huds_bottom(options) ) {
+            // Top box line
+            drawOneLine( scrn_rect.left, height, width, height);
+            // Tick point adjust
+            marker_ys = height - scrn_rect.bottom  / 2.0;
+
+            // Top arrow
+            glBegin(GL_LINE_STRIP);
+            glVertex2f( marker_xs + bottom_4, height);
+            glVertex2f( marker_xs, marker_ys );
+            glVertex2f( marker_xs - bottom_4, height);
+            glEnd();
+        }
+
+
+        int last = (int)vmax + 1; //FloatToInt(vmax)+1;
+        i = (int)vmin; //FloatToInt(vmin);
+        for ( ; i <last ; i++ )      {
+            condition = true;
+            if ( !modulo()) {
+                if ( i < min_val()) {
+                    condition = false;
+                }
+            }
+            if ( condition )        {
+                marker_xs = scrn_rect.left + (i - vmin) * factor()/* +.5f*/;
+                //        marker_xs = scrn_rect.left + (int)((i - vmin) * factor() + .5f);
+                if ( div_min()){
+                    if ( !(i%(int)div_min()) ) {
+                        // draw in ticks only if they aren't too close to the edge.
+                        if ((( marker_xs + 5) > scrn_rect.left ) ||
+                           (( marker_xs - 5 )< (width))){
+
+                            if ( huds_both(options) ) {
+                                drawOneLine( marker_xs, scrn_rect.top,
+                                             marker_xs, marker_ys - 4);
+                                drawOneLine( marker_xs, marker_ye + 4,
+                                             marker_xs, height);
+                            }
+                            else {
+                                if ( huds_top(options) ) {
+                                    drawOneLine( marker_xs, marker_ys,
+                                                 marker_xs, marker_ye - 4);
+                                }
+                                else {
+                                    drawOneLine( marker_xs, marker_ys + 4,
+                                                 marker_xs, marker_ye);
+                                }
+                            }
+                        }
+                    }
+                }
+                if ( div_max()) {
+                    if ( !(i%(int)div_max()) ) {
+                        if (modulo()) {
+                            if ( disp_val < 0) {
+                                while( disp_val < 0 ) {
+                                    disp_val += modulo();
+                                }
+                            }
+                            disp_val = i % (int)modulo();
+                        } else {
+                            disp_val = i;
+                        }
+                        sprintf( TextScale, "%d",
+                                 FloatToInt(disp_val  * data_scaling()/* +.5*/ ));
+                        lenstr = getStringWidth( TextScale);
+
+                        // Draw major ticks and text only if far enough from the edge.
+                        if (( (marker_xs - 10)> scrn_rect.left ) &&
+                           ( (marker_xs + 10) < width )){
+                            if ( huds_both(options) ) {
+                                drawOneLine( marker_xs, scrn_rect.top,
+                                             marker_xs, marker_ys);
+                                drawOneLine( marker_xs, marker_ye,
+                                             marker_xs, height);
+
+                                if ( !huds_notext(options) ) {
+                                    textString ( marker_xs - lenstr, marker_ys + 4,
+                                                 TextScale ,0);
+                                }
+                            }
+                            else {
+                                drawOneLine( marker_xs, marker_ys,
+                                             marker_xs, marker_ye );
+
+                                if ( !huds_notext(options) ) {
+                                    if ( huds_top(options) )              {
+                                        textString ( marker_xs - lenstr,
+                                                     height - 10,
+                                                     TextScale, 0 );
+                                    }
+                                    else  {
+                                        textString( marker_xs - lenstr, scrn_rect.top,
+                                                    TextScale, 0 );
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }

     }
 }
 
     }
 }