Changeset 593 for trunk/geant4/visualization/management/src/G4VisManager.cc

Timestamp:

Nov 9, 2007, 3:32:25 PM (17 years ago)

Author:

garnier

Message:

r627@mac-90108: laurentgarnier | 2007-11-09 07:57:42 +0100
modif dans les includes directives

File:

• trunk/geant4/visualization/management/src/G4VisManager.cc (modified) (15 diffs)

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

@@ -24 +24 @@
 // ********************************************************************
 //
-// $Id: G4VisManager.cc,v 1.109 2006/11/26 15:43:51 allison Exp $
-// GEANT4 tag $Name: geant4-08-02-patch-01 $
+// $Id: G4VisManager.cc,v 1.113 2007/05/25 10:50:26 allison Exp $
+// GEANT4 tag $Name: geant4-09-00-ref-01 $
 //
 // 
@@ -72 +72 @@
 #include "Randomize.hh"
 #include "G4RunManager.hh"
+#include "G4EventManager.hh"
 #include "G4Run.hh"
 #include "G4Event.hh"
@@ -86 +87 @@
   fpSceneHandler   (0),
   fpViewer         (0),
-  fVerbosity       (confirmations),//(warnings),
+  fVerbosity       (warnings),
   fpStateDependent (0),
   fEventRefreshing          (false),
@@ -92 +93 @@
   fTransientsDrawnThisEvent (false),
   fEventKeepingSuspended    (false),
-  fKeptLastEvent            (false)
+  fKeptLastEvent            (false),
+  fpRequestedEvent (0),
+  fAbortReviewKeptEvents    (false)
   // All other objects use default constructors.
 {
@@ -118 +121 @@
   if (fpInstance) {
     G4Exception
-      ("G4VisManager: attempt to Construct more than one VisManager. ");
+      ("G4VisManager: attempt to Construct more than one VisManager.");
   }
   else {
@@ -584 +587 @@
   if (fpSceneHandler) {
     G4VViewer* p = fpGraphicsSystem -> CreateViewer (*fpSceneHandler, name);
-    if (p) {
-      fpViewer = p;                             // Make current.
-      fpViewer -> Initialise ();
-      fpSceneHandler -> AddViewerToList (fpViewer);
-      fpSceneHandler -> SetCurrentViewer (fpViewer);
-
-      const G4ViewParameters& vp = fpViewer->GetViewParameters();
-      G4bool warn = false;
-      if (vp.IsCulling () && vp.IsCullingInvisible ()) {
-        warn = true;
+    if (!p) {
+      if (fVerbosity >= errors) {
+        G4cout << "ERROR in G4VisManager::CreateViewer during "
+               << fpGraphicsSystem -> GetName ()
+               << " viewer creation.\n  No action taken."
+               << G4endl;
+      }
+    } else {
+      p -> Initialise ();
+      if (p -> GetViewId() < 0) {
+        if (fVerbosity >= errors) {
+        G4cout << "ERROR in G4VisManager::CreateViewer during "
+               << fpGraphicsSystem -> GetName ()
+               << " viewer initialisation.\n  No action taken."
+               << G4endl;
+        }
+      } else {
+        fpViewer = p;                             // Make current.
+        fpSceneHandler -> AddViewerToList (fpViewer);
+        fpSceneHandler -> SetCurrentViewer (fpViewer);
+
         if (fVerbosity >= confirmations) {
-          G4cout << "G4VisManager::CreateViewer: new viewer created:"
+          G4cout << "G4VisManager::CreateViewer: new viewer created."
                  << G4endl;
         }
+
+        const G4ViewParameters& vp = fpViewer->GetViewParameters();
         if (fVerbosity >= parameters) {
           G4cout << " view parameters are:\n  " << vp << G4endl;
         }
-        if (fVerbosity >= warnings) {
-          G4cout <<
-            "WARNING: objects with visibility flag set to \"false\""
-            " will not be drawn!"
-            "\n  \"/vis/viewer/set/culling global false\" to Draw such objects."
-                 << G4endl;
-        }
-      }
-      if (vp.IsCullingCovered ()) {
-        if (!warn) {
+
+        if (vp.IsCulling () && vp.IsCullingInvisible ()) {
+          static G4bool warned = false;
           if (fVerbosity >= confirmations) {
-            G4cout << "G4VisManager::CreateViewer: new viewer created:"
-                   << G4endl;
+            if (!warned) {
+              G4cout <<
+  "NOTE: objects with visibility flag set to \"false\""
+  " will not be drawn!"
+  "\n  \"/vis/viewer/set/culling global false\" to Draw such objects."
+  "\n  Also see other \"/vis/viewer/set\" commands."
+                     << G4endl;
+              warned = true;
+            }
           }
         }
-        warn = true;
-        if (fVerbosity >= warnings) {
-          G4cout <<
-            "WARNING: covered objects in solid mode will not be rendered!"
-            "\n  \"/vis/viewer/set/culling coveredDaughters false\" to reverse this."
-                 << G4endl;
+        if (vp.IsCullingCovered ()) {
+          static G4bool warned = false;
+          if (fVerbosity >= warnings) {
+            if (!warned) {
+              G4cout <<
+  "WARNING: covered objects in solid mode will not be rendered!"
+  "\n  \"/vis/viewer/set/culling coveredDaughters false\" to reverse this."
+  "\n  Also see other \"/vis/viewer/set\" commands."
+                     << G4endl;
+              warned = true;
+            }
+          }
         }
-      }
-      if (warn) {
-        if (fVerbosity >= warnings) {
-          G4cout << "  Also see other \"/vis/viewer/set\" commands."
-                 << G4endl;
-        }
-      }
-    }
-    else {
-      if (fVerbosity >= errors) {
-        G4cout << "ERROR in G4VisManager::CreateViewer during "
-               << fpGraphicsSystem -> GetName ()
-               <<       " viewer creation.\n  No action taken."
-               << G4endl;
       }
     }
@@ -893 +901 @@
 
   // Top level basic commands...
+  RegisterMessenger(new G4VisCommandAbortReviewKeptEvents);
   RegisterMessenger(new G4VisCommandEnable);
   RegisterMessenger(new G4VisCommandList);
@@ -921 +930 @@
   RegisterMessenger(new G4VisCommandGeometrySetLineWidth);
   RegisterMessenger(new G4VisCommandGeometrySetForceAuxEdgeVisible);
+  RegisterMessenger(new G4VisCommandGeometrySetForceLineSegmentsPerCircle);
   RegisterMessenger(new G4VisCommandGeometrySetForceSolid);
   RegisterMessenger(new G4VisCommandGeometrySetForceWireframe);
@@ -1104 +1114 @@
 void G4VisManager::BeginOfRun ()
 {
-  G4cout << "G4VisManager::BeginOfRun" << G4endl;
+  //G4cout << "G4VisManager::BeginOfRun" << G4endl;
   fKeptLastEvent = false;
   fEventKeepingSuspended = false;
@@ -1113 +1123 @@
 void G4VisManager::BeginOfEvent ()
 {
-  G4cout << "G4VisManager::BeginOfEvent" << G4endl;
+  //G4cout << "G4VisManager::BeginOfEvent" << G4endl;
   fTransientsDrawnThisEvent = false;
   if (fpSceneHandler) fpSceneHandler->SetTransientsDrawnThisEvent(false);
@@ -1120 +1130 @@
 void G4VisManager::EndOfEvent ()
 {
-  G4cout << "G4VisManager::EndOfEvent" << G4endl;
+  //G4cout << "G4VisManager::EndOfEvent" << G4endl;
 
   // Don't call IsValidView unless there is a scene handler.  This
@@ -1131 +1141 @@
   const G4Run* currentRun = runManager->GetCurrentRun();
 
-  const G4Event* currentEvent =
-    G4EventManager::GetEventManager()->GetConstCurrentEvent();
+  G4EventManager* eventManager = G4EventManager::GetEventManager();
+  const G4Event* currentEvent = eventManager->GetConstCurrentEvent();
   if (!currentEvent) return;
 
   ClearTransientStoreIfMarked();
-  printf("G4VisManager::DrawEvent \n");
   fpSceneHandler->DrawEvent(currentEvent);
-  printf("G4VisManager::DrawEvent END\n");
 
   G4int nEventsToBeProcessed = 0;
@@ -1160 +1168 @@
       // Keep, but only if user has not kept any...
       if (!nKeptEvents) {
-        G4EventManager::GetEventManager()->KeepTheCurrentEvent();
+        eventManager->KeepTheCurrentEvent();
         fKeptLastEvent = true;
       }
@@ -1182 +1190 @@
       }
     } else if (maxNumberOfKeptEvents != 0) {
-      G4EventManager::GetEventManager()->KeepTheCurrentEvent();
+      eventManager->KeepTheCurrentEvent();
     }
   }
@@ -1189 +1197 @@
 void G4VisManager::EndOfRun ()
 {
-  G4cout << "G4VisManager::EndOfRun" << G4endl;
+  //G4cout << "G4VisManager::EndOfRun" << G4endl;
 
   // Don't call IsValidView unless there is a scene handler.  This