Changeset 1163 for trunk

Timestamp:

Nov 13, 2009, 10:33:58 AM (15 years ago)

Author:

garnier

Message:

Update pour les Tabs

Location:

trunk/source/interfaces

Files:

• basic/include/G4UIQt.hh (modified) (2 diffs)
• basic/src/G4UIQt.cc (modified) (7 diffs)
• common/src/G4Qt.cc (modified) (3 diffs)

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

@@ -157 +157 @@
   QWidget *visWidget;
   QTabWidget* fTabWidget;
- 
+  QString fCoutText;
+
 signals : 
   void myClicked(const QString &text);
@@ -171 +172 @@
   void CommandHistoryCallback();
   void lookForHelpStringCallback();
+  void UpdateTabWidget(int);
 };
 

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

@@ -104 +104 @@
 ,char** argv
 )
-  :fHelpDialog(NULL),
- fTabWidget(NULL)
+:fHelpDialog(NULL)
+,fTabWidget(NULL)
+,fCoutText("Output")
 {
   G4Qt* interactorManager = G4Qt::getInstance (argc,argv,(char*)"Qt");
@@ -162 +163 @@
   QWidget *mainWidget = new QWidget(fMainWindow);
 #if QT_VERSION < 0x040000
-  QSplitter *visCoutSplitter = new QSplitter(Qt::Vertical,fMainWindow);
-  QSplitter *coutHistorySplitter = new QSplitter(Qt::Vertical,fMainWindow);
+  QSplitter *visHistorySplitter = 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 *visHistorySplitter = new QSplitter(Qt::Vertical,mainWidget);
   QSplitter *historyCommandLineSplitter = new QSplitter(Qt::Vertical,mainWidget);
 #endif
@@ -176 +175 @@
   // Set layouts
 
-  visWidget = new QWidget(visCoutSplitter);
-  QWidget* coutWidget = new QWidget(coutHistorySplitter);
+  fTabWidget = new QTabWidget;
+  connect(fTabWidget, SIGNAL(currentChanged ( int ) ), SLOT(UpdateTabWidget(int)));
+
+  visWidget = new QWidget(visHistorySplitter);
+  QWidget* coutWidget = new QWidget(fTabWidget);
   QWidget* historyWidget = new QWidget(historyCommandLineSplitter);
   QWidget* commandLineWidget = new QWidget(historyCommandLineSplitter);
@@ -188 +190 @@
   // fill them
 
+  fTabWidget->addTab(coutWidget,fCoutText);
+ 
   fTextArea = new QTextEdit(coutWidget);
   QPushButton *clearButton = new QPushButton("clear",coutWidget);
@@ -252 +256 @@
   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);
+  visHistorySplitter->addWidget(visWidget);
+  visHistorySplitter->addWidget(historyCommandLineSplitter);
+
+  mainLayout->addWidget(visHistorySplitter);
 
 #endif
@@ -270 +270 @@
   fMainWindow->setCentralWidget(mainWidget);
 #else
-  fMainWindow->setCentralWidget(visCoutSplitter);
+  fMainWindow->setCentralWidget(visHistorySplitter);
 #endif
 
@@ -348 +348 @@
 )
 {
-  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);
-}
+  if (fTabWidget != NULL) {
+    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);
+  }
+}
+
+
+void G4UIQt::UpdateTabWidget(int tabNumber) {
+  QString text = fTabWidget->tabText (tabNumber); 
+  if ( text != fCoutText) {
+
+    // Then we have to do /vis/viewer/select on the selelected tab
+    QString paramSelect = QString("/vis/viewer/select ")+text;
+    QString paramFlush = QString("/vis/viewer/flush ")+text;
+    G4UImanager* UI = G4UImanager::GetUIpointer();
+    if(UI!=NULL)  {
+      UI->ApplyCommand(paramSelect.toStdString().c_str());
+      UI->ApplyCommand(paramFlush.toStdString().c_str());
+    }
+    fTabWidget->currentWidget()->repaint();
+  }
+}
+
 
 

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

@@ -78 +78 @@
 ,char** a_args
  ,char*  /*a_class */
-)
+ )
+:fG4UI(NULL)
 /***************************************************************************/
 /*!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!*/
@@ -210 +211 @@
 /*!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!*/
 {
+#ifdef G4DEBUG_INTERFACES_COMMON
+    printf("G4Qt::SetG4UI \n");
+#endif
   fG4UI = ui;
 }
@@ -221 +225 @@
 /*!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!*/
 {
-  if (fG4UI) {
+  if (fG4UI != NULL) {
     fG4UI->AddTabVisWidget(vis,name);
     return true;