Changeset 1224 for trunk/source/interfaces

Timestamp:

Dec 17, 2009, 6:14:30 PM (15 years ago)

Author:

garnier

Message:

UIQt on avance

Location:

trunk/source/interfaces

Files:

• basic/include/G4UIQt.hh (modified) (7 diffs)
• basic/src/G4UIQt.cc (modified) (25 diffs)
• common/include/G4Qt.hh (modified) (1 diff)
• common/src/G4Qt.cc (modified) (4 diffs)

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

@@ -40 +40 @@
 #include <qobject.h>
 #include <qmap.h>
+#include <qstringlist.h>
 
 class QMainWindow;
@@ -57 +58 @@
 class QResizeEvent;
 class QToolBox;
+class QStringList;
 
 // Class description :
@@ -98 +100 @@
   // Ex : AddButton("my_menu","Run","/run/beamOn 1"); 
 
-  void AddTabVisWidget(QWidget*,QString,int,int);
+  void AddTabWidget(QWidget*,QString,int,int);
   // To add a tab for vis openGL Qt driver
 
@@ -118 +120 @@
   QTreeWidget * CreateHelpTree();
 #endif
+  void ExitHelp();
 
 #if QT_VERSION < 0x040000
@@ -134 +137 @@
   QMap<int,QString> LookForHelpStringInChildTree(G4UIcommandTree *,const QString&);
 
+  void CreateVisParametersTBWidget();
+  void CreateViewComponentsTBWidget();
+  void CreateHelpTBWidget();
+  void CreateCoutTBWidget();
+  void CreateHistoryTBWidget();
 
 private:
@@ -144 +152 @@
   QLabel *fCommandLabel;
   QLineEdit * fCommandArea;
-  QTextEdit *fTextArea;
+  QTextEdit *fCoutTBTextArea;
   QTextEdit *fHelpArea;
   QToolBox* fToolBox;
+  QStringList fG4cout;
+  QLineEdit * fCoutFilter;
 
 #if QT_VERSION < 0x040000
-  QListView *fCommandHistoryArea;
+  QListView *fHistoryTBTableList;
   QListView *fHelpTreeWidget;
 #else
-  QListWidget *fCommandHistoryArea;
+  QListWidget *fHistoryTBTableList;
   QTreeWidget *fHelpTreeWidget;
 #endif
-  QWidget *fHelpTBWidget;
-  QLineEdit *helpLine;
-  QWidget *visWidget;
+  QWidget* fHelpTBWidget;
+  QWidget* fHistoryTBWidget;
+  QWidget* fCoutTBWidget;
+  QWidget* fVisParametersTBWidget;
+  QWidget* fViewComponentsTBWidget;
+  QLineEdit* helpLine;
   QTabWidget* fTabWidget;
   QString fCoutText;
@@ -176 +189 @@
   void UpdateTabWidget(int);
   void ResizeTabWidget( QResizeEvent* );
+  void CoutFilterCallback(const QString&);
 };
 

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

@@ -61 +61 @@
 #include <qtabbar.h>
 #include <qresizeevent>
+#include <qstringlist.h>
 
 #include <qmainwindow.h>
@@ -107 +108 @@
 ,char** argv
 )
-:fTabWidget(NULL)
+:fG4cout("")
+,fHelpTBWidget(NULL)
+,fHistoryTBWidget(NULL)
+,fCoutTBWidget(NULL)
+,fVisParametersTBWidget(NULL)
+,fViewComponentsTBWidget(NULL)
+,fTabWidget(NULL)
 ,fCoutText("Output")
 {
+
   G4Qt* interactorManager = G4Qt::getInstance (argc,argv,(char*)"Qt");
   if (!(QApplication*)interactorManager->GetMainInteractor()) {
@@ -150 +158 @@
   printf("G4UIQt::Initialise after main window creation UImanager:%d G4UIQt(this) : %d+++++++++++\n",UI,this);
 #endif
-#if QT_VERSION < 0x040000
-  fMainWindow->setCaption( tr( "G4UI Session" ));
-  fMainWindow->resize(900,600); 
-  fMainWindow->move(50,100);
-#else
-  fMainWindow->setWindowTitle( tr("G4UI Session") ); 
-  fMainWindow->resize(900,600); 
-  fMainWindow->move(QPoint(50,100));
-#endif
 
 #ifdef G4DEBUG_INTERFACES_BASIC
@@ -177 +176 @@
   // Set layouts
 
-  fTabWidget = new QTabWidget;
-
-  connect(fTabWidget, SIGNAL(currentChanged ( int ) ), SLOT(UpdateTabWidget(int)));
-  connect(fTabWidget, SIGNAL(resizeEvent (  QResizeEvent* ) ), SLOT(ResizeTabWidget( QResizeEvent*)));
-
-  visWidget = new QWidget(myVSplitter);
-  QWidget* coutTBWidget = new QWidget(fToolBox);
-  fHelpTBWidget = new QWidget(fToolBox);
-  QWidget* visParametersTBWidget = new QWidget(fToolBox);
-  QWidget* viewComponentsTBWidget = new QWidget(fToolBox);
-  QWidget* historyTBWidget = new QWidget(fToolBox);
+  // Add a empty tabwidget
+  fTabWidget = new QTabWidget(myVSplitter);
+
   QWidget* commandLineWidget = new QWidget(mainWidget);
-
-  //  QVBoxLayout *layoutVis = new QVBoxLayout(visWidget);
-  QVBoxLayout *layoutCout = new QVBoxLayout(coutTBWidget);
-  QVBoxLayout *layoutHistory = new QVBoxLayout(historyTBWidget);
+#if QT_VERSION < 0x040000
   QVBoxLayout *layoutCommandLine = new QVBoxLayout(commandLineWidget);
-
+#else
+  QVBoxLayout *layoutCommandLine = new QVBoxLayout();
+#endif
+
+#ifdef G4DEBUG_INTERFACES_BASIC
+  printf("G4UIQt::G4UIQt :: 2b\n");
+#endif
   // fill them
-
-  fTextArea = new QTextEdit(coutTBWidget);
-  QPushButton *clearButton = new QPushButton("clear",coutTBWidget);
-  connect(clearButton, SIGNAL(clicked()), SLOT(ClearButtonCallback()));
-
-#if QT_VERSION < 0x040000
-
-  fCommandHistoryArea = new QListView(historyTBWidget);
-  fCommandHistoryArea->setSorting (-1, FALSE);
-  fCommandHistoryArea->setSelectionMode(QListView::Single);
-  fCommandHistoryArea->addColumn("");
-  fCommandHistoryArea->header()->hide();
-  connect(fCommandHistoryArea, SIGNAL(selectionChanged()), SLOT(CommandHistoryCallback()));
-#else
-  fCommandHistoryArea = new QListWidget();
-  fCommandHistoryArea->setSelectionMode(QAbstractItemView::SingleSelection);
-  connect(fCommandHistoryArea, SIGNAL(itemSelectionChanged()), SLOT(CommandHistoryCallback()));
-#endif
-  fCommandHistoryArea->installEventFilter(this);
 
   fCommandLabel = new QLabel("",commandLineWidget);
@@ -228 +203 @@
   fCommandArea->activateWindow();
 #endif
-  connect(fCommandArea, SIGNAL(returnPressed()), SLOT(CommandEnteredCallback()));
+
 #if QT_VERSION < 0x040000
   fCommandArea->setFocusPolicy ( QWidget::StrongFocus );
@@ -236 +211 @@
   fCommandArea->setFocus(Qt::TabFocusReason);
 #endif
-  fTextArea->setReadOnly(true);
-
-  //  layoutVis->addWidget(visWidget);
-
-  layoutCout->addWidget(fTextArea);
-  layoutCout->addWidget(clearButton);
-
-#ifdef G4DEBUG_INTERFACES_BASIC
-  printf("G4UIQt::G4UIQt :: 4\n");
-#endif
-#if QT_VERSION >= 0x040000
-  //  topWidget->setLayout(layoutTop);
-#endif
-
-
-  layoutHistory->addWidget(fCommandHistoryArea);
+
+#ifdef G4DEBUG_INTERFACES_BASIC
+  printf("G4UIQt::G4UIQt :: 4a\n");
+#endif
+
+
   layoutCommandLine->addWidget(fCommandLabel);
   layoutCommandLine->addWidget(fCommandArea);
 #if QT_VERSION >= 0x040000
-
+  QVBoxLayout *mainLayout = new QVBoxLayout();
+#else
   QVBoxLayout *mainLayout = new QVBoxLayout(mainWidget);
-
-  CreateHelpWidget();
+#endif
+
+  fHelpTBWidget = new QWidget(fToolBox);
+  fHistoryTBWidget = new QWidget(fToolBox);
+  fCoutTBWidget = new QWidget(fToolBox);
+  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
+  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(visParametersTBWidget,"Vis parameters");
-  fToolBox->addItem(viewComponentsTBWidget,"Viewer components");
+  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");
-  fToolBox->addItem(coutTBWidget,"Cout");
-  fToolBox->addItem(historyTBWidget,"History");
+#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
+
 
 
   fToolBox->setSizePolicy (QSizePolicy(QSizePolicy::Fixed,QSizePolicy::Fixed));
-  visWidget->setSizePolicy (QSizePolicy(QSizePolicy::Maximum,QSizePolicy::Maximum));
-
-  QSizePolicy policy = visWidget->sizePolicy();
+  fTabWidget->setSizePolicy (QSizePolicy(QSizePolicy::Maximum,QSizePolicy::Maximum));
+
+  QSizePolicy policy = fTabWidget->sizePolicy();
   policy.setHorizontalStretch(1);
   policy.setVerticalStretch(1);
-  visWidget->setSizePolicy(policy);
+  fTabWidget->setSizePolicy(policy);
 
   myVSplitter->addWidget(fToolBox);
-  myVSplitter->addWidget(visWidget);
-
+  myVSplitter->addWidget(fTabWidget);
+
+#if QT_VERSION >= 0x040000
+  commandLineWidget->setLayout(layoutCommandLine);
+#endif
   commandLineWidget->setSizePolicy (QSizePolicy(QSizePolicy::Minimum,QSizePolicy::Minimum));
   mainLayout->addWidget(myVSplitter,1);
   mainLayout->addWidget(commandLineWidget);
 
-#endif
 #ifdef G4DEBUG_INTERFACES_BASIC
   printf("G4UIQt::G4UIQt :: 5\n");
@@ -288 +302 @@
 
 #if QT_VERSION >= 0x040000
+  mainWidget->setLayout(mainLayout);
+#endif
+
   fMainWindow->setCentralWidget(mainWidget);
-#else
-  fMainWindow->setCentralWidget(myVSplitter);
-#endif
 
 #if QT_VERSION < 0x040000
@@ -313 +327 @@
 #endif
 
-  // Set the splitter size. The fTextArea sould be 2/3 on the fMainWindow
-#if QT_VERSION < 0x040000
-  //  QValueList<int> vals = splitter->sizes();
-#else
-  //  QList<int> vals = splitter->sizes();
-#endif
-//    if(vals.size()==2) {
-//      vals[0] = (splitter->orientation()==Qt::Vertical ? splitter->height() : splitter->width())*3/4;
-//      vals[1] = (splitter->orientation()==Qt::Vertical ? splitter->height() : splitter->width())*1/4;
-//      splitter->setSizes(vals);
-//    }
+  connect(fCommandArea, SIGNAL(returnPressed()), SLOT(CommandEnteredCallback()));
 
   if(UI!=NULL) UI->SetCoutDestination(this);  // TO KEEP
 
   interactorManager->SetG4UI(this);
+
+#if QT_VERSION < 0x040000
+  fMainWindow->setCaption( tr( "G4UI Session" ));
+  fMainWindow->resize(900,600); 
+  fMainWindow->move(50,100);
+#else
+  fMainWindow->setWindowTitle( tr("G4UI Session") ); 
+  fMainWindow->resize(900,600); 
+  fMainWindow->move(QPoint(50,100));
+#endif
 
 #ifdef G4DEBUG_INTERFACES_BASIC
@@ -356 +370 @@
 }
 
+/** Create the History ToolBox Widget
+ */
+void G4UIQt::CreateHistoryTBWidget(
+) 
+{
+
+#if QT_VERSION < 0x040000
+  QVBoxLayout *layoutHistoryTB = new QVBoxLayout(fHistoryTBWidget);
+
+  fHistoryTBTableList = new QListView(fHistoryTBWidget);
+  fHistoryTBTableList->setSorting (-1, FALSE);
+  fHistoryTBTableList->setSelectionMode(QListView::Single);
+  fHistoryTBTableList->addColumn("");
+  fHistoryTBTableList->header()->hide();
+  connect(fHistoryTBTableList, SIGNAL(selectionChanged()), SLOT(CommandHistoryCallback()));
+#else
+  QVBoxLayout *layoutHistoryTB = new QVBoxLayout();
+  fHistoryTBTableList = new QListWidget();
+  fHistoryTBTableList->setSelectionMode(QAbstractItemView::SingleSelection);
+  connect(fHistoryTBTableList, SIGNAL(itemSelectionChanged()), SLOT(CommandHistoryCallback()));
+#endif
+  fHistoryTBTableList->installEventFilter(this);
+
+  layoutHistoryTB->addWidget(fHistoryTBTableList);
+
+#if QT_VERSION >= 0x040000
+  fHistoryTBWidget->setLayout(layoutHistoryTB);
+#endif
+}
+
+/** Create the Help ToolBox Widget
+ */
+void G4UIQt::CreateHelpTBWidget(
+) 
+{
+
+  QWidget *helpWidget = new QWidget(fHelpTBWidget);
+  
+  QSplitter *splitter = new QSplitter(Qt::Horizontal,fHelpTBWidget);
+#if QT_VERSION < 0x040000
+  QHBoxLayout *helpLayout = new QHBoxLayout(helpWidget);
+  QVBoxLayout *vLayout = new QVBoxLayout(fHelpTBWidget);
+  helpLayout->add(new QLabel("Search :",helpWidget));
+#else
+  QHBoxLayout *helpLayout = new QHBoxLayout();
+  QVBoxLayout *vLayout = new QVBoxLayout();
+  helpLayout->addWidget(new QLabel("Search :",helpWidget));
+#endif
+  helpLine = new QLineEdit(fHelpTBWidget);
+#if QT_VERSION < 0x040000
+  helpLayout->add(helpLine);
+  connect( helpLine, SIGNAL( returnPressed () ), this, SLOT( lookForHelpStringCallback() ) );
+#else
+  helpLayout->addWidget(helpLine);
+  connect( helpLine, SIGNAL( editingFinished () ), this, SLOT( lookForHelpStringCallback() ) );
+#endif
+  
+  // the help tree
+#if QT_VERSION < 0x040000
+  fHelpTreeWidget = new QListView(splitter);
+#else
+  fHelpTreeWidget = new QTreeWidget();
+#endif
+  fHelpTreeWidget = CreateHelpTree();
+  
+  fHelpArea = new QTextEdit(splitter);
+  fHelpArea->setReadOnly(true);
+  
+  // Set layouts
+  
+#if QT_VERSION >= 0x040000
+  if (fHelpTreeWidget)
+    splitter->addWidget(fHelpTreeWidget);
+  splitter->addWidget(fHelpArea);
+#endif
+  
+  
+#if QT_VERSION >= 0x040000
+  vLayout->addWidget(helpWidget);
+  vLayout->addWidget(splitter,1);
+#else
+  vLayout->addWidget(helpWidget);
+  vLayout->addWidget(splitter,1);
+#endif
+  
+  // set the splitter size
+#if QT_VERSION >= 0x040000
+  QList<int> list;
+#else
+  QValueList<int> list;
+#endif
+  list.append( 400 );
+  list.append( 400 );
+  splitter->setSizes(list);
+
+#if QT_VERSION >= 0x040000
+  helpWidget->setLayout(helpLayout);
+  fHelpTBWidget->setLayout(vLayout);
+#endif  
+}
+
+
+/** Create the Cout ToolBox Widget
+ */
+void G4UIQt::CreateCoutTBWidget(
+) 
+{
+#if QT_VERSION >= 0x040000
+  QVBoxLayout *layoutCoutTB = new QVBoxLayout();
+#else
+  QVBoxLayout *layoutCoutTB = new QVBoxLayout(fCoutTBWidget);
+#endif
+
+  fCoutTBTextArea = new QTextEdit(fCoutTBWidget);
+  fCoutFilter = new QLineEdit(fCoutTBWidget);
+  QLabel* coutFilterLabel = new QLabel("Filter : ",fCoutTBWidget);
+
+  QPushButton *coutTBClearButton = new QPushButton("clear",fCoutTBWidget);
+  connect(coutTBClearButton, SIGNAL(clicked()), SLOT(ClearButtonCallback()));
+  connect(fCoutFilter, SIGNAL(textEdited ( const QString &)), SLOT(CoutFilterCallback( const QString &)));
+
+  fCoutTBTextArea->setReadOnly(true);
+
+  QWidget* coutButtonWidget = new QWidget(fCoutTBWidget);
+  QHBoxLayout* layoutCoutTBButtons = new QHBoxLayout(coutButtonWidget);
+  layoutCoutTBButtons->addWidget(coutTBClearButton);
+  layoutCoutTBButtons->addWidget(coutFilterLabel);
+  layoutCoutTBButtons->addWidget(fCoutFilter);
+
+  layoutCoutTB->addWidget(fCoutTBTextArea);
+  layoutCoutTB->addWidget(coutButtonWidget);
+
+#if QT_VERSION >= 0x040000
+  fCoutTBWidget->setLayout(layoutCoutTB);
+#endif
+}
+
+
+/** Create the VisParameters ToolBox Widget
+ */
+void G4UIQt::CreateVisParametersTBWidget(
+) 
+{
+}
+
+
+/** Create the ViewComponents ToolBox Widget
+ */
+void G4UIQt::CreateViewComponentsTBWidget(
+) 
+{
+}
+
 
 /**   Add a new tab widget.
   Create the tab if it was not done
 */
-void G4UIQt::AddTabVisWidget(
+void G4UIQt::AddTabWidget(
  QWidget* aWidget
 ,QString name
@@ -368 +535 @@
 {
 #ifdef G4DEBUG_INTERFACES_BASIC
-  printf("G4UIQt::AddTabVisWidget %d %d\n",sizeX, sizeY);
-#endif
-  if (fTabWidget != NULL) {
-    if (!aWidget) return;
+  printf("G4UIQt::AddTabWidget %d %d\n",sizeX, sizeY);
+#endif
+  if (!aWidget) return;
+  
+#ifdef G4DEBUG_INTERFACES_BASIC
+  printf("G4UIQt::AddTabWidget ADD %d %d + %d %d---------------------------------------------------\n",sizeX, sizeY,sizeX-fTabWidget->width(),sizeY-fTabWidget->height());
+#endif
+  
+#if QT_VERSION < 0x040000
+  aWidget->reparent(fTabWidget,0,QPoint(0,0));  
+#else
+  aWidget->setParent(fTabWidget);
+#endif
     
-#ifdef G4DEBUG_INTERFACES_BASIC
-    printf("G4UIQt::AddTabVisWidget ADD %d %d + %d %d---------------------------------------------------\n",sizeX, sizeY,sizeX-visWidget->width(),sizeY-visWidget->height());
-#endif
-
-#if QT_VERSION < 0x040000
-    aWidget->reparent(visWidget,0,QPoint(0,0));  
-#else
-    aWidget->setParent(visWidget);
-#endif
-    
-    fTabWidget->insertTab(fTabWidget->count()-1,aWidget,name);
-    QHBoxLayout *mainLayout = new QHBoxLayout(visWidget);
-    mainLayout->setMargin(0);
-    mainLayout->setSpacing(0);   
-    mainLayout->addWidget(fTabWidget);
-
-    // Set the size
-    //    fMainWindow->setSizeIncrement(); 
-
-    fMainWindow->resize(fMainWindow->width()+sizeX-visWidget->width(),
-                        fMainWindow->height()+sizeY-visWidget->height());
-  }
+  fTabWidget->insertTab(fTabWidget->count()-1,aWidget,name);
+  
+  fMainWindow->resize(fMainWindow->width()+sizeX-fTabWidget->width(),
+                      fMainWindow->height()+sizeY-fTabWidget->height());
 }
 
@@ -400 +558 @@
 void G4UIQt::UpdateTabWidget(int tabNumber) {
 #ifdef G4DEBUG_INTERFACES_BASIC
-    printf("G4UIQt::UpdateTabWidget\n");
-#endif
+  printf("G4UIQt::UpdateTabWidget\n");
+#endif
+  if (  fTabWidget == NULL) {
+    fTabWidget = new QTabWidget;
+  }
+  
   QString text = fTabWidget->tabText (tabNumber); 
   if ( text != fCoutText) {
@@ -417 +579 @@
     }
     fTabWidget->currentWidget()->repaint();
+  }
+  if (fTabWidget->count() == 1) {
+    connect(fTabWidget, SIGNAL(currentChanged ( int ) ), SLOT(UpdateTabWidget(int)));
+    //  connect(fTabWidget, SIGNAL(resizeEvent (  QResizeEvent* ) ), SLOT(ResizeTabWidget( QResizeEvent*)));
   }
 }
@@ -554 +720 @@
 G4int G4UIQt::ReceiveG4cout (
  G4String aString
-)
+ )
 {
   if (!aString) return 0;
-  G4Qt* interactorManager = G4Qt::getInstance ();
-  if (!interactorManager) return 0;
-  
-#if QT_VERSION < 0x040000
-  fTextArea->append(QString((char*)aString.data()).simplifyWhiteSpace());
-  fTextArea->verticalScrollBar()->setValue(fTextArea->verticalScrollBar()->maxValue());
-#else
-  fTextArea->append(QString((char*)aString.data()).trimmed());
-  fTextArea->verticalScrollBar()->setSliderPosition(fTextArea->verticalScrollBar()->maximum());
-#endif
-  fTextArea->repaint();
-  //  interactorManager->FlushAndWaitExecution();
+  
+  QStringList newStr;
+  
+  // Add to stringList
+#if QT_VERSION < 0x040000
+  newStr = QStringList(QString((char*)aString.data()).simplifyWhiteSpace());
+#else
+  newStr = QStringList(QString((char*)aString.data()).trimmed());
+#endif
+  fG4cout += newStr;
+ 
+  QStringList result = newStr.filter(fCoutFilter->text());
+
+  if (result.join("\n").isEmpty()) {
+    return 0;
+  }
+  fCoutTBTextArea->append(result.join("\n"));
+  fCoutTBTextArea->repaint();
+
+#if QT_VERSION < 0x040000
+  fCoutTBTextArea->verticalScrollBar()->setValue(fCoutTBTextArea->verticalScrollBar()->maxValue());
+#else
+  fCoutTBTextArea->verticalScrollBar()->setSliderPosition(fCoutTBTextArea->verticalScrollBar()->maximum());
+#endif
+
   return 0;
 }
@@ -583 +762 @@
 {
   if (!aString) return 0;
-  G4Qt* interactorManager = G4Qt::getInstance ();
-  if (!interactorManager) return 0;
-
-#if QT_VERSION < 0x040000
-  QColor previousColor = fTextArea->color();
-  fTextArea->setColor(Qt::red);
-  fTextArea->append(QString((char*)aString.data()).simplifyWhiteSpace());
-  fTextArea->setColor(previousColor);
-  fTextArea->verticalScrollBar()->setValue(fTextArea->verticalScrollBar()->maxValue());
-#else
-  QColor previousColor = fTextArea->textColor();
-  fTextArea->setTextColor(Qt::red);
-  fTextArea->append(QString((char*)aString.data()).trimmed());
-  fTextArea->setTextColor(previousColor);
-  fTextArea->verticalScrollBar()->setSliderPosition(fTextArea->verticalScrollBar()->maximum());
-#endif
-  fTextArea->repaint();
-  //  interactorManager->FlushAndWaitExecution();
+
+  QStringList newStr;
+
+  // Add to stringList
+#if QT_VERSION < 0x040000
+  newStr = QStringList(QString((char*)aString.data()).simplifyWhiteSpace());
+#else
+  newStr = QStringList(QString((char*)aString.data()).trimmed());
+#endif
+  fG4cout += newStr;
+ 
+ QStringList result = newStr.filter(fCoutFilter->text());
+
+#if QT_VERSION < 0x040000
+  QColor previousColor = fCoutTBTextArea->color();
+  fCoutTBTextArea->setColor(Qt::red);
+  fCoutTBTextArea->append(result.join("\n"));
+  fCoutTBTextArea->setColor(previousColor);
+  fCoutTBTextArea->verticalScrollBar()->setValue(fCoutTBTextArea->verticalScrollBar()->maxValue());
+#else
+  QColor previousColor = fCoutTBTextArea->textColor();
+  fCoutTBTextArea->setTextColor(Qt::red);
+  fCoutTBTextArea->append(result.join("\n"));
+  fCoutTBTextArea->setTextColor(previousColor);
+  fCoutTBTextArea->verticalScrollBar()->setSliderPosition(fCoutTBTextArea->verticalScrollBar()->maximum());
+#endif
+  fCoutTBTextArea->repaint();
   return 0;
 }
@@ -675 +863 @@
 
 
-
-
-/**
-   Create the fHelpTBWidget
-   Implementation of <b>void G4VBasicShell::TerminalHelp(G4String newCommand)</b>
-*/
-void G4UIQt::CreateHelpWidget(
-)
-{
- 
-  QVBoxLayout *vLayout = new QVBoxLayout(fHelpTBWidget);
-  QWidget *helpWidget = new QWidget(fHelpTBWidget);
-  QSplitter *splitter = new QSplitter(Qt::Horizontal,fHelpTBWidget);
-  
-  QHBoxLayout *helpLayout = new QHBoxLayout(helpWidget);
-#if QT_VERSION < 0x040000
-  helpLayout->add(new QLabel("Search :",helpWidget));
-#else
-  helpLayout->addWidget(new QLabel("Search :",helpWidget));
-#endif
-  helpLine = new QLineEdit(fHelpTBWidget);
-#if QT_VERSION < 0x040000
-  helpLayout->add(helpLine);
-  connect( helpLine, SIGNAL( returnPressed () ), this, SLOT( lookForHelpStringCallback() ) );
-#else
-  helpLayout->addWidget(helpLine);
-  connect( helpLine, SIGNAL( editingFinished () ), this, SLOT( lookForHelpStringCallback() ) );
-#endif
-  
-  // the help tree
-#if QT_VERSION < 0x040000
-  fHelpTreeWidget = new QListView(splitter);
-#else
-  fHelpTreeWidget = new QTreeWidget();
-#endif
-  fHelpTreeWidget = CreateHelpTree();
-  
-  fHelpArea = new QTextEdit(splitter);
-  fHelpArea->setReadOnly(true);
-  
-  // Set layouts
-  
-#if QT_VERSION >= 0x040000
-  if (fHelpTreeWidget)
-    splitter->addWidget(fHelpTreeWidget);
-  splitter->addWidget(fHelpArea);
-#endif
-  
-  
-#if QT_VERSION >= 0x040000
-  vLayout->addWidget(helpWidget);
-  vLayout->addWidget(splitter,1);
-#else
-  vLayout->addWidget(helpWidget);
-  vLayout->addWidget(splitter,1);
-#endif
-  
-  // set the splitter size
-#if QT_VERSION >= 0x040000
-  QList<int> list;
-#else
-  QValueList<int> list;
-#endif
-  list.append( 400 );
-  list.append( 400 );
-  splitter->setSizes(list);
-  
-#if QT_VERSION >= 0x040000
-  fHelpTBWidget->setLayout(vLayout);
-#endif
-  
-}
 
 
@@ -1134 +1250 @@
   if (aEvent == NULL) return false;
 
-  if (aObj == fCommandHistoryArea) {
+  if (aObj == fHistoryTBTableList) {
     if (aEvent->type() == QEvent::KeyPress) {
       fCommandArea->setFocus();
@@ -1148 +1264 @@
 #if QT_VERSION < 0x040000
         // count rows...
-        QListViewItem* tmpItem = fCommandHistoryArea->firstChild();
+        QListViewItem* tmpItem = fHistoryTBTableList->firstChild();
         int selection = -1;
         int index = 0;
         while (tmpItem != 0) {
-          if (tmpItem == fCommandHistoryArea->selectedItem()) {
+          if (tmpItem == fHistoryTBTableList->selectedItem()) {
             selection = index;
           }
@@ -1158 +1274 @@
           tmpItem = tmpItem->nextSibling();
         }
-        if (fCommandHistoryArea->childCount()) {
+        if (fHistoryTBTableList->childCount()) {
           if (selection == -1) {
-            selection = fCommandHistoryArea->childCount()-1;
+            selection = fHistoryTBTableList->childCount()-1;
           } else {
             if (e->key() == (Qt::Key_Down)) {
-              if (selection <(fCommandHistoryArea->childCount()-1))
+              if (selection <(fHistoryTBTableList->childCount()-1))
                 selection++;
             } else if (e->key() == (Qt::Key_PageDown)) {
-              selection = fCommandHistoryArea->childCount()-1;
-#else
-        int selection = fCommandHistoryArea->currentRow();
-        if (fCommandHistoryArea->count()) {
+              selection = fHistoryTBTableList->childCount()-1;
+#else
+        int selection = fHistoryTBTableList->currentRow();
+        if (fHistoryTBTableList->count()) {
           if (selection == -1) {
-            selection = fCommandHistoryArea->count()-1;
+            selection = fHistoryTBTableList->count()-1;
           } else {
             if (e->key() == (Qt::Key_Down)) {
-              if (selection <(fCommandHistoryArea->count()-1))
+              if (selection <(fHistoryTBTableList->count()-1))
                 selection++;
             } else if (e->key() == (Qt::Key_PageDown)) {
-              selection = fCommandHistoryArea->count()-1;
+              selection = fHistoryTBTableList->count()-1;
 #endif
             } else if (e->key() == (Qt::Key_Up)) {
@@ -1186 +1302 @@
             }
           }
-          fCommandHistoryArea->clearSelection();
-#if QT_VERSION < 0x040000
-          QListViewItem* tmpItem = fCommandHistoryArea->firstChild();
+          fHistoryTBTableList->clearSelection();
+#if QT_VERSION < 0x040000
+          QListViewItem* tmpItem = fHistoryTBTableList->firstChild();
           int index = 0;
           while (tmpItem != 0) {
             if (index == selection) {
               tmpItem->setSelected(true);
-              fCommandHistoryArea->setCurrentItem(tmpItem);
+              fHistoryTBTableList->setCurrentItem(tmpItem);
           }
           index ++;
@@ -1200 +1316 @@
 #else
 #if QT_VERSION < 0x040202
-          fCommandHistoryArea->setItemSelected(fCommandHistoryArea->item(selection),true);
-#else
-          fCommandHistoryArea->item(selection)->setSelected(true);
+          fHistoryTBTableList->setItemSelected(fHistoryTBTableList->item(selection),true);
+#else
+          fHistoryTBTableList->item(selection)->setSelected(true);
 #endif      
-          fCommandHistoryArea->setCurrentItem(fCommandHistoryArea->item(selection));
+          fHistoryTBTableList->setCurrentItem(fHistoryTBTableList->item(selection));
 #endif
         }
@@ -1269 +1385 @@
 )
 {
-  fTextArea->clear();
+  fCoutTBTextArea->clear();
+  fG4cout.clear();
 }
 
@@ -1280 +1397 @@
 }
 
+void G4UIQt::ExitHelp(
+)
+{
+}
 
 /**   Callback call when "click on a menu entry.<br>
@@ -1291 +1412 @@
   if (fCommandArea->text().simplifyWhiteSpace() != "") {
 
-    QListViewItem *newItem = new QListViewItem(fCommandHistoryArea);
+    QListViewItem *newItem = new QListViewItem(fHistoryTBTableList);
     newItem->setText(0,fCommandArea->text());
-    fCommandHistoryArea->insertItem(newItem);
+    fHistoryTBTableList->insertItem(newItem);
     // now we have to arrange 
-    QListViewItem *temp= fCommandHistoryArea->lastItem();
-    for (int i=0; i<fCommandHistoryArea->childCount()-1;i++) {
-      fCommandHistoryArea->takeItem(temp);
-      fCommandHistoryArea->insertItem(temp);
-      temp= fCommandHistoryArea->lastItem();
+    QListViewItem *temp= fHistoryTBTableList->lastItem();
+    for (int i=0; i<fHistoryTBTableList->childCount()-1;i++) {
+      fHistoryTBTableList->takeItem(temp);
+      fHistoryTBTableList->insertItem(temp);
+      temp= fHistoryTBTableList->lastItem();
     }
 #else
   G4String command (fCommandArea->text().toStdString().c_str());
   if (fCommandArea->text().trimmed() != "") {
-    fCommandHistoryArea->addItem(fCommandArea->text());
-#endif
-    fCommandHistoryArea->clearSelection();
-    fCommandHistoryArea->setCurrentItem(NULL);
+    fHistoryTBTableList->addItem(fCommandArea->text());
+#endif
+    fHistoryTBTableList->clearSelection();
+    fHistoryTBTableList->setCurrentItem(NULL);
     fCommandArea->setText("");
 
@@ -1462 +1583 @@
   QListWidgetItem* item =  NULL;
 #endif
-  if (!fCommandHistoryArea)
+  if (!fHistoryTBTableList)
     return ;
 
   
 #if QT_VERSION < 0x040000
-  item =fCommandHistoryArea->selectedItem();
-#else
-  QList<QListWidgetItem *> list =fCommandHistoryArea->selectedItems();
+  item =fHistoryTBTableList->selectedItem();
+#else
+  QList<QListWidgetItem *> list =fHistoryTBTableList->selectedItems();
   if (list.isEmpty())
     return;
@@ -1486 +1607 @@
 }
 
+
+void G4UIQt::CoutFilterCallback(
+const QString & text) {
+
+#ifdef G4DEBUG_INTERFACES_BASIC
+  printf("G4UIQt::CoutFilterCallback : %s\n",text.toStdString().c_str());
+#endif
+ 
+  QStringList result = fG4cout.filter(text);
+
+  fCoutTBTextArea->setText(result.join("\n"));
+  fCoutTBTextArea->repaint();
+#if QT_VERSION < 0x040000
+  fCoutTBTextArea->verticalScrollBar()->setValue(fCoutTBTextArea->verticalScrollBar()->maxValue());
+#else
+  fCoutTBTextArea->verticalScrollBar()->setSliderPosition(fCoutTBTextArea->verticalScrollBar()->maximum());
+#endif
+#ifdef G4DEBUG_INTERFACES_BASIC
+  printf("G4UIQt::CoutFilterCallback textSize:%d resSize:%d \n",fG4cout.join("").size(),result.join("").size());
+#endif
+
+ }
 
 /**   Callback called when user give a new string to look for<br>

trunk/source/interfaces/common/include/G4Qt.hh

@@ -60 +60 @@
   void FlushAndWaitExecution();
   virtual ~G4Qt();                     
-  bool AddTabVisWidget(QWidget*,QString,int,int);
+  bool AddTabWidget(QWidget*,QString,int,int);
   void SetG4UI(G4UIQt*);
 

trunk/source/interfaces/common/src/G4Qt.cc

@@ -130 +130 @@
       qApp = new QApplication (*p_argn, args);
 #else
+#ifdef G4DEBUG_INTERFACES_COMMON
+    printf("G4Qt::G4Qt QAppl \n");
+#endif
       new QApplication (*p_argn, args);
 #endif
@@ -138 +141 @@
         QtInited  = TRUE;
         if (a_argn != 0) {
+#ifdef G4DEBUG_INTERFACES_COMMON
+        printf("G4Qt::G4Qt SetMainInteractor\n");
+#endif
           SetMainInteractor (qApp);
         }
@@ -218 +224 @@
 
 /***************************************************************************/
-bool G4Qt::AddTabVisWidget (
+bool G4Qt::AddTabWidget (
  QWidget * vis
 ,QString name
@@ -228 +234 @@
 {
   if (fG4UI != NULL) {
-    fG4UI->AddTabVisWidget(vis,name,sizeX,sizeY);
+    fG4UI->AddTabWidget(vis,name,sizeX,sizeY);
     return true;
   }