Changeset 2826 in Sophya for trunk/SophyaLib/BaseTools/dvlist.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/dvlist.cc (modified) (8 diffs)

trunk/SophyaLib/BaseTools/dvlist.cc

@@ -49 +49 @@
    Variables names should not contain space characters and is limited to 64
    characters. The DVList class uses \b SOPHYA::MuTyV objects to hold values
-   of type string, integer (\b int_8) or float (\b r_8). A comment string
-   can be associated with each variable name. A global comment string
+   of type string, integer (\b int_8) or float (\b r_8) or time/date (TimeStamp). 
+   A comment string can be associated with each variable name. A global comment string
    can be attached to the DVList object. DVList objects can conveniently be 
    used to represent FITS headers. The class \b SOPHYA::ObjFileIO<DVList>
    handles serialisation for DVList. (See SOPHYA::PPersist ).
+
    \sa SOPHYA::ObjFileIO<DVList>
+   \sa SOPHYA::MuTyV
 
    \code
@@ -65 +67 @@
    dvl("hello") = 88;
    dvl("Hello") = 77.77;    
+   dvl("ToDay") = TimeStamp();    
    dvl.Comment() = "DVList test object, with values named hello, Hello ";
    // Saving the dvl object into a PPF file 
@@ -333 +336 @@
 
 /* --Methode-- */
+/*! Appends or sets the TimeStamp value \b val in the list with name \b key */
+void        DVList::SetT(string const& key, TimeStamp const& val)
+{
+MuTyV div(val);
+Get(key) = div;
+}
+
+/* --Methode-- */
 /*! Assigns the comment \b comm with the name \b key . 
     Does nothing if the entry with name is not present in the list   */
@@ -408 +419 @@
 if (comment.length() > 0)  os << comment << endl;
 char buff[1024];
+TimeStamp ts; 
 ValList::const_iterator it;
 for(it = mvlist.begin(); it != mvlist.end(); it++)  {
@@ -427 +439 @@
       sprintf(buff, "%s = %s (string) %s\n", (*it).first.substr(0,64).c_str(), 
               (*it).second.elval.GetStringPointer()->substr(0,800).c_str(), (*it).second.elcomm.substr(0,128).c_str());
+      break;
+    case MuTyV::MTVTimeStamp :
+      ts.Set((*it).second.elval.GetRealPart());
+      sprintf(buff, "%s = %s (TimeStamp) %s\n", (*it).first.substr(0,64).c_str(), 
+                ts.ToString().c_str(), (*it).second.elcomm.substr(0,128).c_str());
       break;
     default :
@@ -514 +531 @@
       sfw = buf;  s.PutStr(sfw);
       break;
+    case MuTyV::MTVTimeStamp : 
+      sprintf(buf,"T %s %.20g\n", (*it).first.substr(0,64).c_str(), (*it).second.elval.GetRealPart() );
+      sfw = buf;  s.PutStr(sfw);
+      break;
     default :
       break;
@@ -524 +545 @@
 }
 
-sfw = "ZZZZZ--End-of-Varible-List------"; s.PutStr(sfw);
+sfw = "ZZZZZ--End-of-Variable-List------"; s.PutStr(sfw);
 }
 
@@ -587 +608 @@
       dobj->SetS(key, buf+j+1);
       break;
+    case 'T' :
+      dv = atof(buf+j+1);
+      key = buf+2;
+      dobj->SetT(key, TimeStamp(dv));
+      break;
     default :
       break;