Import Geant4 11.0.0 source tree

2021-12-10 14:46:44 +01:00
parent 6399a014b6
commit 80e2389dd8
3932 changed files with 202519 additions and 246221 deletions
@@ -1,28 +0,0 @@
-///\file "visualization/perspective/.README.txt"
-///\brief Example perspective README page
-
-/*! \page Exampleperspective Example perspective
-
-examples/extended/visualization/perspective
-
-This example is another example of using the Geant Visualization
-System as a "stand-alone" graphics library and viewer.  See
-\ref Examplestandalone for a simpler introductory explanation.
-
-The particular feature of this example is the addition of "perspective
-lines".  The direction of these lines is controlled by
-
-\verbatim      
-/perspectiveDemo/optionString x
-\endverbatim      
-
-See vis.mac.
-
-Notes:
- /perspectiveDemo/scene is not used at present.
- visXm.mac is specially for use with G4UIXm and OGL*Xm.
-
-John Allison
-11th June 2012
-
-*/
@@ -1,6 +1,6 @@
 #----------------------------------------------------------------------------
 # Setup the project
-cmake_minimum_required(VERSION 3.12...3.20)
+cmake_minimum_required(VERSION 3.16...3.21)
 project(perspective)

 #----------------------------------------------------------------------------
@@ -15,6 +15,9 @@ track of all tags.
     * Reverse chronological order (last date on top), please *
     ----------------------------------------------------------

+25th October 2021 B.Morgan (exam-ext-vis-persp-V10-07-00)
+- Use G4StrUtil functions replacing deprecated G4String member functions
+
 3rd November 2020 B. Morgan (exam-ext-vis-persp-V10-06-00)
 - Support same CMake version range as core Geant4

@@ -1,25 +0,0 @@
-     =========================================================
-     Geant4 - an Object-Oriented Toolkit for Simulation in HEP
-     =========================================================
-
-               examples/extended/visualization/perspective
-               ------------------------------------------
-
-This example is another example of using the Geant Visualization
-System as a "stand-alone" graphics library and viewer.  See
-examples/extended/visualization/standalone for a simpler
-introductory explanation.
-
-The particular feature of this example is the addition of "perspective
-lines".  The direction of these lines is controlled by
-
-  /perspectiveDemo/optionString x
-
-See vis.mac.
-
-Notes:
- /perspectiveDemo/scene is not used at present.
- visXm.mac is specially for use with G4UIXm and OGL*Xm.
-
-John Allison
-11th June 2012
@@ -180,10 +180,10 @@ void PerspectiveVisAction::ExtendedDraw

  // Draw extended edges as requested...
  G4bool any = false, A = false, X = false, Y = false, Z = false;
-  if (fOptionString.contains("a")) {A = true; any = true;}
-  if (fOptionString.contains("x")) {X = true; any = true;}
-  if (fOptionString.contains("y")) {Y = true; any = true;}
-  if (fOptionString.contains("z")) {Z = true; any = true;}
+  if (G4StrUtil::contains(fOptionString, "a")) {A = true; any = true;}
+  if (G4StrUtil::contains(fOptionString, "x")) {X = true; any = true;}
+  if (G4StrUtil::contains(fOptionString, "y")) {Y = true; any = true;}
+  if (G4StrUtil::contains(fOptionString, "z")) {Z = true; any = true;}
  if (any)
    {
      G4Polyhedron* polyhedron = solid.GetPolyhedron();