Import Geant4 10.7.0 source tree

source/visualization/FukuiRenderer/History

@@ -18,6 +18,16 @@ committal in the CVS repository !
 
 History file for visualization/FukuiRenderer sub-category
 ---------------------------------------------------------
+
+2 October 2020  John Allison  (DAWN-V10-06-03)
+- G4FukuiRendererViewer.cc:
+  o Fix "overlapping comparisons always evaluate to true".
+
+3 July 2020  John Allison  (DAWN-V10-06-02)
+- G4DAWNFILEViewer.cc:
+  o Fix Unbuntu 20 compiler warning about ignoring return value
+    of ‘int system(const char*)’.
+
 31 May 2020 Ben Morgan (DAWN-V10-06-01)
 - Use add_definitions to set PRIVATE-level compile add_definitions
   for compatibility between old and new CMake systems

source/visualization/FukuiRenderer/src/G4DAWNFILEViewer.cc

@@ -186,10 +186,18 @@ void G4DAWNFILEViewer::ShowView( void )
 
 		} else 	if( strcmp( GetG4PrimViewerInvocation(), "" ) )  
 		{
-			G4cout << "File  " << fSceneHandler.GetG4PrimFileName() ;
-			G4cout << "  is generated." << G4endl;
-			G4cout << GetG4PrimViewerInvocation() << G4endl;
-			(void) system( GetG4PrimViewerInvocation() );
+                  G4cout << "File  " << fSceneHandler.GetG4PrimFileName() ;
+                  G4cout << "  is generated." << G4endl;
+                  G4cout << GetG4PrimViewerInvocation() << G4endl;
+                  int iErr = system( GetG4PrimViewerInvocation() );
+                  if ( iErr != 0) {
+                    G4ExceptionDescription ed;
+                    ed << "Error " << iErr
+                    << " when calling system with \"" << GetG4PrimViewerInvocation()
+                    << "\".";
+                    G4Exception("G4DAWNFILEViewer::ShowView()",
+                                "dawn0005", JustWarning, ed);
+                  }
 
 		} else { // no view, i.e., only file generation
 			G4cout << "File  " << fSceneHandler.GetG4PrimFileName() ; 

source/visualization/FukuiRenderer/src/G4FukuiRendererViewer.cc

@@ -164,7 +164,7 @@ G4FukuiRendererViewer::SendDevice( FRDEV dev )
 
   //	enum {PS=1, XWIN=2, PS2=3, XWIN2=4, OPEN_GL=5, DEVICE_END=6};
   
-	if( dev >= FRDEV_PS || dev < FRDEV_DEVICE_END ) {
+	if( dev >= FRDEV_PS && dev < FRDEV_DEVICE_END ) {
 		fSceneHandler.SendStrInt ( FR_DEVICE, dev );
 	}
 }