Changeset 1009 for trunk/source/visualization/OpenGL

Timestamp:

Apr 22, 2009, 11:50:38 AM (15 years ago)

Author:

garnier

Message:

correction du bug de beomOn Bloquant

Location:

trunk/source/visualization/OpenGL/src

Files:

• G4OpenGLImmediateXmViewer.cc (modified) (1 diff)
• G4OpenGLSceneHandler.cc (modified) (1 diff)
• G4OpenGLXmViewer.cc (modified) (2 diffs)

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

@@ -121 +121 @@
   NeedKernelVisit ();  // Always need to visit G4 kernel.
 
-  // Change G4 State in order to redraw everything even when state is not IDLE
-  G4StateManager* stateManager = G4StateManager::GetStateManager(); 
-  G4ApplicationState oldState = stateManager->GetCurrentState(); 
-  stateManager->SetNewState(G4State_Idle);  
-
   ProcessView ();
 
-  stateManager->SetNewState(oldState);  
   FinishView ();
 

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

@@ -372 +372 @@
 
    } else { // Size specified in screen (window) coordinates.
-     glPointSize (size*centre.x());       
+     glPointSize (size);       
      glBegin (GL_POINTS);
      glVertex3f(centre.x(),centre.y(),centre.z());

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

@@ -48 +48 @@
 #include "G4OpenGLXmSliderBar.hh"
 
+#include "G4StateManager.hh"
+
 #include "G4Xt.hh"
 #include <X11/Shell.h>
@@ -54 +56 @@
 #include <Xm/DrawingA.h>
 
+
 #include <sstream>
 
 void G4OpenGLXmViewer::ShowView () {
-
-  G4Xt::getInstance () -> SecondaryLoop ();
-
+#ifdef G4DEBUG_VIS_OGL
+    printf("G4OpenGLXmViewer::ShowView vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv\n");
+#endif
+    G4StateManager* stateManager = G4StateManager::GetStateManager(); 
+    G4ApplicationState state = stateManager->GetCurrentState(); 
+    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");
+#endif
 }