Changeset 688 for trunk/geant4/visualization/management

Timestamp:

Jan 15, 2008, 2:19:33 PM (17 years ago)

Author:

garnier

Message:

mise a jour par rapport au commit sur cvs de geant4

Location:

trunk/geant4/visualization/management

Files:

• History (modified) (2 diffs)
• include/G4VSceneHandler.hh (modified) (2 diffs)
• include/G4VisManager.hh (modified) (2 diffs)
• src/G4VSceneHandler.cc (modified) (2 diffs)
• src/G4VisManager.cc (modified) (2 diffs)

trunk/geant4/visualization/management/History

@@ -1 @@
-$Id: History,v 1.104 2007/11/30 14:47:30 lgarnier Exp $
+$Id: History,v 1.105 2008/01/04 22:03:46 allison Exp $
 
 -------------------------------------------------------------------
@@ -26 +26 @@
 History file for visualization management sub-category
 ------------------------------------------------------
+
+4th January 2008  John Allison  (visman-V09-01-00)
+- Implemented extended 2D interface.
 
 30th November 2007  Laurent Garnier

trunk/geant4/visualization/management/include/G4VSceneHandler.hh

@@ -25 +25 @@
 //
 //
-// $Id: G4VSceneHandler.hh,v 1.39 2007/01/11 16:38:14 allison Exp $
-// GEANT4 tag $Name: geant4-09-00-ref-01 $
+// $Id: G4VSceneHandler.hh,v 1.40 2008/01/04 22:03:45 allison Exp $
+// GEANT4 tag $Name:  $
 //
 // 
@@ -164 +164 @@
   // }
 
-  virtual void BeginPrimitives2D ();
+  virtual void BeginPrimitives2D
+  (const G4Transform3D& objectTransformation);
   // The x,y coordinates of the primitives passed to AddPrimitive are
   // intrepreted as screen coordinates, -1 < x,y < 1.  The

trunk/geant4/visualization/management/include/G4VisManager.hh

@@ -25 +25 @@
 //
 //
-// $Id: G4VisManager.hh,v 1.67 2007/07/10 17:49:27 allison Exp $
-// GEANT4 tag $Name: geant4-09-00-ref-01 $
+// $Id: G4VisManager.hh,v 1.68 2008/01/04 22:03:46 allison Exp $
+// GEANT4 tag $Name:  $
 //
 // 
@@ -250 +250 @@
     const G4Transform3D& objectTransformation = G4Transform3D());
 
-  void Draw2D (const G4Text&);
+  virtual void Draw2D (const G4Circle&,
+    const G4Transform3D& objectTransformation = G4Transform3D());
+
+  virtual void Draw2D (const G4NURBS&,
+    const G4Transform3D& objectTransformation = G4Transform3D());
+
+  virtual void Draw2D (const G4Polyhedron&,
+    const G4Transform3D& objectTransformation = G4Transform3D());
+
+  virtual void Draw2D (const G4Polyline&,
+    const G4Transform3D& objectTransformation = G4Transform3D());
+
+  virtual void Draw2D (const G4Polymarker&,
+    const G4Transform3D& objectTransformation = G4Transform3D());
+
+  virtual void Draw2D (const G4Square&,
+    const G4Transform3D& objectTransformation = G4Transform3D());
+
+  virtual void Draw2D (const G4Text&,
+    const G4Transform3D& objectTransformation = G4Transform3D());
 
   ////////////////////////////////////////////////////////////////////

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

@@ -25 +25 @@
 //
 //
-// $Id: G4VSceneHandler.cc,v 1.82 2007/05/16 15:47:44 allison Exp $
-// GEANT4 tag $Name: geant4-09-00-ref-01 $
+// $Id: G4VSceneHandler.cc,v 1.83 2008/01/04 22:03:46 allison Exp $
+// GEANT4 tag $Name:  $
 //
 // 
@@ -159 +159 @@
 }
 
-void G4VSceneHandler::BeginPrimitives2D () {
+void G4VSceneHandler::BeginPrimitives2D
+(const G4Transform3D& objectTransformation) {
   fNestingDepth++;
   if (fNestingDepth > 1)
     G4Exception("G4VSceneHandler::BeginPrimitives2D: Nesting detected."
                 "\n  It is illegal to nest Begin/EndPrimitives.");
-  // Not actually required for 2D operations but some drivers do an
-  // initial transformation...
-  fpObjectTransformation = &fIdentityTransformation;
+  fpObjectTransformation = &objectTransformation;
 }
 

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

@@ -24 +24 @@
 // ********************************************************************
 //
-// $Id: G4VisManager.cc,v 1.114 2007/11/10 14:59:46 allison Exp $
+// $Id: G4VisManager.cc,v 1.115 2008/01/04 22:03:46 allison Exp $
 // GEANT4 tag $Name:  $
 //
@@ -505 +505 @@
 }
 
-void G4VisManager::Draw2D (const G4Text& text)
+void G4VisManager::Draw2D (const G4Circle& circle,
+                           const G4Transform3D& objectTransform)
 {
   if (IsValidView()) {
     ClearTransientStoreIfMarked();
-    fpSceneHandler -> BeginPrimitives2D();
+    fpSceneHandler -> BeginPrimitives2D(objectTransform);
+    fpSceneHandler -> AddPrimitive(circle);
+    fpSceneHandler -> EndPrimitives2D();
+  }
+}
+
+void G4VisManager::Draw2D (const G4NURBS& nurbs,
+                           const G4Transform3D& objectTransform)
+{
+  if (IsValidView()) {
+    ClearTransientStoreIfMarked();
+    fpSceneHandler -> BeginPrimitives2D(objectTransform);
+    fpSceneHandler -> AddPrimitive(nurbs);
+    fpSceneHandler -> EndPrimitives2D();
+  }
+}
+
+void G4VisManager::Draw2D (const G4Polyhedron& polyhedron,
+                           const G4Transform3D& objectTransform)
+{
+  if (IsValidView()) {
+    ClearTransientStoreIfMarked();
+    fpSceneHandler -> BeginPrimitives2D(objectTransform);
+    fpSceneHandler -> AddPrimitive(polyhedron);
+    fpSceneHandler -> EndPrimitives2D();
+  }
+}
+
+void G4VisManager::Draw2D (const G4Polyline& line,
+                           const G4Transform3D& objectTransform)
+{
+  if (IsValidView()) {
+    ClearTransientStoreIfMarked();
+    fpSceneHandler -> BeginPrimitives2D(objectTransform);
+    fpSceneHandler -> AddPrimitive(line);
+    fpSceneHandler -> EndPrimitives2D();
+  }
+}
+
+void G4VisManager::Draw2D (const G4Polymarker& polymarker,
+                           const G4Transform3D& objectTransform)
+{
+  if (IsValidView()) {
+    ClearTransientStoreIfMarked();
+    fpSceneHandler -> BeginPrimitives2D(objectTransform);
+    fpSceneHandler -> AddPrimitive(polymarker);
+    fpSceneHandler -> EndPrimitives2D();
+  }
+}
+
+void G4VisManager::Draw2D (const G4Square& square,
+                           const G4Transform3D& objectTransform)
+{
+  if (IsValidView()) {
+    ClearTransientStoreIfMarked();
+    fpSceneHandler -> BeginPrimitives2D(objectTransform);
+    fpSceneHandler -> AddPrimitive(square);
+    fpSceneHandler -> EndPrimitives2D();
+  }
+}
+
+void G4VisManager::Draw2D (const G4Text& text,
+                           const G4Transform3D& objectTransform)
+{
+  if (IsValidView()) {
+    ClearTransientStoreIfMarked();
+    fpSceneHandler -> BeginPrimitives2D(objectTransform);
     fpSceneHandler -> AddPrimitive(text);
     fpSceneHandler -> EndPrimitives2D();