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

Timestamp:

Nov 2, 2005, 9:52:39 AM (20 years ago)

Author:

ansari

Message:

1/ Correction bug TimeStamp::ToDays() + petites amelioration
2/ Prise en compte du type TimeStamp dans MuTyV (sous forme de r_8 en interne)
3/ Adaptation DVList a modifs MuTyV (typ TimeStamp) et R/W PPersist

+ Petites corrections et MAJ num.version , Reza 2 Nov 2005

File:

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

trunk/SophyaLib/BaseTools/timestamp.cc

@@ -69 +69 @@
 }
 
+TimeStamp::TimeStamp(int_8 days, r_8 seconds)
+{
+  Set(days, seconds);
+}
+
 TimeStamp::TimeStamp(string& date, string& hour)
 {
@@ -90 +95 @@
 void TimeStamp::Set(double days)
 {
-  if (days < 0.) {
-    mDays = days;
-    mSeconds = (days-mDays)*86400.;
+  if (days >= 0.) {
+    mDays = trunc(days);
+    mSeconds = (days-trunc(days))*86400.;
   }
   else {
-    mDays = trunc(days)-1;
-    mSeconds = (days-mDays)*86400.;
-  }
+    if ( (trunc(days)-days) > 0.) {
+      mDays = trunc(days)-1;
+      mSeconds = (days-mDays)*86400.;
+    }
+    else {
+      mDays = trunc(days);
+      mSeconds = 0.;
+    }
+  }
+}
+
+void TimeStamp::Set(int_8 days, r_8 seconds)
+{
+  if ( (seconds < 0.) || (seconds > 86400.) ) 
+    throw ParmError("TimeStamp::Set(int_8, r_8) seconds<0 or seconds>86400.");
+  mDays = days;
 }
 
@@ -178 +196 @@
   seconds -= hour*3600;
   min = trunc(seconds/60.);
+  while (min >= 60) { hour++; min -= 60; }
   sec = seconds-min*60;
-}
+  while (sec >= 60.) { min++; sec -= 60.; }
+}
+
 double TimeStamp::ToDays() const
 {
@@ -185 +206 @@
 }
 
-string TimeStamp::ToString() const
+/*!
+\param fgday : if false, ignore the date (dd/mm/yy) part 
+\param fghour : if false, ignore the hour (hh:mm:ss) part
+*/
+string TimeStamp::ToString(bool fgday, bool fghour) const
 {
   char buff[128];
@@ -193 +218 @@
   GetDate(aa, mm, jj);
   GetHour(hh, min, sec);
-  sprintf(buff,"%02d/%02d/%02d %02d:%02d:%02.1f GMT", jj,mm,aa,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);
   return buff;
 }
 
-void TimeStamp::Print(ostream& os)  const
-{
-  os << " " << ToString() << " "; 
+/*!
+\param fgday : if false, ignore the date (dd/mm/yy) part 
+\param fghour : if false, ignore the hour (hh:mm:ss) part
+*/
+void TimeStamp::Print(ostream& os, bool fgday, bool fghour)  const
+{
+  os << " " << ToString(fgday, fghour) << " "; 
 }