Changeset 585 for trunk/geant4/visualization/OpenGL

Timestamp:

Sep 26, 2007, 12:17:26 PM (17 years ago)

Author:

garnier

Message:

r610@mac-90108: laurentgarnier | 2007-09-25 16:54:15 +0200
boite de dialogue presque ok, reste plus qu a connecter

Location:

trunk/geant4/visualization/OpenGL

Files:

• include/G4OpenGLQtExportDialog.hh (modified) (1 diff)
• include/G4OpenGLQtViewer.hh (modified) (1 diff)
• src/G4OpenGLQtExportDialog.cc (modified) (8 diffs)
• src/G4OpenGLQtViewer.cc (modified) (3 diffs)

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

@@ -56 +56 @@
 
   int getSliderValue();
+  int getWidth();
+  int getHeight();
 
 public slots:

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

@@ -78 +78 @@
   void createPopupMenu();
   void createRadioAction(QAction *,QAction *, const std::string&,unsigned int a=1);
+  void rescaleImage(int, int);
   
   QMenu *fContextMenu;

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

@@ -57 +57 @@
   originalWidth = aWidth;
   originalHeight = aHeight;
-  printf("height %d width %d\n",aHeight,aWidth);  
 
   // global layout
@@ -63 +62 @@
 
   
-  if(nomFich.endsWith(".jpg")) {
+  if (nomFich.endsWith(".jpg") || 
+      nomFich.endsWith(".jepg")) {
     
     QGroupBox *imageGroupBox = new QGroupBox(tr("Image quality"));
@@ -101 +101 @@
     BW->setChecked( false );
     
-    connect( color, SIGNAL( clicked() ), BW, SLOT( toggle() ) );
-    connect( BW, SIGNAL( clicked() ), color, SLOT( toggle() ) );
+    connect( color, SIGNAL( toggled(bool) ), BW, SLOT( setChecked(bool) ) );
+    connect( BW, SIGNAL( toggled(bool) ), color, SLOT( setChecked(bool) ) );
 
 
@@ -157 +157 @@
   ratioCheckBox->setVisible(modify->isChecked());
 
-  connect( original, SIGNAL( clicked() ), modify, SLOT( toogle() ) );
-  connect( modify, SIGNAL( clicked() ), original, SLOT( toogle() ) );
+  connect( original, SIGNAL( toggled(bool) ), modify, SLOT( setChecked(bool) ) );
+  connect( modify, SIGNAL( toggled(bool) ), original, SLOT( setChecked(bool) ) );
   connect( modify, SIGNAL( toggled(bool) ), this, SLOT( changeSizeBox(bool) ) );
 
@@ -179 +179 @@
   widthWidget = new QWidget;
 
-  widthLineLayout->addWidget(new QLabel("Width"));
+  widthLineLayout->addWidget(new QLabel("Width "));
   width = new QLineEdit(tmp.setNum(originalWidth));
   width->setMaxLength(5);
@@ -225 +225 @@
 }
 
+int G4OpenGLQtExportDialog::getHeight()
+{
+  return height->text().toInt();
+}
+
+int G4OpenGLQtExportDialog::getWidth()
+{
+  return width->text().toInt();
+}
+
+
 void G4OpenGLQtExportDialog::changeSizeBox(bool aChange)
 {
@@ -236 +247 @@
  )
 {
-  printf("new Width : %s\n",s.toStdString().c_str());
   if (ratioCheckBox->isChecked()){
     QString tmp;
@@ -247 +257 @@
 )
 {
-  printf("new Height : %s\n",s.toStdString().c_str());
   if (ratioCheckBox->isChecked()){
     QString tmp;

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

@@ -116 +116 @@
 //////////////////////////////////////////////////////////////////////////////
 void G4OpenGLQtViewer::CreateMainWindow (
-                                         QGLWidget* glWidget
-                                         ) 
+ QGLWidget* glWidget
+) 
 //////////////////////////////////////////////////////////////////////////////
 //!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!//
@@ -676 +676 @@
   nomFich += "."+selectedFilter->toLower();
   printf("G4OpenGLQtViewer::name %s\n",nomFich.toStdString().c_str());
-  if(nomFich.endsWith(".eps")) {
-    G4cerr << "This version of G4UI Could not generate EPS." << G4endl;
-  } else if(nomFich.endsWith(".jpg") || nomFich.endsWith(".jpeg")) {
-    G4OpenGLQtExportDialog* exportDialog= new G4OpenGLQtExportDialog(GLWindow,nomFich,fWindow->height(),fWindow->width());
-    int res = exportDialog->exec();
-    printf("G4OpenGLQtViewer::actionCreateEPS() --%d-- quality:\n",res);
-    fWindow->grabFrameBuffer().save(nomFich);
-  } else {
-    fWindow->grabFrameBuffer().save(nomFich);
-    // grabFrameBuffer() :: Returns an image of the frame buffer. If withAlpha is true the alpha channel is included.
+  G4OpenGLQtExportDialog* exportDialog= new G4OpenGLQtExportDialog(GLWindow,nomFich,fWindow->height(),fWindow->width());
+  if(  exportDialog->exec()) {
+    
+    printf("rescaling before\n");
+    QPixmap * pixmap = new QPixmap(fWindow->renderPixmap (exportDialog->getWidth(),exportDialog->getHeight() )) ;//fWindow->grabFrameBuffer();
+    printf("rescaling after\n");
+      
+    if ((exportDialog->getWidth() !=fWindow->width()) ||
+         (exportDialog->getWidth() !=fWindow->width())) {
+
+      //      rescaleImage(exportDialog->getWidth(),exportDialog->getHeight());// re-scale image
+      printf("rescaling\n");
+    }
+    
+    // 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.
+      pixmap->save(nomFich,0,exportDialog->getSliderValue());
+      printf("saving jpeg quality : %d\n",exportDialog->getSliderValue());
+    } else if (nomFich.endsWith(".eps")) {
+      printf("saving EPS\n");
+    } else if (nomFich.endsWith(".tif") ||
+               nomFich.endsWith(".tiff") ||
+               nomFich.endsWith(".jpg") ||
+               nomFich.endsWith(".png") ||
+               nomFich.endsWith(".bmp") ||
+               nomFich.endsWith(".xpm")) {
+      pixmap->save(nomFich,0,exportDialog->getSliderValue());
+      printf("saving ELSE\n");
+    } else {
+      G4cerr << "This version of G4UI Could not generate the selected format" << G4endl;
+    }
+    
+  } else { // cancel selected
+    return;
   }
   
@@ -910 +936 @@
 }
 
-
+void G4OpenGLQtViewer::rescaleImage(
+ int aWidth
+,int aHeight
+){
+  printf("");
+}
 #endif