Changeset 2197 in Sophya for trunk/SophyaExt/FitsIOServer/fitsfile.h

Timestamp:

Sep 24, 2002, 4:03:36 PM (23 years ago)

Author:

lemeur

Message:

toilette d'ete : rationalisation de types...

File:

• trunk/SophyaExt/FitsIOServer/fitsfile.h (modified) (6 diffs)

trunk/SophyaExt/FitsIOServer/fitsfile.h

@@ -17 +17 @@
 
   struct BnTblLine;
+  class BufferLine;
   class FitsFile;
   class FitsInFile;
@@ -96 +97 @@
      FitsDataType_ASCII,
      FitsDataType_long,
-     FitsDataType_byte
+     FitsDataType_byte,
+     FitsDataType_short
    };
+
+
+class BufferLine
+
+  {
+    public :
+
+BufferLine() {;}
+BufferLine(const vector<FitsFile::FitsDataType>& types);
+inline const vector< pair<FitsFile::FitsDataType, int> >& identificateur() const {return id_;}
+ inline r_8&    r_8Array(int k) { return ddata_[k];}
+ inline const r_8&    r_8Array(int k) const { return ddata_[k];}
+ inline r_4& r_4Array(int k) { return fdata_[k];}
+ inline const r_4& r_4Array(int k) const { return fdata_[k];}
+
+
+ inline int_2& int_2Array(int k) { return shdata_[k];}
+ inline const int_2& int_2Array(int k) const { return shdata_[k];}
+ inline int_4& int_4Array(int k) { return idata_[k];}
+ inline const int_4& int_4Array(int k) const { return idata_[k];}
+
+
+ inline int_8& int_8Array(int k) { return ldata_[k];}
+ inline const int_8& int_8Array(int k) const { return ldata_[k];}
+ inline string& stringArray(int k) { return cdata_[k];}
+ inline const string& stringArray(int k) const { return cdata_[k];}
+ inline unsigned char& u_charArray(int k) { return bdata_[k];}
+ inline const unsigned char& u_charArray(int k) const { return bdata_[k];}
+
+
+ void Print() const;
+
+
+    private :
+      // la paire contient le type de la variable et le rang dans le tableau
+      // du type
+   vector< pair<FitsFile::FitsDataType, int> > id_;
+   vector<r_8>     ddata_;
+   vector<r_4>     fdata_;
+   vector<int_2>   shdata_; 
+   vector<int_4>   idata_; 
+   vector<int_8>   ldata_;
+   vector<string>  cdata_;
+   vector<unsigned char>   bdata_;
+  };
+
+
 
    FitsFile() { InitNull(); };
@@ -108 +157 @@
 
  protected:
+
+
+
+
+
 
 void         ResetStatus(int& status) ; 
@@ -130 +184 @@
    bool imageOnPrimary_;
 
+   BufferLine bfl_;
+
+
  };
 
@@ -214 +271 @@
  string ColNameFromFits(int nocol) const;
  int    ColStringLengthFromFits(int nocol) const;
+ const BufferLine& GetBufferLine(long NoLine); 
  void   GetBinTabLine(int NoLine, double* ddata, float* fdata, int* idata, char
 ** cdata) ;
@@ -367 +425 @@
 
 
-
-
 } // Fin du namespace