Changeset 339 in Sophya

Timestamp:

Jul 27, 1999, 12:17:12 PM (26 years ago)

Author:

ercodmgr

Message:

Pour creer les ADAPTER de GeneralFitData cmv 27/7/99

Location:

trunk/SophyaPI/PIext

Files:

• basexecut.cc (modified) (5 diffs)
• nobjmgr.cc (modified) (2 diffs)
• nomgfdadapter.cc (added)
• nomgfdadapter.h (added)
• pigfd1.cc (modified) (2 diffs)
• pigfd1.h (modified) (2 diffs)
• pigfd2.cc (modified) (3 diffs)
• pigfd2.h (modified) (2 diffs)
• piinit.cc (modified) (4 diffs)

trunk/SophyaPI/PIext/basexecut.cc

@@ -286 +286 @@
   }
 
+// Obsolete : ne pas virer SVP, cmv 26/7/99
 else if (kw == "gfd2d") {
+  cout<<"----- gfd2d OBSOLETE: utilisez nt2d -----"<<endl;
   if(tokens.size()<2)
     {cout<<"Usage: gfd2d nomobj numvarx erreur=(x y xy) opt"<<endl;
@@ -298 +300 @@
   }
 else if (kw == "gfd3d") {
+  cout<<"----- gfd3d OBSOLETE: utilisez nt3d -----"<<endl;
   if(tokens.size()<3)
     {cout<<"Usage: gfd3d nameobj numvarx numvary erreur=(x y z xy xz yz xyz) opt"<<endl;
@@ -710 +713 @@
 usage += "\n Usage : nt3d nameobj varx vary varz [errx erry errz] [graphic_attributes]";
 usage += "\n  Related commands: disp  surf  nt2d nt2dw  gfd3d ";  
+usage += "\n  Related commands: disp  surf  nt2d nt2dw ";  
 mpiac->RegisterCommand(kw, usage, this, "Obj. Display");
+
+// Ceci est maintenant obsolete, on garde pour info.
 kw = "gfd2d";
 usage = "Displays Points (X-Y) with error-bars from a GeneralFit Data ";
 usage += "\n Usage : gfd2d nameobj numvarx erreur=(x y xy) [graphic_attributes]";
-usage += "\n  Related commands: gfd3d nt2d nt3d ";  
+usage += "\n  Related commands: gfd3d nt2d nt3d ";
+usage += "\n  ----- OBSOLETE: utilisez nt2d -----";
 mpiac->RegisterCommand(kw, usage, this, "Obj. Display");
 kw = "gfd3d";
@@ -720 +727 @@
 usage += "\n Usage : gfd3d nameobj numvarx numvary erreur=(x y z xy xz yz xyz) [graphic_attributes]";
 usage += "\n  Related commands: gfd2d nt2d nt3d ";  
+usage += "\n  ----- OBSOLETE: utilisez nt3d -----";
 mpiac->RegisterCommand(kw, usage, this, "Obj. Display");
 
@@ -819 +827 @@
 mpiac->RegisterCommand(kw, usage, this, "Expr. Plotting");
 
-
 }
 

trunk/SophyaPI/PIext/nobjmgr.cc

@@ -925 +925 @@
 }
 
-/* --Methode-- cmv 13/10/98 */
+/* --Methode-- cmv 13/10/98 : Obsolete mais ne pas virer SVP */
 void NamedObjMgr::DisplayGFD(string& nom, string& numvarx, string& numvary, string& err, string dopt)
 //      Pour le display 2D ou 3D d'un ``GeneralFitData''.
@@ -961 +961 @@
 }
 // Decodage des numeros de variables en abscisse
-int numvx=-1, numvy=-1;
-if(numvarx.length()>0) numvx = atoi(numvarx.c_str());
-if(numvary.length()>0) numvy = atoi(numvary.c_str());
-
-int wrsid = 0;
-if(numvy>=0) {              // Display 3D
+ int numvx=-1, numvy=-1;
+ if(numvarx.length()>0) numvx = atoi(numvarx.c_str());
+ if(numvary.length()>0) numvy = atoi(numvary.c_str());
+ 
+ int wrsid = 0;
+ if(numvy>=0) {              // display 3D
   PIGenFitDat3D* pigfd = new PIGenFitDat3D(((GeneralFitData*)obj),false);
   pigfd->SelectXY(numvx,numvy);
   pigfd->SelectErrBar(errx,erry,errz);
   wrsid = myImgApp->Disp3DDrawer(pigfd,nom,opt);  
-} else {                   // Display 2D
+} else {                   // display 2D
   PIGenFitDat* pigfd = new PIGenFitDat(((GeneralFitData*)obj),false);
   pigfd->SelectX(numvx);

trunk/SophyaPI/PIext/pigfd1.cc

@@ +1 @@
+// Cette classe est maintenant obsolete: generaldata <==> ntuple pour le dessin
+
 #include <stdio.h>
 #include "pigfd1.h"
@@ -41 +43 @@
 double dx, dy;
 double xmin=9.e19, xmax=-9.e19, ymin=9.e19, ymax=-9.e19;
-mGFD->GetMinMax(10*VarX+2,xmin,xmax);
-mGFD->GetMinMax(0,ymin, ymax);
+mGFD->GetMnMx(10*VarX+2,xmin,xmax);
+mGFD->GetMnMx(0,ymin, ymax);
 if(xmax<=xmin) xmax = xmin+1.;
 if(ymax<=ymin) ymax = ymin+1.;

trunk/SophyaPI/PIext/pigfd1.h

@@ +1 @@
+// Cette classe est maintenant obsolete: generaldata <==> ntuple pour le dessin
+
 #ifndef PIGFD1_H
 #define PIGFD1_H
@@ -24 +26 @@
 
 #endif
+

trunk/SophyaPI/PIext/pigfd2.cc

@@ +1 @@
+// Cette classe est maintenant obsolete: generaldata <==> ntuple pour le dessin
+
 #include <stdio.h>
 #include "pigfd2.h"
@@ -41 +43 @@
 if(VarX<0 || VarY<0) return;
 double xmin=9.e19, xmax=-9.e19, ymin=9.e19, ymax=-9.e19, zmin=9.e19, zmax=-9.e19;
-mGFD->GetMinMax(10*VarX+2,xmin,xmax);
-mGFD->GetMinMax(10*VarY+2,ymin,ymax);
-mGFD->GetMinMax(0,zmin, zmax);
+mGFD->GetMnMx(10*VarX+2,xmin,xmax);
+mGFD->GetMnMx(10*VarY+2,ymin,ymax);
+mGFD->GetMnMx(0,zmin, zmax);
 if(xmax<=xmin) xmax = xmin+1.;
 if(ymax<=ymin) ymax = ymin+1.;
@@ -103 +105 @@
 return;
 }
+

trunk/SophyaPI/PIext/pigfd2.h

@@ +1 @@
+// Cette classe est maintenant obsolete: generaldata <==> ntuple pour le dessin
+
 #ifndef PIGFD2_H
 #define PIGFD2_H
@@ -25 +27 @@
 
 #endif
+

trunk/SophyaPI/PIext/piinit.cc

@@ -4 +4 @@
 #include "servnobjm.h"
 #include "nomhistadapter.h"
+#include "nomgfdadapter.h"
 #include "nommatvecadapter.h"
 #include "nomimagadapter.h"
@@ -23 +24 @@
   serv->RegisterClass(new NTuple, new NOMAdapter_NTuple );
 
+  serv->RegisterClass(new GeneralFitData, new NOMAdapter_GeneralFitData );
+
   serv->RegisterClass(new Vector, new NOMAdapter_Vector );
   serv->RegisterClass(new Matrix, new NOMAdapter_Matrix );
@@ -30 +33 @@
   serv->RegisterClass(new Image<int_4>, new  NOMAdapter_Image<int_4> );
   serv->RegisterClass(new Image<r_4>, new  NOMAdapter_Image<r_4> );
-  
+ 
   serv->RegisterClass(new FitsImage<uint_2>, new  NOMAdapter_Image<uint_2> );
   serv->RegisterClass(new FitsImage<int_2>, new  NOMAdapter_Image<int_2> );
@@ -37 +40 @@
 
   serv->RegisterClass(new StarList, new NOMAdapter_StarList );
-  
-} 
+
+}
 
 PIAppInitiator::~PIAppInitiator()