Changeset 1668 for trunk/MagicSoft/Mars/mmain
- Timestamp:
- 11/25/02 09:12:47 (22 years ago)
- Location:
- trunk/MagicSoft/Mars/mmain
- Files:
-
- 13 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/MagicSoft/Mars/mmain/MAnalysis.cc
r1656 r1668 100 100 } 101 101 102 MAnalysis::MAnalysis( const TGWindow *main,const TGWindow *p,102 MAnalysis::MAnalysis(/*const TGWindow *main,*/ const TGWindow *p, 103 103 const UInt_t w, const UInt_t h) 104 : MBrowser( main,p, w, h)104 : MBrowser(/*main,*/ p, w, h) 105 105 { 106 106 AddButtons(); -
trunk/MagicSoft/Mars/mmain/MAnalysis.h
r1076 r1668 28 28 29 29 public: 30 MAnalysis( const TGWindow *main=NULL,const TGWindow *p=NULL,30 MAnalysis(/*const TGWindow *main=NULL,*/ const TGWindow *p=NULL, 31 31 const UInt_t w=500, const UInt_t h=500) ; 32 32 -
trunk/MagicSoft/Mars/mmain/MBrowser.cc
r1172 r1668 275 275 } 276 276 277 MBrowser::MBrowser(const TGWindow *main, const TGWindow *p, 278 const UInt_t w, const UInt_t h) 279 : TGTransientFrame(p?p:gClient->GetRoot(), 280 main?main:gClient->GetRoot(), w, h) 277 MBrowser::MBrowser(/*const TGWindow *main,*/ const TGWindow *p, 278 const UInt_t w, const UInt_t h) 279 //: TGTransientFrame(p?p:gClient->GetRoot(), 280 // main?main:gClient->GetRoot(), w, h) 281 : TGMainFrame(p?p:gClient->GetRoot(), w, h) 281 282 { 282 283 fList = new MGList; … … 291 292 fList->Add(linesep); 292 293 AddFrame(linesep, laylinesep); 293 294 294 295 295 // -
trunk/MagicSoft/Mars/mmain/MBrowser.h
r1172 r1668 19 19 class TGFileContainer; 20 20 21 class MBrowser : public TG TransientFrame21 class MBrowser : public TGMainFrame/*TGTransientFrame*/ 22 22 { 23 23 private: … … 62 62 63 63 public: 64 MBrowser( const TGWindow *main=NULL,const TGWindow *p=NULL,65 64 MBrowser(/*const TGWindow *main=NULL,*/ const TGWindow *p=NULL, 65 const UInt_t w=500, const UInt_t h=500) ; 66 66 67 67 virtual ~MBrowser(); -
trunk/MagicSoft/Mars/mmain/MCameraDisplay.cc
r1086 r1668 43 43 // 'new MCameraDisplay()' 44 44 // 45 MCameraDisplay::MCameraDisplay( const TGWindow *main,const TGWindow *p,46 const UInt_t w, const UInt_t h)47 : MBrowser( main,p, w, h)45 MCameraDisplay::MCameraDisplay(/*const TGWindow *main,*/ const TGWindow *p, 46 const UInt_t w, const UInt_t h) 47 : MBrowser(/*main,*/ p, w, h) 48 48 { 49 49 TGTextButton *disp = new TGTextButton(fTop2, "Display Events", kButDisplay); … … 91 91 case kButDisplay: 92 92 new MGCamDisplay(fInputFile, 93 fClient->GetRoot(), this,600, 500);93 fClient->GetRoot(), /*this,*/ 600, 500); 94 94 return kTRUE; 95 95 } -
trunk/MagicSoft/Mars/mmain/MCameraDisplay.h
r1016 r1668 9 9 { 10 10 public: 11 MCameraDisplay( const TGWindow *main=NULL,const TGWindow *p=NULL,11 MCameraDisplay(/*const TGWindow *main=NULL,*/ const TGWindow *p=NULL, 12 12 const UInt_t w=500, const UInt_t h=500) ; 13 13 -
trunk/MagicSoft/Mars/mmain/MDataCheck.cc
r1652 r1668 54 54 // 'new MDataCheck()' 55 55 // 56 MDataCheck::MDataCheck( const TGWindow *main,const TGWindow *p,56 MDataCheck::MDataCheck(/*const TGWindow *main,*/ const TGWindow *p, 57 57 const UInt_t w, const UInt_t h) 58 : MBrowser( main,p, w, h)58 : MBrowser(/*main,*/ p, w, h) 59 59 { 60 60 TGTextButton *pedadc = new TGTextButton(fTop1, "ADC Spectra of Pedestals", kButPedAdc); -
trunk/MagicSoft/Mars/mmain/MDataCheck.h
r1652 r1668 16 16 17 17 public: 18 MDataCheck( const TGWindow *main=NULL,const TGWindow *p=NULL,18 MDataCheck(/*const TGWindow *main=NULL,*/ const TGWindow *p=NULL, 19 19 const UInt_t w=500, const UInt_t h=500) ; 20 20 -
trunk/MagicSoft/Mars/mmain/MEvtDisp.cc
r1086 r1668 39 39 }; 40 40 41 MEvtDisp::MEvtDisp( const TGWindow *main,const TGWindow *p,41 MEvtDisp::MEvtDisp(/*const TGWindow *main,*/ const TGWindow *p, 42 42 const UInt_t w, const UInt_t h) 43 : MBrowser( main,p, w, h)43 : MBrowser(/*main,*/ p, w, h) 44 44 { 45 45 TGTextButton *fadcevt = new TGTextButton(fTop1, "FADC Disp for Events", kButDispEvt); … … 96 96 case kButDispEvt: 97 97 new MGFadcDisp(fInputFile, "Events", 98 fClient->GetRoot(), this,600, 500);98 fClient->GetRoot(), /*this,*/ 600, 500); 99 99 return kTRUE; 100 100 101 101 case kButDispPedestal: 102 102 new MGFadcDisp(fInputFile , "PedEvts", 103 fClient->GetRoot(), this,600, 500);103 fClient->GetRoot(), /*this,*/ 600, 500); 104 104 return kTRUE; 105 105 106 106 case kButDispCalibration: 107 107 new MGFadcDisp(fInputFile , "CalEvts", 108 fClient->GetRoot(), this,600, 500);108 fClient->GetRoot(), /*this,*/ 600, 500); 109 109 return kTRUE; 110 110 } -
trunk/MagicSoft/Mars/mmain/MEvtDisp.h
r1016 r1668 9 9 { 10 10 public: 11 MEvtDisp( const TGWindow *main=NULL,const TGWindow *p=NULL,11 MEvtDisp(/*const TGWindow *main=NULL,*/ const TGWindow *p=NULL, 12 12 const UInt_t w=500, const UInt_t h=500) ; 13 13 -
trunk/MagicSoft/Mars/mmain/MMars.cc
r1644 r1668 277 277 278 278 case kButEvtDisplay: 279 new MEvtDisp( this);279 new MEvtDisp(/*this*/); 280 280 return kTRUE; 281 281 282 282 case kButDataCheck: 283 new MDataCheck( this);283 new MDataCheck(/*this*/); 284 284 return kTRUE; 285 285 286 286 case kButAnalysis: 287 new MAnalysis( this);287 new MAnalysis(/*this*/); 288 288 return kTRUE; 289 289 290 290 case kButMonteCarlo: 291 new MMonteCarlo( this);291 new MMonteCarlo(/*this*/); 292 292 return kTRUE; 293 293 294 294 case kButCameraDisplay: 295 new MCameraDisplay( this);295 new MCameraDisplay(/*this*/); 296 296 return kTRUE; 297 297 -
trunk/MagicSoft/Mars/mmain/MMonteCarlo.cc
r1646 r1668 162 162 } 163 163 164 MMonteCarlo::MMonteCarlo( const TGWindow *main,const TGWindow *p,164 MMonteCarlo::MMonteCarlo(/*const TGWindow *main,*/ const TGWindow *p, 165 165 const UInt_t w, const UInt_t h) 166 : MBrowser( main,p, w, h)166 : MBrowser(/*main,*/ p, w, h) 167 167 { 168 168 AddButtons(); -
trunk/MagicSoft/Mars/mmain/MMonteCarlo.h
r1030 r1668 28 28 29 29 public: 30 MMonteCarlo( const TGWindow *main=NULL,const TGWindow *p=NULL,30 MMonteCarlo(/*const TGWindow *main=NULL,*/ const TGWindow *p=NULL, 31 31 const UInt_t w=500, const UInt_t h=500); 32 32
Note:
See TracChangeset
for help on using the changeset viewer.