Changeset 1044 for trunk

Timestamp:

May 15, 2009, 12:25:18 PM (15 years ago)

Author:

garnier

Message:

maj en aussi sur CVS

Location:

trunk/source/intercoms

Files:

• History (modified) (2 diffs)
• include/G4UIcommandTree.hh (modified) (1 diff)
• src/G4UIcommandTree.cc (modified) (7 diffs)

trunk/source/intercoms/History

@@ -1 @@
-$Id: History,v 1.73 2008/11/21 10:57:25 kmura Exp $
+$Id: History,v 1.75 2009/05/14 02:59:33 kmura Exp $
 -------------------------------------------------------------------
 
@@ -17 +17 @@
      * Reverse chronological order (last date on top), please *
      ----------------------------------------------------------
+
+14 May 2009 K.Murakami (intercoms-V09-02-00)
+ - tagged for release 9.3 beta
+
+7th May 2009, Laurent Garnier
+ - G4UIcommandTree : Add a new function to complete a command path with
+   maximum characters guess.
+ - G4UIcommandTree : FindCommandTree will now return current tree when 
+   command path is "/"
 
 21 November, 2008 K.Murakami (intercoms-V09-01-01)

trunk/source/intercoms/include/G4UIcommandTree.hh

@@ -25 +25 @@
 //
 //
-// $Id: G4UIcommandTree.hh,v 1.16 2008/01/30 11:20:03 lgarnier Exp $
-// GEANT4 tag $Name: geant4-09-02 $
+// $Id: G4UIcommandTree.hh,v 1.17 2009/05/07 09:33:51 lgarnier Exp $
+// GEANT4 tag $Name:  $
 //
 

trunk/source/intercoms/src/G4UIcommandTree.cc

@@ -25 +25 @@
 //
 //
-// $Id: G4UIcommandTree.cc,v 1.14 2008/01/30 11:20:03 lgarnier Exp $
-// GEANT4 tag $Name: geant4-09-02 $
+// $Id: G4UIcommandTree.cc,v 1.15 2009/05/07 09:33:51 lgarnier Exp $
+// GEANT4 tag $Name:  $
 //
 
@@ -229 +229 @@
   G4String pathName = aCommandPath;
   G4String remainingPath = aCommandPath;
+  G4String empty = "";
+  G4String matchingPath = empty;
 
   // find the tree
@@ -235 +237 @@
   G4UIcommandTree* aTree = FindCommandTree(pathName);
 
-  G4String empty = "";
   if (!aTree) {
     return empty;
@@ -245 +246 @@
 
   // list matched directories/commands
-  G4String stream, strtmp;
+  G4String strtmp;
   G4int nMatch= 0;
 
@@ -257 +258 @@
     if( fpdir.index(remainingPath, 0) == 0) {
       if(nMatch==0) {
-        stream = fpdir;
+        matchingPath = fpdir;
       } else {
-        stream = GetFirstMatchedString(fpdir,stream);
+        matchingPath = GetFirstMatchedString(fpdir,matchingPath);
       }
       nMatch++;
@@ -282 +283 @@
     if( fpcmd.index(remainingPath, 0) ==0) {
       if(nMatch==0) {
-        stream= fpcmd + " ";
+        matchingPath= fpcmd + " ";
       } else {
         strtmp= fpcmd + " ";
-        stream= GetFirstMatchedString(stream, strtmp);
+        matchingPath= GetFirstMatchedString(matchingPath, strtmp);
       }
       nMatch++;
@@ -299 +300 @@
   }
 
-  return stream;
+  return matchingPath;
 }