Changeset 928 for trunk

Timestamp:

Feb 17, 2009, 3:34:09 PM (15 years ago)

Author:

garnier

Message:

ok for OI

Location:

trunk/source/visualization/OpenInventor

Files:

• include/HEPVis/actions/SoGL2PSAction.h (modified) (1 diff)
• src/SoGL2PSAction.cc (modified) (2 diffs)

trunk/source/visualization/OpenInventor/include/HEPVis/actions/SoGL2PSAction.h

@@ -45 +45 @@
   static void initClass();
   bool enableFileWriting();
+  void disableFileWriting();
 protected:
   virtual void beginTraversal(SoNode*);
-  void setViewport();
 };
 

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

@@ -89 +89 @@
   const SbViewportRegion& vpr = getViewportRegion();
   SoViewportRegionElement::set(getState(),vpr);
-  gl2psBegin();
+  G4gl2psBegin();
 #endif
   return true;
 }
-
 //////////////////////////////////////////////////////////////////////////////
-void SoGL2PSAction::setViewport(
+void SoGL2PSAction::disableFileWriting(
 )
 //////////////////////////////////////////////////////////////////////////////
 //!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!//
 {
-#ifdef G4DEBUG_VIS_OGL
-  printf("SoGL2PSAction::setViewport\n");
-#endif
-  // Useful ? L.Garnier 02/2009
-
 #ifdef __COIN__
 #else //SGI
-  const SbViewportRegion& vpr = getViewportRegion();
-  SoViewportRegionElement::set(getState(),vpr);
- 
-  const SbVec2s& win = vpr.getWindowSize();
-  fViewport[0] = 0;
-  fViewport[1] = 0;
-  fViewport[2] = win[0];
-  fViewport[3] = win[1];
+  gl2psEndPage();        
 #endif
+  ::fclose(fFile);
+  fFile = 0;
 }
+
 //////////////////////////////////////////////////////////////////////////////
 void SoGL2PSAction::beginTraversal(
@@ -124 +114 @@
 //!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!//
 {
-#ifdef G4DEBUG_VIS_OGL
-  printf("SoGL2PSAction::beginTraversal\n");
-#endif
   if(fFile) {
 #ifdef __COIN__
     const SbViewportRegion& vpr = getViewportRegion();
     SoViewportRegionElement::set(getState(),vpr);
-#ifdef G4DEBUG_VIS_OGL
-  printf("SoGL2PSAction::beginTraversal 1\n");
-#endif
     G4gl2psBegin();
-#ifdef G4DEBUG_VIS_OGL
-  printf("SoGL2PSAction::beginTraversal 2\n");
-#endif
     traverse(aNode);
-#ifdef G4DEBUG_VIS_OGL
-  printf("SoGL2PSAction::beginTraversal 3\n");
-#endif
-    gl2psEndPage();        
-#ifdef G4DEBUG_VIS_OGL
-  printf("SoGL2PSAction::beginTraversal 4\n");
-#endif
+    gl2psEndPage();       
 #else //SGI
+    // Should have already do G4gl2psBegin() before
     SoGLRenderAction::beginTraversal(aNode);
+    // Should do gl2psEndPage() after
 #endif
   } else {
     SoGLRenderAction::beginTraversal(aNode);
   }
-#ifdef G4DEBUG_VIS_OGL
-  printf("SoGL2PSAction::beginTraversal 5\n");
-#endif
 }