Changeset 917 for trunk/source/visualization/OpenGL/src

Timestamp:

Feb 5, 2009, 2:58:49 PM (17 years ago)

Author:

garnier

Message:

renommage

Location:

trunk/source/visualization/OpenGL/src

Files:

• G4OpenGLQtViewer.cc (modified) (2 diffs)
• G4OpenGLViewer.cc (modified) (1 diff)
• G4OpenGLViewerMessenger.cc (modified) (1 diff)
• G4OpenGLXViewer.cc (modified) (1 diff)

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

@@ -1348 +1348 @@
     if (format == QString("eps")) {
       if (exportDialog->getVectorEPS()) {
-        res = generateVectorEPS(fPrintFilename.c_str(),exportDialog->getWidth(),exportDialog->getHeight(),image);
+        printVectoredEPS();
+        res = true;
       } else {
         res = generateEPS(fPrintFilename.c_str(),exportDialog->getNbColor(),(unsigned int)image.width(),(unsigned int)image.height());
@@ -1645 +1646 @@
 }
 
-/**
-   Generate Vectorial Encapsulated Postscript form image
-   @param aFilename : name of file
-   @param aInColor : numbers of colors : 1->BW 2->RGB 3->RGB+Alpha
-   @param aImage : Image to print
-*/
-bool G4OpenGLQtViewer::generateVectorEPS (
- const char * aFilename
-,int aWidth
-,int aHeight
-,QImage aImage
-)
-{
-  // Print vectored PostScript
-  
-  G4int size = 5000000;
-
-  GLfloat* feedback_buffer;
-  GLint returned;
-  FILE* file;
-  
-  feedback_buffer = new GLfloat[size];
-  glFeedbackBuffer (size, GL_3D_COLOR, feedback_buffer);
-  glRenderMode (GL_FEEDBACK);
-  
-  ResizeGLView();
-  DrawView();
-
-  returned = glRenderMode (GL_RENDER);
-  
-  
-  file = fopen (aFilename, "w");
-  if (file) {
-    spewWireframeEPS (file, returned, feedback_buffer, "rendereps");
-  } else {
-    G4cerr << "Could not open "<< aFilename << G4endl;
-  }
-  
-  delete[] feedback_buffer;
-
-  return true;
-}
 
 

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

@@ -390 +390 @@
 }
 
-void G4OpenGLViewer::print() {
+void G4OpenGLViewer::printVectoredEPS() {
 
   // Print vectored PostScript

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

@@ -261 +261 @@
       pOGLViewer->fPrintFilename = std::string(oss.str().c_str());
       // Print eps file...
-      pOGLViewer->print();
+      pOGLViewer->printVectoredEPS();
       // Restore fPrintFilename for Xm...
       pOGLViewer->fPrintFilename = tmp_string;

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

@@ -417 +417 @@
   if (fVectoredPs) {
 
-    G4OpenGLViewer::print();
+    G4OpenGLViewer::printVectoredEPS();
 
   } else {