Changeset 1226

Timestamp:

Dec 18, 2009, 3:17:28 PM (14 years ago)

Author:

garnier

Message:

supp d'une fonction en doublon

Location:

trunk/source/interfaces/basic

Files:

• include/G4UIQt.hh (modified) (2 diffs)
• src/G4UIQt.cc (modified) (13 diffs)

trunk/source/interfaces/basic/include/G4UIQt.hh

@@ -142 +142 @@
   void CreateCoutTBWidget();
   void CreateHistoryTBWidget();
+  void OpenHelpTreeOnCommand(const QString &);
 
 private:
@@ -186 +187 @@
   void ShowHelpCallback();
   void CommandHistoryCallback();
-  void lookForHelpStringCallback();
+  void LookForHelpStringCallback();
   void UpdateTabWidget(int);
   void ResizeTabWidget( QResizeEvent* );

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

@@ -159 +159 @@
 #endif
 
-#ifdef G4DEBUG_INTERFACES_BASIC
-  printf("G4UIQt::G4UIQt :: 1\n");
-#endif
   QWidget *mainWidget = new QWidget(fMainWindow);
 #if QT_VERSION < 0x040000
@@ -171 +168 @@
 #endif
 
-#ifdef G4DEBUG_INTERFACES_BASIC
-  printf("G4UIQt::G4UIQt :: 2\n");
-#endif
   // Set layouts
 
@@ -186 +180 @@
 #endif
 
-#ifdef G4DEBUG_INTERFACES_BASIC
-  printf("G4UIQt::G4UIQt :: 2b\n");
-#endif
   // fill them
 
   fCommandLabel = new QLabel("",commandLineWidget);
 
-#ifdef G4DEBUG_INTERFACES_BASIC
-  printf("G4UIQt::G4UIQt :: 3\n");
-#endif
   fCommandArea = new QLineEdit(commandLineWidget);
   fCommandArea->installEventFilter(this);
@@ -212 +200 @@
 #endif
 
-#ifdef G4DEBUG_INTERFACES_BASIC
-  printf("G4UIQt::G4UIQt :: 4a\n");
-#endif
 
 
@@ -230 +215 @@
   fVisParametersTBWidget = new QWidget(fToolBox);
   fViewComponentsTBWidget = new QWidget(fToolBox);
-
-#ifdef G4DEBUG_INTERFACES_BASIC
-  printf("G4UIQt::G4UIQt :: 4b\n");
-#endif
+  
   CreateVisParametersTBWidget();
-#ifdef G4DEBUG_INTERFACES_BASIC
-  printf("G4UIQt::G4UIQt :: 4c\n");
-#endif
-  //  CreateViewComponentsTBWidget();
-#ifdef G4DEBUG_INTERFACES_BASIC
-  printf("G4UIQt::G4UIQt :: 4d\n");
-#endif
-  //  CreateHelpTBWidget();
-#ifdef G4DEBUG_INTERFACES_BASIC
-  printf("G4UIQt::G4UIQt :: 4e\n");
-#endif
+  CreateViewComponentsTBWidget();
+  CreateHelpTBWidget();
   CreateCoutTBWidget();
-#ifdef G4DEBUG_INTERFACES_BASIC
-  printf("G4UIQt::G4UIQt :: 4f\n");
-#endif
   CreateHistoryTBWidget();
-#ifdef G4DEBUG_INTERFACES_BASIC
-  printf("G4UIQt::G4UIQt :: 4g\n");
-#endif
 
   // the splitter 
   fToolBox->addItem(fVisParametersTBWidget,"Vis parameters");
-#ifdef G4DEBUG_INTERFACES_BASIC
-  printf("G4UIQt::G4UIQt :: 4h\n");
-#endif
   fToolBox->addItem(fViewComponentsTBWidget,"Viewer components");
-#ifdef G4DEBUG_INTERFACES_BASIC
-  printf("G4UIQt::G4UIQt :: 4i\n");
-#endif
   fToolBox->addItem(fHelpTBWidget,"Help");
-#ifdef G4DEBUG_INTERFACES_BASIC
-  printf("G4UIQt::G4UIQt :: 4j\n");
-#endif
   fToolBox->addItem(fCoutTBWidget,"Cout");
-#ifdef G4DEBUG_INTERFACES_BASIC
-  printf("G4UIQt::G4UIQt :: 4k\n");
-#endif
   fToolBox->addItem(fHistoryTBWidget,"History");
-#ifdef G4DEBUG_INTERFACES_BASIC
-  printf("G4UIQt::G4UIQt :: 4l\n");
-#endif
 
 
@@ -421 +373 @@
 #if QT_VERSION < 0x040000
   helpLayout->add(helpLine);
-  connect( helpLine, SIGNAL( returnPressed () ), this, SLOT( lookForHelpStringCallback() ) );
+  connect( helpLine, SIGNAL( returnPressed () ), this, SLOT( LookForHelpStringCallback() ) );
 #else
   helpLayout->addWidget(helpLine);
-  connect( helpLine, SIGNAL( editingFinished () ), this, SLOT( lookForHelpStringCallback() ) );
+  connect( helpLine, SIGNAL( editingFinished () ), this, SLOT( LookForHelpStringCallback() ) );
 #endif
   
@@ -874 +826 @@
   // Look for the choosen command "newCommand"
   size_t i = newCommand.index(" ");
-  G4String targetCom="";
+  G4String targetCom ="";
   if( i != std::string::npos )
     {
@@ -881 +833 @@
       targetCom = ModifyToFullPathCommand( newValue );
     }
+#ifdef G4DEBUG_INTERFACES_BASIC
+  printf("G4UIQt::ActivateCommand found : %d \n",targetCom.data());
+#endif
   if (targetCom != "") {
-#if QT_VERSION < 0x040000
-    QListViewItem* findItem = NULL;
-    QListViewItem* tmpItem = fHelpTreeWidget->firstChild();
-    while (tmpItem != 0) {
-      if (!findItem) {
-        findItem = FindTreeItem(tmpItem,QString((char*)targetCom.data()));
-      }
-      tmpItem = tmpItem->nextSibling();
-    }
-#else
-    QTreeWidgetItem* findItem = NULL;
-    for (int a=0;a<fHelpTreeWidget->topLevelItemCount();a++) {
-      if (!findItem) {
-        findItem = FindTreeItem(fHelpTreeWidget->topLevelItem(a),QString((char*)targetCom.data()));
-      }
-    }
-#endif
-    
-    if (findItem) {      
-      
-      //collapsed open item
-#if QT_VERSION < 0x040000
-
-      // FIXME : Has to be checked
-      QListViewItem* tmpItem = fHelpTreeWidget->firstChild();
-      QList<QListViewItem> openItems;
-      while ((tmpItem != 0) || (!openItems.isEmpty())) {
-        if (tmpItem->isOpen() ) {
-          tmpItem->setOpen(false);
-          openItems.append(tmpItem);
-          tmpItem = tmpItem->firstChild();
-        } else {
-          tmpItem = tmpItem->nextSibling();
-        }
-        if (tmpItem == 0) {
-          tmpItem = openItems.take(openItems.count()-1);
-        }
-      }
-#else
-      QList<QTreeWidgetItem *> selected;
-
-      selected = fHelpTreeWidget->selectedItems();
-      if ( selected.count() != 0 ) {
-        QTreeWidgetItem * tmp =selected.at( 0 );
-        while ( tmp) {
-#if QT_VERSION < 0x040202
-              fHelpTreeWidget->setItemExpanded(tmp,false); 
-#else
-          tmp->setExpanded(false);
-#endif
-          tmp = tmp->parent();
-        }
-      }
-#endif
-      
-      // clear old selection
-      fHelpTreeWidget->clearSelection();
-
-      // set new selection
-#if QT_VERSION >= 0x040000
-#if QT_VERSION < 0x040202
-      fHelpTreeWidget->setItemSelected(findItem,true);
-#else
-      findItem->setSelected(true);
-#endif      
-#else
-      findItem->setSelected(true);
-#endif
-      
-      // expand parent item
-      while ( findItem) {
-#if QT_VERSION < 0x040000
-        findItem->setOpen(true);
-#else
-#if QT_VERSION < 0x040202
-            fHelpTreeWidget->setItemExpanded(findItem,true); 
-#else
-        findItem->setExpanded(true);
-#endif
-#endif
-        findItem = findItem->parent();
-      }
-
-      // Call the update of the right textArea
-      HelpTreeClicCallback();
-    }
-  }
+    OpenHelpTreeOnCommand(targetCom.data());
+  }
+
   fToolBox->setCurrentWidget(fHelpTBWidget);
 }
@@ -1634 +1505 @@
    will display the complete help tree
 */
-void G4UIQt::lookForHelpStringCallback(
-)
-{
+void G4UIQt::LookForHelpStringCallback(
+)
+{
+  QString searchText = helpLine->text();
+
 #if QT_VERSION < 0x040200
   fHelpArea->clear();
@@ -1642 +1515 @@
   fHelpArea->setText("");
 #endif
-  if (helpLine->text() =="") {
+  if (searchText =="") {
     // clear old help tree
     fHelpTreeWidget->clear();
@@ -1651 +1524 @@
     CreateHelpTree();
     return;
-  }
+  } else {
+    OpenHelpTreeOnCommand(searchText);
+  }
+}
+
+
+void G4UIQt::OpenHelpTreeOnCommand(
+ const QString & searchText
+)
+{
 
   // the help tree
@@ -1681 +1563 @@
     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);
+    tmp = GetCommandList (command).count(searchText,Qt::CaseInsensitive);
+#else
+    tmp = GetCommandList (command).contains(searchText,false);
 #endif
     if (tmp >0) {
@@ -1697 +1579 @@
     }
     // look for childs
-    commandChildResultMap = LookForHelpStringInChildTree(treeTop->GetTree(a+1),helpLine->text());
+    commandChildResultMap = LookForHelpStringInChildTree(treeTop->GetTree(a+1),searchText);
     // insert new childs
     if (!commandChildResultMap.empty()) {