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

Timestamp:

Oct 13, 2009, 12:21:44 PM (15 years ago)

Author:

garnier

Message:

en test

File:

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

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

@@ -135 +135 @@
     foreach (QWidget *widget, QApplication::allWidgets()) {
       if ((found== false) && (widget->inherits("QMainWindow"))) {
+#ifdef G4DEBUG_VIS_OGL
+        printf("G4OpenGLQtViewer::CreateMainWindow on top of ................................%d\n",widget);
+#endif
         fGLWindow = new QDialog(0,Qt::WindowTitleHint | Qt::WindowSystemMenuHint | Qt::WindowMinMaxButtonsHint);
         found = true;
+#ifdef G4DEBUG_VIS_OGL
+        printf("G4OpenGLQtViewer::CreateMainWindow after creation................................%d x %d should equal %d x %d\n",fGLWindow->width(),fGLWindow->height(),getWinWidth(), getWinHeight());
+#endif
+        fGLWindow->resize(432,245);
+#ifdef G4DEBUG_VIS_OGL
+        int sw = 0;
+        int sh = 0;
+        if (!fGLWindow->isMaximized() && !fGLWindow->isFullScreen()) {
+          sw = fGLWindow->normalGeometry().width();
+          sh = fGLWindow->normalGeometry().height();
+        } else {
+          sw = fGLWindow->frameGeometry().width();
+          sh = fGLWindow->frameGeometry().height();
+        }
+printf("G4OpenGLQtViewer::CreateMainWindow after creation-> set size................................%d x %d should equal %d x %d\n",sw,sh,432,245);
+        
+#endif
       }
     }
 #endif
+
+#ifdef G4DEBUG_VIS_OGL
+  printf("G4OpenGLQtViewer::CreateMainWindow TOP................................%d x %d\n",fGLWindow->width(),fGLWindow->height());
+#endif
+#ifdef G4DEBUG_VIS_OGL
+  printf("G4OpenGLQtViewer::CreateMainWindow................................%d x %d\n",glWidget->width(),glWidget->height());
+#endif
+
 
 #if QT_VERSION < 0x040000
@@ -181 +209 @@
     YPos = offset;
   }
+#ifdef G4DEBUG_VIS_OGL
+  printf("G4OpenGLQtViewer::CreateMainWindow before size................................%d x %d should equal %d x %d\n",fGLWindow->width(),fGLWindow->height(),getWinWidth(), getWinHeight());
+#endif
   fGLWindow->resize(getWinWidth(), getWinHeight());
+#ifdef G4DEBUG_VIS_OGL
+  printf("G4OpenGLQtViewer::CreateMainWindow TOP end................................%d x %d should equal %d x %d\n",fGLWindow->width(),fGLWindow->height(),getWinWidth(), getWinHeight());
+#endif
+
+
+  fGLWindow->resize(432,245);
+#ifdef G4DEBUG_VIS_OGL
+  printf("G4OpenGLQtViewer::CreateMainWindow TOP end 2................................%d x %d should equal %d x %d\n",fGLWindow->width(),fGLWindow->height(),432,245);
+#endif
   fGLWindow->move(fVP.GetWindowAbsoluteLocationHintX(QApplication::desktop()->width()),YPos);
   fGLWindow->show();
+#ifdef G4DEBUG_VIS_OGL
+  printf("G4OpenGLQtViewer::CreateMainWindow TOP end after show................................%d x %d\n",fGLWindow->width(),fGLWindow->height());
+#endif
   
   if(!fWindow) return;
 #ifdef G4DEBUG_VIS_OGL
-  printf("G4OpenGLQtViewer::CreateMainWindow glWidget END\n");
+  printf("G4OpenGLQtViewer::CreateMainWindow glWidget END ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\n");
 #endif
 
@@ -1433 +1476 @@
 void G4OpenGLQtViewer::FinishView()
 {
-#ifdef G4DEBUG_VIS_OGL
-  printf("G4OpenGLQtViewer::FinishView\n");
-#endif
   glFlush ();
-  GLint renderMode;
-  glGetIntegerv(GL_RENDER_MODE, &renderMode);
-  if (renderMode == GL_RENDER)  printf("G4OpenGLQtViewer::FinishView           RENDER !!!!\n");
-  else  printf("G4OpenGLQtViewer::FinishView           not RENDER !!!!\n");
-  
-  // THIS IF ALLREADY DONE BY THE paintEvent() function
-  // Who call it, I don't know...
-  
-  fWindow->swapBuffers ();
+  //  fWindow->swapBuffers ();
 }
 
@@ -1819 +1851 @@
     if (event->key() == Qt::Key_Plus) {
       fVP.SetZoomFactor(fVP.GetZoomFactor()*(1+fDeltaZoom)); 
-#ifdef G4DEBUG_VIS_OGL
-      printf("G4OpenGLQtViewer::KeyPressEvent zoomFactor=%f\n",fVP.GetZoomFactor()*(1+fDeltaZoom));
-#endif
       updateQWidget();
     }