Changeset 719 for trunk/geant4/interfaces/basic/src/G4UIQt.cc

Timestamp:

Feb 7, 2008, 7:19:06 PM (16 years ago)

Author:

garnier

Message:

Correction du ticket #117

File:

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

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

@@ -26 +26 @@
 //
 // $Id: G4UIQt.cc,v 1.15 2008/01/30 11:16:17 lgarnier Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: HEAD $
 //
 // L. Garnier
 
-//#define GEANT4_QT_DEBUG
+#define GEANT4_QT_DEBUG
 
 #ifdef G4UI_BUILD_QT_SESSION
@@ -547 +547 @@
 #if QT_VERSION < 0x040000
     helpLayout->add(helpLine);
+    connect( helpLine, SIGNAL( returnPressed () ), this, SLOT( lookForHelpStringCallback() ) );
 #else
     helpLayout->addWidget(helpLine);
-#endif
     connect( helpLine, SIGNAL( editingFinished () ), this, SLOT( lookForHelpStringCallback() ) );
+#endif
 
     // the help tree
@@ -578 +579 @@
 #else
     vLayout->addWidget(helpWidget);
-    vLayout->add(splitter,1);
+    vLayout->addWidget(splitter,1);
     vLayout->addWidget(exitButton);
 #endif
@@ -1354 +1355 @@
     // clear old help tree
     fHelpTreeWidget->clear();
+#if QT_VERSION < 0x040200
+    fHelpTreeWidget->removeColumn(1);
+    fHelpTreeWidget->removeColumn(0);
+#endif
     CreateHelpTree();
     return;
   }
+
+#ifdef GEANT4_QT_DEBUG
+  printf("G4UIQt::lookForHelpStringCallback\n");
+#endif
 
   // the help tree
@@ -1367 +1376 @@
   // clear old help tree
   fHelpTreeWidget->clear();
+#if QT_VERSION < 0x040200
+  fHelpTreeWidget->removeColumn(1);
+  fHelpTreeWidget->removeColumn(0);
+#endif
 
   // look for new items
 
   int tmp = 0;
+#if QT_VERSION < 0x040000
+  int multFactor = 1000; // factor special for having double keys in Qt3
+  int doubleKeyAdd = 0;  // decay for doubleKeys in Qt3
+#endif
+
   QMap<int,QString> commandResultMap;
   QMap<int,QString> commandChildResultMap;
 
   for (int a=0;a<treeSize;a++) {
-#ifdef GEANT4_QT_DEBUG
-    printf("Command %s\n",(char*)(treeTop->GetTree(a+1)->GetPathName()).data());
-#endif
     G4UIcommand* command = treeTop->FindPath(treeTop->GetTree(a+1)->GetPathName().data());
+#if QT_VERSION > 0x040000
     tmp = GetCommandList (command).count(helpLine->text(),Qt::CaseInsensitive);
+#else
+    tmp = GetCommandList (command).contains(helpLine->text(),false);
+#endif
     if (tmp >0) {
+#if QT_VERSION > 0x040000
       commandResultMap.insertMulti(tmp,QString((char*)(treeTop->GetTree(a+1)->GetPathName()).data()));
-#ifdef GEANT4_QT_DEBUG
-      printf("Command %s match %d times \n",(char*)(treeTop->GetTree(a+1)->GetPathName()).data(),tmp);
+#else // tricky thing for Qt3...
+      doubleKeyAdd = 0;
+      while (commandResultMap.find( tmp*multFactor+doubleKeyAdd) != commandResultMap.end()) {
+        doubleKeyAdd ++;
+      }
+      commandResultMap.insert( tmp*multFactor+doubleKeyAdd,QString((char*)(treeTop->GetTree(a+1)->GetPathName()).data()) );
 #endif
     }
@@ -1390 +1414 @@
     // insert new childs
     if (!commandChildResultMap.empty()) {
+#if QT_VERSION > 0x040000
       QMap<int,QString>::const_iterator i = commandChildResultMap.constBegin();
       while (i != commandChildResultMap.constEnd()) {
         commandResultMap.insertMulti(i.key(),i.value());
+#else // tricky thing for Qt3...
+      QMap<int,QString>::const_iterator i = commandChildResultMap.begin();
+      while (i != commandChildResultMap.end()) {
+        doubleKeyAdd = 0;
+        while (commandResultMap.find( i.key()*multFactor+doubleKeyAdd) != commandResultMap.end()) {
+          doubleKeyAdd ++;
+        }
+        commandResultMap.insert(i.key()*multFactor+doubleKeyAdd,i.data());
+#endif
         i++;
       }
@@ -1424 +1458 @@
   }
 
+#if QT_VERSION > 0x040000
   QMap<int,QString>::const_iterator i = commandResultMap.constEnd();
+#else
+  QMap<int,QString>::const_iterator i = commandResultMap.end();
+#endif
   i--;
   // 10 maximum progress values
@@ -1438 +1476 @@
   bool end = false;
   while (!end) {
+#if QT_VERSION > 0x040000
     if (i == commandResultMap.constBegin()) {
+#else
+    if (i == commandResultMap.begin()) {
+#endif
       end = true;
     }
@@ -1446 +1488 @@
 #if QT_VERSION < 0x040000
     newItem = new QListViewItem(fHelpTreeWidget);
-    newItem->setText(0,i.value().simplifyWhiteSpace());
-    newItem->setText(1,progressStr);
+    newItem->setText(0,i.data().simplifyWhiteSpace());
 #else
     newItem = new QTreeWidgetItem(fHelpTreeWidget);
     newItem->setText(0,i.value().trimmed());
+#endif
     newItem->setText(1,progressStr);
-#endif
     
 #if QT_VERSION >= 0x040200
@@ -1463 +1504 @@
 #if QT_VERSION < 0x040000
   fHelpTreeWidget->setColumnWidthMode (1,QListView::Maximum);
+  fHelpTreeWidget->setSorting(1,false);
 #else
   fHelpTreeWidget->resizeColumnToContents (0);
+  fHelpTreeWidget->sortItems(1,Qt::DescendingOrder);
   //  fHelpTreeWidget->setColumnWidth(1,10);//resizeColumnToContents (1);
 #endif
@@ -1480 +1523 @@
   if (aCommandTree == NULL) return commandResultMap;
   
+#if QT_VERSION < 0x040000
+  int multFactor = 1000; // factor special for having double keys in Qt3
+  int doubleKeyAdd = 0;  // decay for doubleKeys in Qt3
+#endif
+
   // Get the Sub directories
   int tmp = 0;
@@ -1486 +1534 @@
   for (int a=0;a<aCommandTree->GetTreeEntry();a++) {
     const G4UIcommand* command = aCommandTree->GetGuidance();
+#if QT_VERSION > 0x040000
     tmp = GetCommandList (command).count(text,Qt::CaseInsensitive);
+#else
+    tmp = GetCommandList (command).contains(text,false);
+#endif
     if (tmp >0) {
+#if QT_VERSION > 0x040000
       commandResultMap.insertMulti(tmp,QString((char*)(aCommandTree->GetTree(a+1)->GetPathName()).data()));
+#else // tricky thing for Qt3...
+      doubleKeyAdd = 0;
+      while (commandResultMap.find( tmp*multFactor+doubleKeyAdd) != commandResultMap.end()) {
+        doubleKeyAdd ++;
+      }
+      commandResultMap.insert(tmp*multFactor+doubleKeyAdd,QString((char*)(aCommandTree->GetTree(a+1)->GetPathName()).data()));
+#endif
     }
     // look for childs
@@ -1495 +1555 @@
     if (!commandChildResultMap.empty()) {
       // insert new childs
+#if QT_VERSION > 0x040000
       QMap<int,QString>::const_iterator i = commandChildResultMap.constBegin();
       while (i != commandChildResultMap.constEnd()) {
         commandResultMap.insertMulti(i.key(),i.value());
+#else // tricky thing for Qt3...
+      QMap<int,QString>::const_iterator i = commandChildResultMap.begin();
+      while (i != commandChildResultMap.end()) {
+        doubleKeyAdd = 0;
+        while (commandResultMap.find( i.key()*multFactor+doubleKeyAdd) != commandResultMap.end()) {
+          doubleKeyAdd ++;
+        }
+        commandResultMap.insert(i.key()*multFactor+doubleKeyAdd,i.data());
+#endif
         i++;
       }
@@ -1507 +1577 @@
   for (int a=0;a<aCommandTree->GetCommandEntry();a++) {
     const G4UIcommand* command = aCommandTree->GetCommand(a+1);
+#if QT_VERSION > 0x040000
+    tmp = GetCommandList (command).count(text,Qt::CaseInsensitive);
+#else
+    tmp = GetCommandList (command).contains(text,false);
+#endif
+    if (tmp >0) {
+#if QT_VERSION > 0x040000
+      commandResultMap.insertMulti(tmp,QString((char*)(aCommandTree->GetCommand(a+1)->GetCommandPath()).data()));
+#else // tricky thing for Qt3...
+      doubleKeyAdd = 0;
+      while (commandResultMap.find( tmp*multFactor+doubleKeyAdd) != commandResultMap.end()) {
+        doubleKeyAdd ++;
+      }
+      commandResultMap.insert(tmp*multFactor+doubleKeyAdd,QString((char*)(aCommandTree->GetCommand(a+1)->GetCommandPath()).data()));
+#endif
 #ifdef GEANT4_QT_DEBUG
-    //    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->GetCommand(a+1)->GetCommandPath()).data()));
-#ifdef GEANT4_QT_DEBUG
 #endif
     }