Changeset 699 for trunk/geant4/interfaces/basic/src/G4UIQt.cc

Timestamp:

Jan 28, 2008, 4:38:19 PM (16 years ago)

Author:

garnier

Message:

avancement sur la zone de recherche : ok, pret a supprimer un champ

File:

• trunk/geant4/interfaces/basic/src/G4UIQt.cc (modified) (4 diffs)

trunk/geant4/interfaces/basic/src/G4UIQt.cc

@@ -1241 +1241 @@
   if(UI==NULL) return;
   G4UIcommandTree * treeTop = UI->GetTree();
-#if QT_VERSION < 0x040000
-  G4UIcommand* command = treeTop->FindPath(item->text (1).ascii());
-#else
-  G4UIcommand* command = treeTop->FindPath(item->text (1).toStdString().c_str());
-#endif
+
+
+
+  std::string itemText;
+#if QT_VERSION < 0x040000
+  itemText = std::string(item->text(0).ascii());
+#else
+  itemText = std::string(item->text(0).toStdString());
+#endif
+
+  G4UIcommand* command = treeTop->FindPath(itemText.c_str());
+
   if (command) {
 #if QT_VERSION >= 0x040000
@@ -1257 +1264 @@
     fHelpArea->setText(GetCommandList(command));
 #endif
-  } else {
-    // this is not a command, this is a sub directory
-    // We display the Title
+  } else {  // this is a command
+    G4UIcommandTree* path = treeTop->FindCommandTree(itemText.c_str());
+    if ( path) {
+      // this is not a command, this is a sub directory
+      // We display the Title
 #if QT_VERSION >= 0x040000
 #if QT_VERSION < 0x040200
-    fHelpArea->clear();
-    fHelpArea->append(command->GetTitle().data());
-#else
-    Command est nulle ici :comment récupérer le titre ?
-
-    printf("Command %s\n",(char*)(command->GetCommandPath()).data());
-    printf("Command %s\n",(char*)(command->GetTitle()).data());
-    fHelpArea->setText(command->GetTitle().data());
-#endif
-#else
-    fHelpArea->setText(command->GetTitle().data());
-#endif
-  }
-}
-
+      fHelpArea->clear();
+      fHelpArea->append(path->GetTitle().data());
+#else
+      fHelpArea->setText(path->GetTitle().data());
+#endif
+#else
+      fHelpArea->setText(path->GetTitle().data());
+#endif
+    }
+  }
+}
+ 
 /**   This callback is activated when user double clic on a item in the help tree
 */
@@ -1512 +1518 @@
     
     if (!commandChildResultMap.empty()) {
-      printf("Check -------------------in child %d\n",commandChildResultMap.count());
       // insert new childs
       QMap<int,QString>::const_iterator i = commandChildResultMap.constBegin();
@@ -1539 +1544 @@
     
   }
-  printf("Command Finale retun \n");
   return commandResultMap;
 }