Changeset 923

Timestamp:

Feb 16, 2009, 2:43:12 PM (16 years ago)

Author:

garnier

Message:

ca marche

Location:

trunk/source/visualization

Files:

• OpenGL/include/G4OpenGLViewer.hh (modified) (1 diff)
• OpenGL/src/G4OpenGLViewer.cc (modified) (4 diffs)
• OpenInventor/src/SoGL2PSAction.cc (modified) (2 diffs)
• externals/gl2ps/src/gl2ps.cc (modified) (1 diff)

trunk/source/visualization/OpenGL/include/G4OpenGLViewer.hh

@@ -38 +38 @@
 
 #include "G4VViewer.hh"
-#include "G4OpenGL2PSAction.hh"
+#include "G4OpenGL.hh"
 
 class G4OpenGLSceneHandler;
+class G4OpenGL2PSAction;
 
 // Base class for various OpenGLView classes.

trunk/source/visualization/OpenGL/src/G4OpenGLViewer.cc

@@ -38 +38 @@
 #include "G4OpenGLSceneHandler.hh"
 #include "G4OpenGLTransform3D.hh"
+#include "G4OpenGL2PSAction.hh"
 
 #include "G4Scene.hh"
@@ -48 +49 @@
 #include "G4AttHolder.hh"
 #include "G4AttCheck.hh"
+
+// GL2PS
+#include "Geant4_gl2ps.h"
 
 #include <sstream>
@@ -888 +892 @@
   if (!fGL2PSAction) return;
 
-  fGL2PSAction->setFileName("gl2psTest.ps");
+  fGL2PSAction->setFileName("PostScriptViaGL2PS.ps");
   G4cout << "Produce " << aFile << "..." << G4endl;
   if (fGL2PSAction->enableFileWriting()) {
@@ -896 +900 @@
   //////////////
 
-  FILE *fFile = fopen(aFile,"w");
+  //  FILE *fFile = fopen(aFile,"w");
+  FILE *fFile = fopen("PostScriptALaMain.ps","w");
   if(!fFile) {
     G4cout << "G4OpenGLViewer::WritePostScript. Cannot open file " <<aFile << G4endl;

trunk/source/visualization/OpenInventor/src/SoGL2PSAction.cc

@@ -41 +41 @@
 #include <Inventor/errors/SoDebugError.h>
 
-//#include "Geant4_gl2ps.h"
+#include "Geant4_gl2ps.h"
 
 #include <stdio.h>
@@ -97 +97 @@
     const SbViewportRegion& vpr = getViewportRegion();
     SoViewportRegionElement::set(getState(),vpr);
-    Geant4_gl2psBegin();
+    G4gl2psBegin();
     traverse(aNode);
-    Geant4_gl2psEndPage();        
+    gl2psEndPage();        
 #else //SGI
     SoGLRenderAction::beginTraversal(aNode);

trunk/source/visualization/externals/gl2ps/src/gl2ps.cc

@@ -24 +24 @@
 // ********************************************************************
 //
+#ifdef G4VIS_BUILD_OPENGL_DRIVER
+ #define G4VIS_BUILD_OPENGL_GL2PS 
+#endif
 #ifdef G4VIS_BUILD_OI_DRIVER
+ #define G4VIS_BUILD_OPENGL_GL2PS 
+#endif
+
+#ifdef G4VIS_BUILD_OPENGL_GL2PS
 
 /*