Changeset 1135

Timestamp:

Oct 21, 2009, 10:14:58 AM (15 years ago)

Author:

garnier

Message:

preparation to integrate Vis in UI for Qt

Location:

trunk/source/visualization/OpenGL

Files:

• History (modified) (2 diffs)
• include/G4OpenGLQtViewer.hh (modified) (2 diffs)
• src/G4OpenGLQtViewer.cc (modified) (4 diffs)

trunk/source/visualization/OpenGL/History

@@ -1 @@
-$Id: History,v 1.154 2009/10/15 15:33:30 lgarnier Exp $
+$Id: History,v 1.155 2009/10/21 08:14:44 lgarnier Exp $
 -------------------------------------------------------------------
 
@@ -17 +17 @@
      * Reverse chronological order (last date on top), please *
      ----------------------------------------------------------
+
+21 October 2009 Laurent Garnier
+ -  G4OpenGLQtViewer : Prepare to attach viewer In UI
+
 15 October 2009 Laurent Garnier
  - G4OpenGLViewer.cc : Fix a problem with printing. On mac OSX version

trunk/source/visualization/OpenGL/include/G4OpenGLQtViewer.hh

@@ -25 +25 @@
 //
 //
-// $Id: G4OpenGLQtViewer.hh,v 1.19 2009/10/14 15:04:09 lgarnier Exp $
+// $Id: G4OpenGLQtViewer.hh,v 1.20 2009/10/21 08:14:44 lgarnier Exp $
 // GEANT4 tag $Name:  $
 //
@@ -150 +150 @@
   void setRecordingInfos(QString);
   QString getProcessErrorMsg();
-
+  QWidget* getParentWidget();
 
 #if QT_VERSION < 0x040000

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

@@ -25 +25 @@
 //
 //
-// $Id: G4OpenGLQtViewer.cc,v 1.44 2009/10/14 14:35:07 lgarnier Exp $
+// $Id: G4OpenGLQtViewer.cc,v 1.45 2009/10/21 08:14:44 lgarnier Exp $
 // GEANT4 tag $Name:  $
 //
@@ -107 +107 @@
   if(fWindow) return; //Done.
 
-  // launch Qt if not
-  G4Qt* interactorManager = G4Qt::getInstance ();
-  //  G4UImanager* UI = G4UImanager::GetUIpointer();
-
   fWindow = glWidget ;
   //  fWindow->makeCurrent();
 
-  // create window
-  if (((QApplication*)interactorManager->GetMainInteractor())) {
-    // look for the main window
-    bool found = false;
-#if QT_VERSION < 0x040000
-    // theses lines does nothing exept this one "GLWindow = new QDialog(0..."
-    // but if I comment them, it doesn't work...
-    QWidgetList  *list = QApplication::allWidgets();
-    QWidgetListIt it( *list );         // iterate over the widgets
-    QWidget * widget;
-    while ( (widget=it.current()) != 0 ) {  // for each widget...
-      ++it;
-      if ((found== false) && (widget->inherits("QMainWindow"))) {
-        fGLWindow = new QDialog(0,0,FALSE,Qt::WStyle_Title | Qt::WStyle_SysMenu | Qt::WStyle_MinMax );
-        found = true;
-      }
-    }
-    delete list;                      // delete the list, not the widgets
-#else
-    foreach (QWidget *widget, QApplication::allWidgets()) {
-      if ((found== false) && (widget->inherits("QMainWindow"))) {
-        fGLWindow = new QDialog(0,Qt::WindowTitleHint | Qt::WindowSystemMenuHint | Qt::WindowMinMaxButtonsHint);
-        found = true;
-      }
-    }
-#endif
-
-#if QT_VERSION < 0x040000
-    glWidget->reparent(fGLWindow,0,QPoint(0,0));  
-#else
-    glWidget->setParent(fGLWindow);  
-#endif
-
-    if (found==false) {
-#ifdef G4DEBUG_VIS_OGL
-      printf("G4OpenGLQtViewer::CreateMainWindow case Qapp exist, but not found\n");
-#endif
-      fGLWindow = new QDialog();
-    }
-  } else {
-#ifdef G4DEBUG_VIS_OGL
-    printf("G4OpenGLQtViewer::CreateMainWindow case Qapp exist\n");
-#endif
-    fGLWindow = new QDialog();
+  QWidget *myParent = getParentWidget();
+  if (myParent != NULL) {
+#if QT_VERSION < 0x040000
+    glWidget->reparent(myParent,0,QPoint(0,0));  
+#else
+    glWidget->setParent(myParent);  
+#endif
   }
 
@@ -2547 +2506 @@
 
 
-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);
-  f1.setPointSizeF(20);
-
-  // 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()
@@ -2663 +2600 @@
 }
 
+
+
+
+QWidget *G4OpenGLQtViewer::getParentWidget() 
+{
+  // launch Qt if not
+  G4Qt* interactorManager = G4Qt::getInstance ();
+  //  G4UImanager* UI = G4UImanager::GetUIpointer();
+  
+  bool found = false;
+  
+  // create window
+  if (((QApplication*)interactorManager->GetMainInteractor())) {
+    // look for the main window
+#if QT_VERSION < 0x040000
+    // theses lines does nothing exept this one "GLWindow = new QDialog(0..."
+    // but if I comment them, it doesn't work...
+    QWidgetList  *list = QApplication::allWidgets();
+    QWidgetListIt it( *list );         // iterate over the widgets
+    QWidget * widget;
+    while ( (widget=it.current()) != 0 ) {  // for each widget...
+      ++it;
+      if ((found== false) && (widget->inherits("QMainWindow"))) {
+        fGLWindow = new QDialog(0,0,FALSE,Qt::WStyle_Title | Qt::WStyle_SysMenu | Qt::WStyle_MinMax );
+        found = true;
+      }
+    }
+    delete list;                      // delete the list, not the widgets
+#else
+    foreach (QWidget *widget, QApplication::allWidgets()) {
+      if ((found== false) && (widget->inherits("QMainWindow"))) {
+        fGLWindow = new QDialog(widget,Qt::WindowTitleHint | Qt::WindowSystemMenuHint | Qt::WindowMinMaxButtonsHint);
+        found = true;
+      }
+    }
+#endif
+    
+    if (found==false) {
+#ifdef G4DEBUG_VIS_OGL
+      printf("G4OpenGLQtViewer::CreateMainWindow case Qapp exist, but not found\n");
+#endif
+      fGLWindow = new QDialog();
+    }
+  } else {
+#ifdef G4DEBUG_VIS_OGL
+    printf("G4OpenGLQtViewer::CreateMainWindow case Qapp exist\n");
+#endif
+    fGLWindow = new QDialog();
+  }
+  if (found) {
+    return fGLWindow;
+  } else {
+    return NULL;
+  }
+}
+
 /*