Import Geant4 11.1.0 source tree

source/visualization/Vtk/History

@@ -6,6 +6,18 @@ It must **not** be used as a substitute for writing good git commit messages!
 
 -------------------------------------------------------------------------------
 
+## 2022-11-25 Gabriele Cosmo (visVtk-V11-00-07)
+- Fixed compilation warning for implicit type conversions on macOS/XCode 14.1.
+
+## 2022-11-14 I. Hrivnacova (visVtk-V11-00-06)
+- Replaced reinterpret_cast with static_cast where possible
+
+## 2022-10-10 Igor Semeniouk (visVtk-V11-00-05)
+- G4VtkViewer.hh : replaced sprintf by snprintf.
+
+## 2022-09-06 Ben Morgan (visVtk-V11-00-04)
+- Resolve inconsistencies in module dependencies
+
 ## 2022-03-22 Ben Morgan (visVtk-V11-00-03)
 - Use geant4_module_sources to add optional sources
 - Move setting of G4VIS_USE_VTK_QT flag on G4UIcommon module to that module's

source/visualization/Vtk/include/G4VtkViewer.hh

@@ -69,7 +69,7 @@ public:
   }
   virtual void Execute(vtkObject *caller, unsigned long, void*)
   {
-    vtkRenderer *ren = reinterpret_cast<vtkRenderer *>(caller);
+    vtkRenderer *ren = static_cast<vtkRenderer *>(caller);
     vtkCamera *cam = ren->GetActiveCamera();
     //G4cout << cam->GetFocalPoint()[0] << " " << cam->GetFocalPoint()[1] << " " << cam->GetFocalPoint()[2] << G4endl;
     //
@@ -114,7 +114,7 @@ public:
 
   virtual void Execute(vtkObject *caller, unsigned long, void*)
   {
-    vtkRenderer *ren = reinterpret_cast<vtkRenderer *>(caller);
+    vtkRenderer *ren = static_cast<vtkRenderer *>(caller);
     int      nActors = ren->GetActors()->GetNumberOfItems();
     vtkCamera   *cam = ren->GetActiveCamera();
     if(!cam) return;
@@ -136,7 +136,8 @@ public:
     float fps = 1.0/tdiff.count();
 
     // String for display
-    sprintf(this->TextBuff,"camera position    : %.1f %.1f %.1f \n"
+    snprintf(this->TextBuff,sizeof this->TextBuff,
+	                   "camera position    : %.1f %.1f %.1f \n"
                            "camera focal point : %.1f %.1f %.1f \n"
                            "view angle         : %.1f\n"
                            "distance           : %.1f\n"

source/visualization/Vtk/sources.cmake

@@ -16,15 +16,16 @@ geant4_add_module(G4visVtk
 
 geant4_module_link_libraries(G4visVtk
   PUBLIC
-    G4modeling
-    G4globman
-    G4hepgeometry
+    G4intercoms
     G4vis_management
     ${VTK_LIBRARIES}
   PRIVATE
+    G4csg
+    G4geometrymng
+    G4globman
     G4graphics_reps
-    G4UIbasic
-    G4UIcommon)
+    G4materials
+    G4modeling)
 
 # - VTK-Qt if Qt enabled
 if(GEANT4_USE_QT)
@@ -37,5 +38,7 @@ if(GEANT4_USE_QT)
       G4VtkQt.cc
       G4VtkQtSceneHandler.cc
       G4VtkQtViewer.cc)
+
+  geant4_module_link_libraries(G4visVtk PRIVATE G4UIbasic G4UIcommon)
 endif()
 

source/visualization/Vtk/src/vtkTensorGlyphColor.cxx

@@ -244,7 +244,7 @@ int vtkTensorGlyphColor::RequestData(
     {
       cell = this->GetSource()->GetCell(cellId);
       cellPts = cell->GetPointIds();
-      npts = cellPts->GetNumberOfIds();
+      npts = (int)cellPts->GetNumberOfIds();
       for (dir=0; dir < numDirs; dir++)
       {
         // This variable may be removed, but that