Import Geant4 11.3.0.beta source tree

source/visualization/modeling/History

@@ -6,6 +6,17 @@ It must **not** be used as a substitute for writing good git commit messages!
 
 -------------------------------------------------------------------------------
 
+## 2024-01-22 John Allison (modeling-V11-02-01)
+- Coworks with visman-V11-02-04, greps-V11-02-00 and interfaces-V11-02-01.
+- G4PhysicalVolumeModel:
+  - Add data field "TotalTouchables" and access functions.
+
+## 2024-01-16 John Allison (modeling-V11-02-00)
+- Co-works with visman-V11-02-02 and interfaces-V11-02-00.
+- G4TextModel:
+  - Use single quote (') to delineate actual text in description.
+    - This is so that normal quotes can be used in G4VisCommandSceneActivateModel.
+
 ## 2023-07-01 John Allison (modeling-V11-01-06)
 - G4PhysicalVolumeModel: Introduce touchable count.
   - std::map<G4int,G4int>& GetNumberOfTouchables():

source/visualization/modeling/include/G4PhysicalVolumeModel.hh

@@ -243,8 +243,11 @@ public: // With description
   // G4Atts.
 
   const std::map<G4int,G4int>& GetNumberOfTouchables() const {return fNTouchables;}
-  // Total number of touchables drawn at each depth
-  
+  // Number of touchables drawn at each depth.
+
+  G4int GetTotalTouchables () {return fTotalTouchables;}
+  // Total numbere of touchables.
+
   void SetRequestedDepth (G4int requestedDepth) {
     fRequestedDepth = requestedDepth;
   }
@@ -313,6 +316,7 @@ protected:
   ClippingMode       fClippingMode;
   G4int              fNClippers;     // No of clipping/cutting solids - only 0 or 1 allowed
   std::map<G4int,G4int> fNTouchables;   // No of touchables at each depth
+  G4int              fTotalTouchables;
 
 private:
 

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();