Changeset 2204


Ignore:
Timestamp:
06/20/03 10:48:34 (22 years ago)
Author:
Daniela Dorner
Message:
*** empty log message ***
Location:
trunk/MagicSoft/Mars
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/MagicSoft/Mars/Changelog

    r2200 r2204  
    11                                                 -*-*- END OF LINE -*-*-
     2
     3 2003/06/19: Thomas Bretz
     4 
     5   * mgui/MCamDisplay.[h,cc]:
     6     - fixed color palette when loading MCamDisplay
     7
     8
    29
    310 2003/06/18: Thomas Bretz
  • trunk/MagicSoft/Mars/mgui/MCamDisplay.cc

    r2189 r2204  
    7878//  Default Constructor. To be used by the root system ONLY.
    7979//
    80 MCamDisplay::MCamDisplay() : fGeomCam(NULL), fAutoScale(kTRUE)
     80MCamDisplay::MCamDisplay() : fGeomCam(NULL), fAutoScale(kTRUE), fColors(kItemsLegend)
    8181{
    8282    fNumPixels = 0;
     
    9696
    9797    fNotify  = NULL;
     98
     99#if ROOT_VERSION_CODE < ROOT_VERSION(3,01,06)
     100    SetPalette(1, 0);
     101#else
     102    SetPalette(51, 0);
     103#endif
    98104}
    99105
     
    409415        gStyle->SetPalette(ncolors, colors);
    410416
     417    if (!fPixels)
     418    {
     419        for (int i=0; i<kItemsLegend; i++)
     420            fColors[i] = gStyle->GetColorPalette(i);
     421        return;
     422    }
     423
    411424    //
    412425    // Change the colors of the pixels
     
    446459
    447460    //
    448     // Store the color palette used for a leter reverse lookup
     461    // Store the color palette used for a later reverse lookup
    449462    //
    450463    for (int i=0; i<kItemsLegend; i++)
     
    454467    }
    455468}
     469
    456470
    457471void MCamDisplay::SetPrettyPalette()
  • trunk/MagicSoft/Mars/mgui/MCamDisplay.h

    r2189 r2204  
    4545    Float_t        fRange;       // the range in millimeters of the present geometry
    4646
    47     TArrayI        fColors;      // Color conversion table
     47    TArrayI        fColors;      //! Color conversion table
    4848
    4949    TArrow        *fArrowX;      // Coordinate System
Note: See TracChangeset for help on using the changeset viewer.