Import Geant4 10.7.1 source tree

source/intercoms/History

@@ -16,6 +16,14 @@ committal in the CVS repository !
      * Reverse chronological order (last date on top), please *
      ----------------------------------------------------------
 
+16 January 2020  John Allison (intercoms-V10-06-07)
+- G4UImanager:
+  o Introduce flag and access functions for LastCommandOutputTreated.
+  o This flag is set to false at the point in ApplyCommand where, if
+    verbosity>0, the command is sent G4cout.
+  o The treating UI must reset to true when the line has been treated.
+  o Of course, the UI may simply ignore it.
+
 12 November, 2020  J. Madsen (intercoms-V10-06-06)
 - Added G4ProfilerMessenger
 - See examples/extended/parallel/ThreadsafeScorers/run.mac for example usage

source/intercoms/include/G4UImanager.hh

@@ -246,6 +246,9 @@ class G4UImanager : public G4VStateDependent
 
     inline G4int GetLastReturnCode() const { return lastRC; }
 
+    inline bool IsLastCommandOutputTreated() { return fLastCommandOutputTreated; }
+    inline void SetLastCommandOutputTreated() { fLastCommandOutputTreated = true; }
+
   protected:
 
     G4UImanager();
@@ -297,6 +300,8 @@ class G4UImanager : public G4VStateDependent
     G4ICOMS_DLL static G4bool doublePrecisionStr;
 
     G4int lastRC = 0;
+
+    G4bool fLastCommandOutputTreated = true;
 };
 
 #endif

source/intercoms/src/G4UImanager.cc

@@ -487,8 +487,10 @@ G4int G4UImanager::ApplyCommand(const char* aCmd)
   G4String aCommand = SolveAlias(aCmd);
   if(aCommand.isNull())
     return fAliasNotFound;
-  if(verboseLevel)
+  if(verboseLevel) {
+    fLastCommandOutputTreated = false;
     G4cout << aCommand << G4endl;
+  }
   G4String commandString;
   G4String commandParameter;