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

Timestamp:

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

Author:

garnier

Message:

cvs update

File:

• trunk/source/visualization/management/src/G4VisCommandsSceneAdd.cc (modified) (5 diffs)

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);
     }