Changeset 652 for trunk/geant4/visualization/OpenGL

Timestamp:

Dec 11, 2007, 3:04:13 PM (17 years ago)

Author:

garnier

Message:

ajout du EPS vectoriel ticket #100

Location:

trunk/geant4/visualization/OpenGL

Files:

• include/G4OpenGLQtExportDialog.hh (modified) (3 diffs)
• include/G4OpenGLQtViewer.hh (modified) (1 diff)
• src/G4OpenGLQtExportDialog.cc (modified) (5 diffs)
• src/G4OpenGLQtExportDialog_moc.cc (modified) (1 diff)
• src/G4OpenGLQtViewer.cc (modified) (3 diffs)
• src/G4OpenGLQtViewer_moc.cc (modified) (1 diff)
• src/G4OpenGLStoredQtViewer.cc (modified) (1 diff)

trunk/geant4/visualization/OpenGL/include/G4OpenGLQtExportDialog.hh

@@ -69 +69 @@
   int getSliderValue();
 
-  /** return the new width for file if format has a width widget, instead return -1 */
+  /** return the new width for file if format has a width widget, instead return 
+the original value */
   int getWidth();
 
-  /** return the new height for file if format has a height widget, instead return -1 */
+  /** return the new height for file if format has a height widget, instead return
+the original value  */
   int getHeight();
 
@@ -80 +82 @@
   /** return the numbers of colors in the picture if format has a BW/Color widget, instead return -1 */
   int getNbColor();
+
+  /** return if vector EPS is checked, if button does'nt exist, return 0 */
+  bool getVectorEPS();
 
 public slots:
@@ -102 +107 @@
   QPushButton* buttonOk;
   QPushButton* buttonCancel;
-  QCheckBox* transparencyEPS,*boxTransparency;
+  QCheckBox* transparencyEPS,*boxTransparency,*vectorEPSCheckBox;
   QCheckBox* ratioCheckBox;
   QSlider * qualitySlider;

trunk/geant4/visualization/OpenGL/include/G4OpenGLQtViewer.hh

@@ -92 +92 @@
   void rescaleImage(int, int);
   bool generateEPS(QString,int,QImage);  
+  bool generateVectorEPS (QString,int,int,QImage);
   bool generatePS_PDF(QString,int,QImage);  
 

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

@@ -273 +273 @@
 
     QWidget * EPSWidgetGroupBox; // widget containing group button
-    QButtonGroup * EPSButtonGroupBox; // group button 
     QVBoxLayout *EPSGroupBoxLayout;
 
 #if QT_VERSION < 0x040000
 
-    EPSButtonGroupBox = new QButtonGroup( 2,Qt::Vertical, tr("EPS options"),this);
-    //    EPSGroupBoxLayout = new QVBoxLayout(EPSButtonGroupBox);
-    colorButton = new QRadioButton("Color",EPSButtonGroupBox);
-    BWButton = new QRadioButton("Grayscale",EPSButtonGroupBox);
-    EPSButtonGroupBox->setInsideMargin (15); 
-    EPSButtonGroupBox->insert(colorButton);
-    EPSButtonGroupBox->insert(BWButton);
-    EPSButtonGroupBox->setExclusive(true);
-    EPSWidgetGroupBox = EPSButtonGroupBox;
-    //    EPSGroupBoxLayout->add(EPSWidgetGroupBox);
+    QButtonGroup * EPSColorButtonGroupBox = new QButtonGroup( 2,Qt::Vertical, tr("EPS options"),this);
+    //    EPSGroupBoxLayout = new QVBoxLayout(EPSColorButtonGroupBox);
+    colorButton = new QRadioButton("Color",EPSColorButtonGroupBox);
+    BWButton = new QRadioButton("Grayscale",EPSColorButtonGroupBox);
+    EPSColorButtonGroupBox->setInsideMargin (15); 
+    EPSColorButtonGroupBox->insert(colorButton);
+    EPSColorButtonGroupBox->insert(BWButton);
+    EPSColorButtonGroupBox->setExclusive(true);
+    EPSWidgetGroupBox->add(EPSColorButtonGroupBox);
+
+    vectorEPSCheckBox = new QCheckBox( "Vector EPS File",EPSWidgetGroupBox);
+    vectorEPSCheckBox->setChecked( true );
+    EPSWidgetGroupBox->add(vectorEPSCheckBox);
 
 #else
@@ -297 +299 @@
     BWButton = new QRadioButton("Grayscale",EPSWidgetGroupBox);
 
-    EPSButtonGroupBox = new QButtonGroup();
-    EPSButtonGroupBox->addButton(colorButton);
-    EPSButtonGroupBox->addButton(BWButton);
-    EPSButtonGroupBox->setExclusive(true);
+    QButtonGroup * EPSColorButtonGroupBox = new QButtonGroup();
+    EPSColorButtonGroupBox->addButton(colorButton);
+    EPSColorButtonGroupBox->addButton(BWButton);
+    EPSColorButtonGroupBox->setExclusive(true);
 
     EPSGroupBoxLayout->addWidget(colorButton);    
     EPSGroupBoxLayout->addWidget(BWButton);    
+
+    vectorEPSCheckBox = new QCheckBox( "Vector EPS File",EPSWidgetGroupBox);
+    vectorEPSCheckBox->setChecked( true );
+    EPSGroupBoxLayout->addWidget(vectorEPSCheckBox);
+
     EPSWidgetGroupBox->setLayout(EPSGroupBoxLayout);
-
 #endif
     colorButton->setChecked( true );
@@ -355 +361 @@
 int G4OpenGLQtExportDialog::getHeight()
 {
-  if (!height) return -1;
+  if (!height) return originalHeight;
   return height->text().toInt();
 }
@@ -361 +367 @@
 int G4OpenGLQtExportDialog::getWidth()
 {
-  if (!width) return -1;
+  if (!width) return originalWidth;
   return width->text().toInt();
 }
@@ -381 +387 @@
 }
 
+bool G4OpenGLQtExportDialog::getVectorEPS()
+{
+  if (!vectorEPSCheckBox) return 0;
+  return vectorEPSCheckBox->isChecked();
+}
+
 
 void G4OpenGLQtExportDialog::changeSizeBox()

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

@@ -2 +2 @@
 ** Meta object code from reading C++ file 'G4OpenGLQtExportDialog.hh'
 **
-** Created: Fri Dec 7 15:42:42 2007
+** Created: Tue Dec 11 12:06:10 2007
 **      by: The Qt Meta Object Compiler version 59 (Qt 4.2.2)
 **

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

@@ -1115 +1115 @@
     }    
     if (format == QString("eps")) {
-      generateEPS(nomFich,exportDialog->getNbColor(),image);
+      if (exportDialog->getVectorEPS()) {
+        generateVectorEPS(nomFich,exportDialog->getWidth(),exportDialog->getHeight(),image);
+      } else {
+        generateEPS(nomFich,exportDialog->getNbColor(),image);
+      }
     } else if ((format == "ps") || (format == "pdf")) {
       generatePS_PDF(nomFich,exportDialog->getNbColor(),image);
@@ -1248 +1252 @@
     } else if (mButtons & Qt::RightButton) {
       // NEVER DONE BECAUSE OF MOUSE MENU
-#ifdef GEANT4_QT_DEBUG
-      //       printf("G4OpenGLQtViewer::mouseMoveEvent Right \n");
-#endif
       //       setXRotation(xRot + dy/2);
       //       setZRotation(zRot + dx/2);
@@ -1289 +1290 @@
 
 /**
-   Generate Postscript form image
+   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 (
+ QString 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);
+  
+#ifdef GEANT4_QT_DEBUG
+  printf("generateVectorEPS::  AVANt DRAWVIEW !!======================== \n");
+#endif
+  glViewport (0, 0, aWidth,aHeight);
+  DrawView();
+
+#ifdef GEANT4_QT_DEBUG
+  printf("generateVectorEPS::  APREs DRAWVIEW !!======================== \n");
+#endif
+  returned = glRenderMode (GL_RENDER);
+  
+  
+#if QT_VERSION < 0x040000
+  file = fopen (aFilename.ascii(), "w");
+#else
+  file = fopen (aFilename.toStdString().c_str(), "w");
+#endif
+  if (file) {
+    spewWireframeEPS (file, returned, feedback_buffer, "rendereps");
+  } else {
+    printf("Could not open %s\n", print_string);
+  }
+  
+  delete[] feedback_buffer;
+
+  return true;
+}
+
+/**
+   Generate Encapsulated Postscript form image
    @param aFilename : name of file
    @param aInColor : numbers of colors : 1->BW 2->RGB 3->RGB+Alpha

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

@@ -2 +2 @@
 ** Meta object code from reading C++ file 'G4OpenGLQtViewer.hh'
 **
-** Created: Fri Dec 7 15:42:41 2007
+** Created: Tue Dec 11 12:08:34 2007
 **      by: The Qt Meta Object Compiler version 59 (Qt 4.2.2)
 **

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

@@ -134 +134 @@
    //Make sure current viewer is attached and clean...
    //Qt version needed
-   glViewport (0, 0, WinSize_x, WinSize_y);
+   //   glViewport (0, 0, WinSize_x, WinSize_y);
 
    //See if things have changed from last time and remake if necessary...