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

Timestamp:

Jun 23, 1999, 4:41:47 PM (26 years ago)

Author:

ercodmgr

Message:

1/ NTupleInterface mis ds Outils++ et complete -
2/ Les PINtuple et PINtup3D utilisent maintenant NTupleInterface
3/ Debut modification interface NObjMgr - Reza 23/6/99

File:

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

trunk/SophyaPI/PIext/nobjmgr.cc

@@ -23 +23 @@
 #include "matrix.h"
 #include "cvector.h"
+#include "ntuple.h"
 
 // EVOL-PLANCK
@@ -616 +617 @@
 if (!myImgApp)  return; 
 
-if (typeid(*obj) != typeid(NTuple)) { 
+NTupleInterface * nt = dynamic_cast<NTupleInterface *>(obj);
+if (nt == NULL) {
+// if (typeid(*obj) != typeid(NTupleInterface)) { 
   string ctyp = typeid(*obj).name();
   cout << "NamedObjMgr::DisplayNT() Error , Objet n'est pas un NTuple " << ctyp << endl; 
@@ -624 +627 @@
 int wrsid = 0;
 bool fgsr = true;
+dopt = "defline," + dopt;
 int opt = servnobjm->DecodeDispOption(dopt, fgsr);
 
 if (nmz.length()>0)  { // Display 3D
-  PINTuple3D* pin = new PINTuple3D(((NTuple*)obj), false);
+  PINTuple3D* pin = new PINTuple3D(nt, false);
   pin->SelectXYZ(nmx.c_str(), nmy.c_str(), nmz.c_str());
   pin->SelectErrBar(erx.c_str(), ery.c_str(), erz.c_str());
@@ -634 +638 @@
 }
 else {
-  PINTuple* pin = new PINTuple(((NTuple*)obj), false);
+  PINTuple* pin = new PINTuple(nt, false);
   pin->SelectXY(nmx.c_str(), nmy.c_str());
   pin->SelectErrBar(erx.c_str(), ery.c_str());
@@ -773 +777 @@
 
 bool fgsr = true;
+dopt = "defline," + dopt;
 int opt = servnobjm->DecodeDispOption(dopt, fgsr);
 string titre =  nom + ":" + expy + "%" + expx;
@@ -808 +813 @@
 pin->SelectXYZ(ntn[0], ntn[1], ntn[2]);
 bool fgsr = true;
+dopt = "defline," + dopt;
 int opt = servnobjm->DecodeDispOption(dopt, fgsr);
 
@@ -852 +858 @@
     return;
     }
-  float xmin, xmax;
+  double xmin, xmax;
   nt->GetMinMax(0, xmin, xmax);
   h1 = new Histo(xmin, xmax, 100);
@@ -901 +907 @@
     return;
     }
-  float xmin, xmax, ymin, ymax;
+  double xmin, xmax, ymin, ymax;
   nt->GetMinMax(0, xmin, xmax);
   nt->GetMinMax(0, ymin, ymax);
@@ -962 +968 @@
     return;
   }
-  float xmin, xmax;
+  double xmin, xmax;
   nt->GetMinMax(0, xmin, xmax);
   hprof = new HProf(xmin, xmax, 100);
@@ -1117 +1123 @@
 }
 
-/* --Methode-- */
-void NamedObjMgr::PlotFunc(string& expfunc, float xmin, float xmax, int np, string dopt)
-{
-FILE *fip;
-string fname = (*TmpDir) + "func1_pia_dl.c";
-string fnamer = (*TmpDir) + "func1_pia_dl";
-string  cmd;
-int rc;
-
-if (!myImgApp)  return; 
-
-cmd = "rm -f " + fname;
-rc = system(cmd.c_str());
-printf("PlotFunc_Do> %s  (Rc=%d)\n", cmd.c_str(), rc); 
-
-if ((fip = fopen(fname.c_str(), "w")) == NULL)   { 
-  string sn = fname; 
-  cout << "NamedObjMgr/PlotFunc_Erreur: Pb. Ouverture " << sn << endl; 
-  return; 
-  }
-
-// constitution du fichier a compiler
-fputs("#include <math.h> \n", fip);
-fputs("double func1_pia_dl_func(double x) \n{\n", fip);
-fprintf(fip,"return(%s); \n}\n", expfunc.c_str());
-fclose(fip);
-
-DlFunctionOfX f = (DlFunctionOfX) servnobjm->LinkFunctionFromFile(fnamer, "func1_pia_dl_func");
-if (!f) return; 
-PlotFunc(f, xmin, xmax, np, dopt);
-servnobjm->CloseDLL();
-return;
-}
-
-/* --Methode-- */
-void NamedObjMgr::PlotFunc2D(string& expfunc, float xmin, float xmax, float ymin, float ymax, 
-                             int npx, int npy, string dopt)
-{
-FILE *fip;
-string fname = (*TmpDir) + "func2_pia_dl.c";
-string fnamer = (*TmpDir) + "func2_pia_dl";
-string cmd;
-int rc;
-
-if (!myImgApp)  return; 
-
-cmd = "rm " + fname;
-rc = system(cmd.c_str());
-printf("PlotFunc2D_Do> %s  (Rc=%d)\n", cmd.c_str(), rc); 
-
-if ((fip = fopen(fname.c_str(), "w")) == NULL)   { 
-  string sn = fname; 
-  cout << "NamedObjMgr/PlotFunc2D_Erreur: Pb. Ouverture " << sn << endl; 
-  return; 
-  }
-
-// constitution du fichier a compiler
-fputs("#include <math.h> \n", fip);
-fputs("double func2_pia_dl_func(double x, double y) \n{\n", fip);
-fprintf(fip,"return(%s); \n}\n", expfunc.c_str());
-fclose(fip);
-
-DlFunctionOfXY f = (DlFunctionOfXY) servnobjm->LinkFunctionFromFile(fnamer, "func2_pia_dl_func");
-if (!f)  return;
-PlotFunc2D(f, xmin, xmax, ymin, ymax, npx, npy, dopt);
-servnobjm->CloseDLL();
-return;
-}
-
-/* --Methode-- */
-void NamedObjMgr::PlotFunc(DlFunctionOfX f, float xmin, float xmax, int np, string dopt)
-{
-if (!myImgApp)  return; 
-
-int k;
-if (np < 1) np = 1;
-if (xmax <= xmin) xmax = xmin+1.;
-Vector* vpy = new Vector(np);
-
-double xx;
-double dx = (xmax-xmin)/np;
-TRY {
-  for(k=0; k<np; k++) { xx = xmin+dx*k; (*vpy)(k) = f(xx); }
-} CATCH(merr) {
-  fflush(stdout); 
-  cout << endl; 
-  cerr << endl;
-  string es = PeidaExc(merr);
-  cerr << "NamedObjMgr::PlotFunc()  Exception :" << merr << es;
-  delete vpy;
-  vpy = NULL;
-  } ENDTRY;
-
-
-if (vpy) {
-  string nom = "Func";
-  AddObj(vpy, nom);
-  P1DArrayAdapter* vya = new POVectorAdapter(vpy, false);
-  vya->DefineXCoordinate(xmin, (xmax-xmin)/np);
-  PIYfXDrawer* dr = new   PIYfXDrawer(vya, NULL, true) ; 
-  bool fgsr = true;
-  dopt = "thinline," + dopt;
-  int opt = servnobjm->DecodeDispOption(dopt, fgsr);
-  int wrsid = myImgApp->DispScDrawer(dr, nom, opt);
-  if(wrsid >= 0) {
-    NObjList::iterator it = myObjs->find(nom);
-    if (it == myObjs->end()) return; 
-    (*it).second.wrsid.push_back(wrsid);
-    }
-  if (fgsr) myImgApp->RestoreGraphicAtt(); 
-  }
-
-return;
-}
-
-/* --Methode-- */
-void NamedObjMgr::PlotFunc2D(DlFunctionOfXY f, float xmin, float xmax, float ymin, float ymax, 
-                             int npx, int npy, string dopt)
-{
-if (!myImgApp)  return; 
-
-if (npx < 1) npx = 1;
-if (npy < 1) npy = 1;
-if (xmax <= xmin) xmax = xmin+1.;
-if (ymax <= ymin) ymax = ymin+1.;
-
-Matrix* mtx = new Matrix(npy, npx);
-
-int i,j;
-double xx, yy;
-double dx = (xmax-xmin)/npx;
-double dy = (ymax-ymin)/npy;
-// printf(" -- DBG -- %d %d , %g %g , %g %g \n", npx, npy, xmin, xmax, ymin, ymax);
-TRY {
-  for(j=0; j<npy; j++) {
-    yy = ymin+dy*j; 
-    for(i=0; i<npx; i++) {
-      xx = xmin+dx*i;
-      (*mtx)(j, i) = f(xx, yy);
-    }
-  }
-} CATCH(merr) {
-  fflush(stdout); 
-  cout << endl; 
-  cerr << endl;
-  string es = PeidaExc(merr);
-  cerr << "NamedObjMgr::PlotFunc2D()  Exception :" << merr << es;
-  delete mtx;  mtx = NULL;
-  } ENDTRY;
-
-if (mtx) {
-  string nom = "Func2";
-  AddObj(mtx, nom);
-  DisplaySurf3D(nom, dopt);
-  }
-
-return;
-}
 
 ///////////////////// Fit 1D et 2D //////////////////////////