Changeset 1238 for trunk/source/visualization/OpenGL/src
- Timestamp:
- Mar 3, 2010, 5:51:36 PM (15 years ago)
- Location:
- trunk/source/visualization/OpenGL/src
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/source/visualization/OpenGL/src/G4OpenGLImmediateSceneHandler.cc
r1125 r1238 157 157 158 158 // See all primitives immediately... 159 glFlush ();159 // glFlush (); 160 160 161 161 G4OpenGLSceneHandler::EndPrimitives (); … … 216 216 void G4OpenGLImmediateSceneHandler::RequestPrimitives (const G4VSolid& solid) 217 217 { 218 #ifdef G4DEBUG_VIS_OGL 219 printf("G4OpenGLImmediateSceneHandler::RequestPrimitives \n"); 220 #endif 218 221 if (fReadyForTransients) { 219 222 // Always draw transient solids, e.g., hits represented as solids. … … 251 254 // Else invoke base class method... 252 255 G4VSceneHandler::RequestPrimitives (solid); 256 #ifdef G4DEBUG_VIS_OGL 257 printf("G4OpenGLImmediateSceneHandler::RequestPrimitives END\n"); 258 #endif 253 259 } 254 260 -
trunk/source/visualization/OpenGL/src/G4OpenGLSceneHandler.cc
r1196 r1238 199 199 { 200 200 #ifdef G4DEBUG_VIS_OGL 201 201 // printf("G4OpenGLSceneHandler::AddPrimitive polymarker"); 202 202 #endif 203 203 G4int nPoints = polymarker.size (); … … 218 218 { 219 219 #ifdef G4DEBUG_VIS_OGL 220 220 // printf(" dots "); 221 221 #endif 222 222 for (size_t iPoint = 0; iPoint < polymarker.size (); iPoint++) { … … 232 232 { 233 233 #ifdef G4DEBUG_VIS_OGL 234 234 // printf(" circle "); 235 235 #endif 236 236 for (size_t iPoint = 0; iPoint < polymarker.size (); iPoint++) { … … 244 244 { 245 245 #ifdef G4DEBUG_VIS_OGL 246 246 // printf(" square "); 247 247 #endif 248 248 for (size_t iPoint = 0; iPoint < polymarker.size (); iPoint++) { … … 256 256 257 257 #ifdef G4DEBUG_VIS_OGL 258 258 // printf(" \n"); 259 259 #endif 260 260 fProcessingPolymarker = false; … … 336 336 if (fpViewer -> GetViewParameters ().IsMarkerNotHidden ()) { 337 337 #ifdef G4DEBUG_VIS_OGL 338 printf("+");338 // printf("+"); 339 339 #endif 340 340 glDisable (GL_DEPTH_TEST); 341 341 } else { 342 342 #ifdef G4DEBUG_VIS_OGL 343 printf("-");343 // printf("-"); 344 344 #endif 345 345 glEnable (GL_DEPTH_TEST); glDepthFunc (GL_LESS);} -
trunk/source/visualization/OpenGL/src/G4OpenGLStoredQtViewer.cc
r1235 r1238 113 113 // And we loose the redraw of things ! 114 114 115 ComputeView(); 116 #ifdef G4DEBUG_VIS_OGL 117 printf("G4OpenGLStoredQtViewer::DrawView ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\n"); 118 #endif 115 // ComputeView(); 116 #ifdef G4DEBUG_VIS_OGL 117 printf("G4OpenGLStoredQtViewer::DrawView ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ llllllllllllllllllllllllllllllll\n"); 118 #endif 119 updateQWidget(); 119 120 } 120 121 … … 218 219 { 219 220 #ifdef G4DEBUG_VIS_OGL 220 printf("G4OpenGLStoredQtViewer::paintGL ready:%d fHasTo:%d?? \n",fReadyToPaint,fHasToRepaint);221 printf("G4OpenGLStoredQtViewer::paintGL ready:%d fHasTo:%d?? context:%d\n",fReadyToPaint,fHasToRepaint,context()); 221 222 #endif 222 223 if (!fReadyToPaint) { … … 252 253 253 254 SetView(); 254 255 255 256 ClearView (); //ok, put the background correct 256 257 ComputeView(); … … 264 265 265 266 void G4OpenGLStoredQtViewer::paintEvent(QPaintEvent *event) { 266 // fHasToRepaint= false; 267 #ifdef G4DEBUG_VIS_OGL 268 printf("\n\nG4OpenGLStoredQtViewer::paintEvent VVVVVVVVV %d\n",fHasToRepaint); 267 #ifdef G4DEBUG_VIS_OGL 268 printf("\n\nG4OpenGLStoredQtViewer::paintEvent VVVVVVVVV %d context : %d\n",fHasToRepaint,context()); 269 269 #endif 270 270 if ( fHasToRepaint) { -
trunk/source/visualization/OpenGL/src/G4OpenGLViewer.cc
r1233 r1238 100 100 // glDisable (GL_LINE_SMOOTH); 101 101 // glDisable (GL_POLYGON_SMOOTH); 102 103 102 } 104 103 … … 238 237 239 238 if (!fSceneHandler.GetScene()) { 240 G4cerr << "G4OpenGLStoredViewer: Creating a Viewer without a scene is not allowed. \nPlease use /vis/scene/create before /vis/open/.... "241 << G4endl;242 239 return; 243 240 } … … 782 779 GLdouble G4OpenGLViewer::getSceneNearWidth() 783 780 { 781 if (!fSceneHandler.GetScene()) { 782 return 0; 783 } 784 784 const G4Point3D targetPoint 785 785 = fSceneHandler.GetScene()->GetStandardTargetPoint() … … 794 794 GLdouble G4OpenGLViewer::getSceneFarWidth() 795 795 { 796 if (!fSceneHandler.GetScene()) { 797 return 0; 798 } 796 799 const G4Point3D targetPoint 797 800 = fSceneHandler.GetScene()->GetStandardTargetPoint() … … 808 811 GLdouble G4OpenGLViewer::getSceneDepth() 809 812 { 813 if (!fSceneHandler.GetScene()) { 814 return 0; 815 } 810 816 const G4Point3D targetPoint 811 817 = fSceneHandler.GetScene()->GetStandardTargetPoint()
Note: See TracChangeset
for help on using the changeset viewer.