Merge rev 37231 from fireworks branch:

Make digit/quad/box type definitions public.


git-svn-id: http://root.cern.ch/svn/root/trunk@37234 27541ba8-7e3a-0410-8455-c3a389f83636

graf3d/eve/inc/TEveBoxSet.h

@@ -26,17 +26,14 @@ class TEveBoxSet: public TEveDigitSet
    TEveBoxSet& operator=(const TEveBoxSet&); // Not implemented
 
 public:
-   enum EBoxType_e
-      {
-         kBT_Undef,           // unknown-ignored
-         kBT_FreeBox,         // arbitrary box: specify 8*(x,y,z) box corners
-         kBT_AABox,           // axis-aligned box: specify (x,y,z) and (w, h, d)
-         kBT_AABoxFixedDim,   // axis-aligned box w/ fixed dimensions: specify (x,y,z)
-         kBT_Cone,
-         kBT_EllipticCone
-      };
-
-protected:
+   enum EBoxType_e {
+      kBT_Undef,           // unknown-ignored
+      kBT_FreeBox,         // arbitrary box: specify 8*(x,y,z) box corners
+      kBT_AABox,           // axis-aligned box: specify (x,y,z) and (w, h, d)
+      kBT_AABoxFixedDim,   // axis-aligned box w/ fixed dimensions: specify (x,y,z)
+      kBT_Cone,
+      kBT_EllipticCone
+   };
 
    struct BFreeBox_t       : public DigitBase_t { Float_t fVertices[8][3]; };
 

graf3d/eve/inc/TEveDigitSet.h

@@ -44,7 +44,6 @@ public:
    typedef void (*Callback_foo)(TEveDigitSet*, Int_t, TObject*);
    typedef TString (*TooltipCB_foo)(TEveDigitSet*, Int_t);
 
-protected:
    struct DigitBase_t
    {
       // Base-class for digit representation classes.
@@ -55,6 +54,7 @@ protected:
       DigitBase_t(Int_t v=0) : fValue(v), fUserData(0) {}
    };
 
+protected:
    TRefArray        *fDigitIds;       //  Array holding references to external objects.
 
    Int_t             fDefaultValue;   //  Default signal value.

graf3d/eve/inc/TEveQuadSet.h

@@ -24,36 +24,33 @@ class TEveQuadSet : public TEveDigitSet
    TEveQuadSet& operator=(const TEveQuadSet&); // Not implemented
 
 public:
-   enum EQuadType_e
-      {
-         kQT_Undef,                // unknown-ignored
-         kQT_FreeQuad,             // arbitrary quad: specify 4*(x,y,z) quad corners
-         kQT_RectangleXY,          // rectangle in x-y plane: specify x, y, z, w, h
-         kQT_RectangleXZ,          // rectangle in x-z plane: specify x, y, z, w, h
-         kQT_RectangleYZ,          // rectangle in y-z plane: specify x, y, z, w, h
-         kQT_RectangleXYFixedDim,  // rectangle in x-y plane: specify x, y, z; w, h taken from fDefWidth/Height
-         kQT_RectangleXYFixedZ,    // rectangle in x-y plane: specify x, y, w, h; z taken from fDefCoord
-         kQT_RectangleXZFixedY,    // rectangle in x-z plane: specify x, z, w, h; y taken from fDefCoord
-         kQT_RectangleYZFixedX,    // rectangle in y-z plane: specify y, z, w, h; x taken from fDefWidth/Height/Coord
-         kQT_RectangleXYFixedDimZ, // rectangle in x-y plane: specify x, y; w, h, z taken from fDefWidth/Height/Coord
-         kQT_RectangleXZFixedDimY, // rectangle in x-z plane: specify x, z; w, h, y taken from fDefWidth/Height/Coord
-         kQT_RectangleYZFixedDimX, // rectangle in y-z plane: specify y, z; w, h, x taken from fDefWidth/Height/Coord
-         kQT_Rectangle_End,
-         // line modes (needed for uniform handling of silicon-strip digits)
-         kQT_LineXYFixedZ,         // line in x-y plane: specify x, y, w(dx), h(dy); z taken from fDefCoord
-         kQT_LineXZFixedY,         // line in x-z plane: specify x, z, w(dx), h(dz); y taken from fDefCoord
-         kQT_Line_End,
-         // hexagon modes
-         kQT_HexagonXY,            // horizontal hexagon: specify x, y, z, r
-         kQT_HexagonYX,            // vertical   hexagon: specify x, y, z, r
-         kQT_Hexagon_End
-         // circle modes:
-         // QT_CircleXY,          // specify r, z
-         // QT_CircleXYFixedZ,    // specify r
-         // QT_CircleXYFixedR,    // specify z
-      };
-
-protected:
+   enum EQuadType_e {
+      kQT_Undef,                // unknown-ignored
+      kQT_FreeQuad,             // arbitrary quad: specify 4*(x,y,z) quad corners
+      kQT_RectangleXY,          // rectangle in x-y plane: specify x, y, z, w, h
+      kQT_RectangleXZ,          // rectangle in x-z plane: specify x, y, z, w, h
+      kQT_RectangleYZ,          // rectangle in y-z plane: specify x, y, z, w, h
+      kQT_RectangleXYFixedDim,  // rectangle in x-y plane: specify x, y, z; w, h taken from fDefWidth/Height
+      kQT_RectangleXYFixedZ,    // rectangle in x-y plane: specify x, y, w, h; z taken from fDefCoord
+      kQT_RectangleXZFixedY,    // rectangle in x-z plane: specify x, z, w, h; y taken from fDefCoord
+      kQT_RectangleYZFixedX,    // rectangle in y-z plane: specify y, z, w, h; x taken from fDefWidth/Height/Coord
+      kQT_RectangleXYFixedDimZ, // rectangle in x-y plane: specify x, y; w, h, z taken from fDefWidth/Height/Coord
+      kQT_RectangleXZFixedDimY, // rectangle in x-z plane: specify x, z; w, h, y taken from fDefWidth/Height/Coord
+      kQT_RectangleYZFixedDimX, // rectangle in y-z plane: specify y, z; w, h, x taken from fDefWidth/Height/Coord
+      kQT_Rectangle_End,
+      // line modes (needed for uniform handling of silicon-strip digits)
+      kQT_LineXYFixedZ,         // line in x-y plane: specify x, y, w(dx), h(dy); z taken from fDefCoord
+      kQT_LineXZFixedY,         // line in x-z plane: specify x, z, w(dx), h(dz); y taken from fDefCoord
+      kQT_Line_End,
+      // hexagon modes
+      kQT_HexagonXY,            // horizontal hexagon: specify x, y, z, r
+      kQT_HexagonYX,            // vertical   hexagon: specify x, y, z, r
+      kQT_Hexagon_End
+      // circle modes:
+      // QT_CircleXY,          // specify r, z
+      // QT_CircleXYFixedZ,    // specify r
+      // QT_CircleXYFixedR,    // specify z
+   };
 
    struct QFreeQuad_t     : public DigitBase_t     { Float_t fVertices[12]; };