Changeset 1027 for trunk/source/interfaces

Timestamp:

May 5, 2009, 5:45:31 PM (15 years ago)

Author:

garnier

Message:

en test. Ok

Location:

trunk/source/interfaces

Files:

• basic/src/G4VUIshell.cc (modified) (3 diffs)
• common/include/G4VBasicShell.hh (modified) (1 diff)
• common/src/G4VBasicShell.cc (modified) (4 diffs)

trunk/source/interfaces/basic/src/G4VUIshell.cc

@@ -149 +149 @@
 //////////////////////////////////////////////////////////////////////
 {
+  printf("G4VUIshell::GetAbsCommandDirPath %s\n",apath.c_str());
   if(apath.empty()) return apath;  // null string
 
@@ -157 +158 @@
 
   // parsing...
+  printf("G4VUIshell::GetAbsCommandDirPath bpath %s\n",bpath.c_str());
   G4String absPath= "/";
+  printf("G4VUIshell::GetAbsCommandDirPath num %d \n",G4int(bpath.length())-1);
   for(G4int indx=1; indx<=G4int(bpath.length())-1; ) {
+    printf("G4VUIshell::GetAbsCommandDirPath for %d/%d \n",indx,G4int(bpath.length())-1);
     G4int jslash= bpath.index("/", indx);  // search index begin with "/"
     if(jslash != G4int(G4String::npos)) {
@@ -177 +181 @@
     indx= jslash+1;
   }
+  printf("G4VUIshell::GetAbsCommandDirPath RETURN %s\n",absPath.c_str());
   return  absPath;
 }

trunk/source/interfaces/common/include/G4VBasicShell.hh

@@ -85 +85 @@
     G4String Complete(G4String);
     // command completion
+
+    G4String CompleteCommand(G4String);
+    // command completion
     G4String FindMatchingPath(G4UIcommandTree*,G4String);
 

trunk/source/interfaces/common/src/G4VBasicShell.cc

@@ -180 +180 @@
   return value;
 }
+
+
+
+
 G4String G4VBasicShell::FindMatchingPath(
  G4UIcommandTree* aTree
@@ -186 +190 @@
 // From intercoms/src/G4UIcommandTree::FindPath.
 {
+  return aTree->CompleteCommandPath(aCommandPath);
+
 #ifdef G4DEBUG
   printf("G4VBasicShell::FindMatchingPath %s\n",aCommandPath.c_str());
@@ -226 +232 @@
         G4UIcommand* cmd = commands[i_thCommand];
         G4cout << cmd->GetCommandName() << G4endl; 
+#ifdef G4DEBUG
+        printf("%s found\n",cmd->GetCommandName().c_str());
+#endif
       }
       return empty;
@@ -258 +267 @@
     nextPath.append(remainingPath(0,i+1));
     G4int n_treeEntry = aTree->GetTreeEntry();
+#ifdef G4DEBUG
+    printf(" find PATH\n");
+#endif
     for( G4int i_thTree = 1; i_thTree <= n_treeEntry; i_thTree++ ) {
       G4UIcommandTree* tree = aTree->GetTree(i_thTree);
+#ifdef G4DEBUG
+      printf("++++LOOP+++++++++++++%s == %s \n",nextPath.c_str(), tree->GetPathName().c_str());
+#endif
       if( nextPath == tree->GetPathName() ) { 
         return FindMatchingPath(tree,aCommandPath );