r328: *** empty log message ***

[ctsim.git] / libctsim / array2dfile.cpp

diff --git a/libctsim/array2dfile.cpp b/libctsim/array2dfile.cpp
index d0f2d6859051a7fc72c82e065f6560e50dc14345..c450a0ec8389751a44187e32dd8b1c625181718c 100644 (file)
--- a/libctsim/array2dfile.cpp
+++ b/libctsim/array2dfile.cpp
@@ -9,7 +9,7 @@
 **  This is part of the CTSim program
 **  Copyright (C) 1983-2000 Kevin Rosenberg
 **
-**  $Id: array2dfile.cpp,v 1.23 2001/01/01 10:14:34 kevin Exp $
+**  $Id: array2dfile.cpp,v 1.24 2001/01/02 05:34:57 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
@@ -137,23 +137,38 @@ Array2dFileLabel::operator= (const Array2dFileLabel& rhs)
   return (*this);
 }
 
-void
-Array2dFileLabel::print (std::ostream& os) const
-{
-  if (m_labelType == L_HISTORY) {
-    os << "History: " << std::endl;
-    os << "  " << m_strLabel << std::endl;
-    os << "  calc time = " << m_calcTime << " secs" << std::endl;
-    os << "  Timestamp = " << getDateString() << std::endl;
-  } else if (m_labelType == L_USER) {
-    os << "Note: " <<  m_strLabel << std::endl;
-    os << "  Timestamp = %s" << getDateString() << std::endl;
-  } else {
-    os << "Unknown (" << m_labelType << "): " <<  m_strLabel << std::endl;
-    os << "  Timestamp = %s" << getDateString() << std::endl;
-  }
-}
-
+void\r
+Array2dFileLabel::print (std::ostream& os) const\r
+{\r
+  if (m_labelType == L_HISTORY) {\r
+    os << "History: " << std::endl;\r
+    os << "  " << m_strLabel << std::endl;\r
+    os << "  calc time = " << m_calcTime << " secs" << std::endl;\r
+    os << "  Timestamp = " << getDateString() << std::endl;\r
+  } else if (m_labelType == L_USER) {\r
+    os << "Note: " <<  m_strLabel << std::endl;\r
+    os << "  Timestamp = %s" << getDateString() << std::endl;\r
+  } else {\r
+    os << "Unknown (" << m_labelType << "): " <<  m_strLabel << std::endl;\r
+    os << "  Timestamp = %s" << getDateString() << std::endl;\r
+  }\r
+}\r
+\r
+void\r
+Array2dFileLabel::printBrief (std::ostream& os) const\r
+{\r
+  if (m_labelType == L_HISTORY) {\r
+    os << "History (";\r
+    if (m_calcTime > 0)\r
+      os << m_calcTime << " secs, ";\r
+    os << getDateString() << "): " << m_strLabel << std::endl;\r
+  } else if (m_labelType == L_USER) {\r
+    os << "Note (" <<  getDateString() << "): " << m_strLabel << std::endl;\r
+  } else {\r
+    os << "Unknown (" << getDateString() << "): " << m_strLabel << std::endl;\r
+  }\r
+}\r
+\r
 
 ///////////////////////////////////////////////////////////////////////////
 // CLASS IMPLEMENTATION
@@ -660,17 +675,27 @@ Array2dFile::arrayDataClear (void)
   }\r
 }
 
-void
-Array2dFile::printLabels (std::ostream& os) const
-{
-  for (constLabelIterator l = m_labels.begin(); l != m_labels.end(); l++) {
-    const Array2dFileLabel& label = **l;
-    
-    label.print (os);
-    os << std::endl;
-  }
-}
-
+void\r
+Array2dFile::printLabels (std::ostream& os) const\r
+{\r
+  for (constLabelIterator l = m_labels.begin(); l != m_labels.end(); l++) {\r
+    const Array2dFileLabel& label = **l;\r
+    \r
+    label.print (os);\r
+    os << std::endl;\r
+  }\r
+}\r
+\r
+void\r
+Array2dFile::printLabelsBrief (std::ostream& os) const\r
+{\r
+  for (constLabelIterator l = m_labels.begin(); l != m_labels.end(); l++) {\r
+    const Array2dFileLabel& label = **l;\r
+    \r
+    label.printBrief (os);\r
+  }\r
+}\r
+\r
 
 const Array2dFileLabel&
 Array2dFile::labelGet (int i) const