Import Geant4 11.3.0.beta source tree

source/visualization/modeling/src/G4PhysicalVolumeModel.cc

@@ -83,6 +83,7 @@ G4PhysicalVolumeModel::G4PhysicalVolumeModel
 , fpClippingSolid    (0)
 , fClippingMode      (subtraction)
 , fNClippers         (0)
+, fTotalTouchables   (0)
 {
   fType = "G4PhysicalVolumeModel";
 
@@ -228,6 +229,11 @@ void G4PhysicalVolumeModel::DescribeYourselfTo
      startingTransformation,
      sceneHandler);
 
+  fTotalTouchables = 0;
+  for (const auto& entry : fNTouchables) {
+    fTotalTouchables += entry.second;
+  }
+
   // Reset or clear data...
   fCurrentDepth     = 0;
   fpCurrentPV       = fpTopPV;

source/visualization/modeling/src/G4TextModel.cc

@@ -44,8 +44,8 @@ G4TextModel::G4TextModel (const G4Text& g4Text, const G4Transform3D& transform)
 {
   fType = "G4TextModel";
   std::ostringstream oss;
-  oss << "G4TextModel: \"" << fG4Text.GetText()
-      << "\" at " << G4BestUnit(g4Text.GetPosition(),"Length")
+  oss << "G4TextModel: '" << fG4Text.GetText()
+      << "' at " << G4BestUnit(g4Text.GetPosition(),"Length")
       << "with size " << g4Text.GetScreenSize()
       << " with offsets " << g4Text.GetXOffset() << ',' << g4Text.GetYOffset();
   fGlobalTag = oss.str();