Changeset 1160 for trunk/source/visualization/OpenGL/src/G4OpenGLQtViewer.cc

Timestamp:

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

Author:

garnier

Message:

mise en place de Vis dans UI

File:

• trunk/source/visualization/OpenGL/src/G4OpenGLQtViewer.cc (modified) (8 diffs)

trunk/source/visualization/OpenGL/src/G4OpenGLQtViewer.cc

@@ -79 +79 @@
 #include <qdialog.h>
 #include <qevent.h> //include <qcontextmenuevent.h>
-#include <qmainwindow.h>
-
-#ifdef G4DEBUG_VIS_OGL
-#include "G4UImanager.hh"
-#include "G4UIsession.hh"
-#include "G4UIQt.hh"
-#endif
-
-// #define G4DEBUG_VIS_OGL_QTPARENT
+
 
 //////////////////////////////////////////////////////////////////////////////
@@ -112 +104 @@
 //!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!//
 {
-
+#ifdef G4DEBUG_VIS_OGL
+  printf("G4OpenGLQtViewer::CreateMainWindow :: BEGIN \n");
+#endif
   if(fWindow) return; //Done.
 
@@ -118 +112 @@
   //  fWindow->makeCurrent();
 
-  fGLWindow = getParentWidget();
-  if (fGLWindow != NULL) {
-#if QT_VERSION < 0x040000
-    glWidget->reparent(fGLWindow,0,QPoint(0,0));  
-#else
-#ifdef G4DEBUG_VIS_OGL_QTPARENT
-    G4UImanager* UI = G4UImanager::GetUIpointer();
-    if(UI!=NULL) {
-      if (glWidget->thread()) {
-        if (((G4UIQt*)UI->GetSession())->getMainWindow()) {
-          if (((G4UIQt*)UI->GetSession())->getMainWindow()->thread()) {
-            if (glWidget->thread() != ((G4UIQt*)UI->GetSession())->getMainWindow()->thread()) {
 #ifdef G4DEBUG_VIS_OGL
-              printf("G4OpenGLQtViewer::CreateMainWindow not in te same thread ...move to\n");
-#endif
-              glWidget->moveToThread(((G4UIQt*)UI->GetSession())->getMainWindow()->thread());
-            } else {
-              printf("G4OpenGLQtViewer::CreateMainWindow 1\n");
-            }
-            
-            glWidget->setParent(fGLWindow);  
-          } else {
-            printf("G4OpenGLQtViewer::CreateMainWindow 2\n");
-          }
-        } else {
-          printf("G4OpenGLQtViewer::CreateMainWindow 3 UI:%d session(UIQt):%d\n",UI,((G4UIQt*)UI->GetSession()));
-        }
-      } else {
-        printf("G4OpenGLQtViewer::CreateMainWindow 4\n");
-      }
-    }
-#else
-    glWidget->setParent(fGLWindow);  
-#endif
-#endif
-  }
-
-  QHBoxLayout *mainLayout = new QHBoxLayout;
-  mainLayout->setMargin(0);
-  mainLayout->setSpacing(0);
-  mainLayout->addWidget(glWidget);
-
-#if QT_VERSION < 0x040000
-  fGLWindow->setCaption(name );
-#else
-  fGLWindow->setLayout(mainLayout);
-  fGLWindow->setWindowTitle( name);
-#endif
+  printf("G4OpenGLQtViewer::CreateMainWindow :: ++++++++++++++ add new TAB %s\n",name.toStdString().c_str());
+#endif
+  G4Qt* interactorManager = G4Qt::getInstance ();
+
+  // FIXME L.Garnier 9/11/09 Has to be check !!! 
+  // Qt UI with Qt Vis
+  // Qt UI with X Vis
+  // X UI with Qt Vis
+  // X UI with X Vis
+  // Ne marche pas avec un UIBatch !! (ecran blanc)
+
+  // return false if G4UIQt was not launch
+  bool res = interactorManager->AddTabVisWidget(fWindow,name);
+  
+  if (!res) { // we have to do a dialog
+
+#ifdef G4DEBUG_VIS_OGL
+    printf("G4OpenGLQtViewer::CreateMainWindow :: get Parent ? \n");
+#endif
+    QWidget *myParent = getParentWidget();
+#ifdef G4DEBUG_VIS_OGL
+    printf("G4OpenGLQtViewer::CreateMainWindow :: getParent OK \n");
+#endif
+    if (myParent != NULL) {
+#if QT_VERSION < 0x040000
+      fWindow->reparent(myParent,0,QPoint(0,0));  
+#else
+      fWindow->setParent(myParent);  
+#endif
+    }
+    QHBoxLayout *mainLayout = new QHBoxLayout(fGLWindow);
+    
+    mainLayout->setMargin(0);
+    mainLayout->setSpacing(0);   
+    mainLayout->addWidget(fWindow);
+    if (fGLWindow->inherits("QMainWindow")) {
+#if QT_VERSION < 0x040000
+      fGLWindow->setCaption(name );
+#else
+      fGLWindow->setWindowTitle( name);
+#endif
+    }
+#if QT_VERSION >= 0x040000
+    fGLWindow->setLayout(mainLayout);
+#endif
+  } else {
+    fGLWindow = fWindow;
+  }
+  
+  
   ResizeWindow(fVP.GetWindowSizeHintX(),fVP.GetWindowSizeHintY());
-
+  
   //useful for MACOSX, we have to compt the menuBar height
   int offset = QApplication::desktop()->height() 
-                      - QApplication::desktop()->availableGeometry().height();
-
+    - QApplication::desktop()->availableGeometry().height();
+  
   G4int YPos= fVP.GetWindowAbsoluteLocationHintY(QApplication::desktop()->height());
   if (fVP.GetWindowAbsoluteLocationHintY(QApplication::desktop()->height())< offset) {
@@ -181 +178 @@
   
   if(!fWindow) return;
-
+  
   if (!fContextMenu) 
     createPopupMenu();
-
+  
+#ifdef G4DEBUG_VIS_OGL
+  printf("G4OpenGLQtViewer::CreateMainWindow :: END \n");
+#endif
 }
 
@@ -241 +241 @@
 
 #ifdef G4DEBUG_VIS_OGL
+  G4UImanager* UI = G4UImanager::GetUIpointer();
+  printf("G4OpenGLQtViewer::getParentWidget :: UImanager %d++++++++++++\n",UI);
+#endif
+
+#ifdef G4DEBUG_VIS_OGL
   printf("G4OpenGLQtViewer::G4OpenGLQtViewer END\n");
 #endif
@@ -2542 +2547 @@
 
 
-void G4OpenGLQtViewer::drawText( 
-const char * str 
-,int x 
-,int y 
-,int z 
-,int size ) { 
-  
-#ifdef G4DEBUG_VIS_OGL 
-  printf ("G4OpenGLStoredQtViewer::drawText-position %d,%d,%d-----------------------------------------\n",x,y,z); 
-#endif   
-  
-  QFont f1 = QFont("Courrier", size, QFont::Bold); 
-#if QT_VERSION > 0x040000
-  f1.setPointSizeF(20); 
-#else
-  f1.setPointSizeFloat(20); 
-#endif
-  
-  // FIXME : Interesting border effect : resizing world resize detector 
-  // but not traces ! 
-  glColor3d (0.123456,0.1234560,0.123456); 
-  fWindow->renderText (x,y,z,str,f1); 
-  glColor3d (0.321,0.321,0.321); 
-} 
- 
- 
 // FIXME : does not work on Qt3
 void G4OpenGLQtViewer::processEncodeStdout()
@@ -2669 +2648 @@
   // launch Qt if not
   G4Qt* interactorManager = G4Qt::getInstance ();
-  //  G4UImanager* UI = G4UImanager::GetUIpointer();
-  
-
-#ifdef G4DEBUG_VIS_OGL_QTPARENT
   G4UImanager* UI = G4UImanager::GetUIpointer();
-  if(UI!=NULL) {
-    if (((G4UIQt*)UI->GetSession())->getViewWidget()) {
-      printf("G4OpenGLQtViewer::getParentWidget ok :%d\n",((G4UIQt*)UI->GetSession())->getViewWidget());
-      return ((G4UIQt*)UI->GetSession())->getViewWidget();
-      //      fGLWindow = new QWidget(((G4UIQt*)UI->GetSession())->getViewWidget(),Qt::WindowTitleHint | Qt::WindowSystemMenuHint | Qt::WindowMinMaxButtonsHint);    
-    } else {
-      return 0;
-    }
-    //    fGLWindow = new QWidget(0,Qt::WindowTitleHint | Qt::WindowSystemMenuHint | Qt::WindowMinMaxButtonsHint);    
-  }
-#else
-
+#ifdef G4DEBUG_VIS_OGL
+  //  printf("G4OpenGLQtViewer::getParentWidget :: UImanager %d  G4Qt:%d et via GetUIQt:%d---------------------\n",UI,UI->GetSession(),interactorManager,interactorManager->GetUIVisWidget());
+#endif
+  
+  //   if (interactorManager) {
+  //     if (interactorManager->GetUIVisWidget()) {
+  //       fGLWindow = interactorManager->GetUIVisWidget();
+  //       return interactorManager->GetUIVisWidget(); 
+  //     }
+  //   }
+  //
 
 
@@ -2733 +2707 @@
     return NULL;
   }
-#endif
 }