Index: trunk/MagicSoft/Mars/mmain/MBrowser.cc =================================================================== --- trunk/MagicSoft/Mars/mmain/MBrowser.cc (revision 946) +++ trunk/MagicSoft/Mars/mmain/MBrowser.cc (revision 947) @@ -36,4 +36,7 @@ #include // TGFileContainer +#include // TGHorizontal3DLine + // use TGSplitter.h for root<3.00 + #include // S_ISDIR @@ -236,4 +239,12 @@ CreateMenuBar(); + TGLayoutHints *laylinesep = new TGLayoutHints(kLHintsTop|kLHintsExpandX); + fList->Add(laylinesep); + + TGHorizontal3DLine *linesep = new TGHorizontal3DLine(this); + fList->Add(linesep); + AddFrame(linesep, laylinesep); + + // // ---- Create the top window with a lot of buttons ---- @@ -242,4 +253,8 @@ fList->Add(frametop); AddFrame(frametop); + + linesep = new TGHorizontal3DLine(this); + fList->Add(linesep); + AddFrame(linesep, laylinesep); // Index: trunk/MagicSoft/Mars/mmain/MBrowser.h =================================================================== --- trunk/MagicSoft/Mars/mmain/MBrowser.h (revision 946) +++ trunk/MagicSoft/Mars/mmain/MBrowser.h (revision 947) @@ -10,26 +10,13 @@ #endif -class TGMenuBar; -class TGPopupMenu; -class TGTab; +class TList; +class TGListView; class TGComboBox; -class TGTextButton; -class TGListBox; class TGPictureButton; class TGFileContainer; -class TGListView; -class TList; class MBrowser : public TGTransientFrame { private: - - // - // Create a main frame with a number of different buttons. - // - - // - // the things in the file selector - // TGComboBox *fDir; @@ -40,9 +27,4 @@ TGFileContainer *fFileCont; TGListView *fFileView; - - - TList *fList; - - // some icons and pictures often used const TGPicture *fPic1; @@ -58,5 +40,6 @@ protected: - Char_t fInputFile[256]; + TList *fList; + Char_t fInputFile[256]; void DisplError(const char *txt); @@ -74,5 +57,5 @@ const UInt_t w=500, const UInt_t h=500) ; - ~MBrowser(); + virtual ~MBrowser(); void CloseWindow(); Index: trunk/MagicSoft/Mars/mmain/MDataCheck.cc =================================================================== --- trunk/MagicSoft/Mars/mmain/MDataCheck.cc (revision 946) +++ trunk/MagicSoft/Mars/mmain/MDataCheck.cc (revision 947) @@ -41,20 +41,27 @@ : 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,18 +75,10 @@ } -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,5 +91,5 @@ case M_BUTTON_CRTDC: if (!InputFileSelected()) - { + { DisplError("No Input (root) File selected!"); return kTRUE; @@ -100,9 +99,9 @@ { 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,3 +117,3 @@ return MBrowser::ProcessMessage(msg, parm1, parm2); -} +} Index: trunk/MagicSoft/Mars/mmain/MDataCheck.h =================================================================== --- trunk/MagicSoft/Mars/mmain/MDataCheck.h (revision 946) +++ trunk/MagicSoft/Mars/mmain/MDataCheck.h (revision 947) @@ -6,6 +6,6 @@ #endif -#ifndef ROOT_TGFrame -#include +#ifndef MBROWSER_H +#include "MBrowser.h" #endif @@ -14,26 +14,12 @@ #endif -#ifndef MBROWSER_H -#include "MBrowser.h" -#endif - -class TGTextButton; - class MDataCheck : public MBrowser { private: - MViewAdcSpectra fViewAdc; - - TGTextButton *fButPedADC; - TGTextButton *fButPedTDC; - TGTextButton *fButCrADC; - TGTextButton *fButCrTDC; public: MDataCheck(const TGWindow *main=NULL, const TGWindow *p=NULL, const UInt_t w=500, const UInt_t h=500) ; - - ~MDataCheck(); Bool_t ProcessMessage(Long_t msg, Long_t parm1, Long_t parm2); Index: trunk/MagicSoft/Mars/mmain/MEvtDisp.cc =================================================================== --- trunk/MagicSoft/Mars/mmain/MEvtDisp.cc (revision 946) +++ trunk/MagicSoft/Mars/mmain/MEvtDisp.cc (revision 947) @@ -39,19 +39,25 @@ MEvtDisp::MEvtDisp(const TGWindow *main, const TGWindow *p, - const UInt_t w, const UInt_t h) + const UInt_t w, const UInt_t h) : MBrowser(main, p, w, h) { + TGTextButton *fadcevt = new TGTextButton(fTop1, "FADC Disp for Events", M_BUT_DISP1_EVT); + TGTextButton *fadcped = new TGTextButton(fTop1, "FADC Disp for PedEvts", M_BUT_DISP1_PED); + TGTextButton *fadccal = new TGTextButton(fTop1, "FADC Disp for CalEvts", M_BUT_DISP1_CAL); - fButFadcDispEvts = new TGTextButton(fTop1, "FADC Disp for Events", M_BUT_DISP1_EVT ); - fButFadcDispEvts->Associate(this) ; - fTop1->AddFrame (fButFadcDispEvts, new TGLayoutHints(kLHintsTop | kLHintsLeft, 10, 10, 5, 5) ); + fadcevt->Associate(this); + fadcped->Associate(this); + fadccal->Associate(this); - fButFadcDispPed = new TGTextButton(fTop1, "FADC Disp for PedEvts", M_BUT_DISP1_PED ); - fButFadcDispPed->Associate(this) ; - fTop1->AddFrame (fButFadcDispPed, new TGLayoutHints(kLHintsTop | kLHintsLeft, 10, 10, 5, 5) ); + fList->Add(fadcevt); + fList->Add(fadcped); + fList->Add(fadccal); - fButFadcDispCal = new TGTextButton(fTop1, "FADC Disp for CalEvts", M_BUT_DISP1_CAL ); - fButFadcDispCal->Associate(this) ; - fTop1->AddFrame (fButFadcDispCal, new TGLayoutHints(kLHintsTop | kLHintsLeft, 10, 10, 5, 5) ); + TGLayoutHints *laybut = new TGLayoutHints(kLHintsTop|kLHintsLeft, 10, 10, 5, 5); + fList->Add(laybut); + + fTop1->AddFrame(fadcevt, laybut); + fTop1->AddFrame(fadcped, laybut); + fTop1->AddFrame(fadccal, laybut); MapSubwindows(); @@ -63,11 +69,4 @@ MapWindow(); -} - -MEvtDisp::~MEvtDisp() -{ - delete fButFadcDispCal; - delete fButFadcDispPed; - delete fButFadcDispEvts; } @@ -100,11 +99,11 @@ case M_BUT_DISP1_PED: - new MGFadcDisp( fInputFile , "PedEvts", - fClient->GetRoot(), this, 600, 500 ) ; + new MGFadcDisp(fInputFile , "PedEvts", + fClient->GetRoot(), this, 600, 500); return kTRUE; case M_BUT_DISP1_CAL: - new MGFadcDisp( fInputFile , "CalEvts", - fClient->GetRoot(), this, 600, 500 ) ; + new MGFadcDisp(fInputFile , "CalEvts", + fClient->GetRoot(), this, 600, 500); return kTRUE; } Index: trunk/MagicSoft/Mars/mmain/MEvtDisp.h =================================================================== --- trunk/MagicSoft/Mars/mmain/MEvtDisp.h (revision 946) +++ trunk/MagicSoft/Mars/mmain/MEvtDisp.h (revision 947) @@ -6,27 +6,13 @@ #endif -#ifndef ROOT_TGFrame -#include -#endif - #ifndef MBROWSER_H #include "MBrowser.h" #endif -class TGTextButton; - class MEvtDisp : public MBrowser { -private: - - TGTextButton *fButFadcDispEvts; - TGTextButton *fButFadcDispPed; - TGTextButton *fButFadcDispCal; - public: MEvtDisp(const TGWindow *main=NULL, const TGWindow *p=NULL, - const UInt_t w=500, const UInt_t h=500) ; - - ~MEvtDisp(); + const UInt_t w=500, const UInt_t h=500) ; Bool_t ProcessMessage(Long_t msg, Long_t parm1, Long_t parm2); Index: trunk/MagicSoft/Mars/mmain/MMars.cc =================================================================== --- trunk/MagicSoft/Mars/mmain/MMars.cc (revision 946) +++ trunk/MagicSoft/Mars/mmain/MMars.cc (revision 947) @@ -103,5 +103,5 @@ top->AddFrame(magic, lay1); - top->AddFrame(mars, lay1); + top->AddFrame(mars, lay2); } @@ -188,12 +188,15 @@ CreateBottomFrame(low); - AddFrame(top, new TGLayoutHints(kLHintsTop|kLHintsExpandX)); - AddFrame(linesep, new TGLayoutHints(kLHintsTop|kLHintsExpandX)); - AddFrame(low, new TGLayoutHints(kLHintsTop|kLHintsExpandX)); + TGLayoutHints *layout = new TGLayoutHints(kLHintsTop|kLHintsExpandX); + fList->Add(layout); + + AddFrame(top, layout); + AddFrame(linesep, layout); + AddFrame(low, layout); // // Map the window, set up the layout, etc. // - SetWMSizeHints(400, 650, 1000, 1000, 10, 10 ) ; // set the smallest and biggest size of the Main frame + SetWMSizeHints(400, 380, 400, 380, 10, 10); // set the smallest and biggest size of the Main frame MapSubwindows(); Index: trunk/MagicSoft/Mars/mmain/MMonteCarlo.cc =================================================================== --- trunk/MagicSoft/Mars/mmain/MMonteCarlo.cc (revision 946) +++ trunk/MagicSoft/Mars/mmain/MMonteCarlo.cc (revision 947) @@ -34,12 +34,16 @@ }; -MMonteCarlo::MMonteCarlo(const TGWindow *main, const TGWindow *p, - const UInt_t w, const UInt_t h ) - : MBrowser(p, main, w, h) +MMonteCarlo::MMonteCarlo(const TGWindow *main, const TGWindow *p, + const UInt_t w, const UInt_t h) +: MBrowser(main, p, w, h) { + TGTextButton *action = new TGTextButton(fTop1, "ACTION", M_BUTTON_ACTION); + fList->Add(action); + action->Associate(this); - fButAction = new TGTextButton(fTop1, "ACTION", M_BUTTON_ACTION ); - fButAction->Associate(this) ; - fTop1->AddFrame (fButAction, new TGLayoutHints(kLHintsTop | kLHintsLeft, 10, 10, 5, 5) ); + TGLayoutHints *laybut = new TGLayoutHints(kLHintsTop|kLHintsLeft, 10, 10, 5, 5); + fList->Add(laybut); + + fTop1->AddFrame(action, laybut); MapSubwindows(); @@ -52,9 +56,4 @@ MapWindow(); } - -MMonteCarlo::~MMonteCarlo() -{ - delete fButAction; -} // ====================================================================== Index: trunk/MagicSoft/Mars/mmain/MMonteCarlo.h =================================================================== --- trunk/MagicSoft/Mars/mmain/MMonteCarlo.h (revision 946) +++ trunk/MagicSoft/Mars/mmain/MMonteCarlo.h (revision 947) @@ -6,24 +6,13 @@ #endif -#ifndef ROOT_TGFrame -#include -#endif #ifndef MBROWSER_H #include "MBrowser.h" #endif -class TGTextButton; - class MMonteCarlo : public MBrowser { -private: - - TGTextButton *fButAction; - public: MMonteCarlo(const TGWindow *main=NULL, const TGWindow *p=NULL, - const UInt_t w=500, const UInt_t h=500) ; - - ~MMonteCarlo(); + const UInt_t w=500, const UInt_t h=500); Bool_t ProcessMessage(Long_t msg, Long_t parm1, Long_t parm2);