- Timestamp:
- Oct 13, 2009, 12:21:44 PM (15 years ago)
- Location:
- trunk/source/visualization/OpenGL/src
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/source/visualization/OpenGL/src/G4OpenGLImmediateQtViewer.cc
r1122 r1124 50 50 { 51 51 52 #ifdef G4DEBUG_VIS_OGL 53 printf("G4OpenGLImmediateQtViewer::Creation...................before.............%d x %d\n",width(),height()); 54 #endif 55 56 52 57 #if QT_VERSION < 0x040000 53 58 setFocusPolicy(QWidget::StrongFocus); // enable keybord events … … 72 77 CreateFontLists (); 73 78 79 #ifdef G4DEBUG_VIS_OGL 80 printf("G4OpenGLImmediateQtViewer::Initialize...................after.............%d x %d\n",width(),height()); 81 #endif 74 82 fReadyToPaint = true; 75 83 } … … 289 297 printf("\n\nG4OpenGLImmediateQtViewer::paintGL ??\n"); 290 298 #endif 299 #ifdef G4DEBUG_VIS_OGL 300 printf("G4OpenGLImediateQtViewer::PaintGL................................%d x %d\n",width(),height()); 301 #endif 291 302 if (!fReadyToPaint) { 292 303 fReadyToPaint= true; -
trunk/source/visualization/OpenGL/src/G4OpenGLQtViewer.cc
r1122 r1124 135 135 foreach (QWidget *widget, QApplication::allWidgets()) { 136 136 if ((found== false) && (widget->inherits("QMainWindow"))) { 137 #ifdef G4DEBUG_VIS_OGL 138 printf("G4OpenGLQtViewer::CreateMainWindow on top of ................................%d\n",widget); 139 #endif 137 140 fGLWindow = new QDialog(0,Qt::WindowTitleHint | Qt::WindowSystemMenuHint | Qt::WindowMinMaxButtonsHint); 138 141 found = true; 142 #ifdef G4DEBUG_VIS_OGL 143 printf("G4OpenGLQtViewer::CreateMainWindow after creation................................%d x %d should equal %d x %d\n",fGLWindow->width(),fGLWindow->height(),getWinWidth(), getWinHeight()); 144 #endif 145 fGLWindow->resize(432,245); 146 #ifdef G4DEBUG_VIS_OGL 147 int sw = 0; 148 int sh = 0; 149 if (!fGLWindow->isMaximized() && !fGLWindow->isFullScreen()) { 150 sw = fGLWindow->normalGeometry().width(); 151 sh = fGLWindow->normalGeometry().height(); 152 } else { 153 sw = fGLWindow->frameGeometry().width(); 154 sh = fGLWindow->frameGeometry().height(); 155 } 156 printf("G4OpenGLQtViewer::CreateMainWindow after creation-> set size................................%d x %d should equal %d x %d\n",sw,sh,432,245); 157 158 #endif 139 159 } 140 160 } 141 161 #endif 162 163 #ifdef G4DEBUG_VIS_OGL 164 printf("G4OpenGLQtViewer::CreateMainWindow TOP................................%d x %d\n",fGLWindow->width(),fGLWindow->height()); 165 #endif 166 #ifdef G4DEBUG_VIS_OGL 167 printf("G4OpenGLQtViewer::CreateMainWindow................................%d x %d\n",glWidget->width(),glWidget->height()); 168 #endif 169 142 170 143 171 #if QT_VERSION < 0x040000 … … 181 209 YPos = offset; 182 210 } 211 #ifdef G4DEBUG_VIS_OGL 212 printf("G4OpenGLQtViewer::CreateMainWindow before size................................%d x %d should equal %d x %d\n",fGLWindow->width(),fGLWindow->height(),getWinWidth(), getWinHeight()); 213 #endif 183 214 fGLWindow->resize(getWinWidth(), getWinHeight()); 215 #ifdef G4DEBUG_VIS_OGL 216 printf("G4OpenGLQtViewer::CreateMainWindow TOP end................................%d x %d should equal %d x %d\n",fGLWindow->width(),fGLWindow->height(),getWinWidth(), getWinHeight()); 217 #endif 218 219 220 fGLWindow->resize(432,245); 221 #ifdef G4DEBUG_VIS_OGL 222 printf("G4OpenGLQtViewer::CreateMainWindow TOP end 2................................%d x %d should equal %d x %d\n",fGLWindow->width(),fGLWindow->height(),432,245); 223 #endif 184 224 fGLWindow->move(fVP.GetWindowAbsoluteLocationHintX(QApplication::desktop()->width()),YPos); 185 225 fGLWindow->show(); 226 #ifdef G4DEBUG_VIS_OGL 227 printf("G4OpenGLQtViewer::CreateMainWindow TOP end after show................................%d x %d\n",fGLWindow->width(),fGLWindow->height()); 228 #endif 186 229 187 230 if(!fWindow) return; 188 231 #ifdef G4DEBUG_VIS_OGL 189 printf("G4OpenGLQtViewer::CreateMainWindow glWidget END \n");232 printf("G4OpenGLQtViewer::CreateMainWindow glWidget END ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\n"); 190 233 #endif 191 234 … … 1433 1476 void G4OpenGLQtViewer::FinishView() 1434 1477 { 1435 #ifdef G4DEBUG_VIS_OGL1436 printf("G4OpenGLQtViewer::FinishView\n");1437 #endif1438 1478 glFlush (); 1439 GLint renderMode; 1440 glGetIntegerv(GL_RENDER_MODE, &renderMode); 1441 if (renderMode == GL_RENDER) printf("G4OpenGLQtViewer::FinishView RENDER !!!!\n"); 1442 else printf("G4OpenGLQtViewer::FinishView not RENDER !!!!\n"); 1443 1444 // THIS IF ALLREADY DONE BY THE paintEvent() function 1445 // Who call it, I don't know... 1446 1447 fWindow->swapBuffers (); 1479 // fWindow->swapBuffers (); 1448 1480 } 1449 1481 … … 1819 1851 if (event->key() == Qt::Key_Plus) { 1820 1852 fVP.SetZoomFactor(fVP.GetZoomFactor()*(1+fDeltaZoom)); 1821 #ifdef G4DEBUG_VIS_OGL1822 printf("G4OpenGLQtViewer::KeyPressEvent zoomFactor=%f\n",fVP.GetZoomFactor()*(1+fDeltaZoom));1823 #endif1824 1853 updateQWidget(); 1825 1854 } -
trunk/source/visualization/OpenGL/src/G4OpenGLStoredQtViewer.cc
r1123 r1124 33 33 34 34 #ifdef G4VIS_BUILD_OPENGLQT_DRIVER 35 #define QT_STORE_46_DBG 1 36 #define QT_STORE_46_DBG_INIT 1 37 #define QT_STORE_46_DBG_COMPUTE 1 seul ok 38 //#define QT_STORE_46_DBG_RESIZE 1 resize et compute ok 39 //#define QT_STORE_46_DBG_PAINT 1 40 41 #include "G4VViewer.hh" 35 42 36 #include "G4OpenGLStoredQtViewer.hh" 43 #include "G4OpenGLStoredSceneHandler.hh"44 37 45 38 #include "G4ios.hh" … … 51 44 G4OpenGLViewer (sceneHandler), 52 45 G4OpenGLQtViewer (sceneHandler), 53 G4OpenGLStoredViewer (sceneHandler) // FIXME : gerer le pb du parent ! 54 { 46 G4OpenGLStoredViewer (sceneHandler), // FIXME : gerer le pb du parent ! 47 QGLWidget() 48 { 49 #ifdef G4DEBUG_VIS_OGL 50 printf("G4OpenGLStoredQtViewer::Creation...................before.............%d x %d\n",width(),height()); 51 #endif 55 52 56 53 #if QT_VERSION < 0x040000 … … 76 73 #endif 77 74 fReadyToPaint = false; 75 #ifdef G4DEBUG_VIS_OGL 76 printf("G4OpenGLStoredQtViewer::Initialize...................before.............%d x %d\n",width(),height()); 77 #endif 78 78 CreateMainWindow (this,QString(fName)); 79 #ifdef G4DEBUG_VIS_OGL 80 printf("G4OpenGLStoredQtViewer::Initialize...................after.............%d x %d\n",width(),height()); 81 #endif 79 82 CreateFontLists (); 80 83 … … 82 85 } 83 86 84 #ifdef QT_STORE_46_DBG_INIT85 void G4OpenGLStoredQtViewer::initializeGL () {86 glShadeModel(GL_SMOOTH); // Enable Smooth Shading87 glClearColor(0.0f, 0.0f, 0.0f, 0.5f); // Black Background88 glClearDepth(1.0f); // Depth Buffer Setup89 glEnable(GL_DEPTH_TEST); // Enables Depth Testing90 glDepthFunc(GL_LEQUAL); // The Type Of Depth Testing To Do91 glHint(GL_PERSPECTIVE_CORRECTION_HINT, GL_NICEST); // Really Nice Perspective Calculations92 93 94 95 box=glGenLists(1);96 glNewList(box,GL_COMPILE);97 glBegin(GL_QUADS);98 //carré rouge99 glColor3ub(255,0,0);100 glVertex3d(9,9,0);101 glVertex3d(9,0,0);102 glVertex3d(0,0,0);103 glVertex3d(0,9,0);104 //carré vert105 glColor3ub(0,255,0);106 glVertex3d(9,9,0);107 glVertex3d(18,9,0);108 glVertex3d(18,0,0);109 glVertex3d(9,0,0);110 //carré vert111 glColor3ub(0,255,0);112 glVertex3d(0,18,0);113 glVertex3d(9,18,0);114 glVertex3d(9,9,0);115 glVertex3d(0,9,0);116 //carré bleu117 glColor3ub(0,0,255);118 glVertex3d(18,18,0);119 glVertex3d(18,9,0);120 glVertex3d(9,9,0);121 glVertex3d(9,18,0);122 //carré bleu123 glColor3ub(0,0,255);124 glVertex3d(9,0,0);125 glVertex3d(9,9,0);126 glVertex3d(9,9,9);127 glVertex3d(9,0,9);128 //carré blanc129 glColor3ub(255,255,255);130 glVertex3d(9,9,0);131 glVertex3d(0,9,0);132 glVertex3d(0,9,9);133 glVertex3d(9,9,9);134 //carré rouge135 glColor3ub(255,0,0);136 glVertex3d(9,9,9);137 glVertex3d(9,0,9);138 glVertex3d(0,0,9);139 glVertex3d(0,9,9);140 glEnd();141 glEndList();142 return; // Initialization Went OK143 144 }145 #else146 87 void G4OpenGLStoredQtViewer::initializeGL () { 147 88 … … 158 99 glDepthFunc (GL_LEQUAL); 159 100 glDepthMask (GL_TRUE); 160 #ifdef G4DEBUG_VIS_OGL161 printf("glDepthFunc (GL_LEQUAL) G4OpenGLStoredQtViewer\n ");162 printf("glDepthMask (GL_TRUE) G4OpenGLStoredQtViewer\n ");163 #endif164 101 165 102 if (fSceneHandler.GetScene() == 0) { … … 174 111 } 175 112 176 #endif177 113 178 114 void G4OpenGLStoredQtViewer::DrawView () { … … 192 128 } 193 129 194 #ifdef QT_STORE_46_DBG_COMPUTE195 void G4OpenGLStoredQtViewer::ComputeView () {196 makeCurrent();197 ProcessView ();198 glCallList(box);199 200 FinishView ();201 #ifdef G4DEBUG_VIS_OGL202 printf("G4OpenGLStoredQtViewer::ComputeView CALL LIST -%d-\n",doubleBuffer());203 #endif204 }205 #else206 130 void G4OpenGLStoredQtViewer::ComputeView () { 207 131 … … 233 157 HaloingFirstPass (); 234 158 DrawDisplayLists (); 235 #ifdef G4DEBUG_VIS_OGL236 printf("glFlush () G4OpenGLStoredQtViewer\n ");237 #endif238 159 glFlush (); 239 160 … … 283 204 fHasToRepaint =true; 284 205 } 285 #endif286 206 287 207 … … 289 209 - Lors du resize de la fenetre, on doit non pas redessiner le detecteur, mais aussi les evenements 290 210 */ 291 #ifdef QT_STORE_46_DBG_RESIZE292 211 void G4OpenGLStoredQtViewer::resizeGL( 293 212 int aWidth … … 295 214 { 296 215 #ifdef G4DEBUG_VIS_OGL 297 printf("G4OpenGLStoredQtViewer::my resizeGL\n"); 216 printf("G4OpenGLStoredQtViewer::resizeEvent..%d x %d vvvvvv\n",aWidth,aHeight); 217 #endif 218 #ifdef G4DEBUG_VIS_OGL 219 printf("G4OpenGLStoredQtViewer::resizeEvent size ? %d x %d\n",width(),height()); 298 220 #endif 299 221 // Set new size, it will be update when next Repaint()->SetView() called 300 if (2 == 1) { 301 if (aHeight==0) 302 { 303 aHeight=1; 304 } 305 306 glViewport(0,0,aWidth,aHeight); 307 308 glMatrixMode(GL_PROJECTION); 309 glLoadIdentity(); 310 311 // Calculate The Aspect Ratio Of The Window 312 gluPerspective(45.0f,(GLfloat)aWidth/(GLfloat)aHeight,0.1f,100.0f); 313 314 glMatrixMode(GL_MODELVIEW); 315 glLoadIdentity(); 316 } else { 317 int side = qMin(aWidth, aHeight); 318 glViewport((aWidth - side) / 2, (aHeight - side) / 2, side, side); 319 320 glMatrixMode(GL_PROJECTION); 321 glLoadIdentity(); 322 glOrtho(-0.5, +0.5, -0.5, +0.5, 4.0, 15.0); 323 glMatrixMode(GL_MODELVIEW); 324 } 325 } 326 #else 327 void G4OpenGLStoredQtViewer::resizeGL( 328 int aWidth 329 ,int aHeight) 330 { 331 #ifdef G4DEBUG_VIS_OGL 332 printf("G4OpenGLStoredQtViewer::resizeGL\n"); 333 #endif 334 // Set new size, it will be update when next Repaint()->SetView() called 335 336 // ResizeWindow(aWidth,aHeight); 337 338 339 340 // SetView(); // en test ....................... 341 // ResizeGLView(); // en test ....................... 342 343 344 345 222 ResizeWindow(aWidth,aHeight); 346 223 fHasToRepaint = sizeHasChanged(); 347 } 348 #endif 349 350 351 #ifdef QT_STORE_46_DBG_PAINT 352 void G4OpenGLStoredQtViewer::paintGL() 353 { 354 #ifdef G4DEBUG_VIS_OGL 355 printf("G4OpenGLStoredQtViewer::paintGL Immediate\n"); 356 #endif 357 glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT); 358 glMatrixMode(GL_MODELVIEW); 359 glLoadIdentity(); 360 gluLookAt(15,15,15,0,0,0,0,0,1); 361 362 glBegin(GL_QUADS); 363 //carré rouge 364 glColor3ub(255,0,0); 365 glVertex3d(9,9,0); 366 glVertex3d(9,0,0); 367 glVertex3d(0,0,0); 368 glVertex3d(0,9,0); 369 //carré vert 370 glColor3ub(0,255,0); 371 glVertex3d(9,9,0); 372 glVertex3d(18,9,0); 373 glVertex3d(18,0,0); 374 glVertex3d(9,0,0); 375 //carré vert 376 glColor3ub(0,255,0); 377 glVertex3d(0,18,0); 378 glVertex3d(9,18,0); 379 glVertex3d(9,9,0); 380 glVertex3d(0,9,0); 381 //carré bleu 382 glColor3ub(0,0,255); 383 glVertex3d(18,18,0); 384 glVertex3d(18,9,0); 385 glVertex3d(9,9,0); 386 glVertex3d(9,18,0); 387 //carré bleu 388 glColor3ub(0,0,255); 389 glVertex3d(9,0,0); 390 glVertex3d(9,9,0); 391 glVertex3d(9,9,9); 392 glVertex3d(9,0,9); 393 //carré blanc 394 glColor3ub(255,255,255); 395 glVertex3d(9,9,0); 396 glVertex3d(0,9,0); 397 glVertex3d(0,9,9); 398 glVertex3d(9,9,9); 399 //carré rouge 400 glColor3ub(255,0,0); 401 glVertex3d(9,9,9); 402 glVertex3d(9,0,9); 403 glVertex3d(0,0,9); 404 glVertex3d(0,9,9); 405 glEnd(); 406 } 407 408 #else 224 #ifdef G4DEBUG_VIS_OGL 225 printf("G4OpenGLStoredQtViewer::resizeEvent.. ^^^^^^^^\n"); 226 #endif 227 } 228 229 409 230 void G4OpenGLStoredQtViewer::paintGL() 410 231 { … … 420 241 // EXECEPT WHEN MOUSE MOVE EVENT 421 242 if ( !fHasToRepaint) { 243 #ifdef G4DEBUG_VIS_OGL 244 printf("G4OpenGLStoredQtViewer::paintGL size ? %d x %d\n",width(),height()); 245 #endif 246 #ifdef G4DEBUG_VIS_OGL 247 printf("G4OpenGLStoredQtViewer::paintGL %d = %d %d = %d\n",getWinWidth(),width(),getWinHeight(),height()); 248 int sw = 0; 249 int sh = 0; 250 if (!isMaximized() && !isFullScreen()) { 251 sw = normalGeometry().width(); 252 sh = normalGeometry().height(); 253 } else { 254 sw = frameGeometry().width(); 255 sh = frameGeometry().height(); 256 } 257 printf("G4OpenGLStoredQtViewer::paintGL ................................%d x %d \n",sw,sh); 258 259 #endif 422 260 if (((getWinWidth() == (unsigned int)width())) &&(getWinHeight() == (unsigned int) height())) { 423 261 return; … … 436 274 437 275 #ifdef G4DEBUG_VIS_OGL 438 printf("G4OpenGLStoredQtViewer::paintGL ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ready %d\n\n\n\n\n\n\n",fReadyToPaint); 439 #endif 440 } 441 442 #endif 276 printf("G4OpenGLStoredQtViewer::paintGL ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ready %d\n",fReadyToPaint); 277 #endif 278 } 443 279 444 280 void G4OpenGLStoredQtViewer::mousePressEvent(QMouseEvent *event) 445 281 { 446 parentWidget ()->resize(60,89); 447 // G4MousePressEvent(event); 282 G4MousePressEvent(event); 448 283 } 449 284 … … 487 322 { 488 323 #ifdef G4DEBUG_VIS_OGL 489 printf("G4OpenGLStoredQtViewer::paintEvent...................repaint............. \n");324 printf("G4OpenGLStoredQtViewer::paintEvent...................repaint.............%d x %d\n",width(),height()); 490 325 #endif 491 326 QGLWidget::paintEvent(event); … … 494 329 void G4OpenGLStoredQtViewer::updateQWidget() { 495 330 fHasToRepaint= true; 496 #ifdef G4DEBUG_VIS_OGL497 printf("G4OpenGLStoredQtViewer::updateQWidget\n");498 #endif499 331 updateGL(); 500 332 fHasToRepaint= false; -
trunk/source/visualization/OpenGL/src/G4OpenGLViewer.cc
r1121 r1124 107 107 void G4OpenGLViewer::InitializeGLView () 108 108 { 109 #ifdef G4DEBUG_VIS_OGL110 printf("G4OpenGLViewer::InitializeGLView\n");111 #endif112 109 glClearColor (0.0, 0.0, 0.0, 0.0); 113 110 glClearDepth (1.0); … … 116 113 glDisable (GL_POLYGON_SMOOTH); 117 114 118 #ifdef G4DEBUG_VIS_OGL119 printf("glClearColor (0.0, 0.0, 0.0, 0.0); G4OpenGLViewer\n ");120 printf("glClearDepth (1.0); G4OpenGLViewer\n ");121 printf("glDisable (GL_BLEND); G4OpenGLViewer\n ");122 printf("glDisable (GL_LINE_SMOOTH); G4OpenGLViewer\n ");123 printf("glDisable (GL_POLYGON_SMOOTH); G4OpenGLViewer\n ");124 #endif125 126 115 fWinSize_x = fVP.GetWindowSizeHintX(); 127 116 fWinSize_y = fVP.GetWindowSizeHintY(); 128 #ifdef G4DEBUG_VIS_OGL129 printf("G4OpenGLViewer::InitializeGLView END\n");130 #endif131 117 } 132 118 … … 149 135 #endif 150 136 glFlush (); 137 } 138 139 140 void G4OpenGLViewer::ResizeWindow(unsigned int aWidth, unsigned int aHeight) { 151 141 #ifdef G4DEBUG_VIS_OGL 152 printf("glClearColor (...); G4OpenGLViewer\n "); 153 printf("glClearDepth (1.0); G4OpenGLViewer\n "); 154 printf("glDisable (GL_COLOR_BUFFER_BIT); G4OpenGLViewer\n "); 155 printf("glDisable (GL_DEPTH_BUFFER_BIT); G4OpenGLViewer\n "); 156 printf("glDisable (GL_STENCIL_BUFFER_BIT); G4OpenGLViewer\n "); 142 printf("G4OpenGLViewer::ResizeWindow %d x %d\n",aWidth, aHeight); 157 143 #endif 158 }159 160 161 void G4OpenGLViewer::ResizeWindow(unsigned int aWidth, unsigned int aHeight) {162 144 if ((fWinSize_x != aWidth) || (fWinSize_y != aHeight)) { 163 145 fWinSize_x = aWidth; … … 167 149 fSizeHasChanged = false; 168 150 } 151 #ifdef G4DEBUG_VIS_OGL 152 printf("G4OpenGLViewer::ResizeWindow END changed=%d %d x %d\n",fSizeHasChanged,fWinSize_x,fWinSize_y); 153 #endif 169 154 } 170 155 … … 224 209 #endif 225 210 glViewport(X, Y, side, side); 226 #ifdef G4DEBUG_VIS_OGL227 printf("glViewport(%d, %d, %d, %d); G4OpenGLViewer\n ",X,Y,side,side);228 #endif229 211 // glViewport(0, 0, fWinSize_x,fWinSize_y); 230 212
Note: See TracChangeset
for help on using the changeset viewer.