Changeset 1131 for trunk/source
- Timestamp:
- Oct 14, 2009, 4:39:32 PM (15 years ago)
- Location:
- trunk/source/visualization/OpenGL
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/source/visualization/OpenGL/History
r1130 r1131 1 $Id: History,v 1.1 48 2009/10/14 13:27:30lgarnier Exp $1 $Id: History,v 1.151 2009/10/14 14:35:07 lgarnier Exp $ 2 2 ------------------------------------------------------------------- 3 3 … … 19 19 13 October 2009 Laurent Garnier 20 20 - G4OpenGLImmediateQtViewer/StoredQtViewer : some cleaning 21 21 - G4OpenGLQtViewer.hh : Fix a compile error on mac OS X 10.5.8 22 - G4OpenGLImmediateQtViewer : Remove picking to true at initialisation 23 - G4OpenGLQtViewer.cc : Fix a redraw problem on mac OS X 10.6 24 - G4OpenGLStoreQtViewer.cc : Fix width() and height() problem on mac OS X 10.6 25 22 26 29 September 2009 John Allison (opengl-V09-02-07) 23 27 - Tagged. -
trunk/source/visualization/OpenGL/include/G4OpenGLQtViewer.hh
r1127 r1131 25 25 // 26 26 // 27 // $Id: G4OpenGLQtViewer.hh,v 1.1 7 2009/05/13 10:28:00 lgarnier Exp $27 // $Id: G4OpenGLQtViewer.hh,v 1.18 2009/10/14 14:06:00 lgarnier Exp $ 28 28 // GEANT4 tag $Name: $ 29 29 // -
trunk/source/visualization/OpenGL/src/G4OpenGLImmediateQtViewer.cc
r1130 r1131 25 25 // 26 26 // 27 // $Id: G4OpenGLImmediateQtViewer.cc,v 1.1 4 2009/05/13 10:28:00lgarnier Exp $27 // $Id: G4OpenGLImmediateQtViewer.cc,v 1.15 2009/10/14 14:32:09 lgarnier Exp $ 28 28 // GEANT4 tag $Name: $ 29 29 // … … 188 188 // DO NOT RESIZE IF SIZE HAS NOT CHANGE 189 189 if ( !fHasToRepaint) { 190 if (((getWinWidth() == (unsigned int)width())) &&(getWinHeight() == (unsigned int) height())) { 190 // L. Garnier : Trap to get the size with mac OSX 10.6 and Qt 4.6(devel) 191 // Tested on Qt4.5 on mac, 4.4 on windows, 4.5 on unbuntu 192 int sw = 0; 193 int sh = 0; 194 if (!isMaximized() && !isFullScreen()) { 195 sw = normalGeometry().width(); 196 sh = normalGeometry().height(); 197 } else { 198 sw = frameGeometry().width(); 199 sh = frameGeometry().height(); 200 } 201 if ((getWinWidth() == (unsigned int)sw) &&(getWinHeight() == (unsigned int)sh)) { 191 202 return; 192 203 } -
trunk/source/visualization/OpenGL/src/G4OpenGLQtViewer.cc
r1125 r1131 25 25 // 26 26 // 27 // $Id: G4OpenGLQtViewer.cc,v 1.4 3 2009/07/29 10:04:45lgarnier Exp $27 // $Id: G4OpenGLQtViewer.cc,v 1.44 2009/10/14 14:35:07 lgarnier Exp $ 28 28 // GEANT4 tag $Name: $ 29 29 // -
trunk/source/visualization/OpenGL/src/G4OpenGLStoredQtViewer.cc
r1126 r1131 234 234 sh = frameGeometry().height(); 235 235 } 236 #ifdef G4DEBUG_VIS_OGL237 printf("G4OpenGLStoredQtViewer::paintGL %d = %d %d = %d\n",getWinWidth(),width(),getWinHeight(),height());238 printf("G4OpenGLStoredQtViewer::paintGL ................................%d x %d \n",sw,sh);239 240 #endif241 236 if ((getWinWidth() == (unsigned int)sw) &&(getWinHeight() == (unsigned int)sh)) { 242 237 return;
Note: See TracChangeset
for help on using the changeset viewer.