r256: *** empty log message ***

[ctsim.git] / libctsim / array2dfile.cpp

diff --git a/libctsim/array2dfile.cpp b/libctsim/array2dfile.cpp
index b16c7d3b7810db59fd734e8cca62c24fe73e1201..b3dc43263beaf1a54e01455126a907a31a614960 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.15 2000/12/06 01:46:43 kevin Exp $
+**  $Id: array2dfile.cpp,v 1.20 2000/12/16 02:44:26 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
@@ -26,9 +26,10 @@
 ******************************************************************************/
 
 #include "array2dfile.h"
-#include <ctime>
-#include <sstream>
-
+#include <ctime>\r
+#ifdef MSVC\r
+typedef long off_t;\r
+#endif
 
 using namespace std;
 
@@ -108,9 +109,10 @@ Array2dFileLabel::getDateTime (int& year, int& month, int& day, int& hour, int&
 const string& 
 Array2dFileLabel::getDateString (void) const
 {
-  ostringstream oss;
-  oss <<  static_cast<int>(m_month + 1) <<"/"<< static_cast<int>(m_day) <<"/"<< static_cast<int>(m_year + 1900) << " " << static_cast<int>(m_hour) <<":"<<  static_cast<int>(m_minute) <<":"<< static_cast<int>(m_second);
-  m_strDate = oss.str();
+  char szDate [128];\r
+  snprintf (szDate, sizeof(szDate), "%2d/%02d/%4d %02d:%02d:%02d",\r
+         m_month + 1, m_day, m_year + 1900, m_hour, m_minute, m_second);
+  m_strDate = szDate;
   return m_strDate;
 }
 
@@ -137,7 +139,7 @@ Array2dFileLabel::operator= (const Array2dFileLabel& rhs)
 }
 
 void
-Array2dFileLabel::print (ostream& os) const
+Array2dFileLabel::print (std::ostream& os) const
 {
   if (m_labelType == L_HISTORY) {
     os << "History: " << endl;
@@ -553,13 +555,15 @@ Array2dFile::labelAdd (const Array2dFileLabel& label)
 }
 
 void
-Array2dFile::labelsCopy (Array2dFile& copyFile, const char* const idStr)
+Array2dFile::labelsCopy (Array2dFile& copyFile, const char* const pszId)
 {
-    string id = idStr;
+    string id;
+    if (pszId)
+      id = pszId;
     for (unsigned int i = 0; i < copyFile.getNumLabels(); i++) {
       Array2dFileLabel l (copyFile.labelGet (i));
       string lstr = l.getLabelString();
-      lstr = idStr + lstr;
+      lstr = id + lstr;
       l.setLabelString (lstr);
       labelAdd (l);
     }