Changeset 1038 for trunk/source/visualization/management

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/management/src

Files:

• G4VSceneHandler.cc (modified) (6 diffs)
• G4VisManager.cc (modified) (8 diffs)
• G4VisStateDependent.cc (modified) (1 diff)

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;
 }