Changeset 561 for trunk/geant4/visualization/management/src

Timestamp:

Aug 14, 2007, 12:27:44 PM (17 years ago)

Author:

garnier

Message:

r563@mac-90108: laurentgarnier | 2007-08-14 12:28:16 +0200
mise a jour suite au plantage de svk (cheksum error) suite au crash du DD en juin

Location:

trunk/geant4/visualization/management/src

Files:

• G4VSceneHandler.cc (modified) (2 diffs)
• G4VisStateDependent.cc (modified) (1 diff)

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

@@ -566 +566 @@
       if (events) nKeptEvents = events->size();
       if (runManager) {
+          printf("G4VSceneHandler::ProcessScene 4 : run manager OK\n");
         if (fpScene->GetRefreshAtEndOfEvent()) {
-
-          printf("G4VSceneHandler::ProcessScene 4 : fpScene->GetRefreshAtEndOfEvent()\n");
-//        if (verbosity >= G4VisManager::confirmations) {
-//          G4cout << "Refreshing event..." << G4endl;
-//        }
-//        const G4Event* event = 0;
-//        if (events && events->size()) event = events->back();
-//        if (event) DrawEvent(event);
-
-//      } else {  // Accumulating events.
-//   printf("G4VSceneHandler::ProcessScene 7\n");
-
-//        if (verbosity >= G4VisManager::confirmations) {
-//          G4cout << "Refreshing events in run..." << G4endl;
-//        }
-//        for (size_t i = 0; i < nKeptEvents; ++i) {
-//          const G4Event* event = (*events)[i];
-//          if (event) DrawEvent(event);
-//        }
-
-//        if (!fpScene->GetRefreshAtEndOfRun()) {
-//          if (verbosity >= G4VisManager::warnings) {
-//            G4cout <<
-//              "WARNING: Cannot refresh events accumulated over more"
-//              "\n  than one runs.  Refreshed just the last run..."
-//                   << G4endl;
-//          }
-//        }
+          printf("G4VSceneHandler::ProcessScene 5 : fpScene->GetRefreshAtEndOfEvent()\n");
+
+          if (verbosity >= G4VisManager::confirmations) {
+            G4cout << "Refreshing event..." << G4endl;
+          }
+          const G4Event* event = 0;
+          if (events && events->size()) event = events->back();
+          if (event) DrawEvent(event);
+
+        } else {  // Accumulating events.
+  printf("G4VSceneHandler::ProcessScene 7\n");
+
+          if (verbosity >= G4VisManager::confirmations) {
+            G4cout << "Refreshing events in run..." << G4endl;
+          }
+          for (size_t i = 0; i < nKeptEvents; ++i) {
+            const G4Event* event = (*events)[i];
+            if (event) DrawEvent(event);
+          }
+
+          if (!fpScene->GetRefreshAtEndOfRun()) {
+            if (verbosity >= G4VisManager::warnings) {
+              G4cout <<
+                "WARNING: Cannot refresh events accumulated over more"
+                "\n  than one runs.  Refreshed just the last run..."
+                     << G4endl;
+            }
+          }
         }
       }
@@ -607 +608 @@
 void G4VSceneHandler::DrawEvent(const G4Event* event)
 {
+  printf("G4VSceneHandler::DrawEvent \n");
   const std::vector<G4VModel*>& EOEModelList =
     fpScene -> GetEndOfEventModelList ();

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

@@ -46 +46 @@
   }
   else if (previousState == G4State_EventProc &&  requestedState == G4State_GeomClosed) {
+    printf("G4VisStateDependent::EndOfEvent \n");
     fpVisManager -> EndOfEvent ();
   }