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 6.1)


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