Changeset 977

Timestamp:

Apr 10, 2009, 12:26:43 PM (15 years ago)

Author:

garnier

Message:

Ok en SXm, mais Pb sur le retore du contexte

Location:

trunk/source/visualization/OpenGL

Files:

• include/G4OpenGLXViewer.hh (modified) (2 diffs)
• src/G4OpenGLViewer.cc (modified) (2 diffs)
• src/G4OpenGLViewerMessenger.cc (modified) (1 diff)
• src/G4OpenGLXViewer.cc (modified) (2 diffs)

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

@@ -57 +57 @@
   void SetView ();
   void ShowView ();
+  void printEPS();
 
 protected:
@@ -63 +64 @@
   virtual void CreateMainWindow ();
   virtual void CreateFontLists ();
-  void printEPS();
 
   static int snglBuf_RGBA[12];

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

@@ -49 +49 @@
 #include "G4AttHolder.hh"
 #include "G4AttCheck.hh"
+
+#include "G4OpenGLXViewer.hh"
 
 // GL2PS
@@ -485 +487 @@
     res = printVectoredEPS();
   } else {
-    res = printNonVectoredEPS();
+
+    G4OpenGLXViewer* pOGLXViewer = dynamic_cast<G4OpenGLXViewer*>(this);
+    if (pOGLXViewer) {
+      pOGLXViewer->printEPS();
+    } else {
+      res = printNonVectoredEPS();
+    }
   }
   if (res == false) {

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

@@ -261 +261 @@
       pOGLViewer->fPrintFilename = std::string(oss.str().c_str());
       // Print eps file...
+#ifdef G4DEBUG_VIS_OGL
+      printf("G4OpenGLViewerMessenger::SetNewValue Call printEPS %s\n",std::string(oss.str().c_str()).c_str());
+#endif
       pOGLViewer->printEPS();
       // Restore fPrintFilename for Xm...

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

@@ -429 +429 @@
     printf("G4OpenGLXViewer::print non Vectored\n");
 #endif
+    //    G4OpenGLViewer::printEPS();    
+
+
+
+
+
+
 //     G4StateManager* stateManager = G4StateManager::GetStateManager(); 
 //     G4ApplicationState oldState = stateManager->GetCurrentState(); 
@@ -496 +503 @@
         file +=".eps";
 #else
-        std::string file = "G4OpenGL_XPixmapTest.eps";
+        std::string file = fPrintFilename.c_str();
 #endif