Changeset 2115 in Sophya for trunk/SophyaPI/PIext

Timestamp:

Jul 17, 2002, 11:59:50 PM (23 years ago)

Author:

cmv

Message:

ResizeMinMax: cmv 17/07/2002

Location:

trunk/SophyaPI/PIext

Files:

• pigfd1.cc (modified) (3 diffs)
• pintuple.cc (modified) (5 diffs)
• pistlist.cc (modified) (2 diffs)

trunk/SophyaPI/PIext/pigfd1.cc

@@ -3 +3 @@
 #include <stdio.h>
 #include "pigfd1.h"
-
-#define PERC_GARDE 0.02
  
 /* --Methode-- */
@@ -42 +40 @@
 if(mGFD->NData()<=0) return;
 if(VarX<0) return;
-double dx, dy;
 double xmin=9.e19, xmax=-9.e19, ymin=9.e19, ymax=-9.e19;
 mGFD->GetMnMx(10*VarX+2,xmin,xmax);
@@ -48 +45 @@
 if(xmax<=xmin) xmax = xmin+1.;
 if(ymax<=ymin) ymax = ymin+1.;
-dx = PERC_GARDE*(xmax-xmin);
-dy = PERC_GARDE*(ymax-ymin);
-SetLimits((double)xmin-dx,(double)xmax+dx,(double)ymin-dy,(double)ymax+dy);
+PIAxes::ReSizeMinMax(isLogScaleX(),xmin,xmax);
+PIAxes::ReSizeMinMax(isLogScaleY(),ymin,ymax);
+SetLimits(xmin,xmax,ymin,ymax);
 SetAxesFlags(kBoxAxes | kExtTicks | kLabels);
 }

trunk/SophyaPI/PIext/pintuple.cc

@@ -5 +5 @@
 #include <stdio.h>
 #include "pintuple.h"
-
-#define PERC_GARDE 0.02
 
 //++
@@ -126 +124 @@
 
   // Commencer par trouver nos limites
-  double dx, dy;
   double xmin, xmax, ymin, ymax;
   xmin = ymin = 9.e19;
@@ -132 +129 @@
   mNT->GetMinMax(xK, xmin, xmax);
   mNT->GetMinMax(yK, ymin, ymax);
-    
-  dx = PERC_GARDE*(xmax-xmin);
-  dy = PERC_GARDE*(ymax-ymin);
-  
-  SetLimits(xmin-dx, xmax+dx, ymin-dy, ymax+dy);
+  PIAxes::ReSizeMinMax(isLogScaleX(),xmin,xmax);
+  PIAxes::ReSizeMinMax(isLogScaleY(),ymin,ymax);
+  SetLimits(xmin,xmax,ymin,ymax);
 //  SetAxesFlags(kBoxAxes | kExtTicks | kLabels);  Ne pas faire - Reza 11/99
 }
@@ -175 +170 @@
 nok = 0;  
 xp = yp = xl = yl = 0;
-for (int i=0; i<mNT->NbLines(); i++) {
+for (long i=0; i<(long)mNT->NbLines(); i++) {
   xl = xp;  yl = yp; 
   xp = mNT->GetCell(i, xK);
@@ -247 +242 @@
 info += buff;
 info += mNT->LineHeaderToString();
-for (int i=0; i<mNT->NbLines(); i++) {
+for(long i=0; i<(long)mNT->NbLines(); i++) {
   xp = mNT->GetCell(i, xK);
   yp = mNT->GetCell(i, yK);

trunk/SophyaPI/PIext/pistlist.cc

@@ -4 +4 @@
 #include <stdio.h>
 #include "pistlist.h"
-
-#define PERC_GARDE 0.02
 
 //++
@@ -84 +82 @@
 
   // Commencer par trouver nos limites
-  double dx, dy;
-  double x1, x2, y1, y2;
+  double x1,x2,y1,y2;
   mStL->CalcXYLimits(x1, x2, y1, y2);
-  
-  dx = PERC_GARDE*(x2-x1);
-  dy = PERC_GARDE*(y2-y1);
-  
-  SetLimits(x1-dx, x2+dx, y1-dy, y2+dy); 
+  PIAxes::ReSizeMinMax(isLogScaleX(),x1,x2);
+  PIAxes::ReSizeMinMax(isLogScaleY(),y1,y2);
+  SetLimits(x1,x2,y1,y2); 
   SetAxesFlags(kBoxAxes | kExtTicks | kLabels);
 }