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

Timestamp:

Nov 4, 1999, 5:20:32 PM (26 years ago)

Author:

ercodmgr

Message:

Ajout trace en medaillon - Reza 4/11/99

File:

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

trunk/SophyaPI/PIext/pihisto.cc

@@ -65 +65 @@
   if(hmax<=hmin) hmax += 1.;
   SetLimits(mHisto->XMin(), mHisto->XMax(), hmin, hmax);
-  SetAxesFlags(kBoxAxes | kExtTicks | kLabels);
+//  SetAxesFlags(kBoxAxes | kExtTicks | kLabels);   NE PAS faire Reza 11/99
 }
 
@@ -71 +71 @@
 PIHisto::Draw(PIGraphicUC* g, double /*xmin*/, double /*ymin*/, double /*xmax*/, double /*ymax*/)
 {
+  if (axesFlags != kAxesNone) DrawAxes(g);
+
   bool oktrace = false;
   if (!mHisto)  return;  
@@ -138 +140 @@
   PIGrCoord a, d;
   double cH = (double)g->GetFontHeight(a,d);
-  double cellHeight = cH * 3.8;
+  double cellHeight = cH * 3.6;
 //  double cellWidth  = (XMax() - XMin()) * 0.23;
   char label[50];
-  sprintf(label, "N= %.8g    ", mHisto->NData());
-  label[11] ='\0';
+  sprintf(label, "N= %8g    ", mHisto->NData());   label[11] ='\0';
   double cellWidth =  (double)g->CalcStringWidth(label) * 1.1;
-  g->DrawLine(XMax() - cellWidth, YMax(),
-                       XMax() - cellWidth, YMax() - cellHeight);
-  g->DrawLine(XMax() - cellWidth, YMax() - cellHeight,
-                       XMax()            , YMax() - cellHeight);
-  g->DrawString(XMax() - cellWidth*0.95, YMax() - cH*1.2, label);
-  sprintf(label, "m= %.8g", mHisto->Mean());
-  g->DrawString(XMax() - cellWidth*0.95, YMax() - cH*2.4, label);
-  sprintf(label, "s= %.8g", mHisto->Sigma());
-  g->DrawString(XMax() - cellWidth*0.95, YMax() - cH*3.6, label);
+  double xu, yu;
+  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*0.95);
+  yu = g->DeltaUCY(YMax(), - cH*1.15);
+  g->DrawString(xu, yu, label);
+  sprintf(label, "m= %8g", mHisto->Mean());  label[11] ='\0';
+  yu = g->DeltaUCY(YMax(), - cH*2.3);
+  g->DrawString(xu, yu, label);
+  sprintf(label, "s= %8g", mHisto->Sigma());  label[11] ='\0';
+  yu = g->DeltaUCY(YMax(), - cH*3.45);
+  g->DrawString(xu, yu, label);
                        
 }