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

Timestamp:

Oct 2, 2011, 8:25:23 PM (14 years ago)

Author:

cmv

Message:

bintable avec elements vecteur, cmv 02/10/2011

File:

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

trunk/SophyaExt/FitsIOServer/fabtcolread.h

@@ -83 +83 @@
   string    ReadKeyS(const char *keyname);
 
-  double Read(LONGLONG n,bool usebuffer=true);
+  double Read(LONGLONG n,long nfirstel,bool usebuffer=true);
+  inline double Read(LONGLONG n,bool usebuffer=true) {return Read(n,0,usebuffer);}
 
   LONGLONG Read(LONGLONG n1,LONGLONG n2,TVector<uint_2>& data);
@@ -92 +93 @@
 
   //! return the value of the first row
-  double ReadFirstRow(bool usebuffer=false)
-                     {return Read(0,usebuffer);}
+  double ReadFirstRow(long nfirstel,bool usebuffer=false) {return Read(0,nfirstel,usebuffer);}
+  double ReadFirstRow(bool usebuffer=false) {return Read(0,usebuffer);}
   //! return the value of the last row
-  double ReadLastRow(bool usebuffer=false)
-                    {return Read(NBline-1,usebuffer);}
-
-  LONGLONG FirstRow(double val1,double val2,LONGLONG rowstart=-1);
-  LONGLONG LastRow(double val1,double val2,LONGLONG rowstart=-1);
+  double ReadLastRow(long nfirstel,bool usebuffer=false) {return Read(NBline-1,nfirstel,usebuffer);}
+  double ReadLastRow(bool usebuffer=false) {return Read(NBline-1,usebuffer);}
+
+  LONGLONG FirstRow(long nfirstel,double val1,double val2,LONGLONG rowstart=-1);
+  inline LONGLONG FirstRow(double val1,double val2,LONGLONG rowstart=-1)
+                          {return FirstRow(0,val1,val2,rowstart);}
+  LONGLONG LastRow(long nfirstel,double val1,double val2,LONGLONG rowstart=-1);
+  inline LONGLONG LastRow(double val1,double val2,LONGLONG rowstart=-1)
+                          {return LastRow(0,val1,val2,rowstart);}
 
   //! Set debug level
@@ -135 +140 @@
   //! Get the columns fits tform that is read
   inline string GetColTForm(void) const {return ColTForm;}
+  //! Get the columns fits repeat that is read
+  inline long GetColRepeat(void) const {return ColRepeat;}
   //! Get the read requested buffer length
   inline long GetBLen(void) const {return BuffLen;}
@@ -155 +162 @@
   string ColLabel,ColTUnit,ColTForm;
   int ColNum,ColTypeCode,NBcol;
+  long ColRepeat;
   LONGLONG NBline;
 
@@ -201 +209 @@
   string    ReadKeyS(const char *keyname);
 
-  double Read(int ColNum,LONGLONG n,bool usebuffer=true);
+  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);}
   int GetColNum(const char *colname);
 
@@ -240 +249 @@
   inline string GetColTForm(int ColNum) const
          {if(ColNum<0 || ColNum>=NBcol) return string(""); else return ColTForm[ColNum];}
+  //! Get the columns fits repeat that is read
+  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;}
@@ -260 +272 @@
   vector<string> ColLabel,ColTUnit,ColTForm;
   vector<int> ColTypeCode;
+  vector<long> ColRepeat;
   int NBcol;
   LONGLONG NBline;