Changeset 1251 for trunk

Timestamp:

May 7, 2010, 11:51:18 AM (14 years ago)

Author:

garnier

Message:

Help tree Add OK, del NOK

File:

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

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

@@ -1034 +1034 @@
   QString commandText = "";
   for (int a=0;a<treeSize;a++) {
-#ifdef G4DEBUG_INTERFACES_BASIC
-  printf("G4UIQt::FillHelpTree for\n");
-#endif
+
     // Creating new item
+    newItem = NULL;
 
 #if QT_VERSION < 0x040000
@@ -1045 +1044 @@
 #endif
 
+#ifdef G4DEBUG_INTERFACES_BASIC
+    printf("G4UIQt::FillHelpTree for %s\n",commandText.toStdString().c_str());
+#endif
     // if already exist, don't create it !
 #if QT_VERSION < 0x040000
@@ -1055 +1057 @@
     }
 #else
-    for (int b=0;a<fHelpTreeWidget->topLevelItemCount();b++) {
+#ifdef G4DEBUG_INTERFACES_BASIC
+    printf("G4UIQt::FillHelpTree topCount %d\n",fHelpTreeWidget->topLevelItemCount());
+#endif
+    for (int b=0;b<fHelpTreeWidget->topLevelItemCount();b++) {
       if (!newItem)
         newItem = FindTreeItem(fHelpTreeWidget->topLevelItem(b),commandText);
@@ -1063 +1068 @@
     if (newItem == NULL) {
 #ifdef G4DEBUG_INTERFACES_BASIC
-  printf("G4UIQt::FillHelpTree check already present\n");
+  printf("G4UIQt::FillHelpTree NOT present\n");
 #endif
       
@@ -1073 +1078 @@
       newItem->setText(0,GetShortCommandPath(commandText));
     }
+#ifdef G4DEBUG_INTERFACES_BASIC
+    else {
+      printf("G4UIQt::FillHelpTree ALREADY present\n");
+    }
+#endif
 
     // look for childs
@@ -1111 +1121 @@
   // Get the Sub directories
   for (int a=0;a<aCommandTree->GetTreeEntry();a++) {
-#ifdef G4DEBUG_INTERFACES_BASIC
-  printf("G4UIQt::CreateChildTree for\n");
-#endif
 
 #if QT_VERSION < 0x040000
@@ -1121 +1128 @@
 #endif
     
+#ifdef G4DEBUG_INTERFACES_BASIC
+    printf("G4UIQt::CreateChildTree for %s \n",commandText.toStdString().c_str());
+#endif
     // if already exist, don't create it !
     newItem = FindTreeItem(aParent,commandText);
     if (newItem == NULL) {
 #ifdef G4DEBUG_INTERFACES_BASIC
-  printf("G4UIQt::CreateChildTree check already present\n");
+      printf("G4UIQt::CreateChildTree NOT present\n");
 #endif
 #if QT_VERSION < 0x040000
@@ -1134 +1144 @@
       newItem->setText(0,GetShortCommandPath(commandText));
     }
+#ifdef G4DEBUG_INTERFACES_BASIC
+    else {
+      printf("G4UIQt::CreateChildTree ALREADY present\n");
+    }
+#endif
     CreateChildTree(newItem,aCommandTree->GetTree(a+1));
   }
@@ -1145 +1160 @@
     QStringList stringList;
 #if QT_VERSION < 0x040000
-    newItem = new QListViewItem(aParent);
-    newItem->setText(0,GetShortCommandPath(QString((char*)(aCommandTree->GetCommand(a+1)->GetCommandPath()).data()).simplifyWhiteSpace()));
-    newItem->setOpen(false);
-
-#else
-    newItem = new QTreeWidgetItem(aParent);
-    newItem->setText(0,GetShortCommandPath(QString((char*)(aCommandTree->GetCommand(a+1)->GetCommandPath()).data()).trimmed()));
+    commandText = QString((char*)(aCommandTree->GetCommand(a+1)->GetCommandPath()).data()).simplifyWhiteSpace();
+#else
+    commandText = QString((char*)(aCommandTree->GetCommand(a+1)->GetCommandPath()).data()).trimmed();
+#endif
+
+    // if already exist, don't create it !
+    newItem = FindTreeItem(aParent,commandText);
+    if (newItem == NULL) {
+#if QT_VERSION < 0x040000
+      newItem = new QListViewItem(aParent);
+      newItem->setText(0,GetShortCommandPath(commandText));
+      newItem->setOpen(false);
+      
+#else
+      newItem = new QTreeWidgetItem(aParent);
+      newItem->setText(0,GetShortCommandPath(commandText));
 #if QT_VERSION < 0x040202
-        fHelpTreeWidget->setItemExpanded(newItem,false); 
-#else
-    newItem->setExpanded(false);
-#endif
-#endif
-      
+      fHelpTreeWidget->setItemExpanded(newItem,false); 
+#else
+      newItem->setExpanded(false);
+#endif
+#endif
+    }
   }
 }
@@ -1179 +1203 @@
   if (aParent == NULL) return NULL;
 
-  if (GetLongCommandPath(aParent) == aCommand)
+  // Suppress last "/"
+  QString myCommand = aCommand;
+  
+  if (myCommand.lastIndexOf("/") == (myCommand.size()-1)) {
+    myCommand = myCommand.left(myCommand.size()-1);
+  }
+
+#ifdef G4DEBUG_INTERFACES_BASIC
+  printf("G4UIQt::FindTreeItem check -%s=%s-\n",myCommand.toStdString().c_str(),GetLongCommandPath(aParent).toStdString().c_str());
+#endif
+  if (GetLongCommandPath(aParent) == myCommand)
     return aParent;
   
@@ -1187 +1221 @@
     while (tmpItem != 0) {
       if (!tmp)
-        tmp = FindTreeItem(tmpItem,aCommand);
+        tmp = FindTreeItem(tmpItem,myCommand);
       tmpItem = tmpItem->nextSibling();
     }
@@ -1194 +1228 @@
   for (int a=0;a<aParent->childCount();a++) {
     if (!tmp)
-      tmp = FindTreeItem(aParent->child(a),aCommand);
+      tmp = FindTreeItem(aParent->child(a),myCommand);
   }
 #endif