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

Timestamp:

May 11, 1999, 6:04:58 AM (26 years ago)

Author:

ercodmgr

Message:

Adaptation aux "normes DPC", introduction des classes CmdExecutor, ...
Fenetre d'aide en lignes, gestion de modules, ... Reza 11/05/99

File:

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

trunk/SophyaPI/PIext/nobjmgr.cc

@@ -15 +15 @@
 #include "strutil.h"
 #include "datatypes.h"
-#include "fitsimage.h"
 
 #include "nobjmgr.h"
@@ -26 +25 @@
 #include "matrix.h"
 #include "cvector.h"
-#include "zfidu.h"
-
-#include "fft.h"
+
+// EVOL-PLANCK
+#ifdef SANS_EVOLPLANCK
+#include "fitsimage.h"  
+#include "zfidu.h"  
+#endif
+
 #include "fct1dfit.h"
 #include "fct2dfit.h"
@@ -45 +48 @@
 
 //  Si le module StarReco++ a ete compile (Pour les StarList, Transfo, etc ...
-#ifndef SANS_StarReco 
+#ifdef SANS_EVOLPLANCK 
 #include "pistlist.h"
 #include "transfo.h"
@@ -388 +391 @@
 TRY{
 //  obj = RzReadFits((char*)flnm.c_str(), ImgOffX, ImgOffY, ImgSizX, ImgSizY, ImgBitSgn);
+#ifdef SANS_EVOLPLANCK 
   obj = RzReadFits((char*)flnm.c_str());
+#else
+  printf("NamedObjMgr::ReadFITS( NON-Disponible EVOL-PLANCK) \n"); 
+  obj = NULL;
+#endif
   if (obj == NULL)   ok = false;
 }  CATCH(merr) { 
@@ -438 +446 @@
 void NamedObjMgr::SaveFits(string const& nom, string const & flnm)
 {
+
+#ifndef SANS_EVOLPLANCK 
+printf("NamedObjMgr::SaveFITS( NON-Disponible EVOL-PLANCK) \n"); 
+return;
+
+#else
+
 PPersist* obj=NULL;
 obj = GetObj(nom);
 if (obj == NULL)  return;
-
 int cid = obj->ClassId();
 if ( (cid < ClassId_Image) && ( cid > ClassId_Image+kr_8) ) {
@@ -485 +499 @@
 } ENDTRY;
 
+#endif
+
 return;
 }
@@ -580 +596 @@
     break;
 
+#ifdef SANS_EVOLPLANCK 
   case ClassId_ZFidu : 
     ((ZFidu*)obj)->Print();
     break;
 
-#ifndef SANS_StarReco 
   case ClassId_StarList : 
     ((StarList*)obj)->Print(10, 1, 50);
@@ -710 +726 @@
     break;
 
+#ifdef SANS_EVOLPLANCK 
   case ClassId_ZFidu : 
     {
@@ -723 +740 @@
     }
 
-#ifndef SANS_StarReco 
   case ClassId_StarList : 
     {
@@ -1333 +1349 @@
     ndata=((RzImage*)obj)->XSize()*((RzImage*)obj)->YSize();
     break;
-#ifndef SANS_StarReco 
+#ifdef SANS_EVOLPLANCK 
   case ClassId_StarList : 
     ndata=((StarList*)obj)->NbStars();
@@ -1392 +1408 @@
 if (!myImgApp)  return; 
 
-cmd = "rm " + fname;
+cmd = "rm -f " + fname;
 rc = system(cmd.c_str());
 printf("PlotFunc_Do> %s  (Rc=%d)\n", cmd.c_str(), rc); 
@@ -2010 +2026 @@
 }
 
-/* --Methode-- */
-void NamedObjMgr::FFT(string const& nom, string dopt)
-{
-PPersist* obj=GetObj(nom);
-if (obj == NULL) {
-  cout << "NamedObjMgr::FFT() Error , Pas d'objet de nom " << nom << endl; 
-  return;
-}
-if (!myImgApp)  return; 
-
-int cid = obj->ClassId();
-if (cid != ClassId_Vector) { 
-  string ctyp = servnobjm->PClassIdToClassName(cid);
-  cout << "NamedObjMgr::FFT() Error , Objet n'est pas un vecteur " << ctyp << endl; 
-  return;
-  }
-
-FFT1 fft( *((Vector*)obj) );
-
-if (fft.NData() < 1)  return;
-
-char* ntn[3] = {"refc", "imfc", "pfc"};
-NTuple* nt = new NTuple(3,ntn);  // Creation NTuple 
-Vector* vf = new Vector(fft.NData()/2);
-
-float xnt[3]; 
-double pf;
-for(int k=0; k<fft.NData()/2; k++) {
-  xnt[0] = fft.ReF(k);  xnt[1] = fft.ImF(k); 
-  pf = (xnt[0]*xnt[0]+xnt[1]*xnt[1]);
-  if (pf >= 0.)  pf = sqrt(pf);  
-  xnt[2] = pf;   (*vf)(k) = pf;
-  nt->Fill(xnt);  
-  }
-
-P1DArrayAdapter* vya = new POVectorAdapter(vf, true);
-// vya->DefineXCoordinate(xmin, xmax);   a determiner
-PIYfXDrawer* dr = new   PIYfXDrawer(vya, NULL, true) ; 
-bool fgsr = true;
-dopt = "thinline," + dopt;
-int opt = servnobjm->DecodeDispOption(dopt, fgsr);
-myImgApp->DispScDrawer(dr, nom, opt);
-if (fgsr) myImgApp->RestoreGraphicAtt(); 
-
-return;
-}