Changeset 790 for trunk/geant4/visualization/OpenGL/src

Timestamp:

Apr 30, 2008, 6:30:42 PM (16 years ago)

Author:

garnier

Message:

r818@wl-72126: garnier | 2008-04-30 12:42:00 +0200
modif mise a jour sur le cvs

Location:

trunk/geant4/visualization/OpenGL/src

Files:

• G4OpenGLQtViewer.cc (modified) (4 diffs)
• G4OpenGLStoredQtViewer.cc (modified) (2 diffs)
• G4OpenGLStoredSceneHandler.cc (modified) (2 diffs)

trunk/geant4/visualization/OpenGL/src/G4OpenGLQtViewer.cc

@@ -25 +25 @@
 //
 //
-// $Id: G4OpenGLQtViewer.cc,v 1.22 2008/03/14 09:42:04 lgarnier Exp $
+// $Id: G4OpenGLQtViewer.cc,v 1.23 2008/04/29 16:58:04 lgarnier Exp $
 // GEANT4 tag $Name:  $
 //
@@ -36 +36 @@
 #ifdef G4VIS_BUILD_OPENGLQT_DRIVER
 
-#define GEANT4_QT_DEBUG
+//#define GEANT4_QT_DEBUG
 
 #include "G4OpenGLQtViewer.hh"
@@ -53 +53 @@
 #include "G4UImanager.hh"
 #include "G4UIcommandTree.hh"
-#include <qapplication.h>
 #include <qlayout.h>
 #include <qdialog.h>
 #include <qprocess.h>
+#include <qapplication.h>
 
 #if QT_VERSION >= 0x040000
@@ -311 +311 @@
 {
 
+  // launch Qt if not
+  G4Qt* interactorManager = G4Qt::getInstance ();
+
   initMovieParameters();
 
 #ifdef GEANT4_QT_DEBUG
-  printf("G4OpenGLQtViewer::G4OpenGLQtViewer \n");
+  printf("G4OpenGLQtViewer::G4OpenGLQtViewer END\n");
 #endif
 }

trunk/geant4/visualization/OpenGL/src/G4OpenGLStoredQtViewer.cc

@@ -25 +25 @@
 //
 //
-// $Id: G4OpenGLStoredQtViewer.cc,v 1.13 2008/03/11 16:31:09 lgarnier Exp $
+// $Id: G4OpenGLStoredQtViewer.cc,v 1.14 2008/04/29 16:58:04 lgarnier Exp $
 // GEANT4 tag $Name:  $
 //
@@ -93 +93 @@
 #endif
   readyToPaint = true;
-  
-  // First Draw
-  SetView();
-#ifdef GEANT4_QT_DEBUG
-  printf("    ClearView\n");
-#endif
-  ClearView (); //ok, put the background correct
-  FinishView();
 }
 

trunk/geant4/visualization/OpenGL/src/G4OpenGLStoredSceneHandler.cc

@@ -25 +25 @@
 //
 //
-// $Id: G4OpenGLStoredSceneHandler.cc,v 1.37 2008/04/04 13:32:22 allison Exp $
+// $Id: G4OpenGLStoredSceneHandler.cc,v 1.38 2008/04/28 16:19:39 allison Exp $
 // GEANT4 tag $Name:  $
 //
@@ -55 +55 @@
 #include "G4AttHolder.hh"
 
-G4OpenGLStoredSceneHandler::G4OpenGLStoredSceneHandler (G4VGraphicsSystem& system,
-                                          const G4String& name):
+G4OpenGLStoredSceneHandler::PO::PO
+(G4int id,
+ const G4Transform3D& tr):
+  fDisplayListId(id),
+  fTransform(tr),
+  fPickName(0)
+{}
+
+G4OpenGLStoredSceneHandler::TO::TO
+(G4int id,
+ const G4Transform3D& tr):
+  fDisplayListId(id),
+  fTransform(tr),
+  fPickName(0),
+  fStartTime(-DBL_MAX),
+  fEndTime(DBL_MAX)
+{}
+
+G4OpenGLStoredSceneHandler::G4OpenGLStoredSceneHandler
+(G4VGraphicsSystem& system,
+ const G4String& name):
 G4OpenGLSceneHandler (system, fSceneIdCount++, name),
 fMemoryForDisplayLists (true),