Changeset 1384 for trunk/MagicSoft/Mars

Timestamp:

07/08/02 10:55:07 (22 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• NEWS (modified) (1 diff)
• meventdisp/MGCamDisplay.cc (modified) (1 diff)
• meventdisp/MGEvtDisplay.cc (modified) (3 diffs)
• mgui/MCamDisplay.cc (modified) (1 diff)
• mgui/MCamDisplay.h (modified) (1 diff)
• mgui/MHexagon.h (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -16 +16 @@
    * mbase/Makefile, mbase/BaseLinkDef.h, mbase/BaseIncl.h,
      manalysis/Makefile, manalysis/AnalysisLinkDef.h, 
-     manalysis/AnalysisIncl.h:
+     manalysis/AnalysisIncl.h, meventdisp/Makefile:
      - changed accordingly
+
+   * meventdisp/MGCamDisplay.cc:
+     - cd to right canvas before drawing camera display
+
+   * meventdisp/MGEvtDisplay.cc:
+     - added the "Geometry"-Tab
+
+   * mgui/MCamDisplay.[h,cc]:
+     - added DrawPixelNumbers
+
+   * mgui/MHexagon.h:
+     - added Getter functions
+
+
 
  2002/07/04: Abelardo Moralejo

trunk/MagicSoft/Mars/NEWS

@@ -22 +22 @@
 
    - Changed the Alpha range according to TDAS 02-03 to [-90°,90°]
+
+   - Added a camera display displaying the pixel numbers to the
+     event display gui.
 
 

trunk/MagicSoft/Mars/meventdisp/MGCamDisplay.cc

@@ -163 +163 @@
     // Show camera display for the actual geometry
     //
+    fCanvas->cd();
     fDisplay = new MCamDisplay(geom);
     fDisplay->Draw();

trunk/MagicSoft/Mars/meventdisp/MGEvtDisplay.cc

@@ -43 +43 @@
 #include "MTaskList.h"
 #include "MEvtLoop.h"
+#include "MCamDisplay.h"
 #include "MReadMarsFile.h"
+#include "MGeomCamMagic.h"
 
 ClassImp(MGEvtDisplay);
@@ -218 +220 @@
     TGTab *tabdisp = new TGTab(frame, 300, 300);
 
+    TGLayoutHints *laycanvas = new TGLayoutHints(kLHintsCenterX|kLHintsCenterY|kLHintsExpandX|kLHintsExpandY);
+
     TGCompositeFrame *tab2 = tabdisp->AddTab("Event Display");
-
     TRootEmbeddedCanvas *canvas = new TRootEmbeddedCanvas("EventDisplay", tab2, 400, 400);
-
-    TGLayoutHints *laycanvas = new TGLayoutHints(kLHintsCenterX|kLHintsCenterY|kLHintsExpandX|kLHintsExpandY);
     tab2->AddFrame(canvas, laycanvas);
+    fList->Add(canvas);
 
     fCanvas = canvas->GetCanvas();
+
+    TGCompositeFrame *tab3 = tabdisp->AddTab("Geometry");
+    canvas = new TRootEmbeddedCanvas("CamDisplay", tab3, 400, 400);
+    tab3->AddFrame(canvas, laycanvas);
+    fList->Add(canvas);
+
+    MGeomCamMagic geom;
+    MCamDisplay *display = new MCamDisplay(&geom);
+    display->Draw();
+    display->DrawPixelNumbers();
+    fList->Add(display);
 
     //
@@ -237 +250 @@
     //
     fList->Add(tabdisp);
-    fList->Add(canvas);
     fList->Add(laycanvas);
     fList->Add(laydisp);

trunk/MagicSoft/Mars/mgui/MCamDisplay.cc

@@ -269 +269 @@
 }
 
+void MCamDisplay::DrawPixelNumbers()
+{
+    if (!fDrawingPad)
+        Draw();
+
+    fDrawingPad->cd();
+
+    TText txt;
+    txt.SetTextFont(122);
+    txt.SetTextAlign(22);   // centered/centered
+
+    for (UInt_t i=0; i<fNumPixels; i++)
+    {
+        TString num;
+        num += i;
+
+        const MHexagon &h = (MHexagon&)*(*fPixels)[i];
+        TText *nt = txt.DrawText(h.GetX(), h.GetY(), num);
+        nt->SetTextSize(0.0005*h.GetD());
+    }
+}
+
 // ------------------------------------------------------------------------
 //

trunk/MagicSoft/Mars/mgui/MCamDisplay.h

@@ -58 +58 @@
     void DrawPhotNum(const MCerPhotEvt *event);
 
+    void DrawPixelNumbers();
+
     void Reset();
     void Draw(Option_t *option="");

trunk/MagicSoft/Mars/mgui/MHexagon.h

@@ -57 +57 @@
     virtual void  SavePrimitive(ofstream &out, Option_t *);
 
+    Float_t GetX() const { return fX; }
+    Float_t GetY() const { return fY; }
+    Float_t GetD() const { return fD; }
+
     ClassDef(MHexagon, 0)    // A hexagon for MAGIC
 };