5
5
// based on the Program) you indicate your acceptance of this statement,
6
6
// and all its terms.
7
7
//
8
- // $Id: G4VisAttributes.cc,v 2.0 1998/07/02 17:31:05 gunter Exp $
9
- // GEANT4 tag $Name: geant4-00 $
8
+ // $Id: G4VisAttributes.cc,v 1.2 1999/01/08 16:32:04 gunter Exp $
9
+ // GEANT4 tag $Name: greps-01-00-01 $
10
10
//
11
11
//
12
12
// John Allison 23rd October 1996
13
13
14
14
#include " G4VisAttributes.hh"
15
15
16
16
G4VisAttributes::G4VisAttributes ():
17
- fVisible (true ),
18
- fColour (G4Colour ()),
19
- fLineStyle (unbroken),
20
- fLineWidth (1 .),
21
- fForceDrawingStyle (false )
17
+ fVisible (true ),
18
+ fDaughtersInvisible (false ),
19
+ fColour (G4Colour ()),
20
+ fLineStyle (unbroken),
21
+ fLineWidth (1 .),
22
+ fForceDrawingStyle (false )
22
23
{}
23
24
24
25
G4VisAttributes::G4VisAttributes (G4bool visibility):
25
- fVisible (visibility),
26
- fColour (G4Colour ()),
27
- fLineStyle (unbroken),
28
- fLineWidth (1 .),
29
- fForceDrawingStyle (false )
26
+ fVisible (visibility),
27
+ fDaughtersInvisible (false ),
28
+ fColour (G4Colour ()),
29
+ fLineStyle (unbroken),
30
+ fLineWidth (1 .),
31
+ fForceDrawingStyle (false )
30
32
{}
31
33
32
34
G4VisAttributes::G4VisAttributes (const G4Colour& colour):
33
- fVisible (true ),
34
- fColour (colour),
35
- fLineStyle (unbroken),
36
- fLineWidth (1 .),
37
- fForceDrawingStyle (false )
35
+ fVisible (true ),
36
+ fDaughtersInvisible (false ),
37
+ fColour (colour),
38
+ fLineStyle (unbroken),
39
+ fLineWidth (1 .),
40
+ fForceDrawingStyle ( false )
38
41
{}
39
42
40
43
G4VisAttributes::G4VisAttributes (G4bool visibility,
41
- const G4Colour& colour):
42
- fVisible (visibility),
43
- fColour (colour),
44
- fLineStyle (unbroken),
45
- fLineWidth (1 .),
46
- fForceDrawingStyle (false )
44
+ const G4Colour& colour):
45
+ fVisible (visibility),
46
+ fDaughtersInvisible (false ),
47
+ fColour (colour),
48
+ fLineStyle (unbroken),
49
+ fLineWidth (1 .),
50
+ fForceDrawingStyle (false )
47
51
{}
48
52
49
53
const G4VisAttributes G4VisAttributes::Invisible = G4VisAttributes (false );
@@ -52,7 +56,9 @@ ostream& operator << (ostream& os, const G4VisAttributes& a) {
52
56
53
57
os << " G4VisAttributes: " ;
54
58
if (&a){
55
- if (!a.fVisible ) os << " in" ;
59
+ if (!a.fVisible ) os << " in" ;
60
+ os << " visible, daughters " ;
61
+ if (a.fDaughtersInvisible ) os << " in" ;
56
62
os << " visible, colour: " << a.fColour ;
57
63
os << " \n linestyle: " ;
58
64
switch (a.fLineStyle ) {
@@ -89,6 +95,7 @@ G4bool operator != (const G4VisAttributes& a1,
89
95
90
96
if (
91
97
(a1.fVisible != a2.fVisible ) ||
98
+ (a1.fDaughtersInvisible != a2.fDaughtersInvisible ) ||
92
99
(a1.fColour != a2.fColour ) ||
93
100
(a1.fLineStyle != a2.fLineStyle ) ||
94
101
(a1.fLineWidth != a2.fLineWidth ) ||
0 commit comments