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 10.3.p2)


  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 66376 2012-12-18 09:42:59Z gcosmo $
 27 //                                                 28 //
 28 //                                                 29 // 
 29                                                    30 
 30 #include "G4VMarker.hh"                            31 #include "G4VMarker.hh"
 31                                                    32 
 32 #include "G4VisAttributes.hh"                      33 #include "G4VisAttributes.hh"
 33                                                    34 
 34 G4VMarker::G4VMarker ():                           35 G4VMarker::G4VMarker ():
                                                   >>  36   fPosition   (G4Point3D ()),
 35   fWorldSize  (0.),                                37   fWorldSize  (0.),
 36   fScreenSize (0.),                                38   fScreenSize (0.),
 37   fFillStyle  (noFill)                             39   fFillStyle  (noFill)
                                                   >>  40 {
                                                   >>  41   // fInfo: default initialisation.
                                                   >>  42 }
                                                   >>  43 
                                                   >>  44 G4VMarker::G4VMarker (const G4VMarker& mk):
                                                   >>  45   G4Visible   (mk),
                                                   >>  46   fPosition   (mk.fPosition),
                                                   >>  47   fWorldSize  (mk.fWorldSize),
                                                   >>  48   fScreenSize (mk.fScreenSize),
                                                   >>  49   fFillStyle  (mk.fFillStyle),
                                                   >>  50   fInfo       (mk.fInfo)
 38 {}                                                 51 {}
 39                                                    52 
 40 G4VMarker::G4VMarker (const G4Point3D& pos):       53 G4VMarker::G4VMarker (const G4Point3D& pos):
 41   fPosition   (pos),                               54   fPosition   (pos),
 42   fWorldSize  (0.),                                55   fWorldSize  (0.),
 43   fScreenSize (0.),                                56   fScreenSize (0.),
 44   fFillStyle  (noFill)                         <<  57   fFillStyle  (noFill),
 45 {}                                             <<  58   fInfo       (G4String())
                                                   >>  59 {
                                                   >>  60   // fInfo: default initialisation.
                                                   >>  61 }
                                                   >>  62 
                                                   >>  63 G4VMarker::~G4VMarker () {}
 46                                                    64 
 47 G4VMarker::~G4VMarker () = default;            <<  65 G4VMarker& G4VMarker::operator = (const G4VMarker& mk) {
                                                   >>  66   if (&mk == this) return *this;
                                                   >>  67   G4Visible::operator = (mk);
                                                   >>  68   fPosition   = mk.fPosition;
                                                   >>  69   fWorldSize  = mk.fWorldSize;
                                                   >>  70   fScreenSize = mk.fScreenSize;
                                                   >>  71   fFillStyle  = mk.fFillStyle;
                                                   >>  72   fInfo       = mk.fInfo;
                                                   >>  73   return *this;
                                                   >>  74 }
 48                                                    75 
 49 G4bool G4VMarker::operator != (const G4VMarker     76 G4bool G4VMarker::operator != (const G4VMarker& mk) const {
 50   return ( (G4Visible::operator != (mk))   ||  <<  77   if (
 51            (fWorldSize  != mk.fWorldSize)  ||  <<  78       (G4Visible::operator != (mk))   ||
 52            (fScreenSize != mk.fScreenSize) ||  <<  79       (fWorldSize  != mk.fWorldSize)   ||
 53            (fFillStyle  != mk.fFillStyle)  ||  <<  80       (fScreenSize != mk.fScreenSize)  ||
 54            !(fPosition  == mk.fPosition)   );  <<  81       (fFillStyle  != mk.fFillStyle)   ||
                                                   >>  82       !(fPosition  == mk.fPosition)    ||
                                                   >>  83       (fInfo       != mk.fInfo)
                                                   >>  84       )
                                                   >>  85     return true;
                                                   >>  86   return false;
 55 }                                                  87 }
 56                                                    88 
 57 std::ostream& operator << (std::ostream& os, c     89 std::ostream& operator << (std::ostream& os, const G4VMarker& marker) {
 58   os << "G4VMarker: position: " << marker.fPos     90   os << "G4VMarker: position: " << marker.fPosition
 59      << ", world size: " << marker.fWorldSize      91      << ", world size: " << marker.fWorldSize
 60      << ", screen size: " << marker.fScreenSiz <<  92      << ", screen size: " << marker.fScreenSize << '\n'
 61      << ", fill style: ";                      <<  93      << "           fill style: ";
 62   switch (marker.fFillStyle) {                     94   switch (marker.fFillStyle) {
 63   case G4VMarker::noFill:                          95   case G4VMarker::noFill:
 64     os << "no fill";                               96     os << "no fill";
 65     break;                                         97     break;
 66   case G4VMarker::hashed:                          98   case G4VMarker::hashed:
 67     os << "hashed";                                99     os << "hashed";
 68     break;                                        100     break;
 69   case G4VMarker::filled:                         101   case G4VMarker::filled:
 70     os << "filled";                               102     os << "filled";
 71     break;                                        103     break;
 72   default:                                        104   default:
 73     os << "unrecognised"; break;                  105     os << "unrecognised"; break;
 74   }                                               106   }
 75   os << "\n    " << (const G4Visible&) marker; << 107   if (!marker.fInfo.empty()) os << "\n  User information: " << marker.fInfo;
                                                   >> 108   os << "\n           " << (const G4Visible&) marker;
 76   return os;                                      109   return os;
 77 }                                                 110 }
 78                                                   111 
 79 G4VMarker::SizeType G4VMarker::GetSizeType ()     112 G4VMarker::SizeType G4VMarker::GetSizeType () const {
 80   SizeType type = none;                           113   SizeType type = none;
 81   if (fWorldSize != 0.0) type = world;         << 114   if (fWorldSize) type = world;
 82   else if (fScreenSize != 0.0) type = screen;  << 115   else if (fScreenSize) type = screen;
 83   return type;                                    116   return type;
 84 }                                                 117 }
 85                                                   118 
 86 void G4VMarker::SetSize (SizeType sizeType, G4    119 void G4VMarker::SetSize (SizeType sizeType, G4double size) {
 87   fWorldSize = fScreenSize = 0.;                  120   fWorldSize = fScreenSize = 0.;
 88   if (sizeType == world) fWorldSize = size;       121   if (sizeType == world) fWorldSize = size;
 89   else if (sizeType == screen) fScreenSize = s    122   else if (sizeType == screen) fScreenSize = size;
 90 }                                                 123 }
 91                                                   124