Changeset 1891 for trunk/source/parse_commands.cpp

Timestamp:

03/27/08 12:40:50 (8 months ago)

Author:

peter

Message:

source/service.cpp
source/punch_fits.cpp
source/init_coreload.cpp
source/grains_mie.cpp
source/assert_results.cpp
source/parse_punch.cpp
source/optimize_phymir.cpp
source/version.h
source/parse_commands.cpp
source/prt_final.cpp
source/grid_do.cpp
source/parse_print.cpp
source/cddrive.cpp
source/prt_comment.cpp
tsuite/programs/mpi/mpi.cpp

• Bug-fix for PR59 - cdVersion, cdDate could cause segfault.
  
• Start preparing for the change of the release numbering scheme for the next release.
  

Files:

• trunk/source/parse_commands.cpp (modified) (4 diffs)

trunk/source/parse_commands.cpp

@@ -117 +117 @@
 
         /* say this is a beta version if we are talking and it is the truth */
-        if( version.nBetaVer > 0 && called.lgTalk )
+        if( version::Inst().nBetaVer > 0 && called.lgTalk )
         {
                 fprintf( ioQQQ, 
                         "\n                             This is %s (beta %ld) of Cloudy, and is intended for testing only.\n\n", 
-                        version.chVersion, version.nBetaVer );
+                        version::Inst().chVersion, version::Inst().nBetaVer );
         }
 
@@ -127 +127 @@
         {
                 /* this code prints pretty lines at top of output box */
-                for( i=0; i<57; i++ ) 
-                {
-                        fprintf(ioQQQ,"%c",' ');
-                }
-                fprintf( ioQQQ, "Cloudy %s\n", version.chVersion);
-
-                for( i=0; i<57; i++ ) 
-                {
-                        fprintf(ioQQQ,"%c",' ');
-                }
-                fprintf( ioQQQ, "www.nublado.org\n\n");
-
-                for( i=0; i<23; i++ ) 
-                {
-                        fprintf(ioQQQ,"%c",' ');
-                }
+                int indent = (122 - strlen(version::Inst().chVersion))/2;
+                fprintf( ioQQQ, "%*cCloudy %s\n", indent, ' ', version::Inst().chVersion );
+
+                fprintf( ioQQQ, "%57cwww.nublado.org\n\n", ' ' );
 
                 /* now print box and date of version, before printing commands */
+                fprintf( ioQQQ, "%23c", ' ' );
                 fprintf( ioQQQ, "**************************************");
-                fprintf( ioQQQ, "%8.8s", version.chDate);
-                fprintf( ioQQQ, "*************************************\n");
-
-                for( i=0; i<23; i++ ) 
-                {
-                        fprintf(ioQQQ,"%c",' ');
-                }
-                fprintf( ioQQQ, "*");
-
-                for( i=0; i<81; i++ ) 
-                {
-                        fprintf(ioQQQ,"%c",' ');
-                }
-                fprintf( ioQQQ, "*\n");
+                fprintf( ioQQQ, "%7.7s", version::Inst().chDate);
+                fprintf( ioQQQ, "**************************************\n");
+
+                fprintf( ioQQQ, "%23c*%81c*\n", ' ', ' ' );
         }
 
@@ -194 +173 @@
                 /* >>chng 04 jan 21, add HIDE option, mostly for print quiet command */
                 if( called.lgTalk && !nMatch("HIDE",input.chCARDCAPS) )
-                {
-                        fprintf( ioQQQ, "                       * ");
-                        i=0;
-                        while( chCard[i]!='\0' )
-                        {
-                                fprintf(ioQQQ,"%c",chCard[i]);
-                                ++i;
-                        }
-
-                        while( i<80 )
-                        {
-                                fprintf(ioQQQ,"%c",' ');
-                                ++i;
-                        }
-                        fprintf(ioQQQ,"*\n");
-                }
+                        fprintf( ioQQQ, "%23c* %-80s*\n", ' ', chCard );
 
                 /* change chCard to all caps */
@@ -1863 +1827 @@
         if( called.lgTalk )
         {
-                fprintf( ioQQQ, "                       * %80.80s*\n", 
-                  chCard );
-                fprintf( ioQQQ, "                       ***********************************************************************************\n\n\n\n" );
+                fprintf( ioQQQ, "%23c*%81c*\n", ' ', ' ' );
+                fprintf( ioQQQ, "%23c***********************************************************************************\n\n\n\n", ' ' );
         }