Changeset 635 for trunk/geant4/visualization

Timestamp:

Dec 4, 2007, 6:46:23 PM (17 years ago)

Author:

garnier

Message:

modif pour les formats d export

Location:

trunk/geant4/visualization/OpenGL/src

Files:

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

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

@@ -80 +80 @@
     QGroupBox *imageGroupBox = new QGroupBox(tr("Image quality"),this);
     QVBoxLayout *imageGroupBoxLayout = new QVBoxLayout(imageGroupBox);
-    QWidget *sliderBox = new QWidget;
-
-    QHBoxLayout *hSlider = new QHBoxLayout(sliderBox);
+    QWidget *sliderBox = new QWidget();
+
+    QHBoxLayout *hSliderLayout = new QHBoxLayout(sliderBox);
 
     //    qualityLabel =  new QLabel( tr( "Image quality" ) );
     //    imageGroupBoxLayout->addWidget(qualityLabel);
-    qualitySlider= new QSlider(Qt::Horizontal,this);
+    qualitySlider= new QSlider(Qt::Horizontal,sliderBox);
 #if QT_VERSION < 0x040000
     qualitySlider->setMinValue(0);
@@ -97 +97 @@
 #endif
     qualitySlider->setValue(60);
-    hSlider->addWidget(new QLabel("low",this));
-    hSlider->addWidget(qualitySlider);
-    hSlider->addWidget(new QLabel("Maximum",this));
-#if QT_VERSION >= 0x040000
-    sliderBox->setLayout(hSlider);
+    hSliderLayout->addWidget(new QLabel("low",sliderBox));
+    hSliderLayout->addWidget(qualitySlider);
+    hSliderLayout->addWidget(new QLabel("Maximum",sliderBox));
+#if QT_VERSION >= 0x040000
+    sliderBox->setLayout(hSliderLayout);
 #endif
     imageGroupBoxLayout->addWidget(sliderBox);
@@ -117 +117 @@
     //    transparencyEPS->setChecked( true );
 
-    colorButton = new QRadioButton("Color",this);
-    BWButton = new QRadioButton("Grayscale",this);
-
     QWidget * EPSWidgetGroupBox; // widget containing group button
     QButtonGroup * EPSButtonGroupBox; // group button 
-#if QT_VERSION < 0x040000
+
+
+#if QT_VERSION < 0x040000
+    colorButton = new QRadioButton("Color",EPSWidgetGroupBox);
+    BWButton = new QRadioButton("Grayscale",EPSWidgetGroupBox);
     EPSButtonGroupBox = new QButtonGroup( 2,Qt::Vertical, tr("EPS options"),this);
     EPSButtonGroupBox->insert(colorButton);
     EPSButtonGroupBox->insert(BWButton);
     EPSButtonGroupBox->setExclusive(true);
-    colorButton->setChecked( true );
     EPSWidgetGroupBox = EPSButtonGroupBox;
 
@@ -133 +133 @@
     EPSWidgetGroupBox = new QGroupBox(tr("EPS options"));
     QVBoxLayout *EPSGroupBoxLayout = new QVBoxLayout(EPSWidgetGroupBox);
+
+    colorButton = new QRadioButton("Color",EPSWidgetGroupBox);
+    BWButton = new QRadioButton("Grayscale",EPSWidgetGroupBox);
+
     EPSButtonGroupBox = new QButtonGroup();
-    colorButton->setChecked( true );
     EPSButtonGroupBox->addButton(colorButton);
     EPSButtonGroupBox->addButton(BWButton);
@@ -144 +147 @@
 
 #endif
+    colorButton->setChecked( true );
 
     //    EPSGroupBoxLayout->addWidget(transparencyEPS);    
@@ -159 +163 @@
     QVBoxLayout *transparencyGroupBoxLayout = new QVBoxLayout(transparencyGroupBox);
 
-    boxTransparency = new QCheckBox("Save transparency",this);
+    boxTransparency = new QCheckBox("Save transparency",transparencyGroupBox);
     boxTransparency->setChecked( false );
     //    boxTransparency->setEnabled(false);
@@ -172 +176 @@
 
   // size box
-  QWidget* modifyAndRatioWidget = new QWidget;
+  QWidget* modifyAndRatioWidget = new QWidget();
 
   QHBoxLayout *modifyAndRatioLayout = new QHBoxLayout(modifyAndRatioWidget);
-
-  // original button
-  original = new QRadioButton("Original",this);
-  // modify and ratio
-  modify = new QRadioButton("Modify",this);
 
   QWidget * sizeWidgetGroupBox; // widget containing group button
@@ -193 +192 @@
   sizeButtonGroupBox->insert(modify);
   sizeButtonGroupBox->setExclusive(true);
-  original->setChecked( true );
   sizeWidgetGroupBox = sizeButtonGroupBox;
   sizeGroupBoxLayout = sizeWidgetGroupBox->layout();
@@ -202 +200 @@
   sizeGroupBoxLayout = new QVBoxLayout(sizeWidgetGroupBox);
   sizeButtonGroupBox = new QButtonGroup();
-  original->setChecked( true );
 
   original = new QRadioButton("Original");
@@ -216 +213 @@
   sizeWidgetGroupBox->setLayout(sizeGroupBoxLayout);
 #endif
+  original->setChecked( true );
 
 
@@ -244 +242 @@
 
   // height
-  heightWidget = new QWidget;
+  heightWidget = new QWidget();
 
   QHBoxLayout *heightLineLayout = new QHBoxLayout(heightWidget);
@@ -250 +248 @@
   QString tmp;
  
-  heightLineLayout->addWidget(new QLabel("Height",this));
-  height = new QLineEdit(tmp.setNum(originalHeight),this);
+  heightLineLayout->addWidget(new QLabel("Height",heightWidget));
+  height = new QLineEdit(tmp.setNum(originalHeight),heightWidget);
   height->setMaxLength(5);
 #if QT_VERSION < 0x040000
@@ -270 +268 @@
 
   // width
-  widthWidget = new QWidget;
+  widthWidget = new QWidget();
 
   QHBoxLayout *widthLineLayout = new QHBoxLayout(widthWidget);
@@ -279 +277 @@
   widthLineLayout->addWidget(new QLabel("Width ",widthWidget));
 #endif
-  width = new QLineEdit(tmp.setNum(originalWidth),this);
+  width = new QLineEdit(tmp.setNum(originalWidth),widthWidget);
   width->setMaxLength(5);
 #if QT_VERSION < 0x040000

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

@@ -36 +36 @@
 #ifdef G4VIS_BUILD_OPENGLQT_DRIVER
 
-//#define GEANT4_QT_DEBUG
+#define GEANT4_QT_DEBUG
 
 #include "G4OpenGLQtViewer.hh"
@@ -1096 +1096 @@
 
     QImage image;
-    //    if ((exportDialog->getWidth() !=fWindow->width()) ||
-    //        (exportDialog->getHeight() !=fWindow->height())) {
+    if ((exportDialog->getWidth() !=fWindow->width()) ||
+        (exportDialog->getHeight() !=fWindow->height())) {
+      G4cerr << "Export->Change Size : This function is not implemented, to export in another size, please resize your frame to what you need" << G4endl;
       
-      //      rescaleImage(exportDialog->getWidth(),exportDialog->getHeight());// re-scale image
-#ifdef GEANT4_QT_DEBUG
-      printf("rescaling\n");
-#endif
-      QGLWidget* glResized = fWindow;
-      fWindow->renderPixmap (exportDialog->getWidth()*2,exportDialog->getHeight()*2 ).save("/Users/laurentgarnier/Desktop/zzz.jpg","jpg");
-      QPixmap * pixmap = new QPixmap(fWindow->renderPixmap (exportDialog->getWidth(),exportDialog->getHeight() )) ;
-      //      image = pixmap.toImage();
+      //    rescaleImage(exportDialog->getWidth(),exportDialog->getHeight());// re-scale image
+      //      QGLWidget* glResized = fWindow;
+
+      // FIXME :
+      // L.Garnier : I've try to implement change size function, but the problem is 
+      // the renderPixmap function call the QGLWidget to resize and it doesn't draw
+      // the content of this widget... It only draw the background.
+
+      //      fWindow->renderPixmap (exportDialog->getWidth()*2,exportDialog->getHeight()*2,true );
+
+      //      QPixmap pixmap = fWindow->renderPixmap ();
+      
+      //      image = pixmap->toImage();
       //      glResized->resize(exportDialog->getWidth()*2,exportDialog->getHeight()*2);
-#ifdef GEANT4_QT_DEBUG
-      printf("rescaling after\n");
-#endif
       //      image = glResized->grabFrameBuffer();
       
-      //    } else {
-      // image = fWindow->grabFrameBuffer();
-      //  }    
+    } else {
+      image = fWindow->grabFrameBuffer();
+    }    
     // jpeg format
     if (nomFich.endsWith(".jpg") || 
@@ -1134 +1137 @@
                nomFich.endsWith(".bmp") ||
                nomFich.endsWith(".xpm")) {
-      image.save(nomFich,0,exportDialog->getSliderValue());
-#ifdef GEANT4_QT_DEBUG
-      printf("saving ELSE\n");
+      bool res = image.save(nomFich,0,exportDialog->getSliderValue());
+      if (res == false) {
+        G4cerr << "Error while saving file..." << G4endl;
+      }
+#ifdef GEANT4_QT_DEBUG
+      printf("saving ELSE %d\n",res);
 #endif
     } else {

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

@@ -25 +25 @@
 //
 //
-// $Id: G4OpenGLStoredQtViewer.cc,v 1.7 2007/11/30 14:47:30 lgarnier Exp $
+// $Id: G4OpenGLStoredQtViewer.cc,v 1.6 2007/11/15 18:24:28 lgarnier Exp $
 // GEANT4 tag $Name:  $
 //
@@ -34 +34 @@
 #ifdef G4VIS_BUILD_OPENGLQT_DRIVER
 
-//#define GEANT4_QT_DEBUG
+#define GEANT4_QT_DEBUG
 
 #include "G4OpenGLStoredQtViewer.hh"
+#include "G4VisManager.hh"
 
 #include "G4ios.hh"
@@ -304 +305 @@
 void G4OpenGLStoredQtViewer::mouseMoveEvent(QMouseEvent *event)
 {
-#ifdef GEANT4_QT_DEBUG
-  printf("G4OpenGLStoredQtViewer::mouseMoveEvent\n");
-#endif
 #if QT_VERSION < 0x040000
   G4MouseMoveEvent(event->x(),event->y(),event->state());
@@ -318 +316 @@
 void G4OpenGLStoredQtViewer::contextMenuEvent(QContextMenuEvent *e)
 {
+#ifdef GEANT4_QT_DEBUG
+  printf("G4OpenGLStoredQtViewer::contextMenuEvent\n");
+#endif
   manageContextMenuEvent(e);
 }

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() &&
@@ -131 +132 @@
   size_t nPasses = cutawayUnion? cutaways.size(): 1;
   for (size_t i = 0; i < nPasses; ++i) {
+    printf("***************************  CASE A ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ \n");
 
     if (cutawayUnion) {
@@ -142 +144 @@
     }
 
-    if (fG4OpenGLStoredSceneHandler.fTopPODL) 
+    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);
@@ -161 +166 @@
         glCallList (to.fDisplayListId);
         glPopMatrix();
+    printf("***************************  CASE B3 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ \n");
       }
     }