Changeset 1170 for trunk/source/visualization/management/src/G4VisManager.cc

Timestamp:

Nov 16, 2009, 4:56:12 PM (15 years ago)

Author:

garnier

Message:

update contre CVS

File:

• trunk/source/visualization/management/src/G4VisManager.cc (modified) (20 diffs)

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

@@ -24 +24 @@
 // ********************************************************************
 //
-// $Id: G4VisManager.cc,v 1.121 2009/10/30 16:03:41 allison Exp $
+// $Id: G4VisManager.cc,v 1.122 2009/11/04 12:58:00 allison Exp $
 // GEANT4 tag $Name:  $
 //
@@ -87 +87 @@
   fpSceneHandler   (0),
   fpViewer         (0),
-  fVerbosity       (all),//warnings),
+  fVerbosity       (warnings),
   fpStateDependent (0),
   fEventRefreshing          (false),
@@ -98 +98 @@
   // All other objects use default constructors.
 {
-
-#ifdef G4DEBUG_VIS_MANAGEMENT
-  printf("G4VisManager::G4VisManager\n");
-#endif
   fpTrajDrawModelMgr = new G4VisModelManager<G4VTrajectoryModel>("/vis/modeling/trajectories");
   fpTrajFilterMgr = new G4VisFilterManager<G4VTrajectory>("/vis/filtering/trajectories");
@@ -178 +174 @@
 
 G4VisManager::~G4VisManager () {
+  printf("G4VisManager::~G4VisManager DELETING \n");
   fpInstance = 0;
   size_t i;
   for (i = 0; i < fSceneList.size (); ++i) {
+    printf("G4VisManager::~G4VisManager DELETING 1 \n");
     delete fSceneList[i];
   }
   for (i = 0; i < fAvailableSceneHandlers.size (); ++i) {
+  printf("G4VisManager::~G4VisManager DELETING 2\n");
+  if (fAvailableSceneHandlers[i] != NULL) {
     delete fAvailableSceneHandlers[i];
   }
+  }
   for (i = 0; i < fAvailableGraphicsSystems.size (); ++i) {
-    delete fAvailableGraphicsSystems[i];
+    printf("G4VisManager::~G4VisManager DELETING 3\n");
+    if (fAvailableGraphicsSystems[i]) {
+      delete fAvailableGraphicsSystems[i];
+    }
   }
   if (fVerbosity >= startup) {
@@ -194 +198 @@
   }
   for (i = 0; i < fMessengerList.size (); ++i) {
+  printf("G4VisManager::~G4VisManager DELETING 4\n");
     delete fMessengerList[i];
   }
   for (i = 0; i < fDirectoryList.size (); ++i) {
+  printf("G4VisManager::~G4VisManager DELETING 5\n");
     delete fDirectoryList[i];
   }
 
+  printf("G4VisManager::~G4VisManager DELETING 6\n");
   delete fpTrajDrawModelMgr;
+  printf("G4VisManager::~G4VisManager DELETING 7\n");
   delete fpTrajFilterMgr;
+  printf("G4VisManager::~G4VisManager DELETING 8\n");
   delete fpHitFilterMgr;
+  printf("G4VisManager::~G4VisManager DELETING 9\n");
 }
 
@@ -379 +389 @@
 }
 
+
+
 const G4VTrajectoryModel*
 G4VisManager::CurrentTrajDrawModel() const
@@ -665 +677 @@
 
 void G4VisManager::CreateViewer (G4String name,G4String XGeometry) {
-  printf("G4VisManager::CreateViewer -------------------- %s ----%s\n",name.c_str(),XGeometry.c_str());
 
   if (!fInitialised) Initialise ();
@@ -674 +685 @@
   }
 
-  printf("G4VisManager::CreateViewer 1-------------------- %s ----%s\n",name.c_str(),XGeometry.c_str());
   G4VViewer* p = fpGraphicsSystem -> CreateViewer (*fpSceneHandler, name);
-  printf("G4VisManager::CreateViewer 2-------------------- %s ----%s\n",name.c_str(),XGeometry.c_str());
 
   if (!p) {
@@ -749 +758 @@
 
 void G4VisManager::GeometryHasChanged () {
-#ifdef G4DEBUG_VIS_MANAGEMENT
-  printf("G4VisManager::GeometryHasChanged \n");
-#endif
   if (fVerbosity >= confirmations) {
     G4cout << "G4VisManager::GeometryHasChanged() called." << G4endl;
@@ -816 +822 @@
   // Check the manager's current scene...
   if (fpScene && fpScene -> GetRunDurationModelList ().size () == 0) {
-#ifdef G4DEBUG_VIS_MANAGEMENT
-  printf("G4VisManager::GeometryHasChanged NO MODELS\n");
-#endif
     if (fVerbosity >= warnings) {
       G4cout << "WARNING: The current scene \""
@@ -827 +830 @@
   }
 
-}
+  }
 void G4VisManager::NotifyHandlers () {
 
-#ifdef G4DEBUG_VIS_MANAGEMENT
-  printf("G4VisManager::NotifyHandlers \n");
-#endif
   if (fVerbosity >= confirmations) {
     G4cout << "G4VisManager::NotifyHandler() called." << G4endl;
@@ -861 +861 @@
   }
 
-#ifdef G4DEBUG_VIS_MANAGEMENT
-  printf("G4VisManager::NotifyHandlers END\n");
-#endif
 }
 
@@ -1266 +1263 @@
 void G4VisManager::EndOfEvent ()
 {
-  printf("G4VisManager::EndOfEvent \n");
-
   //G4cout << "G4VisManager::EndOfEvent" << G4endl;
 
@@ -1283 +1278 @@
   if (!currentEvent) return;
 
-  // FIXME : OK
-  printf("G4VisManager::EndOfEvent 0\n");
   ClearTransientStoreIfMarked();
-  printf("G4VisManager::EndOfEvent 1\n");
-  // FIXME : OK
   fpSceneHandler->DrawEvent(currentEvent);
 
@@ -1293 +1284 @@
   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();
@@ -1302 +1291 @@
     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) {
@@ -1321 +1307 @@
 
   } 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: Automatic event keeping suspended."
@@ -1342 +1324 @@
       }
     } else if (maxNumberOfKeptEvents != 0) {
-      printf("G4VisManager::EndOfEvent 8 \n");
       eventManager->KeepTheCurrentEvent();
     }
   }
-  printf("G4VisManager::EndOfEvent 9 \n");
 }
 
@@ -1352 +1332 @@
 {
   //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");
+        fpSceneHandler->DrawEndOfRunModels();
         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 <<
@@ -1386 +1360 @@
   fEventRefreshing = false;
 
-  printf("++++++++++++++++++++++++++++++++++++++++++++++++++++++++\n");
   G4RunManager* runManager = G4RunManager::GetRunManager();
   const G4Run* currentRun = runManager->GetCurrentRun();