Changeset 577 for trunk/geant4/interfaces/basic/src

Timestamp:

Sep 17, 2007, 2:32:28 PM (17 years ago)

Author:

garnier

Message:

r595@mac-90108: laurentgarnier | 2007-09-17 14:35:37 +0200
correction ticket #68

Location:

trunk/geant4/interfaces/basic/src

Files:

• G4UIQt.cc (modified) (4 diffs)
• G4UIQt_moc.cc (modified) (5 diffs)

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

@@ -295 +295 @@
 {
   if (!aString) return 0;
-  printf(" **************** G4 Cout : %s \n",(char*)aString.data());
+  //  printf(" **************** G4 Cout : %s \n",(char*)aString.data());
   fTextArea->append(QString((char*)aString.data()).trimmed());
   fTextArea->verticalScrollBar()->setSliderPosition(fTextArea->verticalScrollBar()->maximum());
@@ -423 +423 @@
 
     connect(fHelpTreeWidget, SIGNAL(itemSelectionChanged ()),this, SLOT(HelpTreeClicCallback()));  
-    connect(fHelpTreeWidget, SIGNAL(itemDoubleClicked ()),this, SLOT(HelpTreeDoubleClicCallback()));  
+    connect(fHelpTreeWidget, SIGNAL(itemDoubleClicked (QTreeWidgetItem*,int)),this, SLOT(HelpTreeDoubleClicCallback(QTreeWidgetItem*,int)));  
 
     // Set layouts
@@ -789 +789 @@
 )
 {
+  printf("G4UIQt::HelpTreeClicCallback");
   QTreeWidgetItem* item =  NULL;
   if (!fHelpTreeWidget)
@@ -819 +820 @@
 */
 void G4UIQt::HelpTreeDoubleClicCallback (
-)
-{
-  // update the helpArea
+QTreeWidgetItem* item
+ ,int nb
+)
+{
+  printf("G4UIQt::HelpTreeDoubleClicCallback");
   HelpTreeClicCallback();
-
-  QTreeWidgetItem* item =  NULL;
-  if (!fHelpTreeWidget)
-    return ;
-
-  if (!fHelpArea)
-    return;
-  
-  QList<QTreeWidgetItem *> list =fHelpTreeWidget->selectedItems();
-  if (list.isEmpty())
-    return;
-  item = list.first();
-  if (!item)
-    return;
-
   fCommandArea->setText(item->text (1));
 }

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

@@ -2 +2 @@
 ** Meta object code from reading C++ file 'G4UIQt.hh'
 **
-** Created: Fri Jun 22 15:30:23 2007
+** Created: Mon Sep 17 14:28:15 2007
 **      by: The Qt Meta Object Compiler version 59 (Qt 4.2.2)
 **
@@ -23 +23 @@
        0,       // classname
        0,    0, // classinfo
-       7,   10, // methods
+       8,   10, // methods
        0,    0, // properties
        0,    0, // enums/sets
@@ -35 +35 @@
       79,   31,   31,   31, 0x08,
      103,   31,   31,   31, 0x08,
-     122,   31,   31,   31, 0x08,
-     141,   31,   31,   31, 0x08,
+     126,  175,   31,   31, 0x08,
+     177,   31,   31,   31, 0x08,
+     196,   31,   31,   31, 0x08,
 
        0        // eod
@@ -44 +45 @@
     "G4UIQt\0myClicked(QString)\0text\0\0"
     "ClearButtonCallback()\0CommandEnteredCallback()\0"
-    "ButtonCallback(QString)\0HelpTreeCallback()\0"
-    "ShowHelpCallback()\0CommandHistoryCallback()\0"
+    "ButtonCallback(QString)\0HelpTreeClicCallback()\0"
+    "HelpTreeDoubleClicCallback(QTreeWidgetItem*,int)\0"
+    ",\0ShowHelpCallback()\0CommandHistoryCallback()\0"
 };
 
@@ -81 +83 @@
         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 4: HelpTreeClicCallback(); break;
+        case 5: HelpTreeDoubleClicCallback((*reinterpret_cast< QTreeWidgetItem*(*)>(_a[1])),(*reinterpret_cast< int(*)>(_a[2]))); break;
+        case 6: ShowHelpCallback(); break;
+        case 7: CommandHistoryCallback(); break;
         }
-        _id -= 7;
+        _id -= 8;
     }
     return _id;