Changeset 1236 for trunk/source

Timestamp:

Feb 8, 2010, 5:19:32 PM (14 years ago)

Author:

garnier

Message:

debug mode

Location:

trunk/source/interfaces/basic

Files:

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

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

@@ -41 +41 @@
 #include <qmap.h>
 #include <qstringlist.h>
+#include <qtabwidget.h>
 
 class QMainWindow;
@@ -55 +56 @@
 class QTextEdit;
 class QLabel;
-class QTabWidget;
 class QResizeEvent;
 class QToolBox;
 class QStringList;
+class QSplitter;
 
 // Class description :
@@ -79 +80 @@
 //
 // Class description - end :
+
+class G4QTabWidget : public QTabWidget {
+public :
+  G4QTabWidget();
+  G4QTabWidget(QSplitter*&);
+  void paintEvent  ( QPaintEvent * event );
+  inline void setTabSelected() { tabSelected = true; };
+  inline void unselectTab() { tabSelected = false; };
+  inline bool isTabSelected() { return tabSelected; };
+  bool tabSelected;
+};
 
 class G4UIQt : public QObject, public G4VBasicShell, public G4VInteractiveSession {
@@ -174 +186 @@
   QWidget* fViewComponentsTBWidget;
   QLineEdit* helpLine;
-  QTabWidget* fTabWidget;
+  G4QTabWidget* fTabWidget;
   QString fCoutText;
 
 signals : 
-  void myClicked(const QString &text);
+  void refreshTab(const QString &text);
 
 private slots :
@@ -193 +205 @@
   void ResizeTabWidget( QResizeEvent* );
   void CoutFilterCallback(const QString&);
+  void RefreshTabCallback (const QString&);
+
 };
 
-#endif
-
-#endif
-
+
+#endif
+
+#endif
+

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

@@ -171 +171 @@
 
   // Add a empty tabwidget
-  fTabWidget = new QTabWidget(myVSplitter);
+  fTabWidget = new G4QTabWidget(myVSplitter);
+#if QT_VERSION >= 0x040500
+  fTabWidget->setTabsClosable (true); 
+#endif
+
+#if QT_VERSION >= 0x040200
+  fTabWidget->setUsesScrollButtons (true);
+#endif
 
   QWidget* commandLineWidget = new QWidget(mainWidget);
@@ -280 +287 @@
 
   connect(fCommandArea, SIGNAL(returnPressed()), SLOT(CommandEnteredCallback()));
-
+  connect(this, SIGNAL(refreshTab(const QString &)), SLOT(RefreshTabCallback(const QString&)));
   if(UI!=NULL) UI->SetCoutDestination(this);  // TO KEEP
 
@@ -521 +528 @@
   // then we have to force them on order to check the size
 
-  fTabWidget->insertTab(fTabWidget->count()-1,aWidget,name);
- 
+  fTabWidget->insertTab(fTabWidget->count(),aWidget,name);
+
+  if (fTabWidget->count() == 1) {
+    connect(fTabWidget, SIGNAL(currentChanged ( int ) ), SLOT(UpdateTabWidget(int)));
+    //  connect(fTabWidget, SIGNAL(resizeEvent (  QResizeEvent* ) ), SLOT(ResizeTabWidget( QResizeEvent*)));
+  }
   // Set visible
 #if QT_VERSION >= 0x040000
@@ -574 +585 @@
 #endif
   if (  fTabWidget == NULL) {
-    fTabWidget = new QTabWidget;
-  }
-  
-  QString text = fTabWidget->tabText (tabNumber); 
-  if ( text != fCoutText) {
-
-    // Then we have to do /vis/viewer/select on the selelected tab
-    // And resize selected tab
-    fTabWidget->currentWidget()->resize(fTabWidget->currentWidget()->width(),fTabWidget->currentWidget()->height());
-
-    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();
-  }
-  if (fTabWidget->count() == 1) {
-    connect(fTabWidget, SIGNAL(currentChanged ( int ) ), SLOT(UpdateTabWidget(int)));
-    //  connect(fTabWidget, SIGNAL(resizeEvent (  QResizeEvent* ) ), SLOT(ResizeTabWidget( QResizeEvent*)));
-  }
+    fTabWidget = new G4QTabWidget;
+  }
+  
+  
+  //Must be BEFORE repaint of OGL 
+#ifdef G4DEBUG_INTERFACES_BASIC
+  printf("G4UIQt::UpdateTabWidget CALL REPAINT tabGL\n");
+#endif
+//   QPaintEvent e(fTabWidget->currentWidget()->rect());
+//   QApplication::sendEvent(fTabWidget->currentWidget(), &e);
+
+#ifdef G4DEBUG_INTERFACES_BASIC
+  printf("G4UIQt::UpdateTabWidget CALL REPAINT tabWidget\n");
+#endif
+//   QPaintEvent e2(fTabWidget->rect());
+//   QApplication::postEvent(fTabWidget, &e2);
+
+  // Emit signal in order to refresh glView after all paint tab
+  // signals have been send
+//  emit(refreshTab(fTabWidget->tabText (fTabWidget->currentIndex())));
+  //  fTabWidget->repaint();
+#ifdef G4DEBUG_INTERFACES_BASIC
+  printf("G4UIQt::UpdateTabWidget CALL REPAINT END\n");
+#endif
+
+//   QString text = fTabWidget->tabText (fTabWidget->currentIndex()); 
+//   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->setTabSelected();
+  // Then we have to do /vis/viewer/select on the selelected tab
+  // And resize selected tab
+  //  fTabWidget->currentWidget()->resize(fTabWidget->currentWidget()->width(),fTabWidget->currentWidget()->height());
+
+  //  ((QGLWIdget*)fTabWidget->currentWidget())->makeCurrent();
+  
+// #ifdef G4DEBUG_INTERFACES_BASIC
+//   printf("G4UIQt::UpdateTabWidget REPAINT END\n");
+// #endif
+  //  QCoreApplication::flush ();
+#ifdef G4DEBUG_INTERFACES_BASIC
+  printf("G4UIQt::UpdateTabWidget END\n");
+#endif
 }
 
@@ -1833 +1871 @@
 }
 
-#endif
+  
+
+void G4UIQt::RefreshTabCallback (
+ const QString &text
+)
+{
+#ifdef G4DEBUG_INTERFACES_BASIC
+      printf("G4UIQt::RefreshTabCallback   BEGIN +++++++++++++++++++++\n");
+#endif
+  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());
+  }
+#ifdef G4DEBUG_INTERFACES_BASIC
+      printf("G4UIQt::RefreshTabCallback   BEGIN -+-+-+-+-+-+-+-+-+-+-+\n");
+#endif
+}
+
+G4QTabWidget::G4QTabWidget(
+QSplitter*& split
+):QTabWidget(split)
+{
+}
+
+G4QTabWidget::G4QTabWidget(
+):QTabWidget()
+{
+}
+
+
+
+void G4QTabWidget::paintEvent(
+QPaintEvent * event
+)
+{
+  QCoreApplication::sendPostedEvents () ;
+
+  if (currentWidget()) {
+#ifdef G4DEBUG_INTERFACES_BASIC
+    printf("G4QTabWidget::paintEvent repaint type : %d -- rect %d %d  region:%d %d page : %d %d  ________________________ for = %d i= %d w: %d\n", event->type(),event->rect().height(),event->rect().width(),event->region().boundingRect().width(),event->region().boundingRect().height(),currentWidget()->width(),currentWidget()->height(),this,currentIndex(),currentWidget());
+#endif
+    
+    //    QTabWidget::paintEvent(event);
+
+    if ( isTabSelected()) {
+#ifdef G4DEBUG_INTERFACES_BASIC
+      printf("G4QTabWidget::paintEvent OK\n");
+#endif
+      QString text = tabText (currentIndex()); 
+      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());
+      }
+
+      repaint();
+      unselectTab();
+    }
+  }
+}
+
+#endif