Changeset 700 for trunk/geant4

Timestamp:

Jan 28, 2008, 5:51:08 PM (16 years ago)

Author:

garnier

Message:

zone de recherche OK

File:

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

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

@@ -747 +747 @@
   fHelpTreeWidget->setRootIsDecorated(true);
   fHelpTreeWidget->addColumn("Command");
-  fHelpTreeWidget->addColumn("Description",0);
-  //    fHelpTreeWidget->setColumnWidth (1,0);
   fHelpTreeWidget->header()->setResizeEnabled(FALSE,1);
-  //    QList<QListViewItem *> items;
 #else
   fHelpTreeWidget->setSelectionMode(QAbstractItemView::SingleSelection);
-  fHelpTreeWidget->setColumnCount(2);
-  fHelpTreeWidget->setColumnHidden(1,true);
   QStringList labels;
-  labels << QString("Command") << QString("Description");
+  labels << QString("Command");
   fHelpTreeWidget->setHeaderLabels(labels);
-  //    QList<QTreeWidgetItem *> items;
 #endif
 
@@ -773 +767 @@
     newItem = new QListViewItem(fHelpTreeWidget);
     newItem->setText(0,QString((char*)(treeTop->GetTree(a+1)->GetPathName()).data()).simplifyWhiteSpace());
-    newItem->setText(1,QString((char*)(treeTop->GetTree(a+1)->GetTitle()).data()).simplifyWhiteSpace());
 #else
     newItem = new QTreeWidgetItem(fHelpTreeWidget);
     newItem->setText(0,QString((char*)(treeTop->GetTree(a+1)->GetPathName()).data()).trimmed());
-    newItem->setText(1,QString((char*)(treeTop->GetTree(a+1)->GetTitle()).data()).trimmed());
 #endif
 
@@ -832 +824 @@
       newItem = new QListViewItem(aParent);
       newItem->setText(0,QString((char*)(aCommandTree->GetTree(a+1)->GetPathName()).data()).simplifyWhiteSpace());
-      newItem->setText(1,QString((char*)(aCommandTree->GetTree(a+1)->GetTitle()).data()).simplifyWhiteSpace());
 
 #else
     newItem = new QTreeWidgetItem(aParent);
     newItem->setText(0,QString((char*)(aCommandTree->GetTree(a+1)->GetPathName()).data()).trimmed());
-    newItem->setText(1,QString((char*)(aCommandTree->GetTree(a+1)->GetTitle()).data()).trimmed());
 #endif
 
@@ -853 +843 @@
     newItem = new QListViewItem(aParent);
     newItem->setText(0,QString((char*)(aCommandTree->GetCommand(a+1)->GetCommandPath()).data()).simplifyWhiteSpace());
-    newItem->setText(1,QString((char*)(aCommandTree->GetCommand(a+1)->GetCommandPath()).data()).simplifyWhiteSpace());
     newItem->setOpen(false);
 
@@ -859 +848 @@
     newItem = new QTreeWidgetItem(aParent);
     newItem->setText(0,QString((char*)(aCommandTree->GetCommand(a+1)->GetCommandPath()).data()).trimmed());
-    newItem->setText(1,QString((char*)(aCommandTree->GetCommand(a+1)->GetCommandPath()).data()).trimmed());
 #if QT_VERSION < 0x040202
         fHelpTreeWidget->setItemExpanded(newItem,false); 
@@ -1313 +1301 @@
 
   fCommandArea->clear();
-  fCommandArea->setText(item->text(1));
+  fCommandArea->setText(item->text(0));
 }
 
@@ -1416 +1404 @@
   fHelpTreeWidget->setRootIsDecorated(true);
   fHelpTreeWidget->addColumn("Command");
-  fHelpTreeWidget->addColumn("Description",0);
   fHelpTreeWidget->addColumn("Match");
   //  fHelpTreeWidget->header()->setResizeEnabled(FALSE,1);
 #else
   fHelpTreeWidget->setSelectionMode(QAbstractItemView::SingleSelection);
-  fHelpTreeWidget->setColumnCount(3);
-  fHelpTreeWidget->setColumnHidden(1,true);
+  fHelpTreeWidget->setColumnCount(2);
   QStringList labels;
-  labels << QString("Command") << QString("Description") << QString("Match");
+  labels << QString("Command") << QString("Match");
   fHelpTreeWidget->setHeaderLabels(labels);
 #endif
@@ -1461 +1447 @@
     newItem = new QListViewItem(fHelpTreeWidget);
     newItem->setText(0,i.value().simplifyWhiteSpace());
-    newItem->setText(1,i.value().simplifyWhiteSpace());
-    
-    newItem->setText(2,progressStr);
+    newItem->setText(1,progressStr);
 #else
     newItem = new QTreeWidgetItem(fHelpTreeWidget);
     newItem->setText(0,i.value().trimmed());
-    newItem->setText(1,i.value().trimmed());
-    newItem->setText(2,progressStr);
+    newItem->setText(1,progressStr);
 #endif
     
 #if QT_VERSION >= 0x040200
-    newItem->setForeground ( 2, QBrush(Qt::blue) );
+    newItem->setForeground ( 1, QBrush(Qt::blue) );
 #endif
     progressStr = "|";
@@ -1479 +1462 @@
   // FIXME :  to be checked on Qt3
 #if QT_VERSION < 0x040000
-  fHelpTreeWidget->setColumnWidthMode (0,QListView::Maximum);
+  fHelpTreeWidget->setColumnWidthMode (1,QListView::Maximum);
 #else
   fHelpTreeWidget->resizeColumnToContents (0);
+  //  fHelpTreeWidget->setColumnWidth(1,10);//resizeColumnToContents (1);
 #endif
 }
@@ -1502 +1486 @@
   for (int a=0;a<aCommandTree->GetTreeEntry();a++) {
     const G4UIcommand* command = aCommandTree->GetGuidance();
-#ifdef GEANT4_QT_DEBUG
-    printf("Command loop \n");
-    //    printf("Command %s\n",(char*)(aCommandTree->GetTree(a+1)->GetPathName()).data());
-    //    printf("%s \n",GetCommandList (command).toStdString().c_str());
-#endif
     tmp = GetCommandList (command).count(text,Qt::CaseInsensitive);
     if (tmp >0) {
       commandResultMap.insertMulti(tmp,QString((char*)(aCommandTree->GetTree(a+1)->GetPathName()).data()));
-#ifdef GEANT4_QT_DEBUG
-      printf("---Command %s match %d times \n",(char*)(aCommandTree->GetTree(a+1)->GetPathName()).data(),tmp);
-#endif
     }
     // look for childs
@@ -1532 +1508 @@
     const G4UIcommand* command = aCommandTree->GetCommand(a+1);
 #ifdef GEANT4_QT_DEBUG
-    printf("Command Finale debut\n");
     //    printf("%s \n",GetCommandList (command).toStdString().c_str());
 #endif
@@ -1539 +1514 @@
       commandResultMap.insertMulti(tmp,QString((char*)(aCommandTree->GetCommand(a+1)->GetCommandPath()).data()));
 #ifdef GEANT4_QT_DEBUG
-      printf("---Command Finale %s match %d times \n",(char*)(aCommandTree->GetCommand(a+1)->GetCommandPath()).data(),tmp);
 #endif
     }