Changeset 2831 in Sophya for trunk/SophyaLib/HiStats/basedtable.h

Timestamp:

Nov 8, 2005, 5:16:44 PM (20 years ago)

Author:

ansari

Message:

1/ Prise en charge champ de type DateTimeField ds BaseDataTable , DataTable, SwPPFDataTable
2/ Methodes BaseDataTable completees - en particulier Print/WriteASCII, et
decodage de fichiers ASCII

Reza, 8 Nov 2005

File:

• trunk/SophyaLib/HiStats/basedtable.h (modified) (6 diffs)

trunk/SophyaLib/HiStats/basedtable.h

@@ -18 +18 @@
 #include "dvlist.h"
 #include "segdatablock.h"
+#include "tvector.h"
 
 namespace SOPHYA {
@@ -31 +32 @@
                   FloatField=3, DoubleField=4,
                   ComplexField=5, DoubleComplexField=6,
-                  StringField=7, DateField=8};
+                  StringField=7, DateTimeField=8};
   // <=====================================================> 
 
+  //! Return the column type as a string (long or short depending on fgl=true/false)
   static string     ColTypeToString(FieldType ft, bool fgl=false);
+  //! Return the column type corresponding to \b sctyp
+  static FieldType  StringToColType(string const & sctyp);
 
   // constructeur , destructeur 
@@ -82 +86 @@
   inline sa_size_t  AddStringColumn(string const & cnom) 
   { return AddColumn(StringField, cnom); }
+  //! Adds a column holding Date/Time value, named \b cnom 
+  inline sa_size_t  AddDateTimeColumn(const char * cnom) 
+  { return AddColumn(DateTimeField, cnom); }
+  //! Adds a column holding Date/Time value, named \b cnom 
+  inline sa_size_t  AddDateTimeColumn(string const & cnom) 
+  { return AddColumn(DateTimeField, cnom); }
   
   inline sa_size_t  AddColumn(FieldType ft, const char * cnom)
@@ -124 +134 @@
   virtual MuTyV *   GetLine(sa_size_t n) const ;
 
+  //! Return the information stored in column \b k of the table, converted to double 
+  virtual TVector<r_8>  GetColumnD(sa_size_t k) const ;
+
+  //! Return the information stored in column named \b nom of the table, converted to double 
+  inline TVector<r_8>  GetColumnD(char const * nom) const 
+  { return  GetColumnD(IndexNom(nom)) ; }
+  //! Return the information stored in column named \b nom of the table, converted to double 
+  inline TVector<r_8>  GetColumnD(string const & nom) const 
+  { return  GetColumnD(IndexNom(nom)) ; }
+
   //! Return the index for column name \b nom  
   sa_size_t         IndexNom(char const* nom) const ; 
@@ -146 +166 @@
   virtual void Clear() = 0;
 
-  //! Prints the table content - NOT YET IMPLEMENTED !
-  void              Print(int num, int nmax=1) const ;
-  
-//! Prints table definition and number of entries 
+  //! Prints  the table content (ascii dump)
+  virtual ostream&  Print(ostream& os, sa_size_t lstart, sa_size_t lend, 
+                          sa_size_t lstep=1) const ;
+  //! Prints  the table content (ascii dump) on stream \b os
+  inline ostream&   Print(ostream& os) const
+  { return Print(os, 0, NEntry(), 1); }
+  //! Prints  the table content (ascii dump) on stream \b os
+  inline ostream&   WriteASCII(ostream& os) const 
+  { return Print(os, 0, NEntry(), 1); }
+
+  
+  //! Prints table definition and number of entries 
   void              Show(ostream& os) const ; 
   //! Prints table definition and number of entries on the standard output stream \b cout
   inline void       Show() const { Show(cout) ; } 
   
+  //! Return the associated DVList (info) object. 
   DVList&           Info() const ; 
   
   // Remplissage depuis fichier ASCII 
-  int               FillFromASCIIFile(string const& fn);
+  sa_size_t         FillFromASCIIFile(istream& is, char clm='#', const char* sep=" \t");
   
   //-------------------------------------------------------------
@@ -175 +204 @@
   virtual string    LineHeaderToString() const;
   virtual string    LineToString(sa_size_t n) const;  
+
+  //! Return a table row (line), formatted and converted to a string
+  virtual string    TableRowToString(sa_size_t n, bool qstr, const char* sep=" ",
+                                     int fw=12) const; 
 
   //  Pour la gestion de persistance PPF