Geant4 Cross Reference

Cross-Referencing   Geant4
Geant4/graphics_reps/src/G4VMarker.cc

Version: [ ReleaseNotes ] [ 1.0 ] [ 1.1 ] [ 2.0 ] [ 3.0 ] [ 3.1 ] [ 3.2 ] [ 4.0 ] [ 4.0.p1 ] [ 4.0.p2 ] [ 4.1 ] [ 4.1.p1 ] [ 5.0 ] [ 5.0.p1 ] [ 5.1 ] [ 5.1.p1 ] [ 5.2 ] [ 5.2.p1 ] [ 5.2.p2 ] [ 6.0 ] [ 6.0.p1 ] [ 6.1 ] [ 6.2 ] [ 6.2.p1 ] [ 6.2.p2 ] [ 7.0 ] [ 7.0.p1 ] [ 7.1 ] [ 7.1.p1 ] [ 8.0 ] [ 8.0.p1 ] [ 8.1 ] [ 8.1.p1 ] [ 8.1.p2 ] [ 8.2 ] [ 8.2.p1 ] [ 8.3 ] [ 8.3.p1 ] [ 8.3.p2 ] [ 9.0 ] [ 9.0.p1 ] [ 9.0.p2 ] [ 9.1 ] [ 9.1.p1 ] [ 9.1.p2 ] [ 9.1.p3 ] [ 9.2 ] [ 9.2.p1 ] [ 9.2.p2 ] [ 9.2.p3 ] [ 9.2.p4 ] [ 9.3 ] [ 9.3.p1 ] [ 9.3.p2 ] [ 9.4 ] [ 9.4.p1 ] [ 9.4.p2 ] [ 9.4.p3 ] [ 9.4.p4 ] [ 9.5 ] [ 9.5.p1 ] [ 9.5.p2 ] [ 9.6 ] [ 9.6.p1 ] [ 9.6.p2 ] [ 9.6.p3 ] [ 9.6.p4 ] [ 10.0 ] [ 10.0.p1 ] [ 10.0.p2 ] [ 10.0.p3 ] [ 10.0.p4 ] [ 10.1 ] [ 10.1.p1 ] [ 10.1.p2 ] [ 10.1.p3 ] [ 10.2 ] [ 10.2.p1 ] [ 10.2.p2 ] [ 10.2.p3 ] [ 10.3 ] [ 10.3.p1 ] [ 10.3.p2 ] [ 10.3.p3 ] [ 10.4 ] [ 10.4.p1 ] [ 10.4.p2 ] [ 10.4.p3 ] [ 10.5 ] [ 10.5.p1 ] [ 10.6 ] [ 10.6.p1 ] [ 10.6.p2 ] [ 10.6.p3 ] [ 10.7 ] [ 10.7.p1 ] [ 10.7.p2 ] [ 10.7.p3 ] [ 10.7.p4 ] [ 11.0 ] [ 11.0.p1 ] [ 11.0.p2 ] [ 11.0.p3, ] [ 11.0.p4 ] [ 11.1 ] [ 11.1.1 ] [ 11.1.2 ] [ 11.1.3 ] [ 11.2 ] [ 11.2.1 ] [ 11.2.2 ] [ 11.3.0 ]

Diff markup

Differences between /graphics_reps/src/G4VMarker.cc (Version 11.3.0) and /graphics_reps/src/G4VMarker.cc (Version 9.1)


  1 //                                                  1 //
  2 // *******************************************      2 // ********************************************************************
  3 // * License and Disclaimer                         3 // * License and Disclaimer                                           *
  4 // *                                                4 // *                                                                  *
  5 // * The  Geant4 software  is  copyright of th      5 // * The  Geant4 software  is  copyright of the Copyright Holders  of *
  6 // * the Geant4 Collaboration.  It is provided      6 // * the Geant4 Collaboration.  It is provided  under  the terms  and *
  7 // * conditions of the Geant4 Software License      7 // * conditions of the Geant4 Software License,  included in the file *
  8 // * LICENSE and available at  http://cern.ch/      8 // * LICENSE and available at  http://cern.ch/geant4/license .  These *
  9 // * include a list of copyright holders.           9 // * include a list of copyright holders.                             *
 10 // *                                               10 // *                                                                  *
 11 // * Neither the authors of this software syst     11 // * Neither the authors of this software system, nor their employing *
 12 // * institutes,nor the agencies providing fin     12 // * institutes,nor the agencies providing financial support for this *
 13 // * work  make  any representation or  warran     13 // * work  make  any representation or  warranty, express or implied, *
 14 // * regarding  this  software system or assum     14 // * regarding  this  software system or assume any liability for its *
 15 // * use.  Please see the license in the file      15 // * use.  Please see the license in the file  LICENSE  and URL above *
 16 // * for the full disclaimer and the limitatio     16 // * for the full disclaimer and the limitation of liability.         *
 17 // *                                               17 // *                                                                  *
 18 // * This  code  implementation is the result      18 // * This  code  implementation is the result of  the  scientific and *
 19 // * technical work of the GEANT4 collaboratio     19 // * technical work of the GEANT4 collaboration.                      *
 20 // * By using,  copying,  modifying or  distri     20 // * By using,  copying,  modifying or  distributing the software (or *
 21 // * any work based  on the software)  you  ag     21 // * any work based  on the software)  you  agree  to acknowledge its *
 22 // * use  in  resulting  scientific  publicati     22 // * use  in  resulting  scientific  publications,  and indicate your *
 23 // * acceptance of all terms of the Geant4 Sof     23 // * acceptance of all terms of the Geant4 Software license.          *
 24 // *******************************************     24 // ********************************************************************
 25 //                                                 25 //
 26 //                                                 26 //
                                                   >>  27 // $Id: G4VMarker.cc,v 1.11 2006/06/29 19:07:21 gunter Exp $
                                                   >>  28 // GEANT4 tag $Name: geant4-09-01 $
 27 //                                                 29 //
 28 //                                                 30 // 
 29                                                    31 
 30 #include "G4VMarker.hh"                            32 #include "G4VMarker.hh"
 31                                                    33 
 32 #include "G4VisAttributes.hh"                      34 #include "G4VisAttributes.hh"
 33                                                    35 
 34 G4VMarker::G4VMarker ():                           36 G4VMarker::G4VMarker ():
                                                   >>  37   fPosition   (G4Point3D ()),
 35   fWorldSize  (0.),                                38   fWorldSize  (0.),
 36   fScreenSize (0.),                                39   fScreenSize (0.),
 37   fFillStyle  (noFill)                         <<  40   fFillStyle  (noFill),
                                                   >>  41   fInfo       (G4String())
 38 {}                                                 42 {}
 39                                                    43 
 40 G4VMarker::G4VMarker (const G4Point3D& pos):       44 G4VMarker::G4VMarker (const G4Point3D& pos):
 41   fPosition   (pos),                               45   fPosition   (pos),
 42   fWorldSize  (0.),                                46   fWorldSize  (0.),
 43   fScreenSize (0.),                                47   fScreenSize (0.),
 44   fFillStyle  (noFill)                         <<  48   fFillStyle  (noFill),
                                                   >>  49   fInfo       (G4String())
 45 {}                                                 50 {}
 46                                                    51 
 47 G4VMarker::~G4VMarker () = default;            <<  52 G4VMarker::~G4VMarker () {}
 48                                                    53 
 49 G4bool G4VMarker::operator != (const G4VMarker <<  54 G4bool G4VMarker::operator != (const G4VMarker& m) const {
 50   return ( (G4Visible::operator != (mk))   ||  <<  55   if (
 51            (fWorldSize  != mk.fWorldSize)  ||  <<  56       (G4Visible::operator != (m))   ||
 52            (fScreenSize != mk.fScreenSize) ||  <<  57       (fWorldSize  != m.fWorldSize)   ||
 53            (fFillStyle  != mk.fFillStyle)  ||  <<  58       (fScreenSize != m.fScreenSize)  ||
 54            !(fPosition  == mk.fPosition)   );  <<  59       (fFillStyle  != m.fFillStyle)   ||
                                                   >>  60       !(fPosition  == m.fPosition)
                                                   >>  61       )
                                                   >>  62     return true;
                                                   >>  63   return false;
 55 }                                                  64 }
 56                                                    65 
 57 std::ostream& operator << (std::ostream& os, c     66 std::ostream& operator << (std::ostream& os, const G4VMarker& marker) {
 58   os << "G4VMarker: position: " << marker.fPos     67   os << "G4VMarker: position: " << marker.fPosition
 59      << ", world size: " << marker.fWorldSize      68      << ", world size: " << marker.fWorldSize
 60      << ", screen size: " << marker.fScreenSiz <<  69      << ", screen size: " << marker.fScreenSize << '\n'
 61      << ", fill style: ";                      <<  70      << "           fill style: ";
 62   switch (marker.fFillStyle) {                     71   switch (marker.fFillStyle) {
 63   case G4VMarker::noFill:                          72   case G4VMarker::noFill:
 64     os << "no fill";                               73     os << "no fill";
 65     break;                                         74     break;
 66   case G4VMarker::hashed:                          75   case G4VMarker::hashed:
 67     os << "hashed";                                76     os << "hashed";
 68     break;                                         77     break;
 69   case G4VMarker::filled:                          78   case G4VMarker::filled:
 70     os << "filled";                                79     os << "filled";
 71     break;                                         80     break;
 72   default:                                         81   default:
 73     os << "unrecognised"; break;                   82     os << "unrecognised"; break;
 74   }                                                83   }
 75   os << "\n    " << (const G4Visible&) marker; <<  84   os << "\n           " << (const G4Visible&) marker;
 76   return os;                                       85   return os;
 77 }                                                  86 }
 78                                                    87 
 79 G4VMarker::SizeType G4VMarker::GetSizeType ()  <<  88 const G4String& G4VMarker::GetInfo() const { return fInfo ;}
 80   SizeType type = none;                        <<  89 
 81   if (fWorldSize != 0.0) type = world;         <<  90 void G4VMarker::SetInfo( const G4String& info ){ fInfo = info ;}
 82   else if (fScreenSize != 0.0) type = screen;  << 
 83   return type;                                 << 
 84 }                                              << 
 85                                                    91 
 86 void G4VMarker::SetSize (SizeType sizeType, G4 << 
 87   fWorldSize = fScreenSize = 0.;               << 
 88   if (sizeType == world) fWorldSize = size;    << 
 89   else if (sizeType == screen) fScreenSize = s << 
 90 }                                              << 
 91                                                    92