Clicking on 'sigmas' in the observation legend now cycles through 'sh…

…ow original data from columns 59-65', 'show sigmas instead', and 'show the packed designation instead'. The last is helpful when you have multiple objects combined in one solution, and would like to see the original tracklet identifiers.

dos_help.txt

@@ -111,8 +111,9 @@ j      Toggles the two lines showing which perturbers are included,  R1 and R2,
          just data for the observatory for the currently-selected observation;
          use about a third of the observation area for observatory data;
          or use most of that area for observatory data.
-Alt-K  Toggle display of observational uncertainties in columns 57 to 65 of
-         the MPC 80-column format.  Those columns usually go unused.
+Alt-K  Cycles display of columns 57 to 65 of the MPC 80-column format through
+         three options : show what's there from the original data (usually
+         nothing);  show uncertainties;  show the packed designation.
 &      Select format for observation RA/decs (minutes/seconds or decimal
          degrees).  You can also get this by clicking on "RA (J2000)  dec"
          on the black-on-cyan observation legend line.

ephem0.cpp

@@ -4405,10 +4405,9 @@ void recreate_observation_line( char *obuff, const OBSERVE FAR *obs,
    else
       mag_digits_to_erase = 2 - obs->mag_precision;
    memset( obuff + 70 - mag_digits_to_erase, ' ', mag_digits_to_erase);
-   memcpy( obuff + 56, obs->columns_57_to_65, 9);
-   if( sigmas_in_columns_57_to_65 &&
-               !memcmp( obuff + 56, "         ", 9))
+   if( sigmas_in_columns_57_to_65)
       {
+      memset( obuff + 56, ' ', 9);
       if( obs->posn_sigma_1 == obs->posn_sigma_2)
          put_sigma( obuff + 59, obs->posn_sigma_1);
       else
@@ -4424,6 +4423,8 @@ void recreate_observation_line( char *obuff, const OBSERVE FAR *obs,
          put_sigma( obuff + 61, obs->posn_sigma_2 * multiplier);
          }
       }
+   else
+      memcpy( obuff + 56, obs->columns_57_to_65, 9);
    if( !obs->is_included)
       obuff[64] = 'x';
    if( obs->flags & OBS_DONT_USE)

findorb.cpp

@@ -6190,9 +6190,23 @@ int main( int argc, const char **argv)
             {
             extern int sigmas_in_columns_57_to_65;
 
-            sigmas_in_columns_57_to_65 ^= 1;
             strlcpy_error( message_to_user, "Sigma display");
-            add_off_on = sigmas_in_columns_57_to_65;
+            if( residual_format & RESIDUAL_FORMAT_SHOW_DESIGS)
+               {
+               residual_format ^= RESIDUAL_FORMAT_SHOW_DESIGS;
+               sigmas_in_columns_57_to_65 = 0;
+               }
+            else
+               {
+               sigmas_in_columns_57_to_65 ^= 1;
+               if( !sigmas_in_columns_57_to_65)
+                  {
+                  residual_format |= RESIDUAL_FORMAT_SHOW_DESIGS;
+                  strlcpy_error( message_to_user, "Showing packed desigs in obs area");
+                  }
+               }
+            if( message_to_user[1] == 'i')
+               add_off_on = sigmas_in_columns_57_to_65;
             }
             break;
          case ALT_Q:
@@ -6211,9 +6225,6 @@ int main( int argc, const char **argv)
             strlcpy_error( message_to_user, sort_obs_by_code ?
                      "Obs sorted by MPC code" : "Obs sorted by date");
             break;
-         case ALT_A:
-            residual_format ^= RESIDUAL_FORMAT_SHOW_DESIGS;
-            break;
          case ALT_R:
             if( !inquire( get_find_orb_text( 2038),
                                tbuff, sizeof( tbuff), COLOR_DEFAULT_INQUIRY))
@@ -6329,7 +6340,7 @@ int main( int argc, const char **argv)
          case CTRL( 'S'): case CTRL( 'T'): case CTRL( 'U'):
          case CTRL( 'V'): case CTRL( 'W'): case CTRL( 'Z'):
          case CTRL( '_'): case CTRL( ']'):
-         case ALT_Y:
+         case ALT_A: case ALT_Y:
          case CTL_LEFT: case CTL_RIGHT:
          case KEY_F( 1):
          case KEY_F( 2):