Changeset 980 for trunk

Timestamp:

10/24/01 11:51:33 (23 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mgui

Files:

• MCamDisplay.cc (modified) (1 diff)
• MCamDisplay.h (modified) (3 diffs)

trunk/MagicSoft/Mars/mgui/MCamDisplay.cc

@@ -24 +24 @@
 //
 MCamDisplay::MCamDisplay(MGeomCam *geom)
-    : fAutoScale(kTRUE), fW(0), fH(0), fMinPhe(-2), fMaxPhe(50), fDrawingPad(NULL)
+    : fAutoScale(kTRUE), fMinPhe(-2), fMaxPhe(50), fW(0), fH(0), fDrawingPad(NULL)
 {
     //

trunk/MagicSoft/Mars/mgui/MCamDisplay.h

@@ -24 +24 @@
 
     UInt_t         fNumPixels;   // number of pixels in the present geometry
-    Int_t          fRange;       // the range in millimeters of the present geometry
+    Float_t        fRange;       // the range in millimeters of the present geometry
 
     Float_t        fMinPhe;      // The minimal number of Phe
@@ -33 +33 @@
     TClonesArray  *fLegText;     // array of all texts
 
+    UInt_t         fW;           // Width of canvas
+    UInt_t         fH;           // Height of canvas
     TVirtualPad   *fDrawingPad;  // pad in which we are drawing
-
 
     TBox  *GetBox(Int_t i)  { return (TBox*) fLegend->At(i); }
     TText *GetText(Int_t i) { return (TText*)fLegText->At(i); }
 
-    void SetPixColor(const MCerPhotPix &pix);
-
     MHexagon &operator[](int i) { return *((MHexagon*)fPixels->At(i)); }
 
+    void  SetPixColor(const MCerPhotPix &pix);
     Int_t GetColor(Float_t wert);
 
     void UpdateLegend();
+    void Paint(Option_t *option="");
 
 public:
@@ -51 +52 @@
     ~MCamDisplay();
 
-    void Draw(Option_t *option = "");
-
+    void SetAutoScale(Bool_t input=kTRUE) { fAutoScale = input; }
     void DrawPhotNum(const MCerPhotEvt *event);
-    void DrawPhotErr(const MCerPhotEvt *event);
 
     void Reset();
-
-    void SetAutoScale(Bool_t input = kTRUE)
-    {
-        fAutoScale = input;
-    }
+    void Draw(Option_t *option="");
 
     ClassDef(MCamDisplay, 0) // Displays the magic camera