Changeset 524 for trunk

Timestamp:

Jun 22, 2007, 12:41:05 PM (17 years ago)

Author:

garnier

Message:

r652@mac-90108: laurentgarnier | 2007-06-22 12:43:09 +0200
en test

Location:

trunk/geant4/interfaces/basic

Files:

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

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

@@ -102 +102 @@
   void TerminalHelp(G4String);
   void CreateChildTree(QTreeWidgetItem*,G4UIcommandTree*);
+  QTreeWidgetItem* FindTreeItem(QTreeWidgetItem *,QString);
+
   QString GetCommandList(G4UIcommand*);
-  void expandHelpItem (QTreeWidgetItem *,G4UIcommand*);
 
   G4bool GetHelpChoice(G4int&) ;// have to be implemeted because we heritate from G4VBasicShell

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

@@ -1 @@
-// TODO !
-
 //
 // ********************************************************************
@@ -65 +63 @@
 static G4bool exitSession = true;
 static G4bool exitPause = true;
-/***************************************************************************/
-/**
- Build a Qt window with a menubar, output area and promt area 
-      +-----------------------+
-      |exit menu|             |
-      |                       |
-      | +-------------------+ |
-      | |                   | |
-      | |  Output area      | |
-      | |                   | |
-      | +-------------------+ |
-      |     | clear |         |
-      | +-------------------+ |
-      | |  promt history    | |
-      | +-------------------+ |
-      | +-------------------+ |
-      | |> promt area       | |
-      | +-------------------+ |
-      +-----------------------+
-*/
-
+
+/**   Build a Qt window with a menubar, output area and promt area<br> 
+<pre>
+   +-----------------------+
+   |exit menu|             |
+   |                       |
+   | +-------------------+ |
+   | |                   | |
+   | |  Output area      | |
+   | |                   | |
+   | +-------------------+ |
+   |      | clear |        |
+   | +-------------------+ |
+   | |  promt history    | |
+   | +-------------------+ |
+   | +-------------------+ |
+   | |> promt area       | |
+   | +-------------------+ |
+   +-----------------------+
+</pre>
+*/
 G4UIQt::G4UIQt (
- int argc,
- char** argv
-)
+                int argc,
+                char** argv
+                )
   :fHelpDialog(NULL)
-
-/***************************************************************************/
-/*!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!*/
 {
   G4Qt* interactorManager = G4Qt::getInstance ();
@@ -166 +161 @@
   if(UI!=NULL) UI->SetCoutDestination(this);  // TO KEEP
 }
-/***************************************************************************/
+
+
+
 G4UIQt::~G4UIQt(
 ) 
-/***************************************************************************/
-/*!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!*/
 { 
   G4UImanager* UI = G4UImanager::GetUIpointer();  // TO KEEP
@@ -182 +177 @@
     delete fMainWindow;
 }
-/***************************************************************************/
-/*
-    Start the Qt main loop
- */
+
+
+
+
+/**   Start the Qt main loop
+*/
 G4UIsession* G4UIQt::SessionStart (
 )
-/***************************************************************************/
-/*!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!*/
 {
 
@@ -204 +199 @@
   // je ne pense pas 13/06
 
-//   void* event; // TO KEEP
-//   while((event = interactorManager->GetEvent())!=NULL) {  // TO KEEP
-//     interactorManager->DispatchEvent(event); // TO KEEP
-//     if(exitSession==true) break; // TO KEEP
-//   } // TO KEEP
+  //   void* event; // TO KEEP
+  //   while((event = interactorManager->GetEvent())!=NULL) {  // TO KEEP
+  //     interactorManager->DispatchEvent(event); // TO KEEP
+  //     if(exitSession==true) break; // TO KEEP
+  //   } // TO KEEP
 
   interactorManager->EnableSecondaryLoop ();
@@ -214 +209 @@
   return this;
 }
-/***************************************************************************/
-
-/**
-  Display the prompt in the prompt area
- */
+
+
+/**   Display the prompt in the prompt area
+   @param aPrompt : string to display as the promt label
+   //FIXME : probablement inutile puisque le seul a afficher qq chose d'autre
+   que "session" est SecondaryLoop()
+*/
 void G4UIQt::Prompt (
  G4String aPrompt
 )
-/***************************************************************************/
-/*!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!*/
 {
   fCommandLabel->setText((char*)aPrompt.data());
 }
-/***************************************************************************/
+
+
 void G4UIQt::SessionTerminate (
 )
-/***************************************************************************/
-/*!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!*/
 {
   G4Qt* interactorManager = G4Qt::getInstance ();
@@ -237 +231 @@
   ((QApplication*)interactorManager->GetMainInteractor())->exit(); 
 }
-/***************************************************************************/
+
+
+
+/**
+   Called by intercoms/src/G4UImanager.cc<br>
+   Called by visualization/management/src/G4VisCommands.cc with "EndOfEvent" argument<br>
+   It have to pause the session command terminal.<br>
+   Call SecondaryLoop to wait for exit event<br>
+   @param aState
+   @see : G4VisCommandReviewKeptEvents::SetNewValue
+*/
 void G4UIQt::PauseSessionStart (
- G4String a_state
-)
-/***************************************************************************/
-/*!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!*/
+ G4String aState
+)
 {
   printf("G4UIQt::PauseSessionStart\n");
-  if(a_state=="G4_pause> ") {  // TO KEEP
+  if(aState=="G4_pause> ") {  // TO KEEP
     SecondaryLoop ("Pause, type continue to exit this state"); // TO KEEP
   } // TO KEEP
 
-  if(a_state=="EndOfEvent") { // TO KEEP
+  if(aState=="EndOfEvent") { // TO KEEP
     // Picking with feed back in event data Done here !!!
     SecondaryLoop ("End of event, type continue to exit this state"); // TO KEEP
   } // TO KEEP
 }
-/***************************************************************************/
+
+
+
+/**
+   Begin the secondary loop
+   @param a_prompt : label to display as the prompt label
+ */
 void G4UIQt::SecondaryLoop (
- G4String a_prompt
-)
-/***************************************************************************/
-/*!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!*/
+ G4String aPrompt
+)
 {
   printf("G4UIQt::SecondaryLoop\n");
   G4Qt* interactorManager = G4Qt::getInstance (); // TO KEEP ?
-  Prompt(a_prompt); // TO KEEP
+  Prompt(aPrompt); // TO KEEP
   exitPause = false; // TO KEEP
   void* event; // TO KEEP
@@ -272 +278 @@
   Prompt("session"); // TO KEEP
 }
-/***************************************************************************/
-/**
-  Receive a cout from Geant4. We have to display it in the cout zone
- */
+
+
+
+/**
+   Receive a cout from Geant4. We have to display it in the cout zone
+   @param aString : label to add in the display area
+*/
 G4int G4UIQt::ReceiveG4cout (
- G4String a_string
-)
-/***************************************************************************/
-/*!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!*/
-{
-  fTextArea->append(QString((char*)a_string.data()).trimmed());
+ G4String aString
+)
+{
+  fTextArea->append(QString((char*)aString.data()).trimmed());
   fTextArea->verticalScrollBar()->setSliderPosition(fTextArea->verticalScrollBar()->maximum());
   return 0;
 }
-/***************************************************************************/
-/**
-  Receive a cerr from Geant4. We have to display it in the cout zone
- */
+
+
+/**
+   Receive a cerr from Geant4. We have to display it in the cout zone
+   @param aString : label to add in the display area
+*/
 G4int G4UIQt::ReceiveG4cerr (
- G4String a_string
-)
-/***************************************************************************/
-/*!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!*/
+ G4String aString
+)
 {
   QColor previousColor = fTextArea->textColor();
   fTextArea->setTextColor(Qt::red);
-  fTextArea->append(QString((char*)a_string.data()).trimmed());
+  fTextArea->append(QString((char*)aString.data()).trimmed());
   fTextArea->setTextColor(previousColor);
   fTextArea->verticalScrollBar()->setSliderPosition(fTextArea->verticalScrollBar()->maximum());
@@ -304 +311 @@
 }
 
-/***************************************************************************/
+
+
+/**
+   Add a new menu to the menu bar
+   @param aName name of menu
+   @param aLabel label to display
+ */
 void G4UIQt::AddMenu (
- const char* a_name
-,const char* a_label
-)
-/***************************************************************************/
-/*!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!*/
-{
-  printf("G4UIQt::AddMenu %s %s\n",a_name,a_label);
-
-  //  QMenu *fileMenu = fMainWindow->menuBar()->addMenu(a_label);
-  QMenu *fileMenu = new QMenu(a_label);
+ const char* aName
+,const char* aLabel
+)
+{
+  QMenu *fileMenu = new QMenu(aLabel);
   fMainWindow->menuBar()->insertMenu(fMainWindow->menuBar()->actions().last(),fileMenu); 
-  AddInteractor (a_name,(G4Interactor)fileMenu);
-}
-/***************************************************************************/
+  AddInteractor (aName,(G4Interactor)fileMenu);
+}
+
+
+/**
+   Add a new button to a menu
+   @param aMenu : parent menu
+   @param aLabel : label to display
+   @param aCommand : command to execute as a callback
+ */
 void G4UIQt::AddButton (
- const char* a_menu
-,const char* a_label
-,const char* a_command
-)
-/***************************************************************************/
-/*!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!*/
-{
-  if(a_menu==NULL) return; // TO KEEP
-  if(a_label==NULL) return; // TO KEEP
-  if(a_command==NULL) return; // TO KEEP
-  QMenu *parent = (QMenu*)GetInteractor(a_menu);
+ const char* aMenu
+,const char* aLabel
+,const char* aCommand
+)
+{
+  if(aMenu==NULL) return; // TO KEEP
+  if(aLabel==NULL) return; // TO KEEP
+  if(aCommand==NULL) return; // TO KEEP
+  QMenu *parent = (QMenu*)GetInteractor(aMenu);
   if(parent==NULL) return;
   
   signalMapper = new QSignalMapper(this);
-  QAction *action = parent->addAction(a_label, signalMapper, SLOT(map()));
-  signalMapper->setMapping(action, QString(a_command));
+  QAction *action = parent->addAction(aLabel, signalMapper, SLOT(map()));
+  signalMapper->setMapping(action, QString(aCommand));
   connect(signalMapper, SIGNAL(mapped(const QString &)),this, SLOT(buttonCallback(const QString&)));
 }
@@ -344 +357 @@
 
 /**
-  Open the help dialog in a separate window.
-  This will be display as a tree widget
-  Implementation of <b>void G4VBasicShell::TerminalHelp(G4String newCommand)</b>
-
-  @param newCommand : open the tree widget item on this command if is set
- */
-void G4UIQt::TerminalHelp(G4String newCommand)
-{
-
-
+   Open the help dialog in a separate window.<br>
+   This will be display as a tree widget.<br>
+   Implementation of <b>void G4VBasicShell::TerminalHelp(G4String newCommand)</b>
+
+   @param newCommand : open the tree widget item on this command if is set
+*/
+void G4UIQt::TerminalHelp(
+ G4String newCommand
+)
+{
+  // Create the help dialog
   if (!fHelpDialog) {
     fHelpDialog = new QDialog;
@@ -416 +430 @@
   G4String targetCom="";
   if( i != std::string::npos )
-  {
-    G4String newValue = newCommand(i+1,newCommand.length()-(i+1));
-    newValue.strip(G4String::both);
-    targetCom = ModifyToFullPathCommand( newValue );
-    printf("test : av:%s-- ap:%s--\n",((char*)newValue.data()),((char*)targetCom.data()));
-  }
+    {
+      G4String newValue = newCommand(i+1,newCommand.length()-(i+1));
+      newValue.strip(G4String::both);
+      targetCom = ModifyToFullPathCommand( newValue );
+      printf("test : av:%s-- ap:%s--\n",((char*)newValue.data()),((char*)targetCom.data()));
+    }
   if (targetCom != "") {
-    QList<QTreeWidgetItem *> list = fHelpTreeWidget->findItems(QString(((char*)targetCom.data())),Qt::MatchFixedString,0);
-    for (int a=0;a<13;a++) {
-      printf("verif.... =%s= +%s+\n",fHelpTreeWidget->topLevelItem(a)->text(0).toStdString().c_str(),((char*)targetCom.data())); 
+    QTreeWidgetItem* findItem = NULL;
+    for (int a=0;a<fHelpTreeWidget->topLevelItemCount();a++) {
+      if (!findItem) {
+        findItem = FindTreeItem(fHelpTreeWidget->topLevelItem(a),QString((char*)targetCom.data()));
+      }
     }
 
-    if (!list.isEmpty()) {
-      if (list.first()->childCount() >0)  
-        list.first()->setExpanded(true);
-      
+    if (findItem) {      
+      // clear old selection
+      fHelpTreeWidget->clearSelection();
+
       //collapsed open item
       QList<QTreeWidgetItem *> selected;
       selected = fHelpTreeWidget->selectedItems();
       if ( selected.count() != 0 ) {
-        fHelpTreeWidget->collapseItem (selected.at( 0 ) );
+        QTreeWidgetItem * tmp =selected.at( 0 );
+        while ( tmp) {
+          tmp->setExpanded(false);
+          tmp = findItem->parent();
+        }
       }
       
-      // clear old selection
-      fHelpTreeWidget->clearSelection();
-      list.first()->setSelected(true);
+      // set new selection
+      findItem->setSelected(true);
       
+      // expand parent item
+      while ( findItem) {
+        findItem->setExpanded(true);
+        findItem = findItem->parent();
+      }
+
       // Call the update of the right textArea
       helpTreeCallback();
     }
-  } 
+  }
   fHelpDialog->setWindowTitle("Help on commands"); 
   fHelpDialog->resize(800,600); 
@@ -457 +482 @@
 
 
-void G4UIQt::CreateChildTree(QTreeWidgetItem *a_parent,G4UIcommandTree *a_commandTree) {
+/**
+   Fill the Help Tree Widget
+   @param aParent : parent item to fill
+   @param aCommandTree : commandTree node associate with this part of the Tree
+*/
+void G4UIQt::CreateChildTree(
+ QTreeWidgetItem *aParent
+,G4UIcommandTree *aCommandTree
+)
+{
 
   // Creating new item
   QTreeWidgetItem * newItem;
 
-
   // Get the Sub directories
-  for (int a=0;a<a_commandTree->GetTreeEntry();a++) {
+  for (int a=0;a<aCommandTree->GetTreeEntry();a++) {
     
     QStringList stringList;
-    stringList << QString((char*)(a_commandTree->GetTree(a+1)->GetPathName()).data()).trimmed()  ;
-    stringList << QString((char*)(a_commandTree->GetTree(a+1)->GetTitle()).data()).trimmed()  ;
+    stringList << QString((char*)(aCommandTree->GetTree(a+1)->GetPathName()).data()).trimmed()  ;
+    stringList << QString((char*)(aCommandTree->GetTree(a+1)->GetTitle()).data()).trimmed()  ;
     newItem = new QTreeWidgetItem(stringList);
 
-    CreateChildTree(newItem,a_commandTree->GetTree(a+1));
-    a_parent->addChild(newItem);
+    CreateChildTree(newItem,aCommandTree->GetTree(a+1));
+    aParent->addChild(newItem);
   }
 
@@ -479 +512 @@
   // Get the Commands
 
-  for (int a=0;a<a_commandTree->GetCommandEntry();a++) {
+  for (int a=0;a<aCommandTree->GetCommandEntry();a++) {
     
     QStringList stringList;
-    stringList << QString((char*)(a_commandTree->GetCommand(a+1)->GetCommandPath()).data()).trimmed()  ;
-    stringList << QString((char*)(a_commandTree->GetCommand(a+1)->GetCommandPath()).data()).trimmed()  ;
+    stringList << QString((char*)(aCommandTree->GetCommand(a+1)->GetCommandPath()).data()).trimmed()  ;
+    stringList << QString((char*)(aCommandTree->GetCommand(a+1)->GetCommandPath()).data()).trimmed()  ;
     newItem = new QTreeWidgetItem(stringList);
       
-    a_parent->addChild(newItem);
+    aParent->addChild(newItem);
     newItem->setExpanded(false);
   }
@@ -493 +526 @@
 
 /**
-  This fonction return the command list parameters in a QString
-
- */
-/***************************************************************************/
+*/
+QTreeWidgetItem* G4UIQt::FindTreeItem(
+ QTreeWidgetItem *aParent
+,QString aCommand
+)
+{
+  if (aParent->text(0) == aCommand)
+    return aParent;
+  
+  QTreeWidgetItem * tmp = NULL;
+  for (int a=0;a<aParent->childCount();a++) {
+    if (!tmp)
+      tmp = FindTreeItem(aParent->child(a),aCommand);
+  }
+  return tmp;
+}
+
+
+/**
+   Build the command list parameters in a QString<br>
+   Reimplement partialy the G4UIparameter.cc
+   @param aCommand : command to list parameters
+   @see G4UIparameter::List()
+   @return the command list parameters
+*/
 QString G4UIQt::GetCommandList (
-  G4UIcommand *a_command
-)
-/***************************************************************************/
-/*!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!*/
+ G4UIcommand *aCommand
+)
 {
 
   QString txt;
-  G4String commandPath = a_command->GetCommandPath();
-  G4String rangeString = a_command->GetRange();
+  G4String commandPath = aCommand->GetCommandPath();
+  G4String rangeString = aCommand->GetRange();
 
   if((commandPath.length()-1)!='/')
-  {
-    txt += "Command " + QString((char*)(commandPath).data()) + "\n";
-  }
+    {
+      txt += "Command " + QString((char*)(commandPath).data()) + "\n";
+    }
   txt += "Guidance :\n";
-  G4int n_guidanceEntry = a_command->GetGuidanceEntries();
+  G4int n_guidanceEntry = aCommand->GetGuidanceEntries();
 
   for( G4int i_thGuidance=0; i_thGuidance < n_guidanceEntry; i_thGuidance++ )
-    { txt += QString((char*)(a_command->GetGuidanceLine(i_thGuidance)).data()) + "\n"; }
+    { txt += QString((char*)(aCommand->GetGuidanceLine(i_thGuidance)).data()) + "\n"; }
   if( ! rangeString.isNull() )
     { txt += " Range of parameters : " + QString((char*)(rangeString).data()) + "\n"; }
-  G4int n_parameterEntry = a_command->GetParameterEntries();
+  G4int n_parameterEntry = aCommand->GetParameterEntries();
   if( n_parameterEntry > 0 )
     {
@@ -527 +579 @@
 
       for( G4int i_thParameter=0; i_thParameter<n_parameterEntry; i_thParameter++ )
-        { param = a_command->GetParameter(i_thParameter);
+        { param = aCommand->GetParameter(i_thParameter);
           txt += "\nParameter : " + QString((char*)(param->GetParameterName()).data()) + "\n";
           if( ! param->GetParameterGuidance().isNull() )
@@ -551 +603 @@
 
 
-/***************************************************************************/
-void G4UIQt::expandHelpItem (
- QTreeWidgetItem *a_parent
-,G4UIcommand* a_expandCommand
-)
-/***************************************************************************/
-/*!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!*/
-{
-}
-
-/***************************************************************************/
+/**
+  Implement G4VBasicShell vurtual function
+ */
 G4bool G4UIQt::GetHelpChoice(
  G4int& aInt
 )
-/***************************************************************************/
-/*!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!*/
 {
   printf("G4UIQt::GetHelpChoice SHOULD NEVER GO HERE");
@@ -572 +614 @@
 }
 
-/***************************************************************************/
+
+/**
+   Implement G4VBasicShell vurtual function
+*/
 void G4UIQt::ExitHelp(
 )
-/***************************************************************************/
-/*!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!*/
 {
   printf("G4UIQt::ExitHelp SHOULD NEVER GO HERE");
@@ -583 +626 @@
 
 /**
- Event filter method. Every event from QtApplication goes here.
- We apply a filter only for the Up and Down Arrow press when the QLineEdit
- is active. If this filter match, Up arrow we give the previous command
- and Down arrow will give the next if exist.
- @param obj Emitter of the event
- @param event Kind of event
-*/
-/***************************************************************************/
+   Event filter method. Every event from QtApplication goes here.<br/>
+   We apply a filter only for the Up and Down Arrow press when the QLineEdit<br/>
+   is active. If this filter match, Up arrow we give the previous command<br/>
+   and Down arrow will give the next if exist.<br/>
+   @param obj Emitter of the event
+   @param event Kind of event
+*/
 bool G4UIQt::eventFilter(
- QObject *obj
-,QEvent *event
-)
-/***************************************************************************/
-/*!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!*/
+                         QObject *obj
+                         ,QEvent *event
+                         )
 {
   if (obj == fCommandHistoryArea) {
@@ -649 +689 @@
 /***************************************************************************/
 
-/***************************************************************************/
+/**
+   Called when user give "help" command.
+*/
 void G4UIQt::showHelpCallback (
 )
-/***************************************************************************/
-/*!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!*/
 {
   TerminalHelp("");
 }
 
-/***************************************************************************/
+
+/**
+   Called when user click on clear button. Clear the text Output area
+*/
 void G4UIQt::clearButtonCallback (
 )
-/***************************************************************************/
-/*!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!*/
 {
   fTextArea->clear();
@@ -669 +710 @@
 
 /**
-  Callback call when "click on a menu entry.
-  Send the associated command to geant4
- */
+   Callback call when "click on a menu entry.<br>
+   Send the associated command to geant4
+*/
 void G4UIQt::commandEnteredCallback (
 )
-/***************************************************************************/
-/*!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!*/
 {
   G4String command (fCommandArea->text().toStdString().c_str());
@@ -685 +724 @@
 
     if (command(0,4) != "help") {
-        ApplyShellCommand (command,exitSession,exitPause);
+      ApplyShellCommand (command,exitSession,exitPause);
     } else {
       TerminalHelp(command);
@@ -695 +734 @@
 }
 
-/**
-  Callback call when "enter" clicked on the command zone.
-  Send the command to geant4
- */
+
+/**
+   Callback call when "enter" clicked on the command zone.<br>
+   Send the command to geant4
+   @param aCommand
+*/
 void G4UIQt::buttonCallback (
-  const QString& a_command
-)
-/***************************************************************************/
-/*!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!*/
-{
-  G4String ss = G4String(a_command.toStdString().c_str());
+ const QString& aCommand
+)
+{
+  G4String ss = G4String(aCommand.toStdString().c_str());
   printf ("debug : execute:\n-%s- %d %d \n",ss.data(),exitSession,exitPause);
   ApplyShellCommand(ss,exitSession,exitPause);
@@ -711 +750 @@
     SessionTerminate();
 }
-/**
-This callback is activated when user selected a item in the help tree
- */
+
+
+
+/**
+   This callback is activated when user selected a item in the help tree
+*/
 void G4UIQt::helpTreeCallback (
 )
-/***************************************************************************/
-/*!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!*/
 {
   //  G4bool GetHelpChoice(G4int&);
@@ -748 +788 @@
 
 
-
+/**
+   Callback called when user select an old command in the command history<br>
+   Give it to the command area.
+*/
 void G4UIQt::commandHistoryCallback(
 )
-/***************************************************************************/
-/*!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!*/
-{
-  //  G4bool GetHelpChoice(G4int&);
+{
   QListWidgetItem* item =  NULL;
   if (!fCommandHistoryArea)