Changeset 510 for trunk/geant4

Timestamp:

Jun 14, 2007, 5:39:52 PM (17 years ago)

Author:

garnier

Message:

r620@mac-90108: laurentgarnier | 2007-06-14 15:18:02 +0200
une version qui marche

Location:

trunk/geant4/interfaces/basic

Files:

• include/G4UIQt.hh (modified) (1 diff)
• src/G4UIQt.cc (modified) (7 diffs)

trunk/geant4/interfaces/basic/include/G4UIQt.hh

@@ -127 +127 @@
   void commandEnteredCallback();
   void buttonCallback(const QString&);
-  void helpTreeCallback(const QString&);
+  void helpTreeCallback( QTreeWidgetItem*, int);
 };
 

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

@@ -493 +493 @@
 
   QSplitter *splitter = new QSplitter(Qt::Horizontal);
-  QTextEdit *fhelpArea = new QTextEdit();
+  fHelpArea = new QTextEdit();
   QPushButton *exitButton = new QPushButton("Exit");
   connect(exitButton, SIGNAL(clicked()), helpDialog,SLOT(close()));
@@ -512 +512 @@
   G4int treeSize = treeTop->GetTreeEntry();
   QTreeWidgetItem * newItem;
-  for (unsigned int a=0;a<treeSize;a++) {
+  for (int a=0;a<treeSize;a++) {
     // Creating new item
     QStringList stringList;
@@ -527 +527 @@
   treeWidget->insertTopLevelItems(0, items);
 
+  //connecting callback
+  signalMapper = new QSignalMapper(this);
+  connect(treeWidget, SIGNAL(itemClicked(QTreeWidgetItem*, int)),this, SLOT(helpTreeCallback(QTreeWidgetItem*, int)));  
 
   // Set layouts
   QHBoxLayout *splitterLayout = new QHBoxLayout;
 
-  QWidget* topWidget = new QWidget();
   QVBoxLayout *vLayout = new QVBoxLayout;
 
@@ -627 +629 @@
   QTreeWidgetItem * newItem;
 
-  //  QSignalMapper *signalMapper = new QSignalMapper(this);
 
   // Get the Sub directories
-  for (unsigned int a=0;a<a_commandTree->GetTreeEntry();a++) {
+  for (int a=0;a<a_commandTree->GetTreeEntry();a++) {
     
     QStringList stringList;
@@ -653 +654 @@
   // Get the Commands
 
-  for (unsigned int a=0;a<a_commandTree->GetCommandEntry();a++) {
+  for (int a=0;a<a_commandTree->GetCommandEntry();a++) {
     
     QStringList stringList;
-    stringList << QString((char*)(a_commandTree->GetCommand(a+1)->GetCommandName()).data()).trimmed()  ;
+    stringList << QString((char*)(a_commandTree->GetCommand(a+1)->GetCommandPath()).data()).trimmed()  ;
     stringList << QString((char*)(a_commandTree->GetCommand(a+1)->GetTitle()).data()).trimmed()  ;
     newItem = new QTreeWidgetItem(stringList);
-
-    //connecting callback
-    signalMapper = new QSignalMapper(this);
-    connect(newItem, SIGNAL(itemActivated(QTreeWidgetItem*, int)), signalMapper, SLOT(map()));
-    signalMapper->setMapping(newItem, GetCommandList(a_commandTree->GetCommand(a+1)));
-    connect(signalMapper, SIGNAL(mapped(const QString &)),this, SLOT(helpTreeCallback(const QString&)));
       
     a_parent->addChild(newItem);
@@ -678 +673 @@
 /***************************************************************************/
 void G4UIQt::helpTreeCallback (
-  const QString & a_txt
-)
-/***************************************************************************/
-/*!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!*/
-{
-  fHelpArea->setText(a_txt);
+ QTreeWidgetItem* a_treeItem
+,int a_index
+)
+/***************************************************************************/
+/*!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!*/
+{
+  if (fHelpArea) {
+    G4UImanager* UI = G4UImanager::GetUIpointer();
+    if(UI==NULL) return;
+    G4UIcommandTree * treeTop = UI->GetTree();
+    G4UIcommand* command = treeTop->FindPath(a_treeItem->text (0).toStdString().c_str());
+    if (command) {
+      printf ("G4UIQt::CreateChildTree  end of for loop ========\n");
+      fHelpArea->setText(GetCommandList(treeTop->FindPath(a_treeItem->text (0).toStdString().c_str())));
+    } else {
+      printf ("G4UIQt::CreateChildTree  end of for loop ********\n");
+    }
+  }
 }
 
@@ -695 +702 @@
 /*!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!*/
 {
+  printf ("G4UIQt::CreateChildTree  %s --\n",(char*)(a_command->GetCommandName()).data())  ;
+
   QString txt;
   G4String commandPath = a_command->GetCommandPath();