Changeset 1057


Ignore:
Timestamp:
11/08/01 15:00:25 (23 years ago)
Author:
tbretz
Message:
*** empty log message ***
Location:
trunk/MagicSoft/Mars
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/MagicSoft/Mars/Changelog

    r1052 r1057  
    11                                                                  -*-*- END -*-*-
    22 2001/11/08: Thomas Bretz
     3
     4   * meventdisp/MGCamDisplay.cc:
     5     - changed enums to root style
     6     - get rid of the problem of button deletion by adding the buttons
     7       as first entries to the list
     8
     9   * mmain/MMonteCarlo.cc:
     10     - changed enums to root style
     11     - get rid of the problem of button deletion by adding the buttons
     12       as first entries to the list
    313
    414   * manalysis/MCerPhotCalc.cc, manalysis/MPedCalcPedRun.cc,

  • trunk/MagicSoft/Mars/Makefile

    r1052 r1057  
    105105mrproper:       $(MRPROPERS) rmbin rmbak rmbakmac rmhtml clean
    106106        @echo " Done."
     107        @echo " "
    107108
    108109tar:    mrproper

  • trunk/MagicSoft/Mars/manalysis/Makefile

    r1052 r1057  
    3636           MHillasCalc.cc \
    3737           MCerPhotCalc.cc \
     38           MCerPhotPix.cc \
    3839           MCerPhotEvt.cc \
    39            MCerPhotPix.cc \
    4040           MPedCalcPedRun.cc
    4141

  • trunk/MagicSoft/Mars/meventdisp/MGCamDisplay.cc

    r1051 r1057  
    4646enum
    4747{
    48     M_RBUT_RAW    = 0x1000,
    49     M_RBUT_CLEAN  = 0x1001,
    50     M_CBUT_HILLAS = 0x1002
     48    kRButRawEvt,
     49    kRButCleanedEvt,
     50    kCButHillas
    5151};
    5252
    … …  
    6363    fList->Add(group);
    6464
    65     TGRadioButton *but1 = new TGRadioButton(group, "Raw Events",      M_RBUT_RAW);
    66     TGRadioButton *but2 = new TGRadioButton(group, "Cleaned Events",  M_RBUT_CLEAN);
    67     TGCheckButton *but3 = new TGCheckButton(fTab1, "Display Ellipse", M_CBUT_HILLAS);
     65    TGRadioButton *but1 = new TGRadioButton(group, "Raw Events",      kRButRawEvt);
     66    TGRadioButton *but2 = new TGRadioButton(group, "Cleaned Events",  kRButCleanedEvt);
     67    TGCheckButton *but3 = new TGCheckButton(fTab1, "Display Ellipse", kCButHillas);
    6868
    6969    but2->SetState(kButtonDown);
    … …  
    7373    fDisplayHillas = kTRUE;
    7474
    75     /* FXIME:
    76      fList->Add(but1);
    77      fList->Add(but2);
    78     */
     75    /*
     76     WARNING:
     77     Bacause of some strage and hidden dependencies the
     78     GetMaiFrame call in the destructor of TGButton may fail if some
     79     of the other gui elemts is deleted first.
     80     AddFirst adds the buttons at the beginning of the deletion list,
     81     this seems to work.
     82     */
     83    fList->AddFirst(but1);
     84    fList->AddFirst(but2);
    7985
    8086    but1->Associate(this);
    … …  
    223229            switch (parm1)
    224230            {
    225             case M_CBUT_HILLAS:
     231            case kCButHillas:
    226232                fDisplayHillas = !fDisplayHillas;
    227233                UpdateDisplay();
    … …  
    233239            switch (parm1)
    234240            {
    235             case M_RBUT_RAW:
     241            case kRButRawEvt:
    236242                fDisplayRaw = kTRUE;
    237243                UpdateDisplay();
    238244                return kTRUE;
    239245
    240             case M_RBUT_CLEAN:
     246            case kRButCleanedEvt:
    241247                fDisplayRaw = kFALSE;
    242248                UpdateDisplay();

  • trunk/MagicSoft/Mars/mmain/MMonteCarlo.cc

    r1039 r1057  
    8686    fRadioButton1->SetState(kButtonDown);
    8787
    88     /* FIXME:
    89      fList->Add(fRadioButton1);
    90      fList->Add(fRadioButton2);
    91      fList->Add(fRadioButton3);
    92     */
     88    /*
     89     WARNING:
     90     Bacause of some strage and hidden dependencies the
     91     GetMaiFrame call in the destructor of TGButton may fail if some
     92     of the other gui elemts is deleted first.
     93     AddFirst adds the buttons at the beginning of the deletion list,
     94     this seems to work.
     95     */
     96    fList->AddFirst(fRadioButton1);
     97    fList->AddFirst(fRadioButton2);
     98    fList->AddFirst(fRadioButton3);
    9399
    94100    //
Note: See TracChangeset for help on using the changeset viewer.