Import Geant4 10.7.0 source tree

source/interfaces/GAG/src/G4UIGAG.cc

@@ -531,7 +531,7 @@ G4UIcommandTree * G4UIGAG::FindDirPath(const G4String& newCommand)
 void G4UIGAG::SendCommandProperties(G4UIcommandTree * tree)
 {
   if( tree == NULL ) { 
-    G4cerr << "GetTree() returnes null." << G4endl;
+    G4cerr << "GetTree() returns null." << G4endl;
     return;
   }
   if (uiMode == java_mode){
@@ -549,7 +549,7 @@ void G4UIGAG::SendCommandProperties(G4UIcommandTree * tree)
 void G4UIGAG::SendParameterProperties(G4UIcommandTree * tree)
 {
   if( tree == NULL ) { 
-    G4cerr << "GetTree() returnes null." << G4endl;
+    G4cerr << "GetTree() returns null." << G4endl;
     return;
   }
   if (uiMode == java_mode){

source/interfaces/GAG/src/G4UIGainServer.cc

@@ -647,7 +647,7 @@ G4UIcommandTree* G4UIGainServer::FindDirPath(G4String newCommand){
 void G4UIGainServer::SendCommandProperties(G4UIcommandTree* tree){
 //////////////////////////////////////////////////////////
   if( tree == NULL ) {
-    G4cerr << "GetTree() returnes null." << G4endl;
+    G4cerr << "GetTree() returns null." << G4endl;
     return;
   }
   if (uiMode == java_mode){
@@ -662,7 +662,7 @@ void G4UIGainServer::SendCommandProperties(G4UIcommandTree* tree){
 void G4UIGainServer::SendParameterProperties(G4UIcommandTree* tree){
 ////////////////////////////////////////////////////////////
   if( tree == NULL ) {
-    G4cerr << "GetTree() returnes null." << G4endl;
+    G4cerr << "GetTree() returns null." << G4endl;
     return;
   }
   if (uiMode == java_mode){

source/interfaces/History

@@ -16,6 +16,36 @@ committal in the CVS repository !
      * Reverse chronological order (last date on top), please *
      ----------------------------------------------------------
 
+29 November 2020  Gabriele Cosmo (interfaces-V10-06-11)
+- G4UIQt.cc: protected MT code within G4MULTITHREADED in workaround
+  introduced previously.
+
+09 November 2020  John Allison (interfaces-V10-06-10)
+- G4UIQt.cc:
+  o Re "workaround" (interfaces-V10-06-08), it seems workers write
+    to std::cout/cerr anyway (is that a bug?) so limit this workaround
+    to the master thread.
+
+16 November 2020  Gabriele Cosmo (interfaces-V10-06-09)
+- Fixed typos in printed-out text. Addressing problem report #2285.
+
+09 November 2020  John Allison (interfaces-V10-06-08)
+- G4UIQt.cc:
+  o As a workaround to the problem of loss of output in the case of
+    a crash or G4Exception:
+    - Send G4cout/cerr also to std::cout/cerr so that output is not lost.
+ 
+21 September 2020  John Allison (interfaces-V10-06-07)
+- G4Qt.cc: Add the following to fix a problem with Windows - see
+  https://geant4-forum.web.cern.ch/t/blue-screen-when-running-b1-example-using-qt/3144
+#ifdef WIN32
+      qApp->setAttribute( Qt::AA_UseDesktopOpenGL );
+#endif
+
+28 August 2020 Ben Morgan (interfaces-V10-06-06)
+- GEANT4_USE_INVENTOR for SoXt activates use of Xm, so we do not
+  need to check for use of inventor in setting up Xt, only GEANT4_USE_XM.
+
 19 June 2020  John Allison  (interfaces-V10-06-05)
 - Fix Qt 5.15 deprecation warnings.
 

source/interfaces/basic/src/G4UIQt.cc

@@ -2018,6 +2018,13 @@ G4int G4UIQt::ReceiveG4cout (
     return ReceiveG4cerr(aString);
   }
 
+  // Workaround so that output is not lost after crash or G4Exception
+  // It seems workers write to std::cout anyway, so limit this to the master
+#ifdef G4MULTITHREADED
+  if (G4Threading::IsMasterThread())
+#endif
+    std::cout << aString;
+
   QStringList newStr;
 
   // Add to string
@@ -2060,6 +2067,14 @@ G4int G4UIQt::ReceiveG4cerr (
 #ifdef G4MULTITHREADED
   G4AutoLock al(&ReceiveG4cerrMutex);
 #endif
+
+  // Workaround so that output is not lost after crash or G4Exception
+  // It seems workers write to std::cerr anyway, so limit this to the master
+#ifdef G4MULTITHREADED
+  if (G4Threading::IsMasterThread())
+#endif
+    std::cerr << aString;
+
   QStringList newStr;
 
   // Add to string
@@ -4586,7 +4601,7 @@ void G4UIQt::ChangePerspectiveOrtho(const QString& action) {
     if (list.at(i)->data().toString () == action) {
       list.at(i)->setChecked(TRUE);
       checked = list.at(i)->data().toString ();
-    } else if (list.at(i)->data().toString () == "persepective") {
+    } else if (list.at(i)->data().toString () == "perspective") {
       list.at(i)->setChecked(FALSE);
     } else if (list.at(i)->data().toString () == "ortho") {
       list.at(i)->setChecked(FALSE);

source/interfaces/basic/src/G4UIWt.cc

@@ -2768,7 +2768,7 @@ void G4UIWt::ChangePerspectiveOrthoCallback(const Wt::WString& /* action */) {
     if (list.at(i)->data().toString () == action) {
       list.at(i)->setChecked(TRUE);
       checked = list.at(i)->data().toString ();
-    } else if (list.at(i)->data().toString () == "persepective") {
+    } else if (list.at(i)->data().toString () == "perspective") {
       list.at(i)->setChecked(FALSE);
     } else if (list.at(i)->data().toString () == "ortho") {
       list.at(i)->setChecked(FALSE);

source/interfaces/common/sources.cmake

@@ -65,8 +65,8 @@ if(MSVC)
   add_definitions(-DG4INTY_BUILD_WIN32)
 endif()
 
-# X11 options - we only need this for Xm and/or Inventor UI
-if(UNIX AND (GEANT4_USE_XM OR GEANT4_USE_INVENTOR))
+# X11 options - we only need this for Xm (and Inventor, which activates XM)
+if(UNIX AND GEANT4_USE_XM)
   # Add the sources
   list(APPEND G4INTERFACES_COMMON_MODULE_HEADERS G4Xt.hh)
   list(APPEND G4INTERFACES_COMMON_MODULE_SOURCES G4Xt.cc)

source/interfaces/common/src/G4Qt.cc

@@ -112,6 +112,9 @@ G4Qt::G4Qt (
 
       int *p_argn = (int*)malloc(sizeof(int));
       *p_argn = argn;
+#ifdef WIN32
+      qApp->setAttribute( Qt::AA_UseDesktopOpenGL );
+#endif
       new QApplication (*p_argn, args);
       if(!qApp) {