Changeset 1164 for trunk/source/visualization/OpenGL/src

Timestamp:

Nov 13, 2009, 10:39:07 AM (15 years ago)

Author:

garnier

Message:

Update pour les Tabs

Location:

trunk/source/visualization/OpenGL/src

Files:

• G4OpenGLQtViewer.cc (modified) (5 diffs)
• G4OpenGLStoredQtViewer.cc (modified) (1 diff)

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

@@ -104 +104 @@
 //!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!//
 {
+  // G4Qt* interactorManager = G4Qt::getInstance ();
+
 #ifdef G4DEBUG_VIS_OGL
   printf("G4OpenGLQtViewer::CreateMainWindow :: BEGIN \n");
@@ -126 +128 @@
   // 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");
+    printf("G4OpenGLQtViewer::CreateMainWindow :: NO UI get Parent ? \n");
 #endif
     QWidget *myParent = getParentWidget();
@@ -138 +140 @@
     if (myParent != NULL) {
 #if QT_VERSION < 0x040000
-      fWindow->reparent(myParent,0,QPoint(0,0));  
-#else
-      fWindow->setParent(myParent);  
+      glWindget->reparent(myParent,0,QPoint(0,0));  
+#else
+      glWidget->setParent(myParent);  
 #endif
     }
     QHBoxLayout *mainLayout = new QHBoxLayout(fGLWindow);
     
+#ifdef G4DEBUG_VIS_OGL
+    printf("G4OpenGLQtViewer::CreateMainWindow :: After create Layout fGLWindow:%d \n",fGLWindow);
+#endif
     mainLayout->setMargin(0);
     mainLayout->setSpacing(0);   
@@ -153 +158 @@
 #else
       fGLWindow->setWindowTitle( name);
+#ifdef G4DEBUG_VIS_OGL
+      printf("G4OpenGLQtViewer::CreateMainWindow :: is QMainWindow \n");
+#endif
 #endif
     }
 #if QT_VERSION >= 0x040000
+#ifdef G4DEBUG_VIS_OGL
+    printf("G4OpenGLQtViewer::CreateMainWindow ::  set layout to fGLWindow:%d \n",fGLWindow);
+#endif
     fGLWindow->setLayout(mainLayout);
 #endif
@@ -2701 +2712 @@
 #endif
     fGLWindow = new QDialog();
+#ifdef G4DEBUG_VIS_OGL
+    printf("G4OpenGLQtViewer::GetParentWidget fGLWindow:%d \n",fGLWindow);
+#endif
   }
   if (found) {

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

@@ -70 +70 @@
 #endif
   fReadyToPaint = false;
-  CreateMainWindow (this,QString(fName));
+  CreateMainWindow (this,QString(GetName()));
   CreateFontLists ();