- Timestamp:
- May 7, 2009, 4:41:04 PM (15 years ago)
- Location:
- trunk/source/visualization/OpenGL
- Files:
-
- 9 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/source/visualization/OpenGL/History
r1023 r1036 1 $Id: History,v 1.13 6 2009/04/27 16:02:50 allisonExp $1 $Id: History,v 1.139 2009/05/06 13:51:21 lgarnier Exp $ 2 2 ------------------------------------------------------------------- 3 3 … … 20 20 History file for visualization/OpenGL 21 21 ------------------------------------- 22 6 May 2009, Laurent Garnier 23 - G4OpenGLQtViewer.cc: Fix compilation warning and error with gcc4.4 24 25 28th April 2009, John Allison 26 - G4OpenGLViewerMessenger.cc: Added return statement at end of every 27 "if (command == ..." statement. (Because of test for OGLS, it is 28 not elegant to use "if...else if...else" structure.) 29 22 30 28th April 2009, Laurent Garnier 23 31 - G4OpenGLXViewer,G4OpenGLViewer : End of moving printEPS and associated … … 26 34 - Remove debug methods 27 35 - Add check in SetView() method 36 - G4OpenGLViewer : Add a glReadBuffer before glReadPixel in grabPixel method 28 37 29 38 8th April 2009, Laurent Garnier -
trunk/source/visualization/OpenGL/include/G4OpenGLXViewer.hh
r1008 r1036 25 25 // 26 26 // 27 // $Id: G4OpenGLXViewer.hh,v 1.3 1 2009/04/08 16:55:44 lgarnier Exp $27 // $Id: G4OpenGLXViewer.hh,v 1.32 2009/04/28 14:33:04 lgarnier Exp $ 28 28 // GEANT4 tag $Name: $ 29 29 // -
trunk/source/visualization/OpenGL/src/G4OpenGLQtViewer.cc
r1029 r1036 25 25 // 26 26 // 27 // $Id: G4OpenGLQtViewer.cc,v 1. 39 2009/03/31 17:14:42lgarnier Exp $27 // $Id: G4OpenGLQtViewer.cc,v 1.40 2009/05/06 13:51:21 lgarnier Exp $ 28 28 // GEANT4 tag $Name: $ 29 29 // … … 1275 1275 void G4OpenGLQtViewer::actionSaveImage() { 1276 1276 QString filters; 1277 const char * tst =".";1278 fPrintFilename += "." + std::string(tst);1279 1277 #if QT_VERSION < 0x040000 1280 1278 QStrList listFormat=QImageIO::outputFormats(); -
trunk/source/visualization/OpenGL/src/G4OpenGLSceneHandler.cc
r1009 r1036 436 436 //Method for handling G4Polyhedron objects for drawing solids. 437 437 void G4OpenGLSceneHandler::AddPrimitive (const G4Polyhedron& polyhedron) { 438 439 438 // Assume all facets are planar convex quadrilaterals. 440 439 // Draw each facet individually … … 445 444 if (fpViewer->GetViewParameters().IsPicking()) { 446 445 G4AttHolder* holder = new G4AttHolder; 447 LoadAtts(polyhedron, holder); 446 const G4Visible vis; 447 printf ("G4OpenGLSceneHandler::AddPrimitives poly %d",&polyhedron); 448 LoadAtts(vis, holder); 449 // LoadAtts(polyhedron, holder); 448 450 fPickMap[fPickName] = holder; 449 451 } -
trunk/source/visualization/OpenGL/src/G4OpenGLStoredSceneHandler.cc
r980 r1036 332 332 // gets into the display list 333 333 AddPrimitivePreamble(polyhedron); 334 printf("G4OpenGLStoredSceneHandler::AddPrimitive :\n"); 334 335 G4OpenGLSceneHandler::AddPrimitive(polyhedron); 335 336 AddPrimitivePostamble(); -
trunk/source/visualization/OpenGL/src/G4OpenGLViewer.cc
r1023 r1036 25 25 // 26 26 // 27 // $Id: G4OpenGLViewer.cc,v 1.5 3 2009/04/08 16:55:44 lgarnier Exp $27 // $Id: G4OpenGLViewer.cc,v 1.54 2009/04/28 14:33:04 lgarnier Exp $ 28 28 // GEANT4 tag $Name: $ 29 29 // … … 198 198 void G4OpenGLViewer::SetView () { 199 199 200 #ifdef G4DEBUG_VIS_OGL 201 printf("G4OpenGLViewer::SetView\n"); 202 #endif 200 203 if (!fSceneHandler.GetScene()) { 201 204 G4cerr << "G4OpenGLStoredViewer: Creating a Viewer without a scene is not allowed. \nPlease use /vis/scene/create before /vis/open/.... " … … 336 339 background = fVP.GetBackgroundColour (); 337 340 341 #ifdef G4DEBUG_VIS_OGL 342 printf("G4OpenGLViewer::SetView END\n"); 343 #endif 338 344 } 339 345 … … 615 621 } 616 622 623 width=8192; 624 height=8192; 625 617 626 if (!fGL2PSAction) return false; 618 627 … … 624 633 fWinSize_x = width; 625 634 fWinSize_y = height; 626 glReadBuffer(GL_FRONT);627 635 ResizeGLView(); 628 636 if (fGL2PSAction->enableFileWriting()) { -
trunk/source/visualization/OpenGL/src/G4OpenGLXViewer.cc
r1023 r1036 25 25 // 26 26 // 27 // $Id: G4OpenGLXViewer.cc,v 1.5 2 2009/04/08 16:55:44 lgarnier Exp $27 // $Id: G4OpenGLXViewer.cc,v 1.54 2009/04/28 14:33:04 lgarnier Exp $ 28 28 // GEANT4 tag $Name: $ 29 29 // -
trunk/source/visualization/OpenGL/src/G4OpenGLXmViewer.cc
r1023 r1036 64 64 G4StateManager* stateManager = G4StateManager::GetStateManager(); 65 65 G4ApplicationState state = stateManager->GetCurrentState(); 66 //if (state == G4State_Idle) {66 // if (state == G4State_Idle) { 67 67 #ifdef G4DEBUG_VIS_OGL 68 68 printf("G4OpenGLXmViewer::ShowView LOOOOOOOOOOOOOOOPPPPPPPPPPP\n"); 69 69 #endif 70 70 G4Xt::getInstance () -> SecondaryLoop (); 71 // }72 71 #ifdef G4DEBUG_VIS_OGL 73 printf("G4OpenGLXmViewer::ShowView END ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\n"); 72 printf("G4OpenGLXmViewer::ShowView LOOOOOOOOOOOOOOOPPPPPPPPPPP END\n"); 73 #endif 74 // } 75 #ifdef G4DEBUG_VIS_OGL 76 printf("G4OpenGLXmViewer::Showiew END ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\n"); 74 77 #endif 75 78 } -
trunk/source/visualization/OpenGL/src/G4OpenGLXmWindowHandlingCallbacks.cc
r975 r1036 42 42 XtPointer x) 43 43 { 44 #ifdef G4DEBUG_VIS_OGL 45 printf("G4OpenGLXmViewer::resize_callback\n"); 46 #endif 44 47 expose_callback(w,clientData,x); 45 48 } … … 64 67 glXMakeCurrent (pView->dpy, XtWindow(pView->glxarea), pView->cx); 65 68 66 pView->SetView (); 67 pView->ClearView (); 69 #ifdef G4DEBUG_VIS_OGL 70 printf("G4OpenGLXmViewer::expose_callback\n"); 71 #endif 72 pView->SetView (); 73 // pView->ClearView (); 68 74 pView->DrawView (); 69 75 }
Note: See TracChangeset
for help on using the changeset viewer.