Changeset 959 for trunk/source/visualization
- Timestamp:
- Apr 2, 2009, 3:23:18 PM (16 years ago)
- Location:
- trunk/source/visualization
- Files:
-
- 13 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/source/visualization/GNUmakefile
r944 r959 26 26 27 27 # For Debug mode 28 #CPPFLAGS += -DG4DEBUG_VIS_OGL29 #CPPFLAGS += -DG4DEBUG_VIS_OI30 #CPPFLAGS += -DG4DEBUG_VIS_MANAGEMENT28 CPPFLAGS += -DG4DEBUG_VIS_OGL 29 CPPFLAGS += -DG4DEBUG_VIS_OI 30 CPPFLAGS += -DG4DEBUG_VIS_MANAGEMENT 31 31 32 32 # Libraries which can be used without external packages or libraries... -
trunk/source/visualization/History
r954 r959 1 $Id: History,v 1.43 3 2009/03/19 12:00:11lgarnier Exp $1 $Id: History,v 1.435 2009/04/01 16:34:13 lgarnier Exp $ 2 2 ------------------------------------------------------------------- 3 3 … … 24 24 History file for visualization category 25 25 --------------------------------------- 26 27 1st April 2009 Laurent Garnier (vis-V09-02-01) 28 - opengl-V09-02-01 : Improvments in order to use GL2PS for printing 29 - openinventor-V09-02-01 : Improvments in order to use GL2PS for printing 30 - visexternal-V09-02-01 : Add GL2PS library in external (it was in 31 OpenInventor before) 26 32 27 33 14th March 2009 John Allison … … 56 62 16 February 2009, Laurent Garnier 57 63 - Creation of this gl2ps library in order to have a gl2ps for all viewers. 64 - GNUMakefile : Add the gl2ps external library 58 65 - Some modifications in GNUMakefile for gl2ps. Packages OpenInventor, 59 66 OpenGL had also been modified for gl2ps. -
trunk/source/visualization/OpenGL/History
r951 r959 21 21 ------------------------------------- 22 22 23 24th March 2009, Laurent Garnier ( vis-V09-02-01)23 24th March 2009, Laurent Garnier (opengl-V09-02-01) 24 24 - G4OpenGLViewer : Add a fix and resizing when X/Y size was even (lack of precision 25 25 in a /2) -
trunk/source/visualization/OpenGL/include/G4OpenGLWin32Viewer.hh
r956 r959 26 26 // 27 27 // $Id: G4OpenGLWin32Viewer.hh,v 1.15 2009/02/04 16:48:41 lgarnier Exp $ 28 // GEANT4 tag $Name: HEAD$28 // GEANT4 tag $Name: $ 29 29 // 30 30 // -
trunk/source/visualization/OpenGL/src/G4OpenGLQtViewer.cc
r955 r959 1634 1634 */ 1635 1635 void G4OpenGLQtViewer::rescaleImage( 1636 int /* aWidth*/1637 ,int /* aHeight*/1636 int /* aWidth */ 1637 ,int /* aHeight */ 1638 1638 ){ 1639 1639 // GLfloat* feedback_buffer; -
trunk/source/visualization/OpenGL/src/G4OpenGLStoredSceneHandler.cc
r955 r959 214 214 { 215 215 216 #ifdef G4DEBUG_VIS_OGL 216 217 printf("G4OpenGLStoredSceneHandler::AddPrimitive\n"); 217 218 #endif 218 219 std::vector< G4Polymarker > poly; 219 220 // 40,83 N03 lancement … … 286 287 } 287 288 #endif 289 #ifdef G4DEBUG_VIS_OGL 288 290 printf("G4OpenGLStoredSceneHandler::AddPrimitive new marker list\n"); 291 #endif 289 292 AddPrimitivePreamble(polymarker); 290 293 G4OpenGLSceneHandler::AddPrimitive(polymarker); … … 378 381 void G4OpenGLStoredSceneHandler::EndModeling () { 379 382 // Make a List which calls the other lists. 383 #ifdef G4DEBUG_VIS_OGL 380 384 printf("G4OpenGLStoredSceneHandler::EndModeling Cree une nouvelle liste+++++++++++++++++++++++++++\n"); 385 #endif 381 386 fTopPODL = glGenLists (1); 382 387 if (glGetError() == GL_OUT_OF_MEMORY) { // Could pre-allocate? -
trunk/source/visualization/OpenGL/src/G4OpenGLViewer.cc
r955 r959 115 115 116 116 void G4OpenGLViewer::ClearView () { 117 #ifdef G4DEBUG_VIS_OGL 117 118 printf("G4OpenGLViewer::ClearView\n"); 119 #endif 118 120 glClearColor (background.GetRed(), 119 121 background.GetGreen(), … … 141 143 void G4OpenGLViewer::ResizeGLView() 142 144 { 145 #ifdef G4DEBUG_VIS_OGL 143 146 printf("G4OpenGLViewer::ResizeGLView %d %d\n",fWinSize_x,fWinSize_y); 147 #endif 144 148 // Check size 145 149 GLint dims[2]; … … 182 186 GLint Y = (fWinSize_y - side) / 2; 183 187 188 #ifdef G4DEBUG_VIS_OGL 184 189 printf("G4OpenGLViewer::ResizeGLView X:%d Y:%d W:%d H:%d --side%d\n",(fWinSize_x - side) / 2,(fWinSize_y - side) / 2,fWinSize_x,fWinSize_y,side); 190 #endif 185 191 glViewport(X, Y, side, side); 186 192 // glViewport(0, 0, fWinSize_x,fWinSize_y); -
trunk/source/visualization/OpenGL/src/G4OpenGLXViewer.cc
r955 r959 413 413 void G4OpenGLXViewer::printEPS() { 414 414 415 #ifdef G4DEBUG_VIS_OGL 415 416 printf("G4OpenGLXViewer::print \n"); 417 #endif 416 418 417 419 //using namespace std; … … 541 543 // fGLXWin, 542 544 // cx); 545 #ifdef G4DEBUG_VIS_OGL 543 546 printf("G4OpenGLXViewer::print Restored context:%d old winGL:%d \n",cx,fGLXWin); 547 #endif 544 548 // printf("Error 1:%d 2:%d\n",er1,er2); 545 549 … … 589 593 590 594 595 #ifdef G4DEBUG_VIS_OGL 591 596 printf("------%d------\n",tmp_cx); 597 #endif 592 598 return glXCreateContext (dpy, 593 599 pvi, -
trunk/source/visualization/OpenInventor/src/G4OpenInventorXt.cc
r914 r959 16 16 // * for the full disclaimer and the limitation of liability. * 17 17 // * * 18 // * This code implementation is the result of the scientific and *18 // * This code implementation is the result of the scientific and * 19 19 // * technical work of the GEANT4 collaboration. * 20 20 // * By using, copying, modifying or distributing the software (or * … … 26 26 // 27 27 // $Id: G4OpenInventorXt.cc,v 1.4 2006/06/29 21:22:24 gunter Exp $ 28 // GEANT4 tag $Name: HEAD$28 // GEANT4 tag $Name: $ 29 29 // 30 30 // -
trunk/source/visualization/OpenInventor/src/SoMarkerSet.cc
r931 r959 732 732 delete bitmap; 733 733 } 734 #ifdef G4DEBUG_VIS_OI 734 735 printf("DM %d %d %f %f",w,h,xorig,yorig); 736 #endif 735 737 736 738 if(aAction->isOfType(SoGL2PSAction::getClassTypeId())) { 739 #ifdef G4DEBUG_VIS_OI 737 740 printf(" GL2PS "); 741 #endif 738 742 ((SoGL2PSAction*)aAction)->addBitmap(w-2,h-2,xorig,yorig,xmove,ymove); 739 743 } -
trunk/source/visualization/management/src/G4VSceneHandler.cc
r948 r959 470 470 471 471 void G4VSceneHandler::ProcessScene (G4VViewer&) { 472 473 #ifdef G4DEBUG_VIS_MANAGEMENT 472 474 printf("G4VSceneHandler::ProcessScene : BEGIN\n"); 475 #endif 473 476 474 477 if (!fpScene) return; … … 482 485 fReadyForTransients = false; 483 486 487 #ifdef G4DEBUG_VIS_MANAGEMENT 484 488 printf("G4VSceneHandler::ProcessScene : Before clear store \n"); 489 #endif 485 490 // Clear stored scene, if any, i.e., display lists, scene graphs. 486 491 ClearStore (); … … 503 508 } 504 509 510 #ifdef G4DEBUG_VIS_MANAGEMENT 505 511 printf("G4VSceneHandler::ProcessScene : begin model\n"); 512 #endif 506 513 BeginModeling (); 507 514 … … 544 551 fReadyForTransients = true; 545 552 553 #ifdef G4DEBUG_VIS_MANAGEMENT 546 554 printf("G4VSceneHandler::ProcessScene : Idle ?\n"); 555 #endif 547 556 // Refresh event from end-of-event model list. Allow only in Idle state... 548 557 G4StateManager* stateManager = G4StateManager::GetStateManager(); 549 558 G4ApplicationState state = stateManager->GetCurrentState(); 550 559 if (state == G4State_Idle) { 560 #ifdef G4DEBUG_VIS_MANAGEMENT 551 561 printf("G4VSceneHandler::ProcessScene : IDLE\n"); 562 #endif 552 563 553 564 visManager->SetEventRefreshing(true); -
trunk/source/visualization/management/src/G4VViewer.cc
r948 r959 111 111 void G4VViewer::ProcessView () 112 112 { 113 #ifdef G4DEBUG_VIS_MANAGEMENT 113 114 printf("G4VViewer::ProcessView\n"); 115 #endif 114 116 115 117 // If ClearStore has been requested, e.g., if the scene has changed, … … 119 121 // DrawView)... 120 122 if (fNeedKernelVisit) { 123 #ifdef G4DEBUG_VIS_MANAGEMENT 121 124 printf("G4VViewer::ProcessView : NeedKernelVisit\n"); 125 #endif 122 126 // Reset flag. This must be done before ProcessScene to prevent 123 127 // recursive calls when recomputing transients... -
trunk/source/visualization/modeling/src/G4TrajectoryDrawerUtils.cc
r942 r959 25 25 // 26 26 // $Id: G4TrajectoryDrawerUtils.cc,v 1.12 2009/02/24 12:00:56 allison Exp $ 27 // GEANT4 tag $Name: modeling-V09-02-00$27 // GEANT4 tag $Name: $ 28 28 // 29 29 // Jane Tinslay, John Allison, Joseph Perl November 2005 … … 90 90 91 91 GetPoints(traj, trajectoryLine, auxiliaryPoints, stepPoints); 92 92 93 93 if (lineRequired) { 94 94 G4VisAttributes trajectoryLineAttribs(colour);
Note: See TracChangeset
for help on using the changeset viewer.