Changeset 2864 in Sophya for trunk/SophyaExt/FitsIOServer/fitsarrhand.h

Timestamp:

Jan 2, 2006, 2:47:44 PM (20 years ago)

Author:

ansari

Message:

1/ Ajout methode CheckReadability() , retour int pour CheckHandling() ds l'interface FitsHandler et propagation vers handler TArray et DataTable
2/ Correction dans FitsManager et ajout initialiseur de module FitsIOServer (fiosinit.h .cc)
3/ FitsSwapper complete - corrige - full template (suppression de fitsswapper.cc)
4/ MAJ Makefile et objlist.list suite ajout fiosinit.cc et swfitsdtable

Reza , 2 Jan 2006

File:

• trunk/SophyaExt/FitsIOServer/fitsarrhand.h (modified) (5 diffs)

trunk/SophyaExt/FitsIOServer/fitsarrhand.h

@@ -5 +5 @@
 #include <string>
 #include "tarray.h"
+#include "tvector.h"
 
 #include "fitshandler.h"
+#include "fitsblkrw.h"
 
 namespace SOPHYA {
@@ -23 +25 @@
   virtual   AnyDataObj* DataObj() { return(dobj); }
 
-  virtual   bool        CheckHandling(AnyDataObj & o) 
+  virtual   int         CheckHandling(AnyDataObj & o) 
   {  
+    if ( (typeid(o) == typeid(TArray<T>)) ||
+         (typeid(o) == typeid(TMatrix<T>)) ||
+         (typeid(o) == typeid(TVector<T>)) )  return 2;
     TArray<T> * po = dynamic_cast< TArray<T> * >(& o); 
-    if (po == NULL) return false;
-    else return true;
+    if (po == NULL) return 0;
+    else return 1;
   }
+
   virtual   void        SetDataObj(AnyDataObj & o) 
   {  
@@ -38 +44 @@
     }
     if (ownobj && dobj) delete dobj;  dobj = po; ownobj = false; 
+  }
+
+  virtual int         CheckReadability(FitsInOutFile& is)
+  {
+    if (is.CurrentHDUType() != IMAGE_HDU)  return 0;
+    T x = 0;
+    long naxes[BASEARRAY_MAXNDIMS];
+    int naxis=BASEARRAY_MAXNDIMS;
+    if (FitsTypes::ImageType(x) == is.GetImageHDUInfo(naxis, naxes))
+      return 2;
+    else return 1;
   }
 
@@ -56 +73 @@
       os.CreateImageHDU(FitsTypes::ImageType(x), dobj->NbDimensions(), naxes);
       os.WriteHeaderRecords(dobj->Info());
+      MuTyV mtv;
+      mtv = "SOPHYA::TArray<T>";
+      os.WriteKey("SOPCLSNM",mtv," Object class name "); 
       FitsBlockRW<T>::WriteImageData(os, dobj->Data(), dobj->Size());
     }
@@ -62 +82 @@
   virtual void     Read(FitsInOutFile& is)
     {
-      if ( dobj == NULL) 
-        throw NullPtrError("FitsArrayHandler<T>::Read() dobj=NULL ");
       long naxes[BASEARRAY_MAXNDIMS];
       int naxis=BASEARRAY_MAXNDIMS;
       is.GetImageHDUInfo(naxis, naxes);
+      if ( dobj == NULL) {
+        if (naxis == 1) dobj = new TVector<T>;
+        else if (naxis == 1) dobj = new TMatrix<T>;
+        else dobj = new TArray<T>;
+        ownobj = true;
+      }
       sa_size_t sz[BASEARRAY_MAXNDIMS];
       if (naxis > BASEARRAY_MAXNDIMS) naxis = BASEARRAY_MAXNDIMS;