Changeset 1158

Timestamp:

Nov 9, 2009, 6:56:57 PM (15 years ago)

Author:

garnier

Message:

mise en place de Vis dans UI

Location:

trunk/source/interfaces

Files:

• GAG/include/G4UIGAG.hh (modified) (1 diff)
• GAG/include/G4UIGainServer.hh (modified) (1 diff)
• GAG/src/G4UIGAG.cc (modified) (1 diff)
• GAG/src/G4UIGainServer.cc (modified) (1 diff)
• basic/include/G4UIQt.hh (modified) (4 diffs)
• basic/src/G4UIQt.cc (modified) (13 diffs)
• common/include/G4Qt.hh (modified) (3 diffs)
• common/src/G4Qt.cc (modified) (4 diffs)

trunk/source/interfaces/GAG/include/G4UIGAG.hh

@@ -26 +26 @@
 //
 // $Id: G4UIGAG.hh,v 1.7 2006/06/29 19:09:18 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name:  $
 //
 // G4UIGAG.hh

trunk/source/interfaces/GAG/include/G4UIGainServer.hh

@@ -26 +26 @@
 //
 // $Id: G4UIGainServer.hh,v 1.5 2006/06/29 19:09:21 gunter Exp $
-// $Name: geant4-09-02-ref-02 $
+// $Name:  $
 //
 

trunk/source/interfaces/GAG/src/G4UIGAG.cc

@@ -26 +26 @@
 //
 // $Id: G4UIGAG.cc,v 1.19 2007/10/30 10:14:34 kmura Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name:  $
 //
 // G4UIGAG.cc

trunk/source/interfaces/GAG/src/G4UIGainServer.cc

@@ -27 +27 @@
 // 12/06/2002 G4UIGainServer H. MInamimoto and H. Yoshida created
 // $Id: G4UIGainServer.cc,v 1.12 2008/07/18 06:39:43 kmura Exp $
-// $Name: geant4-09-02-ref-02 $
+// $Name:  $
 //
 #ifndef WIN32

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

@@ -55 +55 @@
 class QLabel;
 class QDialog;
+class QTabWidget;
 
 // Class description :
@@ -95 +96 @@
   // Third argument is the Geant4 command executed when the button is fired.
   // Ex : AddButton("my_menu","Run","/run/beamOn 1"); 
+
+  void AddTabVisWidget(QWidget*,QString);
+  // To add a tab for vis openGL Qt driver
+
 public:
   ~G4UIQt();
@@ -103 +108 @@
   G4int ReceiveG4cerr(G4String);
   //   G4String GetCommand(Widget);
-  QMainWindow * getMainWindow();
 
 private:
@@ -151 +155 @@
   QDialog *fHelpDialog;
   QLineEdit *helpLine;
+  QWidget *visWidget;
+  QTabWidget* fTabWidget;
  
 signals : 

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

@@ -57 +57 @@
 #include <qtextedit.h>
 #include <qsignalmapper.h>
+#include <qtabwidget.h>
 
 #include <qmainwindow.h>
@@ -103 +104 @@
 ,char** argv
 )
-  :fHelpDialog(NULL)
+  :fHelpDialog(NULL),
+ fTabWidget(NULL)
 {
   G4Qt* interactorManager = G4Qt::getInstance (argc,argv,(char*)"Qt");
@@ -143 +145 @@
 
 #ifdef G4DEBUG_INTERFACES_BASIC
-  printf("G4UIQt::Initialise after main window creation\n");
+  printf("G4UIQt::Initialise after main window creation UImanager:%d G4UIQt(this) : %d+++++++++++\n",UI,this);
 #endif
 #if QT_VERSION < 0x040000
@@ -155 +157 @@
 #endif
 
+#ifdef G4DEBUG_INTERFACES_BASIC
+  printf("G4UIQt::G4UIQt :: 1\n");
+#endif
   QWidget *mainWidget = new QWidget(fMainWindow);
 #if QT_VERSION < 0x040000
-  QSplitter *splitter = new QSplitter(Qt::Vertical,fMainWindow);
-#else
-  QSplitter *splitter = new QSplitter(Qt::Vertical,mainWidget);
-#endif
-
+  QSplitter *visCoutSplitter = new QSplitter(Qt::Vertical,fMainWindow);
+  QSplitter *coutHistorySplitter = new QSplitter(Qt::Vertical,fMainWindow);
+  QSplitter *historyCommandLineSplitter = new QSplitter(Qt::Vertical,fMainWindow);
+#else
+  QSplitter *visCoutSplitter = new QSplitter(Qt::Vertical,mainWidget);
+  QSplitter *coutHistorySplitter = new QSplitter(Qt::Vertical,mainWidget);
+  QSplitter *historyCommandLineSplitter = new QSplitter(Qt::Vertical,mainWidget);
+#endif
+
+#ifdef G4DEBUG_INTERFACES_BASIC
+  printf("G4UIQt::G4UIQt :: 2\n");
+#endif
   // Set layouts
 
-  QWidget* topWidget = new QWidget(splitter);
-  QWidget* bottomWidget = new QWidget(splitter);
-
-  QVBoxLayout *layoutTop = new QVBoxLayout(topWidget);
-  QVBoxLayout *layoutBottom = new QVBoxLayout(bottomWidget);
+  visWidget = new QWidget(visCoutSplitter);
+  QWidget* coutWidget = new QWidget(coutHistorySplitter);
+  QWidget* historyWidget = new QWidget(historyCommandLineSplitter);
+  QWidget* commandLineWidget = new QWidget(historyCommandLineSplitter);
+
+  //  QVBoxLayout *layoutVis = new QVBoxLayout(visWidget);
+  QVBoxLayout *layoutCout = new QVBoxLayout(coutWidget);
+  QVBoxLayout *layoutHistory = new QVBoxLayout(historyWidget);
+  QVBoxLayout *layoutCommandLine = new QVBoxLayout(commandLineWidget);
 
   // fill them
 
-  fTextArea = new QTextEdit(topWidget);
-  QPushButton *clearButton = new QPushButton("clear",topWidget);
+  fTextArea = new QTextEdit(coutWidget);
+  QPushButton *clearButton = new QPushButton("clear",coutWidget);
   connect(clearButton, SIGNAL(clicked()), SLOT(ClearButtonCallback()));
 
 #if QT_VERSION < 0x040000
 
-  fCommandHistoryArea = new QListView(bottomWidget);
+  fCommandHistoryArea = new QListView(historyWidget);
   fCommandHistoryArea->setSorting (-1, FALSE);
   fCommandHistoryArea->setSelectionMode(QListView::Single);
@@ -190 +206 @@
 #endif
   fCommandHistoryArea->installEventFilter(this);
-  fCommandLabel = new QLabel("",bottomWidget);
-
-  fCommandArea = new QLineEdit(bottomWidget);
+  fCommandLabel = new QLabel("",commandLineWidget);
+
+#ifdef G4DEBUG_INTERFACES_BASIC
+  printf("G4UIQt::G4UIQt :: 3\n");
+#endif
+  fCommandArea = new QLineEdit(commandLineWidget);
   fCommandArea->installEventFilter(this);
 #if QT_VERSION < 0x040000
@@ -209 +228 @@
   fTextArea->setReadOnly(true);
 
-  layoutTop->addWidget(fTextArea);
-  layoutTop->addWidget(clearButton);
-
+  //  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
 
-  layoutBottom->addWidget(fCommandHistoryArea);
-  layoutBottom->addWidget(fCommandLabel);
-  layoutBottom->addWidget(fCommandArea);
+  layoutHistory->addWidget(fCommandHistoryArea);
+  layoutCommandLine->addWidget(fCommandLabel);
+  layoutCommandLine->addWidget(fCommandArea);
 #if QT_VERSION >= 0x040000
 
@@ -224 +248 @@
   QVBoxLayout *mainLayout = new QVBoxLayout(mainWidget);
 
-  splitter->addWidget(topWidget);
-  splitter->addWidget(bottomWidget);
-
-  mainLayout->addWidget(splitter);
-
+  // the splitter for History/CommandLine 
+  historyCommandLineSplitter->addWidget(historyWidget);
+  historyCommandLineSplitter->addWidget(commandLineWidget);
+
+  // The splitter for Cout/History
+  coutHistorySplitter->addWidget(coutWidget);
+  coutHistorySplitter->addWidget(historyCommandLineSplitter);
+
+  // The splitter for Vis/Cout
+  visCoutSplitter->addWidget(visWidget);
+  visCoutSplitter->addWidget(coutHistorySplitter);
+
+  mainLayout->addWidget(visCoutSplitter);
+
+#endif
+#ifdef G4DEBUG_INTERFACES_BASIC
+  printf("G4UIQt::G4UIQt :: 5\n");
 #endif
 
@@ -234 +270 @@
   fMainWindow->setCentralWidget(mainWidget);
 #else
-  fMainWindow->setCentralWidget(splitter);
+  fMainWindow->setCentralWidget(visCoutSplitter);
 #endif
 
@@ -263 +299 @@
   AddInteractor ("file",(G4Interactor)fileMenu);
   AddInteractor ("help",(G4Interactor)helpMenu);
+#ifdef G4DEBUG_INTERFACES_BASIC
+  printf("G4UIQt::G4UIQt :: 6\n");
+#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();
+  //  QValueList<int> vals = splitter->sizes();
+#else
+  //  QList<int> vals = splitter->sizes();
 #endif
 //    if(vals.size()==2) {
@@ -277 +316 @@
 
   if(UI!=NULL) UI->SetCoutDestination(this);  // TO KEEP
+
+  interactorManager->SetG4UI(this);
+
+#ifdef G4DEBUG_INTERFACES_BASIC
+  printf("G4UIQt::G4UIQt END\n");
+#endif
 }
 
@@ -295 +340 @@
 
 
+/**   Add a new tab widget.
+  Create the tab if it was not done
+*/
+void G4UIQt::AddTabVisWidget(
+ QWidget* aWidget
+ ,QString name
+)
+{
+  if (fTabWidget == NULL) {
+    fTabWidget = new QTabWidget;
+  }
+  if (!aWidget) return;
+
+#if QT_VERSION < 0x040000
+  aWidget->reparent(visWidget,0,QPoint(0,0));  
+#else
+  aWidget->setParent(visWidget);
+#endif
+
+  fTabWidget->addTab(aWidget,name);
+  QHBoxLayout *mainLayout = new QHBoxLayout(visWidget);
+  mainLayout->setMargin(0);
+  mainLayout->setSpacing(0);   
+  mainLayout->addWidget(fTabWidget);
+}
+
 
 /**   Start the Qt main loop
@@ -350 +421 @@
 
 
-QMainWindow * G4UIQt::getMainWindow (
-)
-{
-  return fMainWindow;
-}
 
 void G4UIQt::SessionTerminate (
@@ -929 +995 @@
   return tmp;
 }
+
 
 

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

@@ -39 +39 @@
 #include "G4VInteractorManager.hh"
 
+class G4UIQt;
+class QWidget;
+class QString;
+
 // Class description :
 //
@@ -56 +60 @@
   void FlushAndWaitExecution();
   virtual ~G4Qt();                     
+  bool AddTabVisWidget(QWidget*,QString);
+  void SetG4UI(G4UIQt*);
+
 private:
   G4Qt (int,char**,char*);                     
@@ -61 +68 @@
   int    argn;
   char** args;
+  G4UIQt* fG4UI;
 };
 

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

@@ -38 +38 @@
 
 #include "G4Qt.hh"
+#include "G4UIQt.hh"
+#include <qwidget.h>
 
 #include <qapplication.h>
@@ -66 +68 @@
     instance = new G4Qt(a_argn,a_args,a_class);
   }
+#ifdef G4DEBUG_INTERFACES_COMMON
+    printf("G4Qt::getInstance :%d\n",instance);
+#endif
   return instance;
 }
@@ -143 +148 @@
 #ifdef G4DEBUG_INTERFACES_COMMON
   if (qApp) {
-    printf("G4Qt::qApp exist\n");
+    printf("G4Qt::qApp exist adress:%d\n",this);
   }  else {
     printf("G4Qt::qApp not exist\n");
@@ -198 +203 @@
 }
 
-#endif
-
-
-
+/***************************************************************************/
+void G4Qt::SetG4UI (
+ G4UIQt* ui
+)
+/***************************************************************************/
+/*!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!*/
+{
+  fG4UI = ui;
+}
+
+/***************************************************************************/
+bool G4Qt::AddTabVisWidget (
+ QWidget * vis
+ ,QString name
+)
+/***************************************************************************/
+/*!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!*/
+{
+  if (fG4UI) {
+    fG4UI->AddTabVisWidget(vis,name);
+    return true;
+  }
+  return false;
+}
+#endif
+
+
+