Changeset 947 for trunk/MagicSoft/Mars/mmain/MDataCheck.cc

Timestamp:

09/26/01 12:22:51 (23 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/mmain/MDataCheck.cc (modified) (5 diffs)

trunk/MagicSoft/Mars/mmain/MDataCheck.cc

@@ -41 +41 @@
 : MBrowser(main, p, w, h)
 {
+    TGTextButton *pedadc = new TGTextButton(fTop2, "ADC Spectra of Pedestals", M_BUTTON_PEDADC);
+    TGTextButton *cradc  = new TGTextButton(fTop2, "ADC Specta of Cosmics",    M_BUTTON_CRADC);
+    TGTextButton *pedtdc = new TGTextButton(fTop3, "TDC Spectra of Pedestals", M_BUTTON_PEDTDC);
+    TGTextButton *crtdc  = new TGTextButton(fTop3, "TDC Specta of Cosmics",    M_BUTTON_CRTDC);
 
-    fButPedADC = new TGTextButton(fTop2, "ADC Spectra of Pedestals", M_BUTTON_PEDADC );
-    fButPedADC->Associate(this) ;
-    fTop2->AddFrame (fButPedADC, new TGLayoutHints(kLHintsTop | kLHintsLeft, 10, 10, 5, 5) );
+    pedadc->Associate(this);
+    cradc ->Associate(this);
+    pedtdc->Associate(this);
+    crtdc ->Associate(this);
 
-    fButCrADC = new TGTextButton(fTop2, "ADC Specta of Cosmics", M_BUTTON_CRADC );
-    fButCrADC->Associate(this) ;
-    fTop2->AddFrame (fButCrADC, new TGLayoutHints(kLHintsTop | kLHintsLeft, 10, 10, 5, 5) );
+    fList->Add(pedadc);
+    fList->Add(cradc);
+    fList->Add(pedtdc);
+    fList->Add(crtdc);
 
-    fButPedTDC = new TGTextButton(fTop3, "TDC Spectra of Pedestals", M_BUTTON_PEDTDC );
-    fButPedTDC->Associate(this) ;
-    fTop3->AddFrame (fButPedTDC, new TGLayoutHints(kLHintsTop | kLHintsLeft, 10, 10, 5, 5) );
+    TGLayoutHints *laybut = new TGLayoutHints(kLHintsTop|kLHintsLeft, 10, 10, 5, 5);
+    fList->Add(laybut);
 
-    fButCrTDC = new TGTextButton(fTop3, "TDC Specta of Cosmics", M_BUTTON_CRTDC );
-    fButCrTDC->Associate(this) ;
-    fTop3->AddFrame (fButCrTDC, new TGLayoutHints(kLHintsTop | kLHintsLeft, 10, 10, 5, 5) );
+    fTop2->AddFrame(pedadc, laybut);
+    fTop2->AddFrame(cradc,  laybut);
+
+    fTop3->AddFrame(pedtdc, laybut);
+    fTop3->AddFrame(crtdc,  laybut);
 
     MapSubwindows();
@@ -68 +75 @@
 }
 
-MDataCheck::~MDataCheck()
-{
-    delete fButPedADC;
-    delete fButCrADC;
-    delete fButPedTDC;
-    delete fButCrTDC;
-} 
-
 // ======================================================================
 
 Bool_t MDataCheck::ProcessMessage(Long_t msg, Long_t parm1, Long_t parm2)
-{     
-  // Process events generated by the buttons in the frame.
-  
+{
+    // Process events generated by the buttons in the frame.
+
     if (GET_MSG(msg)!=kC_COMMAND || GET_SUBMSG(msg)!=kCM_BUTTON)
         return MBrowser::ProcessMessage(msg, parm1, parm2);
@@ -92 +91 @@
     case M_BUTTON_CRTDC:
         if (!InputFileSelected())
-        {     
+        {
             DisplError("No Input (root) File selected!");
             return kTRUE;
@@ -100 +99 @@
         {
         case M_BUTTON_PEDADC:
-            fViewAdc.AdcSpectra(fInputFile, "PedEvents" ) ;
+            fViewAdc.AdcSpectra(fInputFile, "PedEvents");
             return kTRUE;
 
         case M_BUTTON_CRADC:
-            fViewAdc.AdcSpectra(fInputFile, "Events" ) ;
+            fViewAdc.AdcSpectra(fInputFile, "Events");
             return kTRUE;
 
@@ -118 +117 @@
 
     return MBrowser::ProcessMessage(msg, parm1, parm2);
-} 
+}