Changeset 2400 in Sophya for trunk/SophyaPI

Timestamp:

Jun 6, 2003, 4:58:23 PM (22 years ago)

Author:

ansari

Message:

Modifs ds PINtup3D suite a la prise en charge du trace d'axes par ls BaseDrawer ds les traces 3D - Reza 6 Juin 2003

Location:

trunk/SophyaPI/PIext

Files:

• pintup3d.cc (modified) (8 diffs)
• pintup3d.h (modified) (1 diff)

trunk/SophyaPI/PIext/pintup3d.cc

@@ -48 +48 @@
   mNT = nt;
   mAdDO = ad; 
+  mAutoScaleXY = mAutoScaleZ = true;
   UseSizeScale(true, 5);
   UseColorScale(true);
+  ConnectPoints(false);
   SelectXYZ(NULL, NULL, NULL);
   SelectWt(NULL);
@@ -139 +141 @@
   mNT->GetMinMax(zK, zmin, zmax);
 
+  ComputeScaleFactor(xmin, xmax, ymin, ymax, zmin, zmax, 
+                     mAutoScaleXY, mAutoScaleZ, mScy, mScz);
+  
+  // cout << " DEBUG - NTup3D X:" << XMin3() << "-" << XMax3() " s=" << mScx
+  //     <<  " Y:" YMin3() << "-" << YMax3() << " 
+  xmin *= mScx;  xmax *= mScx; 
+  ymin *= mScy;  ymax *= mScy; 
+  zmin *= mScz;  zmax *= mScz; 
 // Centre du champ en C = (xmin+xmax)/2., (ymin+ymax)/2  (zmin+zmax)*0.5
 // Distance D = Max(xmax-xmin,ymin-ymax)*2
@@ -149 +159 @@
             (xmin+xmax)/2.+D , (ymin+ymax)/2.-2.5*D , zmin+(zmax-zmin)*0.85, 0.25, 0.25);  
 
+  Set3DBox(xmin, xmax, ymin, ymax, zmin, zmax, mScx, mScy, mScz);
+
   /*
   x3Min = xmin;  // - PERC_GARDE*(xmax-xmin);
@@ -158 +170 @@
   */
 
-  Set3DBox(xmin, xmax, ymin, ymax, zmin, zmax);
 
 //  printf("PINTuple3D::UpdateLimits() : %g .. %g  %g .. %g  %g .. %g (%g) \n", xmin,xmax,ymin,ymax,zmin,zmax,D);
@@ -241 +252 @@
 
   if ( (i > 0) && connectPts ) // On relie les points ...
-    g3->DrawLine3D(xl, yl, zl, xp, yp, zp);
+    g3->DrawLine3D(xl*mScx, yl*mScy, zl*mScz, xp*mScx, yp*mScy, zp*mScz);
   nok++;
   if ( xebK >= 0 ) {
     xer = mNT->GetCell(i, xebK);
-    g3->DrawLine3D(xp-xer, yp, zp, xp+xer, yp, zp);
+    g3->DrawLine3D((xp-xer)*mScx, yp*mScy, zp*mScz, (xp+xer)*mScx, yp*mScy, zp*mScz);
   }
   if ( yebK >= 0 ) {
     yer = mNT->GetCell(i, yebK);
-    g3->DrawLine3D(xp, yp-yer, zp, xp, yp+yer, zp);
+    g3->DrawLine3D(xp*mScx, (yp-yer)*mScy, zp*mScz, xp*mScx, (yp+yer)*mScy, zp*mScz);
   }
   if ( zebK >= 0 ) {
     zer = mNT->GetCell(i, zebK);
-    g3->DrawLine3D(xp, yp, zp-zer, xp, yp, zp+zer);
+    g3->DrawLine3D(xp*mScx, yp*mScy, (zp-zer)*mScz, xp*mScx, yp*mScy, (zp+zer)*mScz);
   }
   // Trace du marker
-  if ((wK >= 0)||(lK < 0)||(mmrk != PI_NotDefMarker))  g3->DrawMarker3D(xp, yp, zp); 
+  if ((wK >= 0)||(lK < 0)||(mmrk != PI_NotDefMarker))  
+    g3->DrawMarker3D(xp*mScx, yp*mScy, zp*mScz); 
   // Trace eventuel du label
-  if (lK >= 0) g3->DrawString3D(xp, yp, zp, mNT->GetCelltoString(i, lK).c_str());
+  if (lK >= 0) g3->DrawString3D(xp*mScx, yp*mScy, zp*mScz, 
+                                mNT->GetCelltoString(i, lK).c_str());
 }
 
@@ -303 +316 @@
       UseSizeScale(true, nbn);
     }
+    else if (opts == "rescalexy") mAutoScaleXY = true;
+    else if (opts == "norescalexy") mAutoScaleXY = false;
+    else if (opts == "rescalez") mAutoScaleZ = true;
+    else if (opts == "norescalez") mAutoScaleZ = false;
     else {
       // Si option non decode
@@ -325 +342 @@
 void PINTuple3D::GetOptionsHelpInfo(string& info)
 {
-// On recupere d'abord la chaine info de la classe de base
-PIDrawer::GetOptionsHelpInfo(info);
 info += " ---- PINTuple3D options help info : \n" ;
 info += "  connectpoints: The points are connected by a line \n";
@@ -332 +347 @@
 info += "  colorscale/nocolorscale (Use color scale for weight) \n";
 info += "  sizescale/sizescale=nbins/nosizescale (Use marker size for weight) \n";
+info += "  rescalexy / norescalexy   rescalez / norescalez \n";
 info += "  and usual color/line/marker/... attribute decoding  \n";
+// On recupere ensuite la chaine info de la classe de base
+PIDrawer::GetOptionsHelpInfo(info);
 return;
 }

trunk/SophyaPI/PIext/pintup3d.h

@@ -37 +37 @@
   NTupleInterface* mNT;
   bool mAdDO;
+  bool mAutoScaleXY, mAutoScaleZ;
   int xK, yK, zK;           // Index du nom de variable en X/Y/Z ds le ntuple
   int xebK, yebK, zebK;     // Index du nom de variable en ErrBarX/Y/Z ds le ntuple