Import Geant4 10.6.0 source tree

source/visualization/HepRep/History

@@ -19,6 +19,10 @@ committal in the CVS repository !
 History file for visualization/HepRep sub-category
 --------------------------------------------------
 
+29 August 2019  John Allison (vis-HepRep-V10-05-00)
+- Part of vis-V10-05-24.
+- Add G4TessellatedSolid to list of solids that may be specially treated
+
 14th September 2017  John Allison  (vis-HepRep-V10-03-01)
 - G4HepRepMessenger.cc: Fix Coverity warning.
 

source/visualization/HepRep/include/G4HepRepFileSceneHandler.hh

@@ -76,6 +76,7 @@ public:
   void AddSolid(const G4Polyhedra&);
   void AddSolid(const G4Orb&);
   void AddSolid(const G4Ellipsoid&);
+  void AddSolid(const G4TessellatedSolid&);
   void AddSolid(const G4VSolid&);
   void AddCompound (const G4VTrajectory&);
   void InitTrajectory();

source/visualization/HepRep/include/G4HepRepSceneHandler.hh

@@ -78,6 +78,7 @@ class G4HepRepSceneHandler: public G4VSceneHandler {
         void AddSolid (const G4Polyhedra& polyhedra);
         void AddSolid (const G4Orb& orb);
         void AddSolid (const G4Ellipsoid& ellipsoid);
+        void AddSolid (const G4TessellatedSolid& tess);
         void AddSolid (const G4VSolid& solid);
         
         void AddCompound (const G4VTrajectory&);

source/visualization/HepRep/src/G4HepRepFileSceneHandler.cc

@@ -501,6 +501,18 @@ void G4HepRepFileSceneHandler::AddSolid(const G4Ellipsoid& ellipsoid) {
 }
 
 
+void G4HepRepFileSceneHandler::AddSolid(const G4TessellatedSolid& tess) {
+#ifdef G4HEPREPFILEDEBUG
+  G4cout <<
+  "G4HepRepFileSceneHandler::AddSolid(const G4TessellatedSolid& ) called for "
+  << tess.GetName()
+  << G4endl;
+  PrintThings();
+#endif
+  G4VSceneHandler::AddSolid(tess);  // Invoke default action.
+}
+
+
 void G4HepRepFileSceneHandler::AddSolid(const G4VSolid& solid) {
 #ifdef G4HEPREPFILEDEBUG
 	G4cout <<

source/visualization/HepRep/src/G4HepRepMessenger.cc

@@ -56,11 +56,11 @@ G4HepRepMessenger::G4HepRepMessenger() :
 	setFileDirCommand->SetGuidance("Set directory for output.");
 	setFileDirCommand->SetGuidance("This command is used by HepRepFile, not by HepRepXML.");
 	setFileDirCommand->SetParameterName("directory",false);
-	if ( getenv( "G4HEPREPFILE_DIR" ) == NULL ) {
+	if ( std::getenv( "G4HEPREPFILE_DIR" ) == NULL ) {
 		setFileDirCommand->SetDefaultValue("");
 	} else {
-		setFileDirCommand->SetDefaultValue(getenv("G4HEPREPFILE_DIR"));
-		fileDir = getenv("G4HEPREPFILE_DIR");
+		setFileDirCommand->SetDefaultValue(std::getenv("G4HEPREPFILE_DIR"));
+		fileDir = std::getenv("G4HEPREPFILE_DIR");
 	}
 	setFileDirCommand->AvailableForStates(G4State_Idle);
 		
@@ -68,11 +68,11 @@ G4HepRepMessenger::G4HepRepMessenger() :
 	setFileNameCommand->SetGuidance("Set file name for output.");
 	setFileNameCommand->SetGuidance("This command is used by HepRepFile, not by HepRepXML.");
 	setFileNameCommand->SetParameterName("directory",false);
-	if ( getenv( "G4HEPREPFILE_NAME" ) == NULL ) {
+	if ( std::getenv( "G4HEPREPFILE_NAME" ) == NULL ) {
 		setFileNameCommand->SetDefaultValue("G4Data");
 	} else {
-		setFileNameCommand->SetDefaultValue(getenv("G4HEPREPFILE_NAME"));
-		fileName = getenv("G4HEPREPFILE_NAME");
+		setFileNameCommand->SetDefaultValue(std::getenv("G4HEPREPFILE_NAME"));
+		fileName = std::getenv("G4HEPREPFILE_NAME");
 	}
 	setFileNameCommand->AvailableForStates(G4State_Idle);
 
@@ -81,11 +81,11 @@ G4HepRepMessenger::G4HepRepMessenger() :
 	setOverwriteCommand->SetGuidance("Set false to increment the file name for each new output.");
 	setOverwriteCommand->SetGuidance("This command is used by HepRepFile, not by HepRepXML.");
 	setOverwriteCommand->SetParameterName("flag",false);
-	if ( getenv( "G4HEPREPFILE_OVERWRITE" ) == NULL ) {
+	if ( std::getenv( "G4HEPREPFILE_OVERWRITE" ) == NULL ) {
 		setOverwriteCommand->SetDefaultValue(false);
 	} else {
-		setOverwriteCommand->SetDefaultValue(getenv("G4HEPREPFILE_OVERWRITE"));
-		overwrite = setOverwriteCommand->ConvertToBool(getenv("G4HEPREPFILE_OVERWRITE"));
+		setOverwriteCommand->SetDefaultValue(std::getenv("G4HEPREPFILE_OVERWRITE"));
+		overwrite = setOverwriteCommand->ConvertToBool(std::getenv("G4HEPREPFILE_OVERWRITE"));
 	}
 	setOverwriteCommand->AvailableForStates(G4State_Idle);
 		
@@ -93,11 +93,11 @@ G4HepRepMessenger::G4HepRepMessenger() :
 	setCullInvisiblesCommand->SetGuidance("Remove invisible objects from output file.");
 	setCullInvisiblesCommand->SetGuidance("This command is used by HepRepFile, not by HepRepXML.");
 	setCullInvisiblesCommand->SetParameterName("flag",false);
-	if ( getenv( "G4HEPREPFILE_CULL" ) == NULL ) {
+	if ( std::getenv( "G4HEPREPFILE_CULL" ) == NULL ) {
 		setCullInvisiblesCommand->SetDefaultValue(false);
 	} else {
-		setCullInvisiblesCommand->SetDefaultValue(getenv("G4HEPREPFILE_CULL"));
-		cullInvisibles = setCullInvisiblesCommand->ConvertToBool(getenv("G4HEPREPFILE_CULL"));
+		setCullInvisiblesCommand->SetDefaultValue(std::getenv("G4HEPREPFILE_CULL"));
+		cullInvisibles = setCullInvisiblesCommand->ConvertToBool(std::getenv("G4HEPREPFILE_CULL"));
 	}
 	setCullInvisiblesCommand->AvailableForStates(G4State_Idle);
 		

source/visualization/HepRep/src/G4HepRepSceneHandler.cc

@@ -741,6 +741,11 @@ void G4HepRepSceneHandler::AddSolid (const G4Ellipsoid& ellipsoid) {
   G4VSceneHandler::AddSolid (ellipsoid);
 }
 
+void G4HepRepSceneHandler::AddSolid (const G4TessellatedSolid& tess) {
+  if (dontWrite()) return;
+  G4VSceneHandler::AddSolid (tess);
+}
+
 void G4HepRepSceneHandler::AddSolid (const G4VSolid& solid) {
     if (dontWrite()) return;
     G4VSceneHandler::AddSolid(solid);