Changeset 1250 for trunk

Timestamp:

May 6, 2010, 5:49:48 PM (14 years ago)

Author:

garnier

Message:

HelpTree compil mais ne marche pas

File:

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

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

@@ -1014 +1014 @@
 #endif
 
-  QString defaultSelection = "";
-
   if (! fHelpTreeWidget ) {
     InitHelpTree();
-  } else {
-    // Memorise previous selection
-    if (fHelpTreeWidget->currentItem() != NULL) {
-      defaultSelection = fHelpTreeWidget->currentItem()->text(0);
-    }
-  }
+  }
+
   G4UImanager* UI = G4UImanager::GetUIpointer();
   if(UI==NULL) return;
@@ -1030 +1024 @@
 
   // Remove all previous children
-  fHelpTreeWidget->clear();
+  //  fHelpTreeWidget->clear();
 
   G4int treeSize = treeTop->GetTreeEntry();
 #if QT_VERSION < 0x040000
-  QListViewItem * newItem;
-  QListViewItem * defaultItem;
-#else
-  QTreeWidgetItem * newItem;
-  QTreeWidgetItem * defaultItem;
-#endif
+  QListViewItem * newItem = NULL;
+#else
+  QTreeWidgetItem * newItem = NULL;
+#endif
+  QString commandText = "";
   for (int a=0;a<treeSize;a++) {
+#ifdef G4DEBUG_INTERFACES_BASIC
+  printf("G4UIQt::FillHelpTree for\n");
+#endif
     // Creating new item
 
 #if QT_VERSION < 0x040000
-    newItem = new QListViewItem(fHelpTreeWidget);
-    newItem->setText(0,GetShortCommandPath(QString((char*)(treeTop->GetTree(a+1)->GetPathName()).data()).simplifyWhiteSpace()));
-#else
-    newItem = new QTreeWidgetItem(fHelpTreeWidget);
-    newItem->setText(0,GetShortCommandPath(QString((char*)(treeTop->GetTree(a+1)->GetPathName()).data()).trimmed()));
-#endif
-
+    commandText = QString((char*)(treeTop->GetTree(a+1)->GetPathName()).data()).simplifyWhiteSpace();
+#else
+    commandText = QString((char*)(treeTop->GetTree(a+1)->GetPathName()).data()).trimmed();
+#endif
+
+    // if already exist, don't create it !
+#if QT_VERSION < 0x040000
+    QListViewItem* tmpItem = fHelpTreeWidget->firstChild();
+    while (tmpItem != 0) {
+      if (!newItem) {
+        newItem = FindTreeItem(tmpItem,commandText);
+      }
+      tmpItem = tmpItem->nextSibling();
+    }
+#else
+    for (int b=0;a<fHelpTreeWidget->topLevelItemCount();b++) {
+      if (!newItem)
+        newItem = FindTreeItem(fHelpTreeWidget->topLevelItem(b),commandText);
+    }
+#endif
+
+    if (newItem == NULL) {
+#ifdef G4DEBUG_INTERFACES_BASIC
+  printf("G4UIQt::FillHelpTree check already present\n");
+#endif
+      
+#if QT_VERSION < 0x040000
+      newItem = new QListViewItem(fHelpTreeWidget);
+#else
+      newItem = new QTreeWidgetItem(fHelpTreeWidget);
+#endif
+      newItem->setText(0,GetShortCommandPath(commandText));
+    }
 
     // look for childs
     CreateChildTree(newItem,treeTop->GetTree(a+1));
     //      items.append(newItem);
-    if (defaultSelection != "") {
-      defaultItem = FindTreeItem(newItem,defaultSelection);
-      if (defaultItem != NULL ) {
-        defaultItem->setSelected(true);
-        while (defaultItem->parent() != NULL) {
-          defaultItem = defaultItem->parent();
-          defaultItem->setExpanded(true);
-        }
-      }
-    }
   }
 }
@@ -1096 +1108 @@
 #endif
 
+  QString commandText = "";
   // 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
+    commandText = QString((char*)(aCommandTree->GetTree(a+1)->GetPathName()).data()).simplifyWhiteSpace();
+#else
+    commandText = QString((char*)(aCommandTree->GetTree(a+1)->GetPathName()).data()).trimmed();
+#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");
+#endif
 #if QT_VERSION < 0x040000
       newItem = new QListViewItem(aParent);
-      newItem->setText(0,GetShortCommandPath(QString((char*)(aCommandTree->GetTree(a+1)->GetPathName()).data()).simplifyWhiteSpace()));
-
-#else
-    newItem = new QTreeWidgetItem(aParent);
-    newItem->setText(0,GetShortCommandPath(QString((char*)(aCommandTree->GetTree(a+1)->GetPathName()).data()).trimmed()));
-#endif
-
+#else
+      newItem = new QTreeWidgetItem(aParent);
+#endif
+      newItem->setText(0,GetShortCommandPath(commandText));
+    }
     CreateChildTree(newItem,aCommandTree->GetTree(a+1));
   }
@@ -1153 +1179 @@
   if (aParent == NULL) return NULL;
 
-  if (aParent->text(0) == aCommand)
+  if (GetLongCommandPath(aParent) == aCommand)
     return aParent;
   
@@ -1164 +1190 @@
       tmpItem = tmpItem->nextSibling();
     }
-
 #else
   QTreeWidgetItem * tmp = NULL;
@@ -1961 +1986 @@
   itemText = item->text(0);
 
-#ifdef G4DEBUG_INTERFACES_BASIC
-  printf("G4UIQt::HelpTreeClicCallback text:%s\n",item->text(0).toStdString().c_str());
-#endif
   while (item->parent() != NULL) {
     itemText = item->parent()->text(0)+"/"+itemText;