Changeset 688 for trunk/geant4/visualization/OpenGL/include

Timestamp:

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

Author:

garnier

Message:

mise a jour par rapport au commit sur cvs de geant4

Location:

trunk/geant4/visualization/OpenGL/include

Files:

• G4OpenGLImmediateSceneHandler.hh (modified) (2 diffs)
• G4OpenGLQtExportDialog.hh (modified) (1 diff)
• G4OpenGLQtViewer.hh (modified) (2 diffs)
• G4OpenGLSceneHandler.hh (modified) (3 diffs)
• G4OpenGLStoredQtViewer.hh (modified) (2 diffs)
• G4OpenGLStoredSceneHandler.hh (modified) (3 diffs)

trunk/geant4/visualization/OpenGL/include/G4OpenGLImmediateSceneHandler.hh

@@ -25 +25 @@
 //
 //
-// $Id: G4OpenGLImmediateSceneHandler.hh,v 1.13 2007/04/04 16:50:26 allison Exp $
+// $Id: G4OpenGLImmediateSceneHandler.hh,v 1.14 2008/01/04 22:07:01 allison Exp $
 // GEANT4 tag $Name:  $
 //
@@ -54 +54 @@
   void BeginPrimitives (const G4Transform3D& objectTransformation);
   void EndPrimitives ();
-  void BeginPrimitives2D ();
+  void BeginPrimitives2D (const G4Transform3D& objectTransformation);
   void EndPrimitives2D ();
   void BeginModeling ();

trunk/geant4/visualization/OpenGL/include/G4OpenGLQtExportDialog.hh

@@ -25 +25 @@
 //
 //
-// $Id: G4OpenGLQtExportDialog.hh,v 1.3 2007/11/09 15:03:21 lgarnier Exp $
+// $Id: G4OpenGLQtExportDialog.hh,v 1.4 2008/01/15 11:05:08 lgarnier Exp $
 // GEANT4 tag $Name: 
 //

trunk/geant4/visualization/OpenGL/include/G4OpenGLQtViewer.hh

@@ -25 +25 @@
 //
 //
-// $Id: G4OpenGLQtViewer.hh,v 1.5 2007/11/30 14:47:30 lgarnier Exp $
+// $Id: G4OpenGLQtViewer.hh,v 1.6 2008/01/15 11:05:08 lgarnier Exp $
 // GEANT4 tag $Name:  $
 //
@@ -135 +135 @@
   void actionDrawingSurfaceRemoval();
   void actionDrawingLineSurfaceRemoval();
-//   void actionControlPanels();
-//   void actionExitG4();
   void actionCreateEPS();
 

trunk/geant4/visualization/OpenGL/include/G4OpenGLSceneHandler.hh

@@ -25 +25 @@
 //
 //
-// $Id: G4OpenGLSceneHandler.hh,v 1.23 2007/04/04 16:50:26 allison Exp $
+// $Id: G4OpenGLSceneHandler.hh,v 1.24 2008/01/04 22:07:01 allison Exp $
 // GEANT4 tag $Name:  $
 //
@@ -58 +58 @@
   virtual void BeginPrimitives (const G4Transform3D& objectTransformation);
   virtual void EndPrimitives ();
-  virtual void BeginPrimitives2D ();
+  virtual void BeginPrimitives2D (const G4Transform3D& objectTransformation);
   virtual void EndPrimitives2D ();
   void AddPrimitive (const G4Polyline&);
@@ -95 +95 @@
   const G4Polyhedron* CreateCutawayPolyhedron ();
 
+  void ClearAndDestroyAtts();  // Destroys att holders and clears pick map.
+
   GLuint fPickName;
   std::map<GLuint, G4AttHolder*> fPickMap;  // For picking.
-  void ClearAndDestroyAtts();  // Destroys att holders and clears pick map.
+
+  G4bool fProcessing2D;
 
 private:

trunk/geant4/visualization/OpenGL/include/G4OpenGLStoredQtViewer.hh

@@ -25 +25 @@
 //
 //
-// $Id: G4OpenGLStoredQtViewer.hh,v 1.3 2007/11/09 15:03:21 lgarnier Exp $
+// $Id: G4OpenGLStoredQtViewer.hh,v 1.4 2008/01/15 11:05:08 lgarnier Exp $
 // GEANT4 tag $Name:  $
 //
@@ -77 +77 @@
   QPoint beginZoom;
   QPoint endZoom;
-  QImage glBufferImage;
+  //  QImage glBufferImage;
 };
 

trunk/geant4/visualization/OpenGL/include/G4OpenGLStoredSceneHandler.hh

@@ -25 +25 @@
 //
 //
-// $Id: G4OpenGLStoredSceneHandler.hh,v 1.24 2007/04/04 16:50:26 allison Exp $
+// $Id: G4OpenGLStoredSceneHandler.hh,v 1.25 2008/01/04 22:07:01 allison Exp $
 // GEANT4 tag $Name:  $
 //
@@ -58 +58 @@
   void BeginPrimitives (const G4Transform3D& objectTransformation);
   void EndPrimitives ();
-  void BeginPrimitives2D ();
+  void BeginPrimitives2D (const G4Transform3D& objectTransformation);
   void EndPrimitives2D ();
   void BeginModeling ();
@@ -111 +111 @@
   // A proper implementation would use geometry hierarchy.
   std::map <const G4VSolid*, G4int, std::less <const G4VSolid*> > fSolidMap;
-
-private:
-  G4bool fProcessing2D;
 };