Changeset 4025 in Sophya for trunk/SophyaExt/FitsIOServer/fabtcolread.h

Timestamp:

Oct 3, 2011, 6:32:44 PM (14 years ago)

Author:

cmv

Message:

read/write string, complex, bufferisation enlevee pour FitsABTColRd1F, cmv 03/10/2011

File:

• trunk/SophyaExt/FitsIOServer/fabtcolread.h (modified) (7 diffs)

trunk/SophyaExt/FitsIOServer/fabtcolread.h

@@ -85 +85 @@
   double Read(LONGLONG n,long nfirstel,bool usebuffer=true);
   inline double Read(LONGLONG n,bool usebuffer=true) {return Read(n,0,usebuffer);}
+  complex<r_8> ReadComplex(LONGLONG n,long nfirstel=0);
+  char* ReadInStr(LONGLONG n,long nfirstel=0);
 
   LONGLONG Read(LONGLONG n1,LONGLONG n2,TVector<uint_2>& data);
@@ -161 +163 @@
 
   string ColLabel,ColTUnit,ColTForm;
-  int ColNum,ColTypeCode,NBcol;
+  int ColNum,ColTypeCode,ColDispWidth,NBcol;
   long ColRepeat;
   LONGLONG NBline;
+  char *StrBuff;
 
   double NulVal;
@@ -195 +198 @@
 
 ///////////////////////////////////////////////////////////////////
-//! Class for reading ALL the columns in a FITS ASCII or BINARY table
+//! Class for reading ALL the columns in a FITS ASCII or BINARY table (no bufferisation)
 class FitsABTColRd1F : public AnyDataObj {
 public:
-  FitsABTColRd1F(FitsOpenFile* fof,int ihdu=0
-              ,long blen=100,long bsens=1,int lp=0);
+  FitsABTColRd1F(FitsOpenFile* fof,int ihdu=0,int lp=0);
   virtual ~FitsABTColRd1F();
-
-  void ChangeBuffer(long blen=100,long bsens=1);
 
   double    ReadKey(const char *keyname);
@@ -209 +209 @@
   string    ReadKeyS(const char *keyname);
 
-  double Read(int ColNum,LONGLONG n,long nfirstel,bool usebuffer=true);
-  inline double Read(int ColNum,LONGLONG n,bool usebuffer=true) {return Read(ColNum,n,0,usebuffer);}
+  double Read(int ColNum,LONGLONG n,long nfirstel);
+  inline double Read(int ColNum,LONGLONG n) {return Read(ColNum,n,0);}
+  complex<r_8> ReadComplex(int ColNum,LONGLONG n,long nfirstel=0);
+  char* ReadInStr(int ColNum,LONGLONG n,long nfirstel=0);
   int GetColNum(const char *colname);
 
@@ -252 +254 @@
   inline long GetColRepeat(int ColNum) const
          {if(ColNum<0 || ColNum>=NBcol) return -999; else return ColRepeat[ColNum];}
-  //! Get the read requested buffer length
-  inline long GetBLen(void) const {return BuffLen;}
-  //! Get the read buffer direction
-  inline long GetBSens(void) const {return BuffSens;}
   //! Print to os
   virtual void Print(ostream& os,int lp=1) const;
@@ -261 +259 @@
   inline  void Print(int lp=1) const {Print(cout,lp);}
   //! Get the read effective buffer length
-  inline long GetNBuffer(void) const {return NBuffer;}
-  //! Get the read bufferpointer
-  inline double* GetBuffer(int ColNum)
-         {if(ColNum<0 || ColNum>=NBcol) return NULL; else return Buffer[ColNum];}
 
 protected:
-  void Init(FitsOpenFile* fof,int ihdu,long blen,long bsens,int lp);
+  void Init(FitsOpenFile* fof,int ihdu,int lp);
   void Delete(void);
 
   vector<string> ColLabel,ColTUnit,ColTForm;
-  vector<int> ColTypeCode;
+  vector<int> ColTypeCode, ColDispWidth;
   vector<long> ColRepeat;
   int NBcol;
   LONGLONG NBline;
+  vector<char*> StrBuff;
 
   double NulVal;
   unsigned short DbgLevel;
-  long BuffLen, BuffSens;
 
   FitsOpenFile* FitsOF;
-  vector<LONGLONG> LineDeb, LineFin;
-  double **Buffer;
-  long NBuffer;
 };
 
@@ -291 +282 @@
 class FitsABTColRead1F : public FitsABTColRd1F {
 public:
-  FitsABTColRead1F(string fname,int ihdu=0
-                ,long blen=100,long bsens=1,int lp=0);
-  FitsABTColRead1F(const char *cfname,int ihdu=0
-                ,long blen=100,long bsens=1,int lp=0);
+  FitsABTColRead1F(string fname,int ihdu=0,int lp=0);
+  FitsABTColRead1F(const char *cfname,int ihdu=0,int lp=0);
   virtual ~FitsABTColRead1F();
 };