Changeset 2830 in Sophya for trunk/SophyaLib/BaseTools/timestamp.cc

Timestamp:

Nov 8, 2005, 5:13:56 PM (20 years ago)

Author:

ansari

Message:

Amelioration classe TimeStamp - prise en charge format YYYY-MM-DDThh:mm:ss
et TimeStamp rendu PPersist - Reza 8/11/2005

File:

• trunk/SophyaLib/BaseTools/timestamp.cc (modified) (8 diffs)

trunk/SophyaLib/BaseTools/timestamp.cc

@@ -74 +74 @@
 }
 
-TimeStamp::TimeStamp(string& date, string& hour)
+TimeStamp::TimeStamp(string const & date, string const & hour)
 {
   SetDate(date);
@@ -86 +86 @@
 }
 
+TimeStamp::TimeStamp(string& datim)
+{
+  Set(datim);
+}
+
+TimeStamp::TimeStamp(const char* datim)
+{
+  Set(datim);
+}
 
 void TimeStamp::Set(TimeStamp const & ts)
@@ -96 +105 @@
 {
   if (days >= 0.) {
-    mDays = trunc(days);
+    mDays = (int_8)trunc(days);
     mSeconds = (days-trunc(days))*86400.;
   }
   else {
     if ( (trunc(days)-days) > 0.) {
-      mDays = trunc(days)-1;
+      mDays = (int_8)trunc(days)-1;
       mSeconds = (days-mDays)*86400.;
     }
     else {
-      mDays = trunc(days);
+      mDays = (int_8)trunc(days);
       mSeconds = 0.;
     }
@@ -116 +125 @@
     throw ParmError("TimeStamp::Set(int_8, r_8) seconds<0 or seconds>86400.");
   mDays = days;
-}
+  mSeconds = seconds;
+}
+
+void TimeStamp::Set(const char * datim)
+{
+  int year, month, day;
+  int hour, min;
+  double sec;
+  sscanf(datim,"%d-%d-%dT%d:%d:%lf", &year, &month, &day,
+         &hour, &min, &sec);
+  SetDate(year, month, day);
+  SetHour(hour, min, sec);
+}
+
 
 void TimeStamp::SetNow()
@@ -193 +215 @@
 {
   double seconds = mSeconds;
-  hour = trunc(seconds/3600.);
+  hour = (int)trunc(seconds/3600.);
   seconds -= hour*3600;
-  min = trunc(seconds/60.);
+  min = (int)trunc(seconds/60.);
   while (min >= 60) { hour++; min -= 60; }
   sec = seconds-min*60;
@@ -207 +229 @@
 
 /*!
-\param fgday : if false, ignore the date (dd/mm/yy) part 
-\param fghour : if false, ignore the hour (hh:mm:ss) part
+\param fmt : String format for the date 
+  - FmtPackedDateTime : YYYY-MM-DDThh:mm:ss.s
+  - FmtDateOnly : dd/mm/yyyy
+  - FmtTimeOnly : hh:mm:ss.s
+  - FmtDateTime : dd/mm/yyyy hh:mm:ss.s UT
 */
-string TimeStamp::ToString(bool fgday, bool fghour) const
+string TimeStamp::ToString(StrFmt fmt) const
 {
   char buff[128];
@@ -218 +243 @@
   GetDate(aa, mm, jj);
   GetHour(hh, min, sec);
-  if (!fghour) 
-    sprintf(buff,"%02d/%02d/%02d ", jj,mm,aa);
-  else if (!fgday) 
-    sprintf(buff,"%02d:%02d:%02.3f ", hh,min,sec);
-  else 
-    sprintf(buff,"%02d/%02d/%02d %02d:%02d:%02.1f GMT", jj,mm,aa,hh,min,sec);
+  if (fmt == FmtPackedDateTime) 
+    sprintf(buff,"%04d-%02d-%02dT%02d:%02d:%02.1f", aa,mm,jj, hh,min,sec);
+  else {
+    if (fmt == FmtDateOnly) 
+      sprintf(buff,"%02d/%02d/%04d ", jj,mm,aa);
+    else if (fmt == FmtTimeOnly) 
+      sprintf(buff,"%02d:%02d:%02.3f ", hh,min,sec);
+    else 
+      sprintf(buff,"%02d/%02d/%04d %02d:%02d:%02.1f UT", jj,mm,aa,hh,min,sec);
+  }
   return buff;
 }
 
 /*!
-\param fgday : if false, ignore the date (dd/mm/yy) part 
-\param fghour : if false, ignore the hour (hh:mm:ss) part
+\param fmt : String format for the date 
+  - FmtPackedDateTime : YYYY-MM-DDThh:mm:ss.s
+  - FmtDateOnly : dd/mm/yyyy
+  - FmtTimeOnly : hh:mm:ss.s
+  - FmtDateTime : dd/mm/yyyy hh:mm:ss.s UT
 */
-void TimeStamp::Print(ostream& os, bool fgday, bool fghour)  const
-{
-  os << " " << ToString(fgday, fghour) << " "; 
+void TimeStamp::Print(ostream& os, StrFmt fmt)  const
+{
+  os << " " << ToString(fmt) << " "; 
 }
 
@@ -280 +312 @@
   return t;
 }
+
+//----------------------------------------------------------
+// Classe pour la gestion de persistance
+// ObjFileIO<TimeStamp>
+//----------------------------------------------------------
+
+/* --Methode-- */
+DECL_TEMP_SPEC  /* equivalent a template <> , pour SGI-CC en particulier */
+void        ObjFileIO<TimeStamp>::WriteSelf(POutPersist& s) const
+{
+  if (dobj == NULL)
+    throw NullPtrError("ObjFileIO<TimeStamp>::WriteSelf() dobj=NULL");
+  int_4 ver;
+  ver = 1;
+  s.Put(ver);   // Lecture numero de version PPF
+  s.Put(dobj->DaysPart());
+  s.Put(dobj->SecondsPart());
+}
+
+/* --Methode-- */
+DECL_TEMP_SPEC  /* equivalent a template <> , pour SGI-CC en particulier */
+void        ObjFileIO<TimeStamp>::ReadSelf(PInPersist& s)
+{
+  int_4 ver;
+  s.Get(ver);   // Lecture numero de version PPF
+  r_8 seconds;
+  int_8 days;
+  s.Get(days);
+  s.Get(seconds);
+
+  if (dobj == NULL) dobj = new TimeStamp(days, seconds);
+  else dobj->Set(days, seconds);
+}
+
+
+#ifdef __CXX_PRAGMA_TEMPLATES__
+#pragma define_template ObjFileIO<TimeStamp>
+#endif
+
+#if defined(ANSI_TEMPLATES) || defined(GNU_TEMPLATES)
+template class ObjFileIO<TimeStamp>;
+#endif