Changeset 932 for trunk/source/graphics_reps/src

Timestamp:

Feb 26, 2009, 12:23:33 PM (17 years ago)

Author:

garnier

Message:

John update

Location:

trunk/source/graphics_reps/src

Files:

• G4PolyhedronArbitrary.cc (modified) (2 diffs)
• G4VMarker.cc (modified) (2 diffs)
• G4VVisManager.cc (modified) (1 diff)

trunk/source/graphics_reps/src/G4PolyhedronArbitrary.cc

@@ -18 +18 @@
 // * This  code  implementation is the result of  the  scientific and *
 // * technical work of the GEANT4 collaboration and of QinetiQ Ltd,   *
-// * subject DEFCON 705 IPR conditions.                               *
+// * subject to DEFCON 705 IPR conditions.                            *
 // * By using,  copying,  modifying or  distributing the software (or *
 // * any work based  on the software)  you  agree  to acknowledge its *
@@ -24 +24 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
+//
 //
 // %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%

trunk/source/graphics_reps/src/G4VMarker.cc

@@ -25 +25 @@
 //
 //
-// $Id: G4VMarker.cc,v 1.11 2006/06/29 19:07:21 gunter Exp $
-// GEANT4 tag $Name: HEAD $
+// $Id: G4VMarker.cc,v 1.12 2009/02/24 10:58:04 allison Exp $
+// GEANT4 tag $Name: greps-V09-02-00 $
 //
 // 
@@ -86 +86 @@
 }
 
-const G4String& G4VMarker::GetInfo() const { return fInfo ;}
+G4VMarker::SizeType G4VMarker::GetSizeType () const {
+  SizeType type = none;
+  if (fWorldSize) type = world;
+  else if (fScreenSize) type = screen;
+  return type;
+}
 
-void G4VMarker::SetInfo( const G4String& info ){ fInfo = info ;}
-
+void G4VMarker::SetSize (SizeType sizeType, G4double size) {
+  fWorldSize = fScreenSize = 0.;
+  if (sizeType == world) fWorldSize = size;
+  else if (sizeType == screen) fScreenSize = size;
+}

trunk/source/graphics_reps/src/G4VVisManager.cc

@@ -40 +40 @@
 G4VVisManager* G4VVisManager::GetConcreteInstance ()
 {
+  printf("G4VVisManager::GetConcreteInstance %d\n",fpConcreteInstance);
   return fpConcreteInstance;
 }