Changeset 636 for trunk/geant4/visualization

Timestamp:

Dec 5, 2007, 10:50:44 AM (17 years ago)

Author:

garnier

Message:

amelioration du ticket #66

Location:

trunk/geant4/visualization/OpenGL/src

Files:

• G4OpenGLQtExportDialog.cc (modified) (3 diffs)
• G4OpenGLQtViewer.cc (modified) (2 diffs)
• G4OpenGLStoredViewer.cc (modified) (4 diffs)

trunk/geant4/visualization/OpenGL/src/G4OpenGLQtExportDialog.cc

@@ -76 +76 @@
   
   if (nomFich.endsWith(".jpg") || 
-      nomFich.endsWith(".jepg")) {
+      nomFich.endsWith(".jpeg")) {
     
     QGroupBox *imageGroupBox = new QGroupBox(tr("Image quality"),this);
@@ -111 +111 @@
   }
   
-  if(nomFich.endsWith(".eps")) {
+  if ((nomFich.endsWith(".ps")) || (nomFich.endsWith(".pdf")) || (nomFich.endsWith(".eps"))) {
 
     //    transparencyEPS = new QCheckBox( "transparencyEPS" );
@@ -157 +157 @@
      nomFich.endsWith(".tiff") ||
      nomFich.endsWith(".jpg") ||
+     nomFich.endsWith(".jpeg") ||
      nomFich.endsWith(".png") ||
      nomFich.endsWith(".xpm")) {

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

@@ -1120 +1120 @@
     }    
     // jpeg format
-    if (nomFich.endsWith(".jpg") || 
-        nomFich.endsWith(".jpeg")) {
-      // grabFrameBuffer() :: Returns an image of the frame buffer. If withAlpha is true the alpha channel is included.
-      image.save(nomFich,0,exportDialog->getSliderValue());
-#ifdef GEANT4_QT_DEBUG
-      printf("saving jpeg quality : %d\n",exportDialog->getSliderValue());
-#endif
-    } else if (nomFich.endsWith(".eps")) {
+    if (nomFich.endsWith(".eps")) {
       generateEPS(nomFich,exportDialog->getNbColor(),image);
     } else if (nomFich.endsWith(".ps") ||nomFich.endsWith(".pdf")) {
@@ -1134 +1127 @@
                nomFich.endsWith(".tiff") ||
                nomFich.endsWith(".jpg") ||
+               nomFich.endsWith(".jpeg") ||
                nomFich.endsWith(".png") ||
                nomFich.endsWith(".bmp") ||

trunk/geant4/visualization/OpenGL/src/G4OpenGLStoredViewer.cc

@@ -126 +126 @@
 void G4OpenGLStoredViewer::DrawDisplayLists () {
 
-  printf("***************************  CASE AA ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ \n");
   const G4Planes& cutaways = fVP.GetCutawayPlanes();
   G4bool cutawayUnion = fVP.IsCutaway() &&
@@ -132 +131 @@
   size_t nPasses = cutawayUnion? cutaways.size(): 1;
   for (size_t i = 0; i < nPasses; ++i) {
-    printf("***************************  CASE A ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ \n");
 
     if (cutawayUnion) {
@@ -146 +144 @@
     if (fG4OpenGLStoredSceneHandler.fTopPODL) {
       glCallList (fG4OpenGLStoredSceneHandler.fTopPODL);
-    printf("***************************  CASE A1 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ \n");
     }
     for (size_t i = 0; i < fG4OpenGLStoredSceneHandler.fTOList.size(); ++i) {
-    printf("***************************  CASE B1 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ \n");
       G4OpenGLStoredSceneHandler::TO& to =
         fG4OpenGLStoredSceneHandler.fTOList[i];
       if (to.fEndTime >= fStartTime && to.fStartTime <= fEndTime) {
-    printf("***************************  CASE B2 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ \n");
         glPushMatrix();
         G4OpenGLTransform3D oglt (to.fTransform);
@@ -166 +161 @@
         glCallList (to.fDisplayListId);
         glPopMatrix();
-    printf("***************************  CASE B3 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ \n");
       }
     }