Geant4 Cross Reference

Cross-Referencing   Geant4
Geant4/graphics_reps/src/G4Visible.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/G4Visible.cc (Version 11.3.0) and /graphics_reps/src/G4Visible.cc (Version 9.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: G4Visible.cc,v 1.17 2006/11/07 11:53:16 allison Exp $
                                                   >>  28 // GEANT4 tag $Name: geant4-09-03-patch-02 $
 27 //                                                 29 //
 28 //                                                 30 // 
 29 // John Allison  30th October 1996                 31 // John Allison  30th October 1996
 30 // Base class for all things visible, i.e., wh     32 // Base class for all things visible, i.e., which have Vis Attributes.
 31                                                    33 
 32 #include "G4Visible.hh"                            34 #include "G4Visible.hh"
 33 #include "G4VisAttributes.hh"                      35 #include "G4VisAttributes.hh"
 34 #include "G4ios.hh"                                36 #include "G4ios.hh"
 35                                                    37 
 36 G4Visible::G4Visible ():                           38 G4Visible::G4Visible ():
 37   fpVisAttributes (nullptr),                   <<  39   fpVisAttributes (0),
 38   fAllocatedVisAttributes (false)                  40   fAllocatedVisAttributes (false)
 39 {}                                                 41 {}
 40                                                    42 
 41 G4Visible::G4Visible (const G4Visible& visible     43 G4Visible::G4Visible (const G4Visible& visible){
 42   fAllocatedVisAttributes = visible.fAllocated     44   fAllocatedVisAttributes = visible.fAllocatedVisAttributes;
 43   if (fAllocatedVisAttributes)                     45   if (fAllocatedVisAttributes)
 44     fpVisAttributes = new G4VisAttributes(*vis <<  46     fpVisAttributes = new G4VisAttributes(visible.fpVisAttributes);
 45   else fpVisAttributes = visible.fpVisAttribut     47   else fpVisAttributes = visible.fpVisAttributes;
 46 }                                                  48 }
 47                                                    49 
 48 G4Visible::G4Visible (G4Visible&& visible){    << 
 49   fAllocatedVisAttributes = visible.fAllocated << 
 50   fpVisAttributes = visible.fpVisAttributes;   << 
 51   visible.fpVisAttributes = nullptr;           << 
 52   visible.fAllocatedVisAttributes = false;     << 
 53 }                                              << 
 54                                                << 
 55 G4Visible::G4Visible (const G4VisAttributes* p     50 G4Visible::G4Visible (const G4VisAttributes* pVA):
 56   fpVisAttributes (pVA),                           51   fpVisAttributes (pVA),
 57   fAllocatedVisAttributes (false)                  52   fAllocatedVisAttributes (false)
 58 {}                                                 53 {}
 59                                                    54 
 60 G4Visible::~G4Visible () {                         55 G4Visible::~G4Visible () {
 61   if (fAllocatedVisAttributes) delete fpVisAtt     56   if (fAllocatedVisAttributes) delete fpVisAttributes;
 62 }                                                  57 }
 63                                                    58 
 64 G4Visible& G4Visible::operator= (const G4Visib     59 G4Visible& G4Visible::operator= (const G4Visible& rhs) {
 65   if (&rhs == this) return *this;              << 
 66   fInfo = rhs.fInfo;                           << 
 67   fAllocatedVisAttributes = rhs.fAllocatedVisA     60   fAllocatedVisAttributes = rhs.fAllocatedVisAttributes;
 68   if (fAllocatedVisAttributes) {               <<  61   if (fAllocatedVisAttributes)
 69     delete fpVisAttributes;                    <<  62     fpVisAttributes = new G4VisAttributes(rhs.fpVisAttributes);
 70     fpVisAttributes = new G4VisAttributes(*rhs << 
 71   }                                            << 
 72   else fpVisAttributes = rhs.fpVisAttributes;      63   else fpVisAttributes = rhs.fpVisAttributes;
 73   return *this;                                    64   return *this;
 74 }                                                  65 }
 75                                                    66 
 76 G4Visible& G4Visible::operator= (G4Visible&& r << 
 77   if (&rhs == this) return *this;              << 
 78   fInfo = rhs.fInfo;                           << 
 79   if (fAllocatedVisAttributes) delete fpVisAtt << 
 80   fpVisAttributes = rhs.fpVisAttributes;       << 
 81   fAllocatedVisAttributes = rhs.fAllocatedVisA << 
 82   rhs.fpVisAttributes = nullptr;               << 
 83   rhs.fAllocatedVisAttributes = false;         << 
 84   return *this;                                << 
 85 }                                              << 
 86                                                << 
 87 void G4Visible::SetVisAttributes (const G4VisA     67 void G4Visible::SetVisAttributes (const G4VisAttributes& VA) {
 88   // Allocate G4VisAttributes on the heap in c     68   // Allocate G4VisAttributes on the heap in case the user specifies a
 89   // short-lived VA for a long-lived G4Visible     69   // short-lived VA for a long-lived G4Visible.  Flag so that it can
 90   // be deleted in the destructor.                 70   // be deleted in the destructor.
 91   // First delete any G4VisAttributes already      71   // First delete any G4VisAttributes already on the heap...
 92   if (fAllocatedVisAttributes) delete fpVisAtt     72   if (fAllocatedVisAttributes) delete fpVisAttributes;
 93   fpVisAttributes = new G4VisAttributes(VA);       73   fpVisAttributes = new G4VisAttributes(VA);
 94   fAllocatedVisAttributes = true;                  74   fAllocatedVisAttributes = true;
 95 }                                                  75 }
 96                                                    76 
 97                                                    77 
 98 void G4Visible::SetVisAttributes (const G4VisA     78 void G4Visible::SetVisAttributes (const G4VisAttributes* pVA) {
 99   // First delete any G4VisAttributes already      79   // First delete any G4VisAttributes already on the heap...
100   if (fAllocatedVisAttributes) delete fpVisAtt     80   if (fAllocatedVisAttributes) delete fpVisAttributes;
101   fpVisAttributes = pVA;                           81   fpVisAttributes = pVA;
102   fAllocatedVisAttributes = false;                 82   fAllocatedVisAttributes = false;
103 }                                                  83 }
104                                                    84 
105 G4bool G4Visible::operator != (const G4Visible     85 G4bool G4Visible::operator != (const G4Visible& right) const {
106   if (fInfo != right.fInfo) return false;      <<  86   return *fpVisAttributes != *right.fpVisAttributes;
107   if ((fpVisAttributes != nullptr) && (right.f << 
108     return *fpVisAttributes != *right.fpVisAtt << 
109   if ((fpVisAttributes == nullptr) && (right.f << 
110   return true;                                 << 
111 }                                                  87 }
112                                                    88 
113 std::ostream& operator << (std::ostream& os, c     89 std::ostream& operator << (std::ostream& os, const G4Visible& v) {
114   os << "G4Visible: ";                         <<  90   if (v.fpVisAttributes) return os << *(v.fpVisAttributes);
115   if (!v.fInfo.empty()) os << "User informatio <<  91   else return os << "No Visualization Attributes";
116   if (v.fpVisAttributes != nullptr) return os  << 
117   return os << "No Visualization Attributes";  << 
118 }                                                  92 }
119                                                    93