Changeset 1023 for trunk/source/visualization/OpenGL

Timestamp:

Apr 28, 2009, 2:57:38 PM (17 years ago)

Author:

garnier

Message:

update before cvs

Location:

trunk/source/visualization/OpenGL

Files:

• History (modified) (3 diffs)
• src/G4OpenGLImmediateXmViewer.cc (modified) (2 diffs)
• src/G4OpenGLViewer.cc (modified) (2 diffs)
• src/G4OpenGLXViewer.cc (modified) (1 diff)
• src/G4OpenGLXmViewer.cc (modified) (2 diffs)

trunk/source/visualization/OpenGL/History

@@ -1 @@
-$Id: History,v 1.135 2009/04/08 16:55:44 lgarnier Exp $
+$Id: History,v 1.136 2009/04/27 16:02:50 allison Exp $
 -------------------------------------------------------------------
 
@@ -20 +20 @@
 History file for visualization/OpenGL
 -------------------------------------
+28th April 2009, Laurent Garnier
+ - G4OpenGLXViewer,G4OpenGLViewer : End of moving printEPS and associated 
+   functions from GLXViewer to GLViewer.   
+ - G4OpenGLXViewer :
+   - Remove debug methods
+   - Add check in SetView() method
 
 8th April 2009, Laurent Garnier
@@ -38 +44 @@
    mode on some windows size
 
-6th April 2009, Joseph Perl (opengl-V09-02-02)
+6th April 2009, Joseph Perl (opengl-V09-02-02, then opengl-V09-02-03)
  - New tag to clean up all of the cases of files that changed only in the cvs id.
 

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

@@ -37 +37 @@
 #include "G4OpenGLImmediateXmViewer.hh"
 #include "G4OpenGLImmediateSceneHandler.hh"
-#include "G4StateManager.hh"
 
 #include "G4ios.hh"
@@ -117 +116 @@
   printf("G4OpenGLImmediateXmViewer::DrawView : need Kernel/Process/Finish\n");
 #endif
-
-
   NeedKernelVisit ();  // Always need to visit G4 kernel.
-
   ProcessView ();
-
   FinishView ();
-
 
 }

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

@@ -49 +49 @@
 #include "G4AttHolder.hh"
 #include "G4AttCheck.hh"
-
-#include "G4OpenGLXViewer.hh"
 
 // GL2PS
@@ -438 +436 @@
   int size;
 
-#ifdef G4DEBUG_VIS_OGL
-  printf("G4OpenGLViewer::grabPixels\n");
-#endif
   if (inColor) {
     format = GL_RGB;

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

@@ -92 +92 @@
 
 void G4OpenGLXViewer::SetView () {
-#ifdef G4DEBUG_VIS_OGL
-    printf("G4OpenGLXViewer::SetView \n");
-#endif
   Bool success = glXMakeCurrent (dpy, win, cx);
   if (!success) {

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

@@ -56 +56 @@
 #include <Xm/DrawingA.h>
 
-
 #include <sstream>
 
@@ -65 +64 @@
     G4StateManager* stateManager = G4StateManager::GetStateManager(); 
     G4ApplicationState state = stateManager->GetCurrentState(); 
-    if (state == G4State_Idle) {
+    //    if (state == G4State_Idle) {
 #ifdef G4DEBUG_VIS_OGL
       printf("G4OpenGLXmViewer::ShowView LOOOOOOOOOOOOOOOPPPPPPPPPPP\n");
 #endif
       G4Xt::getInstance () -> SecondaryLoop ();
-    }
+      //    }
 #ifdef G4DEBUG_VIS_OGL
     printf("G4OpenGLXmViewer::ShowView END ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\n");