X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;ds=sidebyside;f=src%2Fifinfo.cpp;h=a054f2a989d6d397e47fa31df246bbff2dab7629;hb=f4a23943110823118f35756dd41fbd6707f04511;hp=136792db28bd586604bec92db0dc3bacdc1f064a;hpb=59ff52843f44bec1ecd1ad36625cdda305cc7ef8;p=ctsim.git

diff --git a/src/ifinfo.cpp b/src/ifinfo.cpp
index 136792d..a054f2a 100644
--- a/src/ifinfo.cpp
+++ b/src/ifinfo.cpp
@@ -1,28 +1,15 @@
 /*****************************************************************************
-**  This is part of the CTSim program
-**  Copyright (C) 1983-2000 Kevin Rosenberg
-**
-**  $Id: ifinfo.cpp,v 1.3 2000/06/07 07:43:19 kevin Exp $
-**  $Log: ifinfo.cpp,v $
-**  Revision 1.3  2000/06/07 07:43:19  kevin
-**  Converted to IF data files and C++
-**
-**  Revision 1.2  2000/06/07 03:50:27  kevin
-**  *** empty log message ***
-**
-**  Revision 1.1  2000/06/07 02:29:05  kevin
-**  Initial C++ versions
-**
-**  Revision 1.3  2000/05/16 04:33:59  kevin
-**  Improved option processing
+** FILE IDENTIFICATION
 **
-**  Revision 1.2  2000/05/08 20:02:32  kevin
-**  ANSI C changes
-**
-**  Revision 1.1.1.1  2000/04/28 13:02:44  kevin
-**  Initial CVS import for first public release
+**   Name:          ifinfo.cpp
+**   Purpose:       Display information about an image file
+**   Programmer:    Kevin Rosenberg
+**   Date Started:  April 2000
 **
+**  This is part of the CTSim program
+**  Copyright (C) 1983-2000 Kevin Rosenberg
 **
+**  $Id: ifinfo.cpp,v 1.7 2000/06/17 20:12:15 kevin Exp $
 **
 **  This program is free software; you can redistribute it and/or modify
 **  it under the terms of the GNU General Public License (version 2) as
@@ -62,7 +49,7 @@ static struct option my_options[] =
 void 
 ifinfo_usage (const char *program)
 {
-  fprintf(stdout, "usage: %s infile [OPTIONS]\n", kbasename(program));
+  fprintf(stdout, "usage: %s infile [OPTIONS]\n", fileBasename(program));
   fprintf(stdout, "Imagefile information\n");
   fprintf(stdout, "\n");
   fprintf(stdout, "     infile       Name of input SDF file\n");
@@ -140,32 +127,31 @@ ifinfo_main (int argc, char *const argv[])
   in_file = argv[optind];
 
   im = new ImageFile (in_file);
-  if (! im->adf.fileRead ()) {
+  if (! im->fileRead ()) {
     sys_error (ERR_WARNING, "Unable to read file %s", in_file);
     return (1);
   }
 
   if (opt_labels) 
     {
-      int nlabels = im->adf.getNumLabels();
+      int nlabels = im->getNumLabels();
       int i;
 
       for (i = 0; i < nlabels; i++)
 	{
 	    Array2dFileLabel label;
-	    im->adf.labelRead (label, i);
-
-	    string str;
-	    label.getDateString (str);
+	    im->labelRead (label, i);
 
 	    if (label.getLabelType() == Array2dFileLabel::L_HISTORY) {
-	      cout << "History: " << label.getLabelString() << endl;
+	      cout << "History: " << endl;
+	      cout << "  " << label.getLabelString() << endl;
 	      cout << "  calc time = " << label.getCalcTime() << " secs" << endl;
-	      cout << "  Timestamp = " << str << endl;
+	      cout << "  Timestamp = " << label.getDateString() << endl;
 	    } else if (label.getLabelType() == Array2dFileLabel::L_USER) {
 	      cout << "Note: " <<  label.getLabelString() << endl;
-	      cout << "  Timestamp = %s" << str << endl;
-	  }
+	      cout << "  Timestamp = %s" << label.getDateString() << endl;
+	    }
+	    cout << endl;
 	}
     }
 
@@ -234,13 +220,13 @@ ifinfo_main (int argc, char *const argv[])
 	    }
 	}
       stddev = sqrt(stddev / (nx * ny));
-      cout << "nx=" << nx << endl;
-      cout << "nx=" << ny << endl;
-      cout << "min=" << minfound << endl;
-      cout << "max=" << maxfound << endl;
-      cout << "mean=" << mean << endl;
-      cout << "mode=" << mode << endl;
-      cout << "stddef=" << stddev << endl;
+      cout << "    nx: " << nx << endl;
+      cout << "    nx: " << ny << endl;
+      cout << "   min: " << minfound << endl;
+      cout << "   max: " << maxfound << endl;
+      cout << "  mean: " << mean << endl;
+      cout << "  mode: " << mode << endl;
+      cout << "stddef: " << stddev << endl;
     }
   
   return (0);