Changeset 2557 for trunk/MagicSoft/Mars/mhist/MHCamera.cc

Timestamp:

11/22/03 21:14:14 (21 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/mhist/MHCamera.cc (modified) (3 diffs)

trunk/MagicSoft/Mars/mhist/MHCamera.cc

@@ -568 +568 @@
     Update(gPad->GetLogy(), isbox, iscol);
     PaintAxisTitle();
+
+    if (opt.Contains("pixelindex"))
+        PaintIndices(kFALSE);
+    if (opt.Contains("sectorindex"))
+        PaintIndices(kTRUE);
 }
 
@@ -627 +632 @@
 }
 
-void MHCamera::DrawPixelIndices()
+void MHCamera::PaintIndices(Bool_t sector)
 {
     if (fNcells<=1)
         return;
-
-    // FIXME: Is this correct?
-    for (int i=0; i<kItemsLegend; i++)
-        fColors[i] = 16;
-
-    if (!gPad)
-        Draw();
 
     TText txt;
@@ -645 +643 @@
     for (Int_t i=0; i<fNcells-2; i++)
     {
+        const MGeomPix &h = (*fGeomCam)[i];
+
         TString num;
-        num += i;
-
-        const MGeomPix &h = (*fGeomCam)[i];
-        TText *nt = txt.DrawText(h.GetX(), h.GetY(), num);
-        nt->SetTextSize(0.3*h.GetD()/fGeomCam->GetMaxRadius()/1.05);
-    }
-}
-
-void MHCamera::DrawSectorIndices()
-{
-    if (fNcells<=1)
-        return;
-
-    for (int i=0; i<kItemsLegend; i++)
-        fColors[i] = 16;
-
-    if (!gPad)
-        Draw();
-
-    TText txt;
-    txt.SetTextFont(122);
-    txt.SetTextAlign(22);   // centered/centered
-
-    for (Int_t i=0; i<fNcells-2; i++)
-    {
-        TString num;
-        num += (*fGeomCam)[i].GetSector();
-
-        const MGeomPix &h = (*fGeomCam)[i];
-        TText *nt = txt.DrawText(h.GetX(), h.GetY(), num);
-        nt->SetTextSize(0.3*h.GetD()/fGeomCam->GetMaxRadius()/1.05);
+        num += sector ? h.GetSector() : i;
+
+        txt.SetTextSize(0.3*h.GetD()/fGeomCam->GetMaxRadius()/1.05);
+        txt.PaintText(h.GetX(), h.GetY(), num);
     }
 }