Changeset 1668 for trunk/MagicSoft/Mars/meventdisp

Timestamp:

11/25/02 09:12:47 (22 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/meventdisp

Files:

• MGCamDisplay.cc (modified) (1 diff)
• MGCamDisplay.h (modified) (1 diff)
• MGEvtDisplay.cc (modified) (4 diffs)
• MGEvtDisplay.h (modified) (2 diffs)
• MGFadcDisp.cc (modified) (1 diff)
• MGFadcDisp.h (modified) (1 diff)

trunk/MagicSoft/Mars/meventdisp/MGCamDisplay.cc

@@ -148 +148 @@
 //
 MGCamDisplay::MGCamDisplay(const char *filename,
-                           const TGWindow *p, const TGWindow *main,
+                           const TGWindow *p, /*const TGWindow *main,*/
                            UInt_t w, UInt_t h)
-: MGEvtDisplay(filename, "Events", p, main, w, h), fDisplay(NULL)
+: MGEvtDisplay(filename, "Events", p, /*main,*/ w, h), fDisplay(NULL)
 {
     //

trunk/MagicSoft/Mars/meventdisp/MGCamDisplay.h

@@ -32 +32 @@
 public:
     MGCamDisplay(const char *filename,
-                 const TGWindow *p, const TGWindow *main,
+                 const TGWindow *p, /*const TGWindow *main,*/
                  UInt_t w, UInt_t h);
 

trunk/MagicSoft/Mars/meventdisp/MGEvtDisplay.cc

@@ -141 +141 @@
     fEvtInfo = new TGLabel(top2, new TGString(""));
     fList->Add(fEvtInfo);
-
     top2->AddFrame(fEvtInfo, laystd);
 
@@ -393 +392 @@
 
 MGEvtDisplay::MGEvtDisplay(const char *fname, const char *tname,
-                           const TGWindow *p, const TGWindow *main,
+                           const TGWindow *p, /*const TGWindow *main,*/
                            UInt_t w, UInt_t h)
-    : TGTransientFrame(p, main, w, h), fInitOk(kFALSE)
+//    : TGTransientFrame(p, main, w, h), fInitOk(kFALSE)
+: TGMainFrame(p, w, h), fInitOk(kFALSE)
 {
     //
@@ -472 +472 @@
         break;
     default:
-        txt += "Unknown Particle Id";
+        txt += "Unknown Particle Id#";
+        txt += evt->GetPartId();
     }
 
@@ -493 +494 @@
 
     fEvtInfo->SetText(txt);
+
+    //
+    // Seems to be necessary to newly layout the upper part to display
+    // the whole line of text
+    //
+    TGFrame &f = *(TGFrame*)fEvtInfo->GetParent()->GetParent();
+    f.Layout();
+    f.MapSubwindows();
 }
 

trunk/MagicSoft/Mars/meventdisp/MGEvtDisplay.h

@@ -21 +21 @@
 class MReadTree;
 
-class MGEvtDisplay : public TGTransientFrame
+class MGEvtDisplay : public TGMainFrame/*TGTransientFrame*/
 {
 private:
@@ -74 +74 @@
 public:
     MGEvtDisplay(const char *fname, const char *tname,
-                 const TGWindow *p, const TGWindow *main,
+                 const TGWindow *p, /*const TGWindow *main,*/
                  UInt_t w, UInt_t h);
 

trunk/MagicSoft/Mars/meventdisp/MGFadcDisp.cc

@@ -113 +113 @@
 //
 MGFadcDisp::MGFadcDisp(const char *filename, const char *treename,
-                       const TGWindow *p, const TGWindow *main,
+                       const TGWindow *p, /*const TGWindow *main,*/
                        UInt_t w, UInt_t h)
-    : MGEvtDisplay(filename, treename, p, main, w, h)
+    : MGEvtDisplay(filename, treename, p, /*main,*/ w, h)
 {
     //

trunk/MagicSoft/Mars/meventdisp/MGFadcDisp.h

@@ -23 +23 @@
 
     MGFadcDisp(const char *filename, const char *treename,
-               const TGWindow *p, const TGWindow *main, UInt_t w, UInt_t h);
+               const TGWindow *p, /*const TGWindow *main,*/ UInt_t w, UInt_t h);
 
     virtual Bool_t ProcessMessage(Long_t msg, Long_t parm1, Long_t parm2);