Changeset 333 in Sophya for trunk/SophyaPI/PIext/servnobjm.h

Timestamp:

Jul 12, 1999, 1:12:29 PM (26 years ago)

Author:

ercodmgr

Message:

Trace de NTuple en 2D avec Marker de taille proportionnelle a Weight
Introduction des repertoires dans la gestion d'objets NameObjMgr
Reorganisation NamedObjMgr et Services2NObjMgr, ajout de commandes , ...
Reza 12/7/99

File:

• trunk/SophyaPI/PIext/servnobjm.h (modified) (4 diffs)

trunk/SophyaPI/PIext/servnobjm.h

@@ -25 +25 @@
 class Histo2D;
 class HProf;
+class NamedObjMgr;
 class PIStdImgApp;
 class NObjMgrAdapter;
@@ -30 +31 @@
 class Services2NObjMgr {
 public:
-                Services2NObjMgr(PIStdImgApp* app, string& tmpdir);
+                Services2NObjMgr(NamedObjMgr* omg, string& tmpdir);
   virtual       ~Services2NObjMgr();
 
@@ -40 +41 @@
   inline void   SetImgApp(PIStdImgApp* app) {mImgapp = app; }
 
-  void          Nobj_ComputeExpressions(NObjMgrAdapter* obja, string& expx, string& expy, string& expz, 
-                                        string& expwt, string& expcut,
-                                        NTuple* nt=NULL, Histo* h1=NULL,
-                                        Histo2D* h2=NULL, HProf* hp=NULL);
-  PlotExprFunc  LinkExprFunc(string& vardec, string& expx, string& expy, string& expz, 
-                             string& wt, string& cut);
+// Trace de fonctions 1-D , 2-D
+  virtual void  PlotFunc(string const & expfunc, string & nom, double xmin, double xmax, 
+                         int np=100, string dopt="");
+  virtual void  PlotFunc2D(string const & expfunc, string & nom, double xmin, double xmax, 
+                           double ymin, double ymax, int npx=50, int npy=50, string dopt="");
+  virtual void  PlotFuncFrCFile(string const & fname, string const & func, string & nom, 
+                                double xmin, double xmax, int np=100, string dopt="");
+  virtual void  PlotFunc2DFrCFile(string const & fname, string const & func, string & nom, 
+                                  double xmin, double xmax, double ymin, double ymax, 
+                                  int npx=50, int npy=50, string dopt="");
+  virtual void  PlotFunc(DlFunctionOfX f, string & nom, double xmin, double xmax, 
+                         int np=100, string dopt="");
+  virtual void  PlotFunc2D(DlFunctionOfXY f, string & nom, double xmin, double xmax, 
+                           double ymin, double ymax, int npx=50, int npy=50, string dopt="");
+
+//  Trace d'expression de NTuple, et d'autres objets
+  virtual void          DisplayPoints2D(string & nom, string& expx, string& expy,
+                                        string& experrx, string& experry, 
+                                        string& expcut, string dopt="");
+  virtual void          DisplayPoints3D(string & nom, string& expx, string& expy, string& expz, 
+                                        string& expcut, string dopt="");
+  virtual void          DisplayPoints2DW(string & nom, string& expx, string& expy, 
+                                         string& expwt, string& expcut, string dopt="");
+//  Projection d'expressions dans histogramme (et trace) 
+  virtual void          ProjectH1(string & nom, string& expx, string& expwt, string& expcut, 
+                                  string& nomh1, string dopt="");
+  virtual void          ProjectH2(string & nom, string& expx, string& expy, string& expwt, 
+                                  string& expcut, string& nomh2, string dopt="");
+  virtual void          ProjectHProf(string & nom, string& expx, string& expy, string& expwt, 
+                                  string& expcut, string& nomprof, string dopt="");
+//  Projection d'expression dans vecteurs et dans n-tuple
+  virtual void          FillVect(string & nom, string& expx, string& expcut, 
+                                 string& nomvec, string dopt="");
+  virtual void          FillNT(string & nom, string& expx, string& expy, string& expz,
+                               string& expt, string& expcut, string& nomnt); 
+  virtual void          FillGFD(string & nom, string& expx, string& expy, string& expz,
+                               string& experr, string& expcut, string& nomgfd);
+  virtual void          FillNTFrCFile(string & nom, string const & fname, 
+                                      string const & funcname, string & nomnt);
+  virtual void          PrepareNTExpressionCFile(string & nomobj, string const & fname, 
+                                                 string const & funcname);
+
+//   Methodes de fit -  CMV , deux methodes H1 H2 ou 1 seule ??) ...
+  virtual void          Fit12D(string & nom, string& func,
+                              string par,string step,string min,string max,string opt);
+
+// Calcul d'expressions d'interface NTuple pour les objets
+  void          ComputeExpressions(NObjMgrAdapter* obja, string& expx, string& expy, 
+                                   string& expz, string& expt, string& expcut,
+                                   NTuple* nt=NULL, Histo* h1=NULL,
+                                   Histo2D* h2=NULL, HProf* hp=NULL);
+  PlotExprFunc  LinkExprFunc(string& vardec, string& expx, string& expy, 
+                             string& expz, string& expt, string& cut);
   DlFunction    LinkFunctionFromFile(string const & fname, string const & funcname);
   void          CloseDLL();  
-
-// Trace de fonctions 1-D , 2-D
-  virtual void  PlotFunc(string const & expfunc, float xmin, float xmax, int np=100, string dopt="");
-  virtual void  PlotFunc2D(string const & expfunc, float xmin, float xmax, float ymin, float ymax, 
-                           int npx=50, int npy=50, string dopt="");
-  virtual void  PlotFuncFrCFile(string const & fname, string const & func, float xmin, float xmax, 
-                                int np=100, string dopt="");
-  virtual void  PlotFunc2DFrCFile(string const & fname, string const & func, float xmin, float xmax, 
-                                  float ymin, float ymax, int npx=50, int npy=50, string dopt="");
-  virtual void  PlotFunc(DlFunctionOfX f, float xmin, float xmax, int np=100, string dopt="");
-  virtual void  PlotFunc2D(DlFunctionOfXY f, float xmin, float xmax, float ymin, float ymax, 
-                           int npx=50, int npy=50, string dopt="");
 
 // Utilitaires divers 
   string        FileName2Name(string const & fn);
   int           DecodeDispOption(string& dopt, bool& fgsrgr);
+  char*         PClassIdToClassName(int cid);
 
 protected:
@@ -94 +131 @@
 
   PIStdImgApp* mImgapp;
+  NamedObjMgr* mOmg;
   
 };