Changeset 526 for trunk/geant4/interfaces

Timestamp:

Jun 25, 2007, 5:30:05 PM (17 years ago)

Author:

garnier

Message:

r655@mac-90108: laurentgarnier | 2007-06-22 15:33:05 +0200
corrections de mises en forme

Location:

trunk/geant4/interfaces/basic

Files:

• include/G4UIQt.hh (modified) (3 diffs)
• src/G4UIQt.cc (modified) (29 diffs)
• src/G4UIQt_moc.cc (modified) (3 diffs)

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

@@ -108 +108 @@
   G4bool GetHelpChoice(G4int&) ;// have to be implemeted because we heritate from G4VBasicShell
   void ExitHelp();// have to be implemeted because we heritate from G4VBasicShell
-  bool eventFilter(QObject*,QEvent*);
+  bool EventFilter(QObject*,QEvent*);
 
 private:
@@ -122 +122 @@
   QTextEdit *fHelpArea;
   QListWidget *fCommandHistoryArea;
-  QSignalMapper *signalMapper ;
   QTreeWidget *fHelpTreeWidget;
   QDialog *fHelpDialog;
@@ -130 +129 @@
 
 private slots :
-  void clearButtonCallback();
-  void commandEnteredCallback();
-  void buttonCallback(const QString&);
-  void helpTreeCallback();
-  void showHelpCallback();
-  void commandHistoryCallback();
+  void ClearButtonCallback();
+  void CommandEnteredCallback();
+  void ButtonCallback(const QString&);
+  void HelpTreeCallback();
+  void ShowHelpCallback();
+  void CommandHistoryCallback();
 };
 

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

@@ -102 +102 @@
   fTextArea = new QTextEdit();
   QPushButton *clearButton = new QPushButton("clear");
-  connect(clearButton, SIGNAL(clicked()), SLOT(clearButtonCallback()));
+  connect(clearButton, SIGNAL(clicked()), SLOT(ClearButtonCallback()));
 
   fCommandHistoryArea = new QListWidget();
   fCommandHistoryArea->setSelectionMode(QAbstractItemView::SingleSelection);
-  connect(fCommandHistoryArea, SIGNAL(itemSelectionChanged()), SLOT(commandHistoryCallback()));
+  connect(fCommandHistoryArea, SIGNAL(itemSelectionChanged()), SLOT(CommandHistoryCallback()));
   fCommandHistoryArea->installEventFilter(this);
   fCommandLabel = new QLabel();
@@ -113 +113 @@
   fCommandArea->installEventFilter(this);
   fCommandArea->activateWindow();
-  connect(fCommandArea, SIGNAL(returnPressed()), SLOT(commandEnteredCallback()));
+  connect(fCommandArea, SIGNAL(returnPressed()), SLOT(CommandEnteredCallback()));
   //  fCommandArea->setFocusPolicy ( Qt::StrongFocus );
   //  fCommandArea->setFocus(Qt::TabFocusReason);
@@ -148 +148 @@
   // Add a Help menu
   QMenu *helpMenu = fMainWindow->menuBar()->addMenu("Help");
-  helpMenu->addAction("Show Help", this, SLOT(showHelpCallback()));
+  helpMenu->addAction("Show Help", this, SLOT(ShowHelpCallback()));
 
   // Set the splitter size. The fTextArea sould be 2/3 on the fMainWindow
@@ -220 +220 @@
 )
 {
+  if (aPrompt == NULL) return;
+
   fCommandLabel->setText((char*)aPrompt.data());
 }
@@ -246 +248 @@
 )
 {
+  if (aState == NULL) return;
+
   printf("G4UIQt::PauseSessionStart\n");
   if(aState=="G4_pause> ") {  // TO KEEP
@@ -267 +271 @@
 )
 {
+  if (aPrompt == NULL) return;
+
   printf("G4UIQt::SecondaryLoop\n");
   G4Qt* interactorManager = G4Qt::getInstance (); // TO KEEP ?
@@ -284 +290 @@
    Receive a cout from Geant4. We have to display it in the cout zone
    @param aString : label to add in the display area
+   @return 0
 */
 G4int G4UIQt::ReceiveG4cout (
@@ -289 +296 @@
 )
 {
+  if (aString == NULL) return 0;
+
   fTextArea->append(QString((char*)aString.data()).trimmed());
   fTextArea->verticalScrollBar()->setSliderPosition(fTextArea->verticalScrollBar()->maximum());
@@ -298 +307 @@
    Receive a cerr from Geant4. We have to display it in the cout zone
    @param aString : label to add in the display area
+   @return 0
 */
 G4int G4UIQt::ReceiveG4cerr (
@@ -303 +313 @@
 )
 {
+  if (aString == NULL) return 0;
+
   QColor previousColor = fTextArea->textColor();
   fTextArea->setTextColor(Qt::red);
@@ -323 +335 @@
 )
 {
+  if (aName == NULL) return;
+  if (aLabel == NULL) return;
+
   QMenu *fileMenu = new QMenu(aLabel);
   fMainWindow->menuBar()->insertMenu(fMainWindow->menuBar()->actions().last(),fileMenu); 
@@ -344 +359 @@
   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);
+  QSignalMapper *signalMapper = new QSignalMapper(this);
   QAction *action = parent->addAction(aLabel, signalMapper, SLOT(map()));
   signalMapper->setMapping(action, QString(aCommand));
-  connect(signalMapper, SIGNAL(mapped(const QString &)),this, SLOT(buttonCallback(const QString&)));
+  connect(signalMapper, SIGNAL(mapped(const QString &)),this, SLOT(ButtonCallback(const QString&)));
 }
 
@@ -408 +424 @@
     fHelpTreeWidget->insertTopLevelItems(0, items);
 
-    //connecting callback
-    //  QSignalMapper signalMapper = new QSignalMapper(this);
-
-    connect(fHelpTreeWidget, SIGNAL(itemSelectionChanged ()),this, SLOT(helpTreeCallback()));  
+    connect(fHelpTreeWidget, SIGNAL(itemSelectionChanged ()),this, SLOT(HelpTreeCallback()));  
 
     // Set layouts
@@ -469 +482 @@
 
       // Call the update of the right textArea
-      helpTreeCallback();
+      HelpTreeCallback();
     }
   }
@@ -482 +495 @@
 
 
-/**
-   Fill the Help Tree Widget
+/**   Fill the Help Tree Widget
    @param aParent : parent item to fill
    @param aCommandTree : commandTree node associate with this part of the Tree
@@ -492 +504 @@
 )
 {
+  if (aParent == NULL) return;
+  if (aCommandTree == NULL) return;
+
 
   // Creating new item
@@ -498 +513 @@
   // Get the Sub directories
   for (int a=0;a<aCommandTree->GetTreeEntry();a++) {
-    
+
     QStringList stringList;
     stringList << QString((char*)(aCommandTree->GetTree(a+1)->GetPathName()).data()).trimmed()  ;
@@ -525 +540 @@
 
 
-/**
+/** Find a treeItemWidget in the help tree
+    @param aCommand item's String to look for
+    @return item if found, NULL if not
 */
 QTreeWidgetItem* G4UIQt::FindTreeItem(
@@ -532 +549 @@
 )
 {
+  if (aParent == NULL) return NULL;
+  if (aCommand == NULL) return NULL;
+
   if (aParent->text(0) == aCommand)
     return aParent;
@@ -549 +569 @@
    @param aCommand : command to list parameters
    @see G4UIparameter::List()
-   @return the command list parameters
+   @see G4UIcommand::List()
+   @return the command list parameters, or "" if nothing
 */
 QString G4UIQt::GetCommandList (
@@ -556 +577 @@
 {
 
-  QString txt;
+  QString txt ="";
+  if (aCommand == NULL)
+    return txt;
+
   G4String commandPath = aCommand->GetCommandPath();
   G4String rangeString = aCommand->GetRange();
-
-  if((commandPath.length()-1)!='/')
-    {
-      txt += "Command " + QString((char*)(commandPath).data()) + "\n";
+  G4int n_guidanceEntry = aCommand->GetGuidanceEntries();
+  G4int n_parameterEntry = aCommand->GetParameterEntries();
+  
+  if ((commandPath == "") && 
+      (rangeString == "") &&
+      (n_guidanceEntry == 0) &&
+      (n_parameterEntry == 0)) {
+    return txt;
+  }
+
+  if((commandPath.length()-1)!='/') {
+    txt += "Command " + QString((char*)(commandPath).data()) + "\n";
+  }
+  txt += "Guidance :\n";
+  
+  for( G4int i_thGuidance=0; i_thGuidance < n_guidanceEntry; i_thGuidance++ ) {
+    txt += QString((char*)(aCommand->GetGuidanceLine(i_thGuidance)).data()) + "\n";
+  }
+  if( ! rangeString.isNull() ) {
+    txt += " Range of parameters : " + QString((char*)(rangeString).data()) + "\n";
+  }
+  if( n_parameterEntry > 0 ) {
+    G4UIparameter *param;
+    
+    // Re-implementation of G4UIparameter.cc
+    
+    for( G4int i_thParameter=0; i_thParameter<n_parameterEntry; i_thParameter++ ) {
+      param = aCommand->GetParameter(i_thParameter);
+      txt += "\nParameter : " + QString((char*)(param->GetParameterName()).data()) + "\n";
+      if( ! param->GetParameterGuidance().isNull() )
+        txt += QString((char*)(param->GetParameterGuidance()).data())+ "\n" ;
+      txt += " Parameter type  : " + QString(param->GetParameterType())+ "\n";
+      if(param->IsOmittable()){
+        txt += " Omittable       : True\n";
+      } else {
+        txt += " Omittable       : False\n";
+      }
+      if( param->GetCurrentAsDefault() ) {
+        txt += " Default value   : taken from the current value\n";
+      } else if( ! param->GetDefaultValue().isNull() ) {
+        txt += " Default value   : " + QString((char*)(param->GetDefaultValue()).data())+ "\n";
+      }
+      if( ! param->GetParameterRange().isNull() ) {
+        txt += " Parameter range : " + QString((char*)(param->GetParameterRange()).data())+ "\n";
+      }
+      if( ! param->GetParameterCandidates().isNull() ) {
+        txt += " Candidates      : " + QString((char*)(param->GetParameterCandidates()).data())+ "\n";
+      }
     }
-  txt += "Guidance :\n";
-  G4int n_guidanceEntry = aCommand->GetGuidanceEntries();
-
-  for( G4int i_thGuidance=0; i_thGuidance < n_guidanceEntry; i_thGuidance++ )
-    { txt += QString((char*)(aCommand->GetGuidanceLine(i_thGuidance)).data()) + "\n"; }
-  if( ! rangeString.isNull() )
-    { txt += " Range of parameters : " + QString((char*)(rangeString).data()) + "\n"; }
-  G4int n_parameterEntry = aCommand->GetParameterEntries();
-  if( n_parameterEntry > 0 )
-    {
-      G4UIparameter *param;
-
-      // Re-implementation of G4UIparameter.cc
-
-      for( G4int i_thParameter=0; i_thParameter<n_parameterEntry; i_thParameter++ )
-        { param = aCommand->GetParameter(i_thParameter);
-          txt += "\nParameter : " + QString((char*)(param->GetParameterName()).data()) + "\n";
-          if( ! param->GetParameterGuidance().isNull() )
-            txt += QString((char*)(param->GetParameterGuidance()).data())+ "\n" ;
-          txt += " Parameter type  : " + QString(param->GetParameterType())+ "\n";
-          if(param->IsOmittable())
-            { txt += " Omittable       : True\n"; }
-          else
-            { txt += " Omittable       : False\n"; }
-          if( param->GetCurrentAsDefault() )
-            { txt += " Default value   : taken from the current value\n"; }
-          else if( ! param->GetDefaultValue().isNull() )
-            { txt += " Default value   : " + QString((char*)(param->GetDefaultValue()).data())+ "\n"; }
-          if( ! param->GetParameterRange().isNull() )
-            txt += " Parameter range : " + QString((char*)(param->GetParameterRange()).data())+ "\n";
-          if( ! param->GetParameterCandidates().isNull() )
-            txt += " Candidates      : " + QString((char*)(param->GetParameterCandidates()).data())+ "\n";
-        }
-    }
+  }
   return txt;
 }
@@ -633 +668 @@
    @param event Kind of event
 */
-bool G4UIQt::eventFilter(
-                         QObject *obj
-                         ,QEvent *event
-                         )
-{
-  if (obj == fCommandHistoryArea) {
-    if (event->type() == QEvent::KeyPress) {
+bool G4UIQt::EventFilter(
+ QObject *aObj
+,QEvent *aEvent
+)
+{
+  if (aObj == NULL) return false;
+  if (aEvent == NULL) return false;
+
+  if (aObj == fCommandHistoryArea) {
+    if (aEvent->type() == QEvent::KeyPress) {
       fCommandArea->setFocus();
     }
   }
-  if (obj == fCommandArea) {
-    if (event->type() == QEvent::KeyPress) {
-      QKeyEvent *e = static_cast<QKeyEvent*>(event);
+  if (aObj == fCommandArea) {
+    if (aEvent->type() == QEvent::KeyPress) {
+      QKeyEvent *e = static_cast<QKeyEvent*>(aEvent);
       if ((e->key() == (Qt::Key_Down)) ||
           (e->key() == (Qt::Key_PageDown)) ||
@@ -677 +715 @@
   }
   // pass the event on to the parent class
-  return QObject::eventFilter(obj, event);
+  return QObject::eventFilter(aObj, aEvent);
 }
 
@@ -692 +730 @@
    Called when user give "help" command.
 */
-void G4UIQt::showHelpCallback (
+void G4UIQt::ShowHelpCallback (
 )
 {
@@ -702 +740 @@
    Called when user click on clear button. Clear the text Output area
 */
-void G4UIQt::clearButtonCallback (
+void G4UIQt::ClearButtonCallback (
 )
 {
@@ -713 +751 @@
    Send the associated command to geant4
 */
-void G4UIQt::commandEnteredCallback (
+void G4UIQt::CommandEnteredCallback (
 )
 {
@@ -740 +778 @@
    @param aCommand
 */
-void G4UIQt::buttonCallback (
+void G4UIQt::ButtonCallback (
  const QString& aCommand
 )
 {
+  if (aCommand == NULL) return;
+
   G4String ss = G4String(aCommand.toStdString().c_str());
   printf ("debug : execute:\n-%s- %d %d \n",ss.data(),exitSession,exitPause);
@@ -756 +796 @@
    This callback is activated when user selected a item in the help tree
 */
-void G4UIQt::helpTreeCallback (
-)
-{
-  //  G4bool GetHelpChoice(G4int&);
+void G4UIQt::HelpTreeCallback (
+)
+{
   QTreeWidgetItem* item =  NULL;
   if (!fHelpTreeWidget)
@@ -792 +831 @@
    Give it to the command area.
 */
-void G4UIQt::commandHistoryCallback(
+void G4UIQt::CommandHistoryCallback(
 )
 {

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

@@ -2 +2 @@
 ** Meta object code from reading C++ file 'G4UIQt.hh'
 **
-** Created: Wed Jun 20 18:07:19 2007
+** Created: Fri Jun 22 15:30:23 2007
 **      by: The Qt Meta Object Compiler version 59 (Qt 4.2.2)
 **
@@ -43 +43 @@
 static const char qt_meta_stringdata_G4UIQt[] = {
     "G4UIQt\0myClicked(QString)\0text\0\0"
-    "clearButtonCallback()\0commandEnteredCallback()\0"
-    "buttonCallback(QString)\0helpTreeCallback()\0"
-    "showHelpCallback()\0commandHistoryCallback()\0"
+    "ClearButtonCallback()\0CommandEnteredCallback()\0"
+    "ButtonCallback(QString)\0HelpTreeCallback()\0"
+    "ShowHelpCallback()\0CommandHistoryCallback()\0"
 };
 
@@ -78 +78 @@
         switch (_id) {
         case 0: myClicked((*reinterpret_cast< const QString(*)>(_a[1]))); break;
-        case 1: clearButtonCallback(); break;
-        case 2: commandEnteredCallback(); break;
-        case 3: buttonCallback((*reinterpret_cast< const QString(*)>(_a[1]))); break;
-        case 4: helpTreeCallback(); break;
-        case 5: showHelpCallback(); break;
-        case 6: commandHistoryCallback(); break;
+        case 1: ClearButtonCallback(); break;
+        case 2: CommandEnteredCallback(); break;
+        case 3: ButtonCallback((*reinterpret_cast< const QString(*)>(_a[1]))); break;
+        case 4: HelpTreeCallback(); break;
+        case 5: ShowHelpCallback(); break;
+        case 6: CommandHistoryCallback(); break;
         }
         _id -= 7;