Changeset 1645 in Sophya for trunk/SophyaPI/PIext/pihisto.cc

Timestamp:

Aug 24, 2001, 1:08:42 PM (24 years ago)

Author:

cmv

Message:

Correc. bug display Statis si axes inverses cmv 24/08/2001

File:

• trunk/SophyaPI/PIext/pihisto.cc (modified) (2 diffs)

trunk/SophyaPI/PIext/pihisto.cc

@@ -142 +142 @@
   PIGrCoord a, d;
   double cH = (double)g->GetFontHeight(a,d);
-  double cellHeight = cH * 3.6;
+  double cellHeight = 3.6 * cH;
 
   // Les labels et leurs longueurs -> largeur de la cellule
-  char *label, label1[32], label2[32], label3[32];
-  sprintf(label1, "N= %-6g",mHisto->NData());
-  sprintf(label2, "m= %-6g",mHisto->Mean());
-  sprintf(label3, "s= %-6g",mHisto->Sigma());
+  char *label, label1[64], label2[64], label3[64];
+  sprintf(label1, "N= %-g",mHisto->NData());
+  sprintf(label2, "m= %-g",mHisto->Mean());
+  sprintf(label3, "s= %-g",mHisto->Sigma());
   label = label1;
   if(strlen(label)<strlen(label2)) label = label2;
@@ -154 +154 @@
   double cellWidth =  1.1 * (double)g->CalcStringWidth(label);
 
-  double xu, yu;
+  double xu, yu, cw;
   // Les limites du cadre
-  xu = g->DeltaUCX(XMax(), - cellWidth);
-  yu = g->DeltaUCY(YMax(), - cellHeight);
-  g->DrawLine(xu, YMax(), xu, yu);
-  g->DrawLine(xu, yu, XMax(), yu);
+  xu = g->DeltaUCX(XMax(), -cellWidth);
+  yu = g->DeltaUCY(YMax(), -cellHeight);
+  g->DrawLine(xu,YMax(),xu,yu);
+  g->DrawLine(xu,yu,XMax(),yu);
 
-  // L'ecriture des labels
-  xu = g->DeltaUCX(XMax(), - cellWidth*0.95);
-  yu = g->DeltaUCY(YMax(), - cH*1.15);
-  g->DrawString(xu, yu, label1);
-  yu = g->DeltaUCY(YMax(), - cH*2.3);
-  g->DrawString(xu, yu, label2);
-  yu = g->DeltaUCY(YMax(), - cH*3.45);
-  g->DrawString(xu, yu, label3);
+  // L'ecriture des labels (attention aux inversions possibles des axes!)
+  cw = (g->isAxeXDirRtoL()) ? -0.05*cellWidth : -0.95*cellWidth;
+  xu = g->DeltaUCX(XMax(),cw);
+
+  cw = (g->isAxeYDirUpDown()) ? -0.15*cH : -1.15*cH;
+  yu = g->DeltaUCY(YMax(),cw);
+  g->DrawString(xu, yu,label1);
+    cw +=  -1.15*cH;
+    yu = g->DeltaUCY(YMax(),cw);
+    g->DrawString(xu, yu,label2);
+      cw +=  -1.15*cH;
+      yu = g->DeltaUCY(YMax(),cw);
+      g->DrawString(xu, yu,label3);
                        
 }
-