Changeset 1157

Timestamp:

Nov 6, 2009, 10:16:53 AM (15 years ago)

Author:

garnier

Message:

intercom update

Location:

trunk/source/intercoms

Files:

• History (modified) (2 diffs)
• include/G4UIbatch.hh (modified) (3 diffs)
• src/G4UIcommandTree.cc (modified) (2 diffs)

trunk/source/intercoms/History

@@ -1 @@
-$Id: History,v 1.75 2009/05/14 02:59:33 kmura Exp $
+$Id: History,v 1.77 2009/11/06 09:00:02 kmura Exp $
 -------------------------------------------------------------------
 
@@ -17 +17 @@
      * Reverse chronological order (last date on top), please *
      ----------------------------------------------------------
+
+6 November, 2009 K. Murakami (intercoms-V09-02-02)
+ - add GetPreviousSession() in G4UIbatch
+
+6 November, 2009 K. Murakami (intercoms-V09-02-01)
+ - fix incorrect directory deletion of G4UIcommandTree::RemoveCommand()
 
 14 May 2009 K.Murakami (intercoms-V09-02-00)

trunk/source/intercoms/include/G4UIbatch.hh

@@ -24 +24 @@
 // ********************************************************************
 //
-// $Id: G4UIbatch.hh,v 1.10 2007/07/16 10:15:12 kmura Exp $
-// GEANT4 tag $Name: geant4-09-02 $
+// $Id: G4UIbatch.hh,v 1.11 2009/11/06 08:58:53 kmura Exp $
+// GEANT4 tag $Name:  $
 //
 // ====================================================================
@@ -70 +70 @@
   ~G4UIbatch();
   
+  G4UIsession* GetPreviousSession() const;
+
   virtual G4UIsession* SessionStart();
   virtual void PauseSessionStart(G4String Prompt);
@@ -75 +77 @@
 };
 
+// ============================================================================
+// inlines
+
+inline G4UIsession* G4UIbatch::GetPreviousSession() const
+{
+  return previousSession;
+}
+
 #endif

trunk/source/intercoms/src/G4UIcommandTree.cc

@@ -25 +25 @@
 //
 //
-// $Id: G4UIcommandTree.cc,v 1.15 2009/05/07 09:33:51 lgarnier Exp $
+// $Id: G4UIcommandTree.cc,v 1.16 2009/11/06 06:16:07 kmura Exp $
 // GEANT4 tag $Name:  $
 //
@@ -143 +143 @@
           tree[i_thTree]->RemoveCommand( aCommand );
           G4int n_commandRemain = tree[i_thTree]->GetCommandEntry();
-          if(n_commandRemain==0)
+        G4int n_treeRemain = tree[i_thTree]-> GetTreeEntry();
+          if(n_commandRemain == 0 && n_treeRemain == 0)
           {
             G4UIcommandTree * emptyTree = tree[i_thTree];