Changeset 1321 in Sophya for trunk/SophyaPI/PIext/nobjmgr.cc

Timestamp:

Nov 13, 2000, 4:32:34 PM (25 years ago)

Author:

ercodmgr

Message:

Adaptateur de TArray et lecture FITS - Reza 13/11/2000

File:

• trunk/SophyaPI/PIext/nobjmgr.cc (modified) (5 diffs)

trunk/SophyaPI/PIext/nobjmgr.cc

@@ -22 +22 @@
 #ifdef SANS_EVOLPLANCK
 #include "fitsimage.h"  
+#else
+#include "fitsautoreader.h"
 #endif
 
@@ -536 +538 @@
 
 if ( (myImgApp != NULL) && (myImgApp->ObjMgrW())->Visible() ) {
-  string oln = nobj + "  (T= " + typeid(*obj).name() + ")" ; 
+  string oln = nobj + "  (T= " + no.obja->GetDataObjType() + ")" ; 
   (myImgApp->ObjMgrW())->AddObjList(did, oln.c_str(), no.oid);
   }
@@ -604 +606 @@
 if ( (myImgApp != NULL) && (myImgApp->ObjMgrW())->Visible() ) {
   (myImgApp->ObjMgrW())->DelObjList(dids, no.oid);
-  string oln = n2 + "  (T= " + typeid(*(no.obj)).name() + ")" ; 
+  string oln = n2 + "  (T= " + no.obja->GetDataObjType() + ")" ; 
   (myImgApp->ObjMgrW())->AddObjList(did, oln.c_str(), no.oid);
 }
@@ -942 +944 @@
 }
 #else
- cerr << " NamedObjMgr::ReadFits() Vide ! A faire Reza ! " << endl;
+ try {
+   FITS_AutoReader fiar(flnm);
+   char buff[512], bun[16];
+   strncpy(buff, flnm.c_str(), 512);
+   int nhdu = FitsInFile::NbBlocks(buff);
+   if (nobj.length()<1)  nobj = servnobjm->FileName2Name(flnm);
+   string name;
+   AnyDataObj* obj;
+   for(int k=1; k<=nhdu; k++) {
+     obj = fiar.ReadObject(k);
+     if (obj) 
+       cout << " NamedObjMgr::ReadFits() " << (string)typeid(*obj).name()
+            << "  read From HDU " << k << endl;
+     else cerr << " NamedObjMgr::ReadFits()  NULL pointer from FITS_AutoReader" << endl;
+     if (k > 1) { 
+       sprintf(bun, "%d", k);
+       name = nobj + bun;
+     }
+     else name = nobj;
+     AddObj(obj, name);
+   }
+ }
+ catch(PThrowable & exc) {
+   cerr << " NamedObjMgr::ReadFits() / Error - Catched Exception \n " 
+        << "    Type= " << (string)typeid(exc).name()
+        << " - Msg= " << exc.Msg() << endl;
+
+   }
 #endif
 
@@ -1374 +1403 @@
   if ((*it).second.dirid != did) continue;
   cn = (*it).first.substr(1);
-  cn = cn.substr(cn.find('/')+1) + "  (T= " + typeid(*((*it).second.obj)).name() + ")" ;
+  //  cn = cn.substr(cn.find('/')+1) + "  (T= " + typeid(*((*it).second.obj)).name() + ")" ;
+  cn = cn.substr(cn.find('/')+1) + "  (T= " + (*it).second.obja->GetDataObjType() + ")" ;
   (myImgApp->ObjMgrW())->AddObj(cn.c_str(), (*it).second.oid);
   }