Changeset 185 in Sophya

Timestamp:

Jan 10, 1999, 5:13:51 PM (27 years ago)

Author:

ercodmgr

Message:

Modif calcul View-3D Reza 10/01/99

Location:

trunk/SophyaPI/PIext

Files:

• pigfd2.cc (modified) (2 diffs)
• pintup3d.cc (modified) (2 diffs)

trunk/SophyaPI/PIext/pigfd2.cc

@@ -52 +52 @@
 D *= 1.4;
 Set3DView((xmin+xmax)/2., (ymin+ymax)/2, (zmin+zmax)/2., 
-          (xmin+xmax)/2.+D , (ymin+ymax)/2.+2.*D , zmin+(zmax-zmin)*0.2, 0.3, 0.3);  
+          (xmin+xmax)/2.+D , (ymin+ymax)/2.-2.5*D , zmin+(zmax-zmin)*0.85, 0.25, 0.25);  
 
-xMin = xmin - 0.05*(xmax-xmin);
-xMax = xmax + 0.05*(xmax-xmin);
-yMin = ymin - 0.05*(ymax-ymin);
-yMax = ymax + 0.05*(ymax-ymin);
-zMin = zmin - 0.05*(zmax-zmin);
-zMax = zmax + 0.05*(zmax-zmin);
+x3Min = xmin;    x3Max = xmax;
+y3Min = ymin;    y3Max = ymax;
+z3Min = zmin;    z3Max = zmax;
 
 }
@@ -66 +63 @@
 void PIGenFitDat3D::Draw(PIGraphicUC* g, float xmin, float ymin, float xmax, float ymax)
 {
+// On trace les axes - En attendant de faire mieux - Reza 8/12/98
+if (axesFlags != kAxesNone)  DrawAxes(g);
+
 if (!mGFD) return;
 if(mGFD->NData()<=0) return;
 if(VarX<0 || VarY<0) return;
+
 // On plotte les barre d'erreurs ligne demandee explicitement
 if(mLAtt!=PI_NotDefLineAtt) SelectErrBar(true,true,true);

trunk/SophyaPI/PIext/pintup3d.cc

@@ -67 +67 @@
   
   Set3DView((xmin+xmax)/2., (ymin+ymax)/2, (zmin+zmax)/2., 
-            (xmin+xmax)/2.+D , (ymin+ymax)/2.+2.*D , zmin+(zmax-zmin)*0.2, 0.3, 0.3);  
+            (xmin+xmax)/2.+D , (ymin+ymax)/2.-2.5*D , zmin+(zmax-zmin)*0.85, 0.25, 0.25);  
 
-  xMin = xmin - 0.05*(xmax-xmin);
-  xMax = xmax + 0.05*(xmax-xmin);
-  yMin = ymin - 0.05*(ymax-ymin);
-  yMax = ymax + 0.05*(ymax-ymin);
-  zMin = zmin - 0.05*(zmax-zmin);
-  zMax = zmax + 0.05*(zmax-zmin);
+  x3Min = xmin;  // - 0.05*(xmax-xmin);
+  x3Max = xmax;  // + 0.05*(xmax-xmin);
+  y3Min = ymin;  // - 0.05*(ymax-ymin);
+  y3Max = ymax;  // + 0.05*(ymax-ymin);
+  z3Min = zmin;  // - 0.05*(zmax-zmin);
+  z3Max = zmax;  // + 0.05*(zmax-zmin);
 
 //  printf("PINTuple3D::UpdateLimits() : %g-%g  %g-%g  %g-%g (%g) \n", xmin,xmax,ymin,ymax,zmin,zmax,D);
@@ -88 +88 @@
 float xp,yp,zp,xer,yer,zer;
 int nok;
+
+// On trace les axes - En attendant de faire mieux - Reza 8/12/98
+if (axesFlags != kAxesNone)  DrawAxes(g);
 
 if (!mNT) return;