Changeset 1258 for trunk/source/visualization/management/src/G4VSceneHandler.cc

Timestamp:

May 20, 2010, 11:49:26 AM (14 years ago)

Author:

garnier

Message:

cvs update

File:

• trunk/source/visualization/management/src/G4VSceneHandler.cc (modified) (6 diffs)

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

@@ -25 +25 @@
 //
 //
-// $Id: G4VSceneHandler.cc,v 1.91 2009/11/16 13:51:08 lgarnier Exp $
+// $Id: G4VSceneHandler.cc,v 1.92 2010/05/11 10:55:07 allison Exp $
 // GEANT4 tag $Name:  $
 //
@@ -67 +67 @@
 #include "G4Polycone.hh"
 #include "G4Polyhedra.hh"
+#include "G4DisplacedSolid.hh"
 #include "G4LogicalVolume.hh"
 #include "G4PhysicalVolumeModel.hh"
@@ -258 +259 @@
 
 void G4VSceneHandler::AddCompound (const G4VTrajectory& traj) {
-  G4TrajectoriesModel* pTrModel =
+  G4TrajectoriesModel* trajectoriesModel =
     dynamic_cast<G4TrajectoriesModel*>(fpModel);
-  if (!pTrModel) G4Exception
+  if (!trajectoriesModel) G4Exception
     ("G4VSceneHandler::AddCompound(const G4VTrajectory&): Not a G4TrajectoriesModel.");
-  traj.DrawTrajectory(pTrModel->GetDrawingMode());
+  G4VVisManager::IsDefaultDrawTrajectory = false;
+  if (trajectoriesModel->IsDrawingModeSet()) {
+    traj.DrawTrajectory(trajectoriesModel->GetDrawingMode());
+  } else {
+    traj.DrawTrajectory();
+  }
+  if (!G4VVisManager::IsDefaultDrawTrajectory) {
+    static G4bool warnedAboutIMode = false;
+    if (!warnedAboutIMode) {
+      G4Exception
+        ("G4VSceneHandler::AddCompound(const G4VTrajectory&)",
+         "",
+         JustWarning,
+  "WARNING: DEPRECATED: The use of the i_mode argument in DrawTrajectory"
+  "\n  is deprecated and will be removed in a future major release.");
+      warnedAboutIMode = true;
+    }
+  }
 }
 
@@ -741 +759 @@
   pModelingParams->SetExplodeCentre(vp.GetExplodeCentre());
 
-  pModelingParams->SetSectionPolyhedron(CreateSectionPolyhedron());
-  pModelingParams->SetCutawayPolyhedron(CreateCutawayPolyhedron());
+  pModelingParams->SetSectionSolid(CreateSectionSolid());
+  pModelingParams->SetCutawaySolid(CreateCutawaySolid());
   // The polyhedron objects are deleted in the modeling parameters destructor.
 
@@ -748 +766 @@
 }
 
-const G4Polyhedron* G4VSceneHandler::CreateSectionPolyhedron()
-{
-  /* Disable for now.  Boolean processor not up to it.
+G4VSolid* G4VSceneHandler::CreateSectionSolid()
+{
+  G4VSolid* sectioner = 0;
   const G4ViewParameters& vp = fpViewer->GetViewParameters();
   if (vp.IsSection () ) {
     G4double radius = fpScene->GetExtent().GetExtentRadius();
     G4double safe = radius + fpScene->GetExtent().GetExtentCentre().mag();
-    G4Box sectionBox("clipper",
-                     safe, safe, 1.e-5 * radius);  // Thin in z-plane.
-    G4Polyhedron* sectioner = sectionBox.CreatePolyhedron();
+    G4VSolid* sectionBox =
+      new G4Box("_sectioner", safe, safe, 1.e-5 * radius);  // Thin in z-plane.
     const G4Plane3D& s = vp.GetSectionPlane ();
     G4double a = s.a();
@@ -770 +787 @@
       transform = G4Rotate3D(angle, axis) * transform;
     }
-    sectioner->Transform(transform);
-    return sectioner;
-  } else {
-    return 0;
-  }
-  */
-  return 0;
-}
-
-const G4Polyhedron* G4VSceneHandler::CreateCutawayPolyhedron()
+    sectioner = new G4DisplacedSolid
+      ("_displaced_sectioning_box", sectionBox, transform);
+  }
+  return sectioner;
+}
+
+G4VSolid* G4VSceneHandler::CreateCutawaySolid()
 {
   return 0;