Changeset 1384 for trunk/MagicSoft/Mars/meventdisp

Timestamp:

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

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/meventdisp

Files:

• MGCamDisplay.cc (modified) (1 diff)
• MGEvtDisplay.cc (modified) (3 diffs)

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);