Import Geant4 8.0.0 source tree

source/visualization/modeling/src/G4VModel.cc

@@ -21,8 +21,8 @@
 // ********************************************************************
 //
 //
-// $Id: G4VModel.cc,v 1.9 2003/06/16 17:14:32 gunter Exp $
-// GEANT4 tag $Name: geant4-07-01 $
+// $Id: G4VModel.cc,v 1.11 2005/11/30 16:06:18 gcosmo Exp $
+// GEANT4 tag $Name: geant4-08-00 $
 //
 // 
 // John Allison  31st December 1997.
@@ -30,25 +30,29 @@
 
 #include "G4VModel.hh"
 
+#include "G4RotationMatrix.hh"
 #include "G4ModelingParameters.hh"
 
 G4VModel::G4VModel (const G4Transform3D& modelTransformation,
 		    const G4ModelingParameters* pMP):
+  fGlobalTag ("Empty"),
+  fGlobalDescription ("Empty"),
   fTransform (modelTransformation),
   fpMP (pMP)
-{
-  fGlobalTag = "Default Global Tag";
-  fGlobalDescription = "Default Global Description";
-}
+{}
 
 G4VModel::~G4VModel () {}
 
 G4String G4VModel::GetCurrentTag () const {
-  return G4String("Default Current Tag");
+  return G4String
+    ("WARNING: GetCurrentTag() not implemented by concrete class."
+     "\n  Global tag: " + fGlobalTag);
 }
 
 G4String G4VModel::GetCurrentDescription () const {
-  return G4String("Default Current Description");
+  return G4String
+    ("WARNING: GetCurrentDescription() not implemented by concrete class."
+     "\n  Global description: " + fGlobalDescription);
 }
 
 G4bool G4VModel::Validate (G4bool) {
@@ -67,7 +71,7 @@ std::ostream& operator << (std::ostream& os, const G4VModel& m) {
   os << "\n  Extent: " << m.fExtent;
   os << "\n  Transformation: ";
   os << "\n    Rotation: ";
-  HepRotation rotation = m.fTransform.getRotation ();
+  G4RotationMatrix rotation = m.fTransform.getRotation ();
   os << rotation.thetaX() << ", "
      << rotation.phiX() << ", "
      << rotation.thetaY() << ", "