Changeset 1937 in Sophya

Timestamp:

Mar 14, 2002, 5:40:42 PM (24 years ago)

Author:

cmv

Message:

fin d ecriture des 10^{?? cmv 14/3/02}

File:

• trunk/SophyaPI/PI/pidrawer.cc (modified) (4 diffs)

trunk/SophyaPI/PI/pidrawer.cc

@@ -383 +383 @@
     if (flags & kLabels) {
       if (!aYdir)
-        DrawHLabels(g, -xMajTickLen*5, xFirstMajTick, xMajTickStep,0);
+        DrawHLabels(g, -xMajTickLen*6, xFirstMajTick, xMajTickStep,0);
       else 
-        DrawHLabels(g, xMajTickLen*5, xFirstMajTick, xMajTickStep,0);
+        DrawHLabels(g, xMajTickLen*6, xFirstMajTick, xMajTickStep,0);
       if (!aXdir)
         DrawVLabels(g, -yMajTickLen*2, yFirstMajTick, yMajTickStep,1);
@@ -441 +441 @@
     if (flags & kLabels) {
       if (!aYdir) {
-        DrawHLabels(g, g->DeltaUCY(yMin, -xMajTickLen*5), xFirstMajTick, xMajTickStep,0);
+        DrawHLabels(g, g->DeltaUCY(yMin, -xMajTickLen*6), xFirstMajTick, xMajTickStep,0);
         //DrawHLabels(g, g->DeltaUCY(yMax,  xMajTickLen*2), xFirstMajTick, xMajTickStep,0);
       }
       else {
         //DrawHLabels(g, g->DeltaUCY(yMin, -xMajTickLen*2), xFirstMajTick, xMajTickStep,0);
-        DrawHLabels(g, g->DeltaUCY(yMax,  xMajTickLen*5), xFirstMajTick, xMajTickStep,0);
+        DrawHLabels(g, g->DeltaUCY(yMax,  xMajTickLen*6), xFirstMajTick, xMajTickStep,0);
       }
       if (!aXdir) {
@@ -499 +499 @@
 
   // Choix du bon format pour les labels des axes;
-  char label[64]; string format;
+  char label[64]; string format; double fac = 1.;
   int npuiss = BonFormatAxes(xBeg,xMax,xStep,format,2,1);
-  double fac = 1.;
 
   if(npuiss!=0) {
     fac = pow(10.,(double)npuiss);
     sprintf(label,"10^%d",npuiss);
-    double largeur = g->CalcStringWidth(label);
-    double xm = (aXdir)? xMin+largeur: xMax-largeur;
-    double ym = (aYdir)? yMax+2.5*fsz: yMin-2.5*fsz;
-    g->DrawString(xm,ym,label);
+    double xm = (aXdir)? xMin: xMax;
+    double ym = (aYdir)? yMax+1.5*fsz: yMin-1.5*fsz;
+    g->DrawString(xm,ym,label,PI_HorizontalCenter|PI_VerticalTop);
   }
 
@@ -536 +534 @@
 
   // Choix du bon format pour les labels des axes;
-  char label[64]; string format;
+  char label[64]; string format; double fac = 1.;
   int npuiss = BonFormatAxes(yBeg,yMax,yStep,format,2,1);
-  double fac = 1.;
 
   if(npuiss!=0) {
     fac = pow(10.,(double)npuiss);
     sprintf(label,"10^%d",npuiss);
-    double largeur = g->CalcStringWidth(label);
-    double xm = (aXdir)? xMax+largeur: xMin-largeur;
+    double xm = (aXdir)? xMax: xMin;
     double ym = (aYdir)? yMin-1.5*fsz: yMax+1.5*fsz;
-    g->DrawString(xm,ym,label);
+    g->DrawString(xm,ym,label,PI_HorizontalRight|PI_VerticalBottom);
   }