Changeset 790 for trunk/geant4/visualization
- Timestamp:
- Apr 30, 2008, 6:30:42 PM (16 years ago)
- Location:
- trunk/geant4/visualization/OpenGL
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/geant4/visualization/OpenGL/GNUmakefile
r789 r790 1 # $Id: GNUmakefile,v 1. 7 2008/01/15 11:05:08lgarnier Exp $1 # $Id: GNUmakefile,v 1.8 2008/04/29 16:58:04 lgarnier Exp $ 2 2 3 3 name := G4OpenGL -
trunk/geant4/visualization/OpenGL/History
r789 r790 1 $Id: History,v 1.11 2 2008/04/04 13:32:22 allisonExp $1 $Id: History,v 1.114 2008/04/29 16:58:04 lgarnier Exp $ 2 2 ------------------------------------------------------------------- 3 3 … … 21 21 ------------------------------------- 22 22 23 2 2th April 2008 Laurent Garnier23 28th April 2008 Laurent Garnier 24 24 - Add better moc control/compilation step in GNUmakefile 25 - Fix a problem when launching QT VIS without QT UI (N02 for example) 26 27 28th April 2008 John Allison (opengl-V09-01-02) 28 - G4OpenGLStoredSceneHandler: Tidied constructors of nested classes. 25 29 26 30 4th April 2008 John Allison (opengl-V09-01-01) -
trunk/geant4/visualization/OpenGL/include/G4OpenGLStoredSceneHandler.hh
r789 r790 25 25 // 26 26 // 27 // $Id: G4OpenGLStoredSceneHandler.hh,v 1.2 6 2008/04/04 13:32:22allison Exp $27 // $Id: G4OpenGLStoredSceneHandler.hh,v 1.27 2008/04/28 16:19:40 allison Exp $ 28 28 // GEANT4 tag $Name: $ 29 29 // … … 87 87 GLint fTopPODL; // List which calls the other PODLs. 88 88 struct PO { 89 PO(G4int id, const G4Transform3D& tr = G4Transform3D()): 90 fDisplayListId(id), fTransform(tr), fPickName(0) {} 89 PO(G4int id, const G4Transform3D& tr = G4Transform3D()); 91 90 G4int fDisplayListId; 92 91 G4Transform3D fTransform; … … 97 96 // TO = Transparent Object. 98 97 struct TO { 99 TO(G4int id, const G4Transform3D& tr = G4Transform3D()): 100 fDisplayListId(id), fTransform(tr), fPickName(0), 101 fStartTime(-DBL_MAX), fEndTime(DBL_MAX) {} 98 TO(G4int id, const G4Transform3D& tr = G4Transform3D()); 102 99 G4int fDisplayListId; 103 100 G4Transform3D fTransform; -
trunk/geant4/visualization/OpenGL/src/G4OpenGLQtViewer.cc
r778 r790 25 25 // 26 26 // 27 // $Id: G4OpenGLQtViewer.cc,v 1.2 2 2008/03/14 09:42:04 lgarnier Exp $27 // $Id: G4OpenGLQtViewer.cc,v 1.23 2008/04/29 16:58:04 lgarnier Exp $ 28 28 // GEANT4 tag $Name: $ 29 29 // … … 36 36 #ifdef G4VIS_BUILD_OPENGLQT_DRIVER 37 37 38 #define GEANT4_QT_DEBUG38 //#define GEANT4_QT_DEBUG 39 39 40 40 #include "G4OpenGLQtViewer.hh" … … 53 53 #include "G4UImanager.hh" 54 54 #include "G4UIcommandTree.hh" 55 #include <qapplication.h>56 55 #include <qlayout.h> 57 56 #include <qdialog.h> 58 57 #include <qprocess.h> 58 #include <qapplication.h> 59 59 60 60 #if QT_VERSION >= 0x040000 … … 311 311 { 312 312 313 // launch Qt if not 314 G4Qt* interactorManager = G4Qt::getInstance (); 315 313 316 initMovieParameters(); 314 317 315 318 #ifdef GEANT4_QT_DEBUG 316 printf("G4OpenGLQtViewer::G4OpenGLQtViewer \n");319 printf("G4OpenGLQtViewer::G4OpenGLQtViewer END\n"); 317 320 #endif 318 321 } -
trunk/geant4/visualization/OpenGL/src/G4OpenGLStoredQtViewer.cc
r754 r790 25 25 // 26 26 // 27 // $Id: G4OpenGLStoredQtViewer.cc,v 1.1 3 2008/03/11 16:31:09lgarnier Exp $27 // $Id: G4OpenGLStoredQtViewer.cc,v 1.14 2008/04/29 16:58:04 lgarnier Exp $ 28 28 // GEANT4 tag $Name: $ 29 29 // … … 93 93 #endif 94 94 readyToPaint = true; 95 96 // First Draw97 SetView();98 #ifdef GEANT4_QT_DEBUG99 printf(" ClearView\n");100 #endif101 ClearView (); //ok, put the background correct102 FinishView();103 95 } 104 96 -
trunk/geant4/visualization/OpenGL/src/G4OpenGLStoredSceneHandler.cc
r789 r790 25 25 // 26 26 // 27 // $Id: G4OpenGLStoredSceneHandler.cc,v 1.3 7 2008/04/04 13:32:22allison Exp $27 // $Id: G4OpenGLStoredSceneHandler.cc,v 1.38 2008/04/28 16:19:39 allison Exp $ 28 28 // GEANT4 tag $Name: $ 29 29 // … … 55 55 #include "G4AttHolder.hh" 56 56 57 G4OpenGLStoredSceneHandler::G4OpenGLStoredSceneHandler (G4VGraphicsSystem& system, 58 const G4String& name): 57 G4OpenGLStoredSceneHandler::PO::PO 58 (G4int id, 59 const G4Transform3D& tr): 60 fDisplayListId(id), 61 fTransform(tr), 62 fPickName(0) 63 {} 64 65 G4OpenGLStoredSceneHandler::TO::TO 66 (G4int id, 67 const G4Transform3D& tr): 68 fDisplayListId(id), 69 fTransform(tr), 70 fPickName(0), 71 fStartTime(-DBL_MAX), 72 fEndTime(DBL_MAX) 73 {} 74 75 G4OpenGLStoredSceneHandler::G4OpenGLStoredSceneHandler 76 (G4VGraphicsSystem& system, 77 const G4String& name): 59 78 G4OpenGLSceneHandler (system, fSceneIdCount++, name), 60 79 fMemoryForDisplayLists (true),
Note: See TracChangeset
for help on using the changeset viewer.