Changeset 1258 for trunk/source/visualization/management/src

Timestamp:

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

Author:

garnier

Message:

cvs update

Location:

trunk/source/visualization/management/src

Files:

• G4VSceneHandler.cc (modified) (6 diffs)
• G4VisCommandsSceneAdd.cc (modified) (5 diffs)
• G4VisManager.cc (modified) (2 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;

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

@@ -25 +25 @@
 //
 //
-// $Id: G4VisCommandsSceneAdd.cc,v 1.78 2009/11/22 14:02:30 allison Exp $
+// $Id: G4VisCommandsSceneAdd.cc,v 1.79 2010/05/11 10:58:49 allison Exp $
 // GEANT4 tag $Name:  $
 // /vis/scene commands - John Allison  9th August 1998
@@ -1373 +1373 @@
   static G4IdentityTrajectoryFilter auxiliaryPointsFilter;
   G4String defaultTrajectoryType;
+  G4bool i_mode_found = false;
   G4int i_mode = 0;
   if (smooth && rich) {
@@ -1390 +1391 @@
       iss >> i_mode;
       if (iss) {
+        i_mode_found = true;
         if (verbosity >= G4VisManager::warnings) {
-          G4cout << "WARNING: Integer parameter " << i_mode << " found."
-            "\n  DEPRECATED - will be removed at next major release."
-            "\n  Use \"/vis/modeling/trajectories\" commands."
+          G4cout <<
+  "WARNING: Integer parameter " << i_mode << " found."
+  "\n  DEPRECATED - its use in this command will be removed at a future major"
+  "\n  release.  Use \"/vis/modeling/trajectories\" commands."
                  << G4endl;
         }
@@ -1421 +1424 @@
   }
 
-  G4TrajectoriesModel* model = new G4TrajectoriesModel(i_mode);
+  G4TrajectoriesModel* model = 0;
+  if (i_mode_found) {
+    model = new G4TrajectoriesModel(i_mode);
+  } else {
+    model = new G4TrajectoriesModel();
+  }
   const G4String& currentSceneName = pScene -> GetName ();
   pScene -> AddEndOfEventModel (model, warn);
@@ -1805 +1813 @@
     const G4double y0 = (param4 + param3) / 2.;
     const G4double z0 = (param6 + param5) / 2.;
-    G4Box clippingBox("_clipping_box",dX,dY,dZ);
-    G4Polyhedron* clippingPolyhedron =
-      new G4PolyhedronBox(dX,dY,dZ);  // The model deletes.
-    clippingPolyhedron->Transform(G4Translate3D(x0,y0,z0));
+    G4VSolid* clippingSolid =
+      new G4DisplacedSolid
+      ("_displaced_clipping_box",
+       new G4Box("_clipping_box",dX,dY,dZ),
+       G4Translate3D(x0,y0,z0));
     for (size_t i = 0; i < foundVolumes.size(); ++i) {
-      models[i]->SetClippingPolyhedron(clippingPolyhedron);
+      models[i]->SetClippingSolid(clippingSolid);
       models[i]->SetClippingMode(clippingMode);
     }

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

@@ -24 +24 @@
 // ********************************************************************
 //
-// $Id: G4VisManager.cc,v 1.123 2010/03/08 16:34:17 lgarnier Exp $
+// $Id: G4VisManager.cc,v 1.124 2010/05/11 11:02:19 allison Exp $
 // GEANT4 tag $Name:  $
 //
@@ -889 +889 @@
   assert (0 != fpTrajDrawModelMgr);
 
-  const G4VTrajectoryModel* model = CurrentTrajDrawModel();
-
-  assert (0 != model); // Should exist
-
-  model->Draw(trajectory, i_mode, visible);
+  const G4VTrajectoryModel* trajectoryModel = CurrentTrajDrawModel();
+
+  assert (0 != trajectoryModel); // Should exist
+
+  G4TrajectoriesModel* trajectoriesModel =
+    dynamic_cast<G4TrajectoriesModel*>(fpSceneHandler->GetModel());
+  if (trajectoriesModel) {
+    if (trajectoriesModel->IsDrawingModeSet()) {
+      trajectoryModel->Draw(trajectory, i_mode, visible);
+    } else {
+      trajectoryModel->Draw(trajectory, visible);
+    }
+  } else {
+    //G4Exception("G4VisManager::DispatchToModel: Not a G4TrajectoriesModel.");
+    // Just draw at user's request
+    trajectoryModel->Draw(trajectory, i_mode, visible);
+    static G4bool warnedAboutIMode = false;
+    if (!warnedAboutIMode) {
+      G4Exception
+        ("G4VisManager::DispatchToModel",
+         "",
+         JustWarning,
+  "WARNING: DEPRECATED: The use of the i_mode argument in DrawTrajectory"
+  "\n  is deprecated and will be removed at the next major release.");
+      warnedAboutIMode = true;
+    }
+   }
 }