Changeset 924 for trunk/source/visualization/OpenInventor

Timestamp:

Feb 16, 2009, 4:31:26 PM (17 years ago)

Author:

garnier

Message:

add gl2ps library and changes to include it. See History file

Location:

trunk/source/visualization/OpenInventor

Files:

• GNUmakefile (modified) (2 diffs)
• History (modified) (2 diffs)
• src/G4OpenInventorViewer.cc (modified) (2 diffs)
• src/SoGL2PSAction.cc (modified) (3 diffs)

trunk/source/visualization/OpenInventor/GNUmakefile

@@ -1 @@
-# $Id: GNUmakefile,v 1.8 2006/11/02 12:02:23 allison Exp $
+# $Id: GNUmakefile,v 1.9 2009/02/16 15:31:05 lgarnier Exp $
 
 name := G4OpenInventor
@@ -18 +18 @@
 include $(G4INSTALL)/config/interactivity.gmk
 
-ifdef G4VIS_BUILD_OPENGL_DRIVER
 CPPFLAGS += -I$(G4BASE)/visualization/externals/gl2ps/include
-endif
-ifdef G4VIS_BUILD_OI_DRIVER
-CPPFLAGS += -I$(G4BASE)/visualization/externals/gl2ps/include
-endif
-
 CPPFLAGS += -I$(G4BASE)/visualization/management/include
 CPPFLAGS += -I$(G4BASE)/visualization/modeling/include

trunk/source/visualization/OpenInventor/History

@@ -1 @@
-$Id: History,v 1.96 2008/04/30 10:05:31 allison Exp $
+$Id: History,v 1.97 2009/02/16 15:31:05 lgarnier Exp $
 -------------------------------------------------------------------
 
@@ -20 +20 @@
 History file for visualization/OpenInventor
 -------------------------------------------
+
+16 February 2009, Laurent Garnier
+ - Modifications in GNUMakefile for gl2ps.
+ - SoGL2PSAction Modified.
+ - G4OpenInventorViewer.cc add a protection on file writing in gl2ps
 
 30th April 2008  John Allison  (openinventor-V09-01-01)

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

@@ -24 +24 @@
 // ********************************************************************
 //
-// $Id: G4OpenInventorViewer.cc,v 1.59 2007/04/03 13:35:48 allison Exp $
-// GEANT4 tag $Name: HEAD $
+// $Id: G4OpenInventorViewer.cc,v 1.60 2009/02/16 15:31:05 lgarnier Exp $
+// GEANT4 tag $Name:  $
 
 #ifdef G4VIS_BUILD_OI_DRIVER
@@ -50 +50 @@
 #include "G4Scene.hh"
 #include "Geant4_SoPolyhedron.h"
-#include "G4AttValue.hh"#include "G4AttDef.hh"
+#include "G4AttValue.hh"
+#include "G4AttDef.hh"
 #include "G4AttCheck.hh"
 #include "G4AttHolder.hh"

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

@@ -33 +33 @@
 /*--------------------------------------------------------------------------*/
 
-
 // this :
 #include <HEPVis/actions/SoGL2PSAction.h>
@@ -60 +59 @@
 :SoGLRenderAction(aViewPortRegion)
 ,G4OpenGL2PSAction()
+,fFileName("out.ps")
+,fFile(0)
 //////////////////////////////////////////////////////////////////////////////
 //!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!//
 {
-  setFileName("out.ps");
   SO_ACTION_CONSTRUCTOR(SoGL2PSAction);
 }
@@ -72 +72 @@
 //!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!//
 {
-  // FIXME Useful ??
-
+  // Useful ?? L.Garnier 02/2009
 #ifdef __COIN__
 #else //SGI