Changeset 1130

Timestamp:

Oct 14, 2009, 3:40:50 PM (15 years ago)

Author:

garnier

Message:

update

Location:

trunk/source/visualization/OpenGL

Files:

• History (modified) (2 diffs)
• include/G4OpenGLImmediateQtViewer.hh (modified) (1 diff)
• include/G4OpenGLStoredQtViewer.hh (modified) (1 diff)
• src/G4OpenGLImmediateQtViewer.cc (modified) (3 diffs)

trunk/source/visualization/OpenGL/History

@@ -1 @@
-$Id: History,v 1.147 2009/09/29 21:28:51 allison Exp $
+$Id: History,v 1.148 2009/10/14 13:27:30 lgarnier Exp $
 -------------------------------------------------------------------
 
@@ -19 +19 @@
 13 October 2009 Laurent Garnier
  - G4OpenGLImmediateQtViewer/StoredQtViewer : some cleaning
-++ - G4OpenGLImmediateQtViewer : Remove picking to true at initialisation 
-++ - G4OpenGLQtViewer :  Fix a drawing problem on mac OS X 10.6
- - G4OpenGLSceneHandler.cc : Fix a compilation error on mac OS X 10.5.8
-++ - G4OpenGLStoredQtViewer.cc : Fix a problem on width() and height() methods
-   on mac OSX 10.6 and Qt4.6(devel version).
-??   - G4OpenGLXmViewer.cc : send an exposure event at each resize event.
-?? - G4OpenGLXmWindowHandlingCallbacks.cc
  
 29 September 2009  John Allison  (opengl-V09-02-07)

trunk/source/visualization/OpenGL/include/G4OpenGLImmediateQtViewer.hh

@@ -25 +25 @@
 //
 //
-// $Id: G4OpenGLImmediateQtViewer.hh,v 1.5 2009/02/04 16:48:40 lgarnier Exp $
+// $Id: G4OpenGLImmediateQtViewer.hh,v 1.6 2009/10/14 13:27:30 lgarnier Exp $
 // GEANT4 tag $Name:  $
 //

trunk/source/visualization/OpenGL/include/G4OpenGLStoredQtViewer.hh

@@ -25 +25 @@
 //
 //
-// $Id: G4OpenGLStoredQtViewer.hh,v 1.8 2009/02/04 16:48:40 lgarnier Exp $
+// $Id: G4OpenGLStoredQtViewer.hh,v 1.9 2009/10/14 13:27:30 lgarnier Exp $
 // GEANT4 tag $Name:  $
 //

trunk/source/visualization/OpenGL/src/G4OpenGLImmediateQtViewer.cc

@@ -34 +34 @@
 #ifdef G4VIS_BUILD_OPENGLQT_DRIVER
 
-#include "G4VViewer.hh"
 #include "G4OpenGLImmediateQtViewer.hh"
 #include "G4OpenGLImmediateSceneHandler.hh"
@@ -71 +70 @@
   CreateFontLists ();
 
-#ifdef G4DEBUG_VIS_OGL
-  printf("G4OpenGLImmediateQtViewer::Initialize...................after.............%d x %d\n",width(),height());
-#endif
   fReadyToPaint = true;
 }
@@ -186 +182 @@
   printf("\n\nG4OpenGLImmediateQtViewer::paintGL ??\n");
 #endif
-#ifdef G4DEBUG_VIS_OGL
-  printf("G4OpenGLImediateQtViewer::PaintGL................................%d x %d\n",width(),height());
-#endif
   if (!fReadyToPaint) {
     fReadyToPaint= true;