Changeset 1131

Timestamp:

Oct 14, 2009, 4:39:32 PM (15 years ago)

Author:

garnier

Message:

update

Location:

trunk/source/visualization/OpenGL

Files:

• History (modified) (2 diffs)
• include/G4OpenGLQtViewer.hh (modified) (1 diff)
• src/G4OpenGLImmediateQtViewer.cc (modified) (2 diffs)
• src/G4OpenGLQtViewer.cc (modified) (1 diff)
• src/G4OpenGLStoredQtViewer.cc (modified) (1 diff)

trunk/source/visualization/OpenGL/History

@@ -1 @@
-$Id: History,v 1.148 2009/10/14 13:27:30 lgarnier Exp $
+$Id: History,v 1.151 2009/10/14 14:35:07 lgarnier Exp $
 -------------------------------------------------------------------
 
@@ -19 +19 @@
 13 October 2009 Laurent Garnier
  - G4OpenGLImmediateQtViewer/StoredQtViewer : some cleaning
- 
+ - G4OpenGLQtViewer.hh : Fix a compile error on mac OS X 10.5.8
+ - G4OpenGLImmediateQtViewer : Remove picking to true at initialisation 
+ - G4OpenGLQtViewer.cc : Fix a redraw problem on mac OS X 10.6
+ - G4OpenGLStoreQtViewer.cc : Fix width() and height() problem on mac OS X 10.6
+
 29 September 2009  John Allison  (opengl-V09-02-07)
 - Tagged.

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

@@ -25 +25 @@
 //
 //
-// $Id: G4OpenGLQtViewer.hh,v 1.17 2009/05/13 10:28:00 lgarnier Exp $
+// $Id: G4OpenGLQtViewer.hh,v 1.18 2009/10/14 14:06:00 lgarnier Exp $
 // GEANT4 tag $Name:  $
 //

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

@@ -25 +25 @@
 //
 //
-// $Id: G4OpenGLImmediateQtViewer.cc,v 1.14 2009/05/13 10:28:00 lgarnier Exp $
+// $Id: G4OpenGLImmediateQtViewer.cc,v 1.15 2009/10/14 14:32:09 lgarnier Exp $
 // GEANT4 tag $Name:  $
 //
@@ -188 +188 @@
   // DO NOT RESIZE IF SIZE HAS NOT CHANGE
   if ( !fHasToRepaint) {
-    if (((getWinWidth() == (unsigned int)width())) &&(getWinHeight() == (unsigned int) height())) {
+    // L. Garnier : Trap to get the size with mac OSX 10.6 and Qt 4.6(devel)
+    // Tested on Qt4.5 on mac, 4.4 on windows, 4.5 on unbuntu
+    int sw = 0;
+    int sh = 0;
+    if (!isMaximized() && !isFullScreen()) {
+      sw = normalGeometry().width();
+      sh = normalGeometry().height();
+    } else {
+      sw = frameGeometry().width();
+      sh = frameGeometry().height();
+    }
+    if ((getWinWidth() == (unsigned int)sw) &&(getWinHeight() == (unsigned int)sh)) {
       return;
     }

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

@@ -25 +25 @@
 //
 //
-// $Id: G4OpenGLQtViewer.cc,v 1.43 2009/07/29 10:04:45 lgarnier Exp $
+// $Id: G4OpenGLQtViewer.cc,v 1.44 2009/10/14 14:35:07 lgarnier Exp $
 // GEANT4 tag $Name:  $
 //

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

@@ -234 +234 @@
       sh = frameGeometry().height();
     }
-#ifdef G4DEBUG_VIS_OGL
-    printf("G4OpenGLStoredQtViewer::paintGL %d = %d    %d = %d\n",getWinWidth(),width(),getWinHeight(),height());
-    printf("G4OpenGLStoredQtViewer::paintGL ................................%d x %d \n",sw,sh);
-    
-#endif
     if ((getWinWidth() == (unsigned int)sw) &&(getWinHeight() == (unsigned int)sh)) {
       return;