Changeset 1136 in Sophya for trunk/SophyaExt/FitsIOServer/fitsxntuple.h

Timestamp:

Aug 24, 2000, 12:18:02 PM (25 years ago)

Author:

ansari

Message:

structuration a la ppersist+ convention sur hdu

File:

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

trunk/SophyaExt/FitsIOServer/fitsxntuple.h

@@ -4 +4 @@
 #ifndef FITSXNTuple_SEEN
 #define FITSXNTuple_SEEN
+#include "machdefs.h"
 #include "xntuple.h"
 #include "anydataobj.h"
@@ -15 +16 @@
 ///////////////////////////////////////////////////////////
 
-class  FITS_XNTuple : public FitsFile  
+class  FITS_XNTuple : public FitsIOHandler  
 {
 
@@ -24 +25 @@
 FITS_XNTuple(XNTuple* obj);
 ~FITS_XNTuple();
- void Read(char inputfile[],int hdunum=2);
+
+virtual   AnyDataObj* DataObj() { return(dobj_); }
+virtual   void        SetDataObj(AnyDataObj & o) 
+  {   
+    XNTuple* po = dynamic_cast<  XNTuple* >(& o); 
+    if (po == NULL) return;
+    if (ownobj_ && dobj_) delete dobj_;  
+    dobj_ = po; 
+    ownobj_ = false; 
+  }    
+
 
 /*!
@@ -32 +43 @@
 */
 void ReadLines(char inputfile[],int firstLine, int numberOfLines,int hdunum=2);
-void Write(char outputfile[], bool OldFile=false);
 inline operator XNTuple() { return(*dobj_); }
 inline XNTuple * getObj() { return(dobj_); }
@@ -39 +49 @@
 
   // implementation de FitsFile
-//  virtual void  ReadFromFits(FitsFile& fn);
- virtual void  ReadFromFits();
-virtual void    WriteToFits();
-void*   getColFromObj(int colNr);
-double* getColDFromObj(int colNr);
-float*  getColFFromObj(int colNr);
-int*    getColIFromObj(int colNr);
-char**  getColSFromObj(int colNr);
+ virtual void  ReadFromFits(FitsInFile& is);
+virtual void    WriteToFits(FitsOutFile& os) ;
 
  private :
 
- void Clean();
 
 inline void InitNull()
@@ -56 +59 @@
      fistLineToBeRead_= -1;
      numberOfLinesToBeRead_= -1;
-     dcolumn_ = NULL;
-     fcolumn_ = NULL;
-     icolumn_ = NULL;
-     ccolumn_ = NULL;
    }
 
@@ -67 +66 @@
   int fistLineToBeRead_;
   int numberOfLinesToBeRead_;
-  double* dcolumn_;
-  float*  fcolumn_;
-  int*    icolumn_;
-  char**  ccolumn_;
 };
 //////////////////////////////////////////////////////////////////