r329: *** empty log message ***

[ctsim.git] / include / array2dfile.h

diff --git a/include/array2dfile.h b/include/array2dfile.h
index 22e8b6173401fe6ed3d2dec6dccc4c2211e65af5..5aa522db89080e67d93ba93850d465c74adfd15b 100644 (file)
--- a/include/array2dfile.h
+++ b/include/array2dfile.h
@@ -9,7 +9,7 @@
 **  This is part of the CTSim program
 **  Copyright (C) 1983-2000 Kevin Rosenberg
 **
-**  $Id: array2dfile.h,v 1.14 2001/01/01 10:14:34 kevin Exp $
+**  $Id: array2dfile.h,v 1.16 2001/01/02 06:29:23 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
@@ -89,6 +89,7 @@ public:
     const std::string& getDateString () const;
 
     void print (std::ostream& os) const;
+    void printBrief (std::ostream& os) const;\r
 
     Array2dFileLabel (const Array2dFileLabel& rhs);
 
@@ -151,7 +152,7 @@ public:
 
   void labelAdd (int type, const char* const m_strLabel, double calc_time=0.);
 
-  void labelsCopy (Array2dFile& file, const char* const idStr = NULL);
+  void labelsCopy (const Array2dFile& file, const char* const idStr = NULL);
 
   void setPixelFormat (int type)
       { m_pixelFormat = type; }
@@ -201,7 +202,11 @@ public:
   const std::string& getFilename (void) const 
       {  return m_filename; }
 
-  void printLabels (std::ostream& os) const;
+  void printLabels (std::ostream& os) const;\r
+  void printLabelsBrief (std::ostream& os) const;\r
+\r
+  unsigned int nLabels() const\r
+  { return m_labels.size(); }\r
 
   typedef std::vector<Array2dFileLabel*>::iterator labelIterator;
   typedef std::vector<Array2dFileLabel*>::const_iterator constLabelIterator;