Changeset 1038

Timestamp:

May 12, 2009, 11:04:00 AM (15 years ago)

Author:

garnier

Message:

en test pour les refresh, ne marche pas bien

Location:

trunk/source/visualization

Files:

• OpenGL/include/G4OpenGLViewer.hh (modified) (3 diffs)
• OpenGL/src/G4OpenGLImmediateQtViewer.cc (modified) (8 diffs)
• OpenGL/src/G4OpenGLQtViewer.cc (modified) (1 diff)
• OpenGL/src/G4OpenGLStoredQtViewer.cc (modified) (8 diffs)
• OpenGL/src/G4OpenGLViewer.cc (modified) (4 diffs)
• OpenGL/src/G4OpenGLXmPanningCallbacks.cc (modified) (4 diffs)
• OpenGL/src/G4OpenGLXmRotationCallbacks.cc (modified) (5 diffs)
• OpenGL/src/G4OpenGLXmStyleCallbacks.cc (modified) (8 diffs)
• OpenGL/src/G4OpenGLXmWindowHandlingCallbacks.cc (modified) (2 diffs)
• externals/gl2ps/History (modified) (2 diffs)
• externals/gl2ps/include/G4OpenGL2PSAction.hh (modified) (1 diff)
• externals/gl2ps/src/G4OpenGL2PSAction.cc (modified) (1 diff)
• management/src/G4VSceneHandler.cc (modified) (6 diffs)
• management/src/G4VisManager.cc (modified) (8 diffs)
• management/src/G4VisStateDependent.cc (modified) (1 diff)
• modeling/src/G4LogicalVolumeModel.cc (modified) (2 diffs)
• modeling/src/G4PhysicalVolumeModel.cc (modified) (1 diff)
• test/test19.g4m (modified) (4 diffs)

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

@@ -59 +59 @@
   virtual ~G4OpenGLViewer ();
   void SetView    ();
+  // Set view and lights, resize
+  void RepaintGLView();
+  // Refresh the view if needed
   void HaloingFirstPass ();
   void HaloingSecondPass ();
@@ -66 +69 @@
   void InitializeGLView ();
   void ResizeGLView(unsigned int, unsigned int);
+  // Resize the view and repaint if necessary
   void Pick(GLdouble x, GLdouble y);
   virtual void CreateFontLists () {}
@@ -83 +87 @@
   G4int                             fPrintSizeX;
   G4int                             fPrintSizeY;
+  G4bool                            fNeedRepaint;
+  // 0 : No need to repaint    1: Need Repaint
 
   G4OpenGLSceneHandler& fOpenGLSceneHandler;

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

@@ -56 +56 @@
   setFocusPolicy(Qt::StrongFocus); // enable keybord events
 #endif
-  hasToRepaint =false;
+
+  fNeedRepaint = false;
 
   if (fViewId < 0) return;  // In case error in base class instantiation.
@@ -73 +74 @@
   CreateFontLists ();
 
+#ifdef G4DEBUG_VIS_OGL
+  printf("G4OpenGLImmediateQtViewer::Initialise END\n");
+#endif
   readyToPaint = true;
+#ifdef G4DEBUG_VIS_OGL
+  printf("G4OpenGLImmediateQtViewer::Initialise END 2\n");
+#endif
+
 }
 
 void G4OpenGLImmediateQtViewer::initializeGL () {
+#ifdef G4DEBUG_VIS_OGL
+  printf("G4OpenGLImmediateQtViewer::initializeGL\n");
+#endif
 
   InitializeGLView ();
+#ifdef G4DEBUG_VIS_OGL
+  printf("G4OpenGLImmediateQtViewer::initializeGL middle\n");
+#endif
 
 
@@ -92 +106 @@
 
   if (fSceneHandler.GetScene() == 0) {
-    hasToRepaint =false;
+    fNeedRepaint = false;
   } else {
-    hasToRepaint =true;
-  }
+    fNeedRepaint = true;
+  }
+#ifdef G4DEBUG_VIS_OGL
+  printf("G4OpenGLImmediateQtViewer::initializeGL END\n");
+#endif
 
 }
@@ -106 +123 @@
   printf("G4OpenGLImmediateQtViewer::DrawView  VVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVV\n");
 #endif
-  // That's no the same logic as Stored Viewer, I don't know why...
-  // see G4OpenGLStoredQtViewer::DrawView for more informations
-
-  updateQWidget();
+
+  // avoid problems at initialisation
+  if (readyToPaint) {
+    ComputeView();
+  }
+  
 #ifdef G4DEBUG_VIS_OGL
   printf("G4OpenGLImmediateQtViewer::DrawView  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\n");
@@ -152 +171 @@
   printf("G4OpenGLImmediateQtViewer::ComputeView  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ \n");
 #endif
-  hasToRepaint = true;
+  fNeedRepaint = false;
 }
 
@@ -175 +194 @@
 ,int aHeight)
 {  
+#ifdef G4DEBUG_VIS_OGL
+  printf("\n\nG4OpenGLImmediateQtViewer::resizeGL VVVVVV %d %d ??\n",aWidth,aHeight);
+#endif
   ResizeGLView(aWidth,aHeight);
-  //  hasToRepaint = true;
+#ifdef G4DEBUG_VIS_OGL
+  printf("\n\nG4OpenGLImmediateQtViewer::resizeGL END\n");
+#endif
 }
 
@@ -182 +206 @@
 void G4OpenGLImmediateQtViewer::paintGL()
 {
+    
 #ifdef G4DEBUG_VIS_OGL
   printf("\n\nG4OpenGLImmediateQtViewer::paintGL ??\n");
 #endif
-  if (!readyToPaint) {
-    readyToPaint= true;
-    return;
-  }
-  // DO NOT RESIZE IF SIZE HAS NOT CHANGE
-//   if ( !hasToRepaint) {
-//     if (((fWinSize_x == (unsigned int)width())) &&(fWinSize_y == (unsigned int) height())) {
-//       return;
-//     }
-//   }
-#ifdef G4DEBUG_VIS_OGL
-  printf("G4OpenGLImmediateQtViewer::paintGL VVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVV ready %d\n",readyToPaint);
-#endif
-
-  SetView();
-   
-  ClearView (); //ok, put the background correct
-  ComputeView();
-
-  hasToRepaint = false; // could be set to false by ComputeView
-
-#ifdef G4DEBUG_VIS_OGL
-  printf("G4OpenGLImmediateQtViewer::paintGL ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ready %d\n\n\n",readyToPaint);
+  if (fNeedRepaint) {
+#ifdef G4DEBUG_VIS_OGL
+    printf("\n\nG4OpenGLImmediateQtViewer::Need ??\n");
+#endif
+    if (readyToPaint) {
+#ifdef G4DEBUG_VIS_OGL
+  printf("\n\nG4OpenGLImmediateQtViewer::ready ??\n");
+#endif
+      RepaintGLView();
+      fNeedRepaint = false;
+    }
+#ifdef G4DEBUG_VIS_OGL
+    else 
+      printf("\n\nG4OpenGLImmediateQtViewer::NOT ready ??\n");
+#endif
+  }
+#ifdef G4DEBUG_VIS_OGL
+  else
+    printf("\n\nG4OpenGLImmediateQtViewer::NOT need ??\n");
+#endif
+
+#ifdef G4DEBUG_VIS_OGL
+  printf("G4OpenGLImmediateQtViewer::paintGL ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ready\n\n\n");
 #endif
 }
@@ -252 +277 @@
 
 void G4OpenGLImmediateQtViewer::updateQWidget() {
-  hasToRepaint= true;
+  fNeedRepaint = true;
   updateGL();
-  hasToRepaint= false;
+  fNeedRepaint = false;
 }
 

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

@@ -182 +182 @@
     YPos = offset;
   }
-  //  ResizeGLView(fVP.GetWindowSizeHintX(),fVP.GetWindowSizeHintY());
+  GLWindow->resize(getWinWidth(),getWinHeight());
   GLWindow->move(fVP.GetWindowAbsoluteLocationHintX(QApplication::desktop()->width()),YPos);
   GLWindow->show();

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

@@ -57 +57 @@
   setFocusPolicy(Qt::StrongFocus); // enable keybord events
 #endif
-  hasToRepaint =false;
+  fNeedRepaint =false;
 
   if (fViewId < 0) return;  // In case error in base class instantiation.
@@ -78 +78 @@
   
   readyToPaint = true;
+#ifdef G4DEBUG_VIS_OGL
+  printf("G4OpenGLStoredQtViewer::Initialise END\n");
+#endif
 }
 
@@ -96 +99 @@
 
   if (fSceneHandler.GetScene() == 0) {
-    hasToRepaint =false;
+    fNeedRepaint =false;
   } else {
-    hasToRepaint =true;
+    fNeedRepaint =true;
   }
 
@@ -117 +120 @@
   // And we loose the redraw of things !
   
-  ComputeView();
+  // avoid problems at initialisation
+  if (readyToPaint) {
+    ComputeView();
+  }
+
 #ifdef G4DEBUG_VIS_OGL
   printf("G4OpenGLStoredQtViewer::DrawView  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\n");
@@ -197 +204 @@
   printf("G4OpenGLStoredQtViewer::ComputeView ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ \n");
 #endif
-  hasToRepaint =true;
 }
 
@@ -205 +211 @@
 */
 void G4OpenGLStoredQtViewer::resizeGL(
-                                      int aWidth
-                                      ,int aHeight)
+ int aWidth
+,int aHeight)
 {  
   // Set new size, it will be update when next Repaint()->SetView() called
   ResizeGLView(aWidth,aHeight);
-  //  hasToRepaint = true;
+  //  fNeedRepaint = true;
 }
 
@@ -223 +229 @@
     return;
   }
-  // DO NOT RESIZE IF SIZE HAS NOT CHANGE :
-  //    WHEN CLICK ON THE FRAME FOR EXAMPLE
-  //    EXECEPT WHEN MOUSE MOVE EVENT
-//   if ( !hasToRepaint) {
-//     if (((fWinSize_x == (unsigned int)width())) &&(fWinSize_y == (unsigned int) height())) {
-//       return;
-//     }
-//   }
-#ifdef G4DEBUG_VIS_OGL
-  printf("G4OpenGLStoredQtViewer::paintGL VVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVV ready %d\n",readyToPaint);
-#endif
-
-  SetView();
-          
-  ClearView (); //ok, put the background correct
-  ComputeView();
-     
-  hasToRepaint =false;
-     
+  RepaintGLView();
+
 #ifdef G4DEBUG_VIS_OGL
   printf("G4OpenGLStoredQtViewer::paintGL ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ready %d\n",readyToPaint);
@@ -288 +277 @@
 
 void G4OpenGLStoredQtViewer::updateQWidget() {
-  hasToRepaint= true;
+  fNeedRepaint= true;
   updateGL();
-  hasToRepaint= false;
+  fNeedRepaint= false;
 }
 

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

@@ -137 +137 @@
 void G4OpenGLViewer::ResizeGLView(unsigned int aWidth,unsigned int aHeight)
 {
-  if ((fWinSize_x != aWidth) && (fWinSize_y != aHeight)) {
+  if ((fWinSize_x != aWidth) || (fWinSize_y != aHeight)) {
     fWinSize_x = aWidth;
     fWinSize_y = aHeight;
@@ -144 +144 @@
 }
 
+void G4OpenGLViewer::RepaintGLView()
+{
+  // DO NOT REPAINT IF NO REFRESH IS NEED
+//   if ( !fNeedRepaint) {
+//     return;
+//   }
+#ifdef G4DEBUG_VIS_OGL
+  printf("G4OpenGLViewer::paintGL VVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVV \n");
+#endif
+
+  fNeedRepaint = true; // could be set to false by ComputeView
+  SetView();
+  ClearView ();
+  DrawView();
+
+  fNeedRepaint = false; // could be set to false by ComputeView
+
+#ifdef G4DEBUG_VIS_OGL
+  printf("G4OpenGLViewer::paintGL ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ \n");
+#endif
+
+}
 
 /**
@@ -200 +222 @@
 #endif
   glViewport(X, Y, side, side);
+
+  RepaintGLView();
+
   //    glViewport(0, 0, fWinSize_x,fWinSize_y);  
   
@@ -640 +665 @@
   }
 
-  width=8192;
-  height=8192;
+//   width=8192;
+//   height=8192;
 
   if (!fGL2PSAction) return false;

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

@@ -76 +76 @@
 
   pView->fVP.SetZoomFactor (zoomBy);
-  pView->SetView ();
-  pView->ClearView ();
-  pView -> DrawView ();
+  pView->RepaintGLView ();
 }  
 
@@ -108 +106 @@
 
   pView->fVP.SetDolly (dolly);
-  pView->SetView ();
-  pView->ClearView ();
-  pView->DrawView ();
+  pView->RepaintGLView ();
 
 }  
@@ -157 +153 @@
   pView->fVP.SetCurrentTargetPoint (tp - stp);
 
-  pView->SetView ();
-  pView->ClearView ();
-  pView->DrawView ();
+  pView->RepaintGLView ();
 
   pView->pan_timer = XtAppAddTimeOut 
@@ -207 +201 @@
   pView->fVP.SetCurrentTargetPoint (tp - stp);
   
-  pView->SetView ();
-  pView->ClearView ();
-  pView->DrawView ();
+  pView->RepaintGLView();
 
   pView->pan_timer = XtAppAddTimeOut 

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

@@ -109 +109 @@
   */
 
-  pView->SetView ();
-  pView->ClearView ();
-  pView->DrawView ();
+  pView->RepaintGLView ();
 
   pView->rotation_timer = XtAppAddTimeOut 
@@ -182 +180 @@
 
   */
-  pView->SetView ();
-  pView->ClearView ();
-  pView->DrawView ();
+  pView->RepaintGLView ();
   
   pView->rotation_timer = XtAppAddTimeOut 
@@ -275 +271 @@
   pView->fVP.SetViewAndLights (pView->original_vp + d_up + d_third_axis);
 
-  pView->SetView ();
-  pView->ClearView ();
-  pView->DrawView ();
+  pView->RepaintGLView ();
   
   if (pView->frameNo++ == 20) {
@@ -284 +278 @@
       pView->frameNo = 0;
       pView->fVP.SetViewAndLights (pView->original_vp);
-      pView->SetView ();
-      pView->ClearView ();
-      pView->DrawView ();
+      pView->RepaintGLView();
    }
   } else {
@@ -311 +303 @@
   pView->fVP.SetZoomFactor(1.0);
   pView->fVP.SetDolly(0.0);
-  pView->SetView ();
+  pView->RepaintGLView();
   pView->ClearView ();
   pView->DrawView ();

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

@@ -75 +75 @@
   pView->fVP.SetDrawingStyle (style);
   
-  pView->SetView ();
-  pView->ClearView ();
-  pView->DrawView ();
+  pView->RepaintGLView();
 }
 
@@ -108 +106 @@
   pView->fVP.SetRepStyle (style);
 
-  pView->SetView ();
-  pView->ClearView ();
-  pView->DrawView ();
+  pView->RepaintGLView ();
 }
 
@@ -145 +141 @@
   }
 
-  pView->SetView ();
-  pView->ClearView ();
-  pView->DrawView ();
+  pView->RepaintGLView ();
 }
 
@@ -175 +169 @@
 
   pView->SetNeedKernelVisit (true);
-  pView->SetView ();
-  pView->ClearView ();
-  pView->DrawView ();
+  pView->RepaintGLView ();
 }
 
@@ -210 +202 @@
   }
 
-  pView->SetView ();
-  pView->ClearView ();
-  pView->DrawView ();
+  pView->RepaintGLView ();
 }
 
@@ -239 +229 @@
   }
 
-  pView->SetView ();
-  pView->ClearView ();
-  pView->DrawView ();
+  pView->RepaintGLView ();
 }
 
@@ -269 +257 @@
 
   pView->SetNeedKernelVisit (true);
-  pView->SetView ();
-  pView->ClearView ();
-  pView->DrawView ();
+  pView->RepaintGLView ();
 }
 
@@ -306 +292 @@
   }
 
-  pView->SetView ();
-  pView->ClearView ();
-  pView->DrawView ();
+  pView->RepaintGLView();
 }  
 

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

@@ -63 +63 @@
 
   pView->ResizeGLView((G4int) width,(G4int) height);
+  // will call  pView->RepaintGLView() if necessary;
 
   glXMakeCurrent (pView->dpy, XtWindow(pView->glxarea), pView->cx);
@@ -69 +70 @@
   printf("G4OpenGLXmViewer::expose_callback\n");
 #endif
-  // FIXME : L.Garnier 11 Mai 2009 : Should be erase
-  pView->SetView ();
-  pView->ClearView ();
-  pView->DrawView ();
-  // ENDOF Fixme
 
 }

trunk/source/visualization/externals/gl2ps/History

@@ -1 @@
-$Id: History,v 1.7 2009/04/27 15:29:46 allison Exp $
+$Id: History,v 1.8 2009/04/29 09:37:55 lgarnier Exp $
 -------------------------------------------------------------------
 
@@ -17 +17 @@
      * Reverse chronological order (last date on top), please *
      ----------------------------------------------------------
+
+29 April 2009, Laurent Garnier
+ - G4OpenGL2PSAction : Fix a circular dependency to G4OpenGL on Linux
 
 27 April 2009, Laurent Garnier (visexternal-V09-02-03)

trunk/source/visualization/externals/gl2ps/include/G4OpenGL2PSAction.hh

@@ -24 +24 @@
 // ********************************************************************
 //
-// $Id: G4OpenGL2PSAction.hh,v 1.2 2009/04/08 15:26:59 lgarnier Exp $
+// $Id: G4OpenGL2PSAction.hh,v 1.3 2009/04/29 09:37:55 lgarnier Exp $
 // GEANT4 tag $Name:  $
 //

trunk/source/visualization/externals/gl2ps/src/G4OpenGL2PSAction.cc

@@ -25 +25 @@
 //
 //
-// $Id: G4OpenGL2PSAction.cc,v 1.3 2009/03/19 11:59:35 lgarnier Exp $
+// $Id: G4OpenGL2PSAction.cc,v 1.4 2009/04/29 09:37:55 lgarnier Exp $
 // GEANT4 tag $Name:  $
 //

trunk/source/visualization/management/src/G4VSceneHandler.cc

@@ -451 +451 @@
     if (pPolyhedron) {
       pPolyhedron -> SetVisAttributes (fpVisAttribs);
+      printf("G4VSceneHandler::RequestPrimitives VSolid: %d\n",pPolyhedron);
+      G4cout <<
+        "G4VSceneHandler::RequestPrimitives VSolid " << solid.GetName () <<G4endl;
       AddPrimitive (*pPolyhedron);
     }
@@ -565 +568 @@
 
     if (visManager->GetRequestedEvent()) {
+#ifdef G4DEBUG_VIS_MANAGEMENT
+      printf("G4VSceneHandler::ProcessScene : DrawEvent\n");
+#endif
       DrawEvent(visManager->GetRequestedEvent());
 
     } else {
 
+#ifdef G4DEBUG_VIS_MANAGEMENT
+      printf("G4VSceneHandler::ProcessScene : no event\n");
+#endif
       G4RunManager* runManager = G4RunManager::GetRunManager();
       if (runManager) {
+#ifdef G4DEBUG_VIS_MANAGEMENT
+        printf("G4VSceneHandler::ProcessScene : runManager\n");
+#endif
         const G4Run* run = runManager->GetCurrentRun();
         const std::vector<const G4Event*>* events =
@@ -578 +590 @@
         if (nKeptEvents) {
 
+#ifdef G4DEBUG_VIS_MANAGEMENT
+        printf("G4VSceneHandler::ProcessScene : 1\n");
+#endif
           if (fpScene->GetRefreshAtEndOfEvent()) {
+#ifdef G4DEBUG_VIS_MANAGEMENT
+        printf("G4VSceneHandler::ProcessScene : 2\n");
+#endif
 
             if (verbosity >= G4VisManager::confirmations) {
@@ -588 +606 @@
 
           } else {  // Accumulating events.
+#ifdef G4DEBUG_VIS_MANAGEMENT
+        printf("G4VSceneHandler::ProcessScene : 3\n");
+#endif
 
             if (verbosity >= G4VisManager::confirmations) {
@@ -593 +614 @@
             }
             for (size_t i = 0; i < nKeptEvents; ++i) {
+#ifdef G4DEBUG_VIS_MANAGEMENT
+        printf("G4VSceneHandler::ProcessScene : 4\n");
+#endif
               const G4Event* event = (*events)[i];
               if (event) DrawEvent(event);
@@ -598 +622 @@
 
             if (!fpScene->GetRefreshAtEndOfRun()) {
+#ifdef G4DEBUG_VIS_MANAGEMENT
+        printf("G4VSceneHandler::ProcessScene : 5\n");
+#endif
               if (verbosity >= G4VisManager::warnings) {
                 G4cout <<

trunk/source/visualization/management/src/G4VisManager.cc

@@ -1243 +1243 @@
 void G4VisManager::EndOfEvent ()
 {
+  printf("G4VisManager::EndOfEvent \n");
+
   //G4cout << "G4VisManager::EndOfEvent" << G4endl;
 
@@ -1258 +1260 @@
   if (!currentEvent) return;
 
+  // FIXME : OK
+  printf("G4VisManager::EndOfEvent 0\n");
   ClearTransientStoreIfMarked();
+  printf("G4VisManager::EndOfEvent 1\n");
+  // FIXME : OK
   fpSceneHandler->DrawEvent(currentEvent);
 
@@ -1264 +1270 @@
   G4int nKeptEvents = 0;
   G4int eventID = -2;  // (If no run manager, triggers ShowView as normal.)
+  printf("G4VisManager::EndOfEvent 2\n");
   if (currentRun) {
+    printf("G4VisManager::EndOfEvent currentRun?\n");
     nEventsToBeProcessed = currentRun->GetNumberOfEventToBeProcessed();
     eventID = currentEvent->GetEventID();
@@ -1271 +1279 @@
     if (events) nKeptEvents = events->size();
   }
-
+  
   if (fpScene->GetRefreshAtEndOfEvent()) {
+    printf("G4VisManager::EndOfEvent GetRefreshAtEndOfEvent()\n");
 
     // Unless last event (in which case wait end of run)...
     if (eventID < nEventsToBeProcessed - 1) {
+      printf("G4VisManager::EndOfEvent 3 \n");
       fpViewer->ShowView();
       fpSceneHandler->SetMarkForClearingTransientStore(true);
     } else {  // Last event...
+      printf("G4VisManager::EndOfEvent 4 \n");
       // Keep, but only if user has not kept any...
       if (!nKeptEvents) {
@@ -1287 +1298 @@
 
   } else {  //  Accumulating events...
+  printf("G4VisManager::EndOfEvent NOT GetRefreshAtEndOfEvent()\n");
 
     G4int maxNumberOfKeptEvents = fpScene->GetMaxNumberOfKeptEvents();
     if (maxNumberOfKeptEvents > 0 && nKeptEvents >= maxNumberOfKeptEvents) {
+      printf("G4VisManager::EndOfEvent 5 \n");
       fEventKeepingSuspended = true;
       static G4bool warned = false;
       if (!warned) {
+        printf("G4VisManager::EndOfEvent 6 \n");
         if (fVerbosity >= warnings) {
+          printf("G4VisManager::EndOfEvent 7 \n");
           G4cout <<
             "WARNING: G4VisManager::EndOfEvent: Event keeping suspended."
@@ -1303 +1318 @@
       }
     } else if (maxNumberOfKeptEvents != 0) {
+      printf("G4VisManager::EndOfEvent 8 \n");
       eventManager->KeepTheCurrentEvent();
     }
   }
+  printf("G4VisManager::EndOfEvent 9 \n");
 }
 
@@ -1311 +1328 @@
 {
   //G4cout << "G4VisManager::EndOfRun" << G4endl;
-
+  printf("G4VisManager::EndOfRun 1\n");
   // Don't call IsValidView unless there is a scene handler.  This
   // avoids WARNING message at end of event and run when the user has
   // not instantiated a scene handler, e.g., in batch mode.
   G4bool valid = GetConcreteInstance() && fpSceneHandler && IsValidView();
+  printf("G4VisManager::EndOfRun 2\n");
   if (valid) {
+  printf("G4VisManager::EndOfRun 3\n");
     if (!fpSceneHandler->GetMarkForClearingTransientStore()) {
+  printf("G4VisManager::EndOfRun 4\n");
       if (fpScene->GetRefreshAtEndOfRun()) {
+  printf("G4VisManager::EndOfRun 5\n");
         fpViewer->ShowView();
+  printf("G4VisManager::EndOfRun 6\n");
         fpSceneHandler->SetMarkForClearingTransientStore(true);
-      }
-    }
-
+  printf("G4VisManager::EndOfRun 7\n");
+      }
+    }
+
+  printf("G4VisManager::EndOfRun 8\n");
     if (fEventKeepingSuspended && fVerbosity >= warnings) {
       G4cout <<
@@ -1337 +1361 @@
   fEventRefreshing = false;
 
+  printf("++++++++++++++++++++++++++++++++++++++++++++++++++++++++\n");
   G4RunManager* runManager = G4RunManager::GetRunManager();
   const G4Run* currentRun = runManager->GetCurrentRun();

trunk/source/visualization/management/src/G4VisStateDependent.cc

@@ -37 +37 @@
 
 G4bool G4VisStateDependent::Notify (G4ApplicationState requestedState) {
+#ifdef G4DEBUG_VIS_MANAGEMENT
+    printf("G4VisStateDependent::Notify  vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv\n");
+#endif
   G4StateManager* stateManager = G4StateManager::GetStateManager();
   G4ApplicationState previousState = stateManager->GetPreviousState();
   if (previousState == G4State_Idle  &&  requestedState == G4State_GeomClosed) {
+#ifdef G4DEBUG_VIS_MANAGEMENT
+    printf("G4VisStateDependent::Notify BeginOfRun \n");
+#endif
     fpVisManager -> BeginOfRun ();
   }
   else if (previousState == G4State_GeomClosed &&  requestedState == G4State_EventProc) {
+#ifdef G4DEBUG_VIS_MANAGEMENT
+    printf("G4VisStateDependent::Notify BeginOfEvent \n");
+#endif
     fpVisManager -> BeginOfEvent ();
   }
   else if (previousState == G4State_EventProc &&  requestedState == G4State_GeomClosed) {
+#ifdef G4DEBUG_VIS_MANAGEMENT
+    printf("G4VisStateDependent::Notify EndOfEvent \n");
+#endif
     fpVisManager -> EndOfEvent ();
   }
   else if (previousState == G4State_GeomClosed &&  requestedState == G4State_Idle) {
+#ifdef G4DEBUG_VIS_MANAGEMENT
+    printf("G4VisStateDependent::Notify EndOfRun -----------------------------------------------------------------------------\n");
+#endif
     fpVisManager -> EndOfRun ();
+#ifdef G4DEBUG_VIS_MANAGEMENT
+    printf("G4VisStateDependent::Notify EndOfRun -----------------------------------------XXXXXXXXXXXXXXXXXXXX-----------------\n");
+#endif
   }
+#ifdef G4DEBUG_VIS_MANAGEMENT
+    printf("G4VisStateDependent::Notify G4VisStateDependent::Notify END ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\n");
+#endif
   return true;
 }

trunk/source/visualization/modeling/src/G4LogicalVolumeModel.cc

@@ -96 +96 @@
       // Add Voxels.
       G4DrawVoxels dv;
+
+      // FIXME : LG 1 May 2009 : return a pointer...should be destroy by the compiler
       G4PlacedPolyhedronList* pPPL =
         dv.CreatePlacedPolyhedra (fpTopPV -> GetLogicalVolume ());
@@ -102 +104 @@
         const G4Polyhedron& polyhedron = (*pPPL)[i].GetPolyhedron ();
         sceneHandler.BeginPrimitives (transform);
-        sceneHandler.AddPrimitive (polyhedron);
+        printf("G4LogicalVolumeModel::DescribeYourselfTo BEFORE ADD %d\n",fpTopPV -> GetLogicalVolume ());
+        if (&polyhedron) {
+          printf("G4LogicalVolumeModel::DescribeYourselfTo  poly FAILED\n");
+        } else {
+          printf("G4LogicalVolumeModel::DescribeYourselfTo  poly OK\n");
+        }
+        sceneHandler.AddPrimitive (polyhedron);
+        printf("G4LogicalVolumeModel::DescribeYourselfTo AFTER ADD\n");
         sceneHandler.EndPrimitives ();
       }

trunk/source/visualization/modeling/src/G4PhysicalVolumeModel.cc

@@ -761 +761 @@
   }
   values->push_back(G4AttValue("PVPath", oss.str(),""));
+  if (fpCurrentLV) {
+    printf("G4PhysicalVolumeModel::CreateCurrentAttValues OK\n");
+  } else {
+    printf("G4PhysicalVolumeModel::CreateCurrentAttValues Failed\n");
+  }
   values->push_back(G4AttValue("LVol", fpCurrentLV->GetName(),""));
   G4VSolid* pSol = fpCurrentLV->GetSolid();

trunk/source/visualization/test/test19.g4m

@@ -41 +41 @@
 #/vis/sceneHandler/create OGLSXm
 #/vis/sceneHandler/create OGLIX
-/vis/sceneHandler/create OGLSX
+/vis/sceneHandler/create OGLSQt
 #/vis/sceneHandler/create VRML1
 #/vis/sceneHandler/create VRML1FILE
@@ -106 +106 @@
 /vis/scene/create
 /vis/scene/add/logicalVolume expHall_L
-/vis/sceneHandler/create OGLSXm
+/vis/sceneHandler/create OGLSQt
 /vis/viewer/create
 /vis/viewer/set/viewpointThetaPhi 35 35
@@ -115 +115 @@
 /vis/scene/create
 /vis/scene/add/logicalVolume intersection_L
-/vis/sceneHandler/create OGLSXm
+/vis/sceneHandler/create OGLSQt
 /vis/viewer/create
 /vis/viewer/reset
@@ -143 +143 @@
 /vis/scene/add/trajectories 5000
 #/vis/sceneHandler/create OGLSX
-/vis/sceneHandler/create OGLSXm
+/vis/sceneHandler/create OGLSQt
 /vis/viewer/create
 /vis/viewer/reset