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

Timestamp:

Dec 20, 2005, 7:25:51 PM (20 years ago)

Author:

ansari

Message:

Ajout constructeur de copie (pas parfait) pour FitsInOutFile + modifs classes FitsFile/FitsInFile/FitsOutFile pour heriter de FitsInOutFile avec constructeur a partir de FitsInOutFile - Reza 20/12/2005

File:

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

trunk/SophyaExt/FitsIOServer/fitsfile.h

@@ -4 +4 @@
 #include "ndatablock.h"
 #include "dvlist.h"
-#include "FitsIO/fitsio.h" 
+#include "fitsinoutfile.h" 
 
 #define OPENFILE    0
@@ -75 +75 @@
 
 //! Class (virtual) for managing FITS format files
- class FitsFile {
+ class FitsFile : public FitsInOutFile {
 
  public:
@@ -148 +148 @@
 
 
-   FitsFile() { InitNull(); };
-   virtual ~FitsFile();
+   FitsFile();
+   FitsFile(FitsInOutFile const& fios);
+   // RzDel virtual ~FitsFile();
    static string GetErrStatus(int status);
    inline  int   statusF() const { return fits_status_;}
@@ -169 +170 @@
 inline void  InitNull() 
   {
-    fptr_ = NULL; 
     hdutype_= FitsExtensionType_NULL; 
     hdunum_ = 0; 
@@ -177 +177 @@
 
 
-
-   fitsfile *fptr_;     /**<  pointer to the FITS file, defined in fitsio.h */
    FitsExtensionType hdutype_;        /**<  image or bintable ? */
    int hdunum_;         /**<   index of header to be read/written */
@@ -197 +195 @@
    FitsInFile(string const & flnm);
    FitsInFile(const char * flnm);
-   ~FitsInFile() { ; };
+   FitsInFile(FitsInOutFile const& fios);
+   //   virtual ~FitsInFile();
 
    static int  NbBlocks(char flnm[]);
@@ -342 +341 @@
    FitsOutFile(string const & flnm, WriteMode wrm = unknown );
    FitsOutFile(const char * flnm, WriteMode wrm = unknown );
-   ~FitsOutFile() { if (dvlToPrimary_ != NULL) delete dvlToPrimary_;};
+   FitsOutFile(FitsInOutFile const& fios);
+   virtual ~FitsOutFile();
    inline void InitNull() {dvlToPrimary_ = NULL;}