Changeset 599 for trunk/geant4/visualization/OpenGL

Timestamp:

Nov 12, 2007, 4:42:32 PM (17 years ago)

Author:

garnier

Message:

r636@mac-90108: laurentgarnier | 2007-11-12 16:46:00 +0100
modif pour qt3

Location:

trunk/geant4/visualization/OpenGL/src

Files:

• G4OpenGLImmediateQtViewer.cc (modified) (1 diff)
• G4OpenGLQtExportDialog.cc (modified) (12 diffs)
• G4OpenGLQtExportDialog_moc.cc (deleted)
• G4OpenGLQtExportDialog_moc_040202.cc (added)
• G4OpenGLQtViewer.cc (modified) (21 diffs)
• G4OpenGLQtViewer_moc.cc (deleted)
• G4OpenGLQtViewer_moc_040202.cc (added)
• G4OpenGLStoredQt.cc (modified) (1 diff)
• G4OpenGLStoredQtViewer.cc (modified) (1 diff)
• G4OpenGLViewerMessenger.cc (modified) (2 diffs)

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

@@ -159 +159 @@
 ,int height)
 {  
-  int side = qMin(width, height);
+  int side = width;
+  if (width > height) {
+    side = height;
+  }
   glViewport((width - side) / 2, (height - side) / 2, side, side);
   glMatrixMode(GL_PROJECTION);

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

@@ -25 +25 @@
 //
 //
-// $Id: G4OpenGLQtExportDialog.cc,v 1.2 2007/11/08 17:00:51 lgarnier Exp $
+// $Id: G4OpenGLQtExportDialog.cc,v 1.3 2007/11/09 15:03:21 lgarnier Exp $
 // GEANT4 tag $Name:  $
 //
@@ -54 +54 @@
   : QDialog( parent )
 {
+#if QT_VERSION < 0x040000
+  setCaption( tr( " Export options" ));
+#else
   setWindowTitle( tr( " Export options" ));
+#endif
   originalWidth = aWidth;
   originalHeight = aHeight;
@@ -66 +70 @@
 
   // global layout
+#if QT_VERSION < 0x040000
+  QVBoxLayout* globalVLayout = new QVBoxLayout(this);
+#else
   QVBoxLayout* globalVLayout = new QVBoxLayout();
+#endif
 
   
@@ -73 +81 @@
     
     QGroupBox *imageGroupBox = new QGroupBox(tr("Image quality"));
+#if QT_VERSION < 0x040000
+    QVBoxLayout *imageGroupBoxLayout = new QVBoxLayout(imageGroupBox);
+#else
     QVBoxLayout *imageGroupBoxLayout = new QVBoxLayout;
-
+#endif
     QWidget *sliderBox = new QWidget;
+
+#if QT_VERSION < 0x040000
+    QHBoxLayout *hSlider = new QHBoxLayout(sliderBox);
+#else
     QHBoxLayout *hSlider = new QHBoxLayout;
+#endif
+
     //    qualityLabel =  new QLabel( tr( "Image quality" ) );
     //    imageGroupBoxLayout->addWidget(qualityLabel);
-    qualitySlider= new QSlider(Qt::Horizontal);
+    qualitySlider= new QSlider(Qt::Horizontal,0);
+#if QT_VERSION < 0x040000
+    qualitySlider->setMinValue(0);
+    qualitySlider->setMaxValue(100);
+    qualitySlider->setTickmarks(QSlider::Below); 
+#else
     qualitySlider->setMinimum(0);
     qualitySlider->setMaximum(100);
     qualitySlider->setTickPosition(QSlider::TicksBelow);
+#endif
     qualitySlider->setValue(60);
-    hSlider->addWidget(new QLabel("low"));
+    hSlider->addWidget(new QLabel("low",0));
     hSlider->addWidget(qualitySlider);
-    hSlider->addWidget(new QLabel("Maximum"));
+    hSlider->addWidget(new QLabel("Maximum",0));
+#if QT_VERSION >= 0x040000
     sliderBox->setLayout(hSlider);
+#endif
     imageGroupBoxLayout->addWidget(sliderBox);
 
+#if QT_VERSION >= 0x040000
     imageGroupBox->setLayout(imageGroupBoxLayout);
+#endif
     globalVLayout->addWidget(imageGroupBox);
   }
@@ -96 +123 @@
   if(nomFich.endsWith(".eps")) {
     QGroupBox *EPSGroupBox = new QGroupBox(tr("EPS options"));
+
+#if QT_VERSION < 0x040000
+    QVBoxLayout *EPSGroupBoxLayout = new QVBoxLayout(EPSGroupBox);
+#else
     QVBoxLayout *EPSGroupBoxLayout = new QVBoxLayout;
+#endif
 
     //    transparencyEPS = new QCheckBox( "transparencyEPS" );
@@ -102 +134 @@
     //    transparencyEPS->setChecked( true );
 
-    colorButton = new QRadioButton("Color");
-    BWButton = new QRadioButton("Grayscale");
+    colorButton = new QRadioButton("Color",0);
+    BWButton = new QRadioButton("Grayscale",0);
     colorButton->setChecked( true );
     BWButton->setChecked( false );
@@ -111 +143 @@
     EPSGroupBoxLayout->addWidget(colorButton);    
     EPSGroupBoxLayout->addWidget(BWButton);    
+#if QT_VERSION >= 0x040000
     EPSGroupBox->setLayout(EPSGroupBoxLayout);
+#endif
     globalVLayout->addWidget(EPSGroupBox);
 
@@ -123 +157 @@
 
     QGroupBox *transparencyGroupBox = new QGroupBox(tr("Transparency"));
+#if QT_VERSION < 0x040000
+    QVBoxLayout *transparencyGroupBoxLayout = new QVBoxLayout(transparencyGroupBox);
+#else
     QVBoxLayout *transparencyGroupBoxLayout = new QVBoxLayout;
-
-    boxTransparency = new QCheckBox("Save transparency");
+#endif
+
+    boxTransparency = new QCheckBox("Save transparency",0);
     boxTransparency->setChecked( false );
     //    boxTransparency->setEnabled(false);
 
     transparencyGroupBoxLayout->addWidget(boxTransparency);    
+#if QT_VERSION >= 0x040000
     transparencyGroupBox->setLayout(transparencyGroupBoxLayout);
+#endif
     globalVLayout->addWidget(transparencyGroupBox);
 
@@ -137 +177 @@
   // size box
   QGroupBox *sizeGroupBox = new QGroupBox(tr("Size"));
+  QWidget* modifyAndRatioWidget = new QWidget;
+
+#if QT_VERSION < 0x040000
+  QHBoxLayout *modifyAndRatioLayout = new QHBoxLayout(modifyAndRatioWidget);
+  QVBoxLayout *sizeGroupBoxLayout = new QVBoxLayout(sizeGroupBox);
+#else
+  QHBoxLayout *modifyAndRatioLayout = new QHBoxLayout;
   QVBoxLayout *sizeGroupBoxLayout = new QVBoxLayout;
-  
-  QHBoxLayout *modifyAndRatioLayout = new QHBoxLayout;
-  QWidget* modifyAndRatioWidget = new QWidget;
+#endif
 
   // original button
-  original = new QRadioButton("Original");
+  original = new QRadioButton("Original",0);
   original->setChecked( true );
   sizeGroupBoxLayout->addWidget(original);
 
   // modify and ratio
-  modify = new QRadioButton("Modify");
+  modify = new QRadioButton("Modify",0);
   modify->setChecked( false );
 
-  ratioCheckBox = new QCheckBox( "Keep ratio" );
+  ratioCheckBox = new QCheckBox( "Keep ratio",0 );
   ratioCheckBox->setChecked( true );
 
   modifyAndRatioLayout->addWidget(modify);
   modifyAndRatioLayout->addWidget(ratioCheckBox);
+#if QT_VERSION >= 0x040000
   modifyAndRatioWidget->setLayout(modifyAndRatioLayout);
+#endif
   sizeGroupBoxLayout->addWidget(modifyAndRatioWidget);
-  ratioCheckBox->setVisible(modify->isChecked());
+  if (modify->isChecked()) {
+    ratioCheckBox->show();
+  } else {
+    ratioCheckBox->hide();
+  }
 
   connect( original, SIGNAL( clicked(bool) ), this, SLOT( changeSizeBox(true)) );
@@ -164 +215 @@
 
   // height
+  heightWidget = new QWidget;
+
+#if QT_VERSION < 0x040000
+  QHBoxLayout *heightLineLayout = new QHBoxLayout(heightWidget);
+#else
   QHBoxLayout *heightLineLayout = new QHBoxLayout;
-  heightWidget = new QWidget;
+#endif
+
   QString tmp;
  
-  heightLineLayout->addWidget(new QLabel("Height"));
-  height = new QLineEdit(tmp.setNum(originalHeight));
+  heightLineLayout->addWidget(new QLabel("Height",0));
+  height = new QLineEdit(tmp.setNum(originalHeight),0);
   height->setMaxLength(5);
   heightLineLayout->addWidget(height);
+#if QT_VERSION >= 0x040000
   heightWidget->setLayout(heightLineLayout);
+#endif
   sizeGroupBoxLayout->addWidget(heightWidget);
   connect( height, SIGNAL( textChanged ( const QString& ) ), this, SLOT( textHeightChanged(const QString &) ) );
@@ -178 +237 @@
 
   // width
+  widthWidget = new QWidget;
+
+#if QT_VERSION < 0x040000
+  QHBoxLayout *widthLineLayout = new QHBoxLayout(widthWidget);
+#else
   QHBoxLayout *widthLineLayout = new QHBoxLayout;
-  widthWidget = new QWidget;
-
-  widthLineLayout->addWidget(new QLabel("Width "));
-  width = new QLineEdit(tmp.setNum(originalWidth));
+#endif
+
+  widthLineLayout->addWidget(new QLabel("Width ",0));
+  width = new QLineEdit(tmp.setNum(originalWidth),0);
   width->setMaxLength(5);
   widthLineLayout->addWidget(width);
+#if QT_VERSION >= 0x040000
   widthWidget->setLayout(widthLineLayout);
+#endif
   sizeGroupBoxLayout->addWidget(widthWidget);
   connect( width, SIGNAL( textChanged ( const QString& ) ), this, SLOT( textWidthChanged(const QString &) ) );
 
+#if QT_VERSION >= 0x040000
   sizeGroupBox->setLayout(sizeGroupBoxLayout);
+#endif
   globalVLayout->addWidget(sizeGroupBox);
 
-  heightWidget->setVisible(false);
-  widthWidget->setVisible(false);
+  heightWidget->hide();
+  widthWidget->hide();
 
   // button ok/cancel box
 
   QGroupBox *buttonGroupBox = new QGroupBox();
+
+#if QT_VERSION < 0x040000
+  QHBoxLayout *buttonGroupBoxLayout = new QHBoxLayout(buttonGroupBox);
+#else
   QHBoxLayout *buttonGroupBoxLayout = new QHBoxLayout;
-
-  buttonOk = new QPushButton( tr( "&OK" ) );
+#endif
+
+  buttonOk = new QPushButton( tr( "&OK" ),0 );
   buttonOk->setAutoDefault( TRUE );
   buttonOk->setDefault( TRUE );
   buttonGroupBoxLayout->addWidget(buttonOk);
 
-  buttonCancel = new QPushButton( tr( "&Cancel" ) );
+  buttonCancel = new QPushButton( tr( "&Cancel" ),0 );
   buttonCancel->setAutoDefault( TRUE );
   buttonGroupBoxLayout->addWidget(buttonCancel);
 
+#if QT_VERSION >= 0x040000
   buttonGroupBox->setLayout(buttonGroupBoxLayout);
+#endif
   globalVLayout->addWidget(buttonGroupBox);
 
 
+#if QT_VERSION >= 0x040000
   setLayout(globalVLayout);
+#endif
 
   // signals and slots connections
@@ -264 +341 @@
   }
   if ( original->isChecked()) {
-    heightWidget->setVisible(false);
-    widthWidget->setVisible(false);
-    ratioCheckBox->setVisible(false);
+    heightWidget->hide();
+    widthWidget->hide();
+    ratioCheckBox->hide();
   } else {
-    heightWidget->setVisible(true);
-    widthWidget->setVisible(true);
-    ratioCheckBox->setVisible(true);
+    heightWidget->show();
+    widthWidget->show();
+    ratioCheckBox->show();
   }
 }

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

@@ -25 +25 @@
 //
 //
-// $Id: G4OpenGLQtViewer.cc,v 1.3 2007/11/08 17:00:51 lgarnier Exp $
+// $Id: G4OpenGLQtViewer.cc,v 1.4 2007/11/09 15:03:22 lgarnier Exp $
 // GEANT4 tag $Name:  $
 //
@@ -51 +51 @@
 #include "G4UImanager.hh"
 #include <qapplication.h>
-#include <qboxLayout.h>
+#include <qlayout.h>
 #include <qdialog.h>
+
+#if QT_VERSION >= 0x040000
 #include <qmenu.h>
 #include <qimagewriter.h>
+#else
+#include <qaction.h>
+#include <qwidgetlist.h>
+#include <qmenudata.h>
+#include <qpopupmenu.h>
+#include <qimage.h>
+#endif
+
 #include <qmessagebox.h>
 #include <qfiledialog.h>
@@ -62 +72 @@
 #include <qdialog.h>
 #include <qevent.h> //include <qcontextmenuevent.h>
-#include <qmenu.h>
-#include <qimage.h>
 
 
@@ -100 +108 @@
     G4cerr << "Visualization window not defined, please choose one before" << G4endl;
   } else {
+#if QT_VERSION < 0x040000
+    GLWindow->setActiveWindow();
+#else
     GLWindow->activateWindow();
+#endif
     printf("G4OpenGLQtViewer::ShowView -----------------------\n");
   }
@@ -145 +157 @@
     // look for the main window
     bool found = false;
+#if QT_VERSION < 0x040000
+    QWidgetList  *list = QApplication::allWidgets();
+    QWidgetListIt it( *list );         // iterate over the widgets
+    QWidget * widget;
+    while ( (widget=it.current()) != 0 ) {  // for each widget...
+      ++it;
+      if ((found== false) && (widget->inherits("QMainWindow"))) {
+        printf("G4OpenGLQtViewer::CreateMainWindow case Qapp exist\n");
+        GLWindow = new QDialog(widget,0,FALSE,Qt::WStyle_Title | Qt::WStyle_SysMenu | Qt::WStyle_MinMax );
+        found = true;
+      }
+    }
+    delete list;                      // delete the list, not the widgets
+#else
     foreach (QWidget *widget, QApplication::allWidgets()) {
       if ((found== false) && (widget->inherits("QMainWindow"))) {
@@ -152 +178 @@
       }
     }
+#endif
+
     if (found==false) {
       printf("G4OpenGLQtViewer::CreateMainWindow case Qapp exist, but not found\n");
@@ -161 +189 @@
   }
 
+#if QT_VERSION < 0x040000
+  QHBoxLayout *mainLayout = new QHBoxLayout(GLWindow);
+#else
   QHBoxLayout *mainLayout = new QHBoxLayout;
+#endif
 
   mainLayout->addWidget(fWindow);
+
+#if QT_VERSION < 0x040000
+  GLWindow->setCaption( tr( "QGl Viewer" ));
+#else
   GLWindow->setLayout(mainLayout);
-  GLWindow->setWindowTitle("QGl Viewer");
+  GLWindow->setWindowTitle(tr("QGl Viewer"));
+#endif
   GLWindow->resize(300, 300);
   GLWindow->move(900,300);
@@ -229 +266 @@
 void G4OpenGLQtViewer::createPopupMenu()    {
 
+#if QT_VERSION < 0x040000
+  fContextMenu = new QPopupMenu( GLWindow,"All" );
+#else
   fContextMenu = new QMenu("All");
-
+#endif
+  Q_CHECK_PTR( fContextMenu );
+
+#if QT_VERSION < 0x040000
+  // === Mouse menu ===
+  QPopupMenu *mMouseAction = new QPopupMenu( fContextMenu );
+  Q_CHECK_PTR( mMouseAction );
+
+  QAction *rotate = new QAction("&Rotate scene",CTRL+Key_N,mMouseAction);
+  QAction *move =  new QAction("&Move scene",CTRL+Key_M,mMouseAction);
+  rotate->addTo(mMouseAction);
+  move->addTo(mMouseAction);
+
+  fContextMenu->insertItem( "&Mouse action", mMouseAction);
+
+#else
+  // === Mouse menu ===
   QMenu *mMouseAction = fContextMenu->addMenu("&Mouse action");
+
   QAction *rotate = mMouseAction->addAction("&Rotate scene");
   QAction *move = mMouseAction->addAction("&Move scene");
+#endif
+
   // INIT mMouse
   createRadioAction(rotate,move,SLOT(toggleMouseAction(bool)),1);
 
-  //Style Menu
+#if QT_VERSION < 0x040000
+  // === Style Menu ===
+  QPopupMenu *mStyle = new QPopupMenu(fContextMenu);
+
+  QPopupMenu *mRepresentation = new QPopupMenu(fContextMenu);
+
+  QAction *polyhedron = new QAction("&Polyhedron",CTRL+Key_P,mRepresentation);
+  QAction *nurbs = new QAction("&NURBS",CTRL+Key_N,mRepresentation);
+  polyhedron->addTo(mRepresentation);
+  nurbs->addTo(mRepresentation);
+
+  mStyle->insertItem("&Representation",mRepresentation);
+  fContextMenu->insertItem("&Style",mStyle);
+
+#else
+  // === Style Menu ===
   QMenu *mStyle = fContextMenu->addMenu("&Style");
 
@@ -243 +317 @@
   QAction *polyhedron = mRepresentation->addAction("Polyhedron");
   QAction *nurbs = mRepresentation->addAction("NURBS");
+#endif
   // INIT mStyle
   G4ViewParameters::RepStyle style;
@@ -255 +330 @@
 
 
+#if QT_VERSION < 0x040000
+  // === Drawing Menu ===
+  QPopupMenu *mDrawing = new QPopupMenu(fContextMenu);
+  fContextMenu->insertItem("&Drawing",mDrawing);
+
+  fDrawingWireframe = new QPopupMenu(mDrawing);
+  mDrawing->insertItem("&Wireframe",fDrawingWireframe);
+
+  mDrawing->setCheckable(true);
+  fDrawingWireframe->setCheckable(true);
+
+  fDrawingLineRemoval = new QPopupMenu(mDrawing);
+  mDrawing->insertItem("&Hidden line removal",fDrawingLineRemoval);
+  fDrawingLineRemoval->setCheckable(true);
+
+  fDrawingSurfaceRemoval = new QPopupMenu(mDrawing);
+  mDrawing->insertItem("&Hidden surface removal",fDrawingSurfaceRemoval);
+  fDrawingSurfaceRemoval->setCheckable(true);
+
+  fDrawingLineSurfaceRemoval = new QPopupMenu(mDrawing);
+  mDrawing->insertItem("&Hidden line and surface removal",fDrawingLineSurfaceRemoval);
+  fDrawingLineSurfaceRemoval->setCheckable(true);
+
+#else
+  // === Drawing Menu ===
   QMenu *mDrawing = mStyle->addMenu("&Drawing");
+
   fDrawingWireframe = mDrawing->addAction("Wireframe");
   fDrawingWireframe->setCheckable(true);
-  fDrawingWireframe->setChecked(true);
+
   fDrawingLineRemoval = mDrawing->addAction("Hidden line removal");
   fDrawingLineRemoval->setCheckable(true);
+
   fDrawingSurfaceRemoval = mDrawing->addAction("Hidden Surface removal");
   fDrawingSurfaceRemoval->setCheckable(true);
+
   fDrawingLineSurfaceRemoval = mDrawing->addAction("Hidden line and surface removal");
   fDrawingLineSurfaceRemoval->setCheckable(true);
+#endif
   // INIT Drawing
   G4ViewParameters::DrawingStyle d_style;
   d_style = fVP.GetDrawingStyle();
   
-  fDrawingWireframe->setCheckable(true);
-  fDrawingLineRemoval->setCheckable(true);
-  fDrawingSurfaceRemoval->setCheckable(true);
-  fDrawingLineSurfaceRemoval->setCheckable(true);
-
+#if QT_VERSION < 0x040000
+  if (d_style == G4ViewParameters::wireframe) {
+    fDrawingWireframe->setItemChecked(0,true);
+  } else if (d_style == G4ViewParameters::hlr) {
+    fDrawingLineRemoval->setItemChecked(0,true);
+  } else if (d_style == G4ViewParameters::hsr) {
+    fDrawingSurfaceRemoval->setItemChecked(0,true);
+  } else if (d_style == G4ViewParameters::hlhsr) {
+    fDrawingLineSurfaceRemoval->setItemChecked(0,true);
+  } else {
+    mDrawing->clear();
+  }
+#else
   if (d_style == G4ViewParameters::wireframe) {
     fDrawingWireframe->setChecked(true);
@@ -285 +397 @@
     mDrawing->clear();
   }
+#endif
 
   QObject ::connect(fDrawingWireframe, 
@@ -304 +417 @@
 
 
+#if QT_VERSION < 0x040000
+  QPopupMenu *mBackground = new QPopupMenu(mStyle);
+  mStyle->insertItem("&Background color",mBackground);
+
+  QAction *white = new QAction("&White",CTRL+Key_W,mBackground);
+  QAction *black =  new QAction("&Black",CTRL+Key_B,mBackground);
+  white->addTo(mBackground);
+  black->addTo(mBackground);
+
+#else
   QMenu *mBackground = mStyle->addMenu("&Background color");
   QAction *white = mBackground->addAction("White");
   QAction *black = mBackground->addAction("Black");
+
+#endif
   if (background.GetRed() == 1. &&
       background.GetGreen() == 1. &&
@@ -316 +441 @@
 
 
-  // Action Menu
+#if QT_VERSION < 0x040000
+  // === Action Menu ===
+  QPopupMenu *mActions = new QPopupMenu(fContextMenu);
+  fContextMenu->insertItem("&Actions",mActions);
+
+  QAction *controlPanels = new QAction("&Control panels",CTRL+Key_C,mActions);
+  QAction *exitG4 =  new QAction("&Exit to G4Vis >",CTRL+Key_E,mActions);
+  QAction *createEPS =  new QAction("&Save as ...",CTRL+Key_S,mActions);
+  controlPanels->addTo(mActions);
+  exitG4->addTo(mActions);
+  createEPS->addTo(mActions);
+
+#else
+  // === Action Menu ===
   QMenu *mActions = fContextMenu->addMenu("&Actions");
   QAction *controlPanels = mActions->addAction("Control panels");
   QAction *exitG4 = mActions->addAction("Exit to G4Vis >");
   QAction *createEPS = mActions->addAction("Save as ...");
+#endif
+
   QObject ::connect(controlPanels, 
                     SIGNAL(triggered()),
@@ -335 +475 @@
 
 
-  // Special Menu
+#if QT_VERSION < 0x040000
+  // === Special Menu ===
+  QPopupMenu *mSpecial = new QPopupMenu(fContextMenu);
+  fContextMenu->insertItem("S&pecial",mSpecial);
+
+  QPopupMenu *mTransparency = new QPopupMenu(mSpecial);
+  mSpecial->insertItem("Transparency",mTransparency);
+
+  QAction *transparencyOn = new QAction("&On",CTRL+Key_O,mTransparency);
+  QAction *transparencyOff = new QAction("&Off",CTRL+Key_F,mTransparency);
+  transparencyOn->addTo(mTransparency);
+  transparencyOff->addTo(mTransparency);
+
+#else
+  // === Special Menu ===
   QMenu *mSpecial = fContextMenu->addMenu("S&pecial");
-  QMenu *transparency = mSpecial->addMenu("Transparency");
-  QAction *transparencyOn = transparency->addAction("On");
-  QAction *transparencyOff = transparency->addAction("Off");
+  QMenu *mTransparency = mSpecial->addMenu("Transparency");
+  QAction *transparencyOn = mTransparency->addAction("On");
+  QAction *transparencyOff = mTransparency->addAction("Off");
+#endif
+
   if (transparency_enabled == false) {
     createRadioAction(transparencyOn,transparencyOff,SLOT(toggleTransparency(bool)),2);
@@ -349 +505 @@
 
 
+#if QT_VERSION < 0x040000
+  QPopupMenu *mAntialiasing = new QPopupMenu(mSpecial);
+  mSpecial->insertItem("Antialiasing",mAntialiasing);
+
+  QAction *antialiasingOn = new QAction("&On",CTRL+Key_O,mAntialiasing);
+  QAction *antialiasingOff = new QAction("&Off",CTRL+Key_F,mAntialiasing);
+  antialiasingOn->addTo(mAntialiasing);
+  antialiasingOff->addTo(mAntialiasing);
+
+#else
   QMenu *mAntialiasing = mSpecial->addMenu("Antialiasing");
   QAction *antialiasingOn = mAntialiasing->addAction("On");
   QAction *antialiasingOff = mAntialiasing->addAction("Off");
+#endif
+
   if (antialiasing_enabled == false) {
     createRadioAction(antialiasingOn,antialiasingOff,SLOT(toggleAntialiasing(bool)),2);
@@ -360 +528 @@
   }
 
+#if QT_VERSION < 0x040000
+  QPopupMenu *mHaloing = new QPopupMenu(mSpecial);
+  mSpecial->insertItem("Haloing",mHaloing);
+
+  QAction *haloingOn = new QAction("&On",CTRL+Key_O,mHaloing);
+  QAction *haloingOff = new QAction("&Off",CTRL+Key_F,mHaloing);
+  haloingOn->addTo(mHaloing);
+  haloingOff->addTo(mHaloing);
+#else
   QMenu *mHaloing = mSpecial->addMenu("Haloing");
   QAction *haloingOn = mHaloing->addAction("On");
   QAction *haloingOff = mHaloing->addAction("Off");
+#endif
   if (haloing_enabled == false) {
     createRadioAction(haloingOn,haloingOff,SLOT(toggleHaloing(bool)),2);
@@ -371 +549 @@
   }
 
+#if QT_VERSION < 0x040000
+  QPopupMenu *mAux = new QPopupMenu(mSpecial);
+  mSpecial->insertItem("Auxiliairy edges",mAux);
+
+  QAction *auxOn = new QAction("&On",CTRL+Key_O,mAux);
+  QAction *auxOff = new QAction("&Off",CTRL+Key_F,mAux);
+  auxOn->addTo(mAux);
+  auxOff->addTo(mAux);
+
+#else
   QMenu *mAux = mSpecial->addMenu("Auxiliary edges");
   QAction *auxOn = mAux->addAction("On");
   QAction *auxOff = mAux->addAction("Off");
+#endif
   if (!fVP.IsAuxEdgeVisible()) {
     createRadioAction(auxOn,auxOff,SLOT(toggleAux(bool)),1);
@@ -381 +570 @@
 
 
+#if QT_VERSION < 0x040000
+  QPopupMenu *mFullScreen = new QPopupMenu(mSpecial);
+  mSpecial->insertItem("Full screen",mFullScreen);
+
+  QAction *fullOn = new QAction("&On",CTRL+Key_O,mFullScreen);
+  QAction *fullOff = new QAction("&Off",CTRL+Key_F,mFullScreen);
+  fullOn->addTo(mFullScreen);
+  fullOff->addTo(mFullScreen);
+#else
   QMenu *mFullScreen = mSpecial->addMenu("Full screen");
   QAction *fullOn = mFullScreen->addAction("On");
   QAction *fullOff = mFullScreen->addAction("Off");
+#endif
   createRadioAction(fullOn,fullOff,SLOT(toggleFullScreen(bool)),2);
 
@@ -415 +614 @@
    @param nCheck: 1 : first action will be set true. 2 : second action will be set true
 */
+#if QT_VERSION < 0x040000
+void G4OpenGLQtViewer::createRadioAction(QAction *action1,QAction *action2, const std::string& method,unsigned int nCheck) {
+
+  if (action1->parent()->inherits("QPopupMenu")){
+    ((QPopupMenu*)action1->parent())->setCheckable(true);
+  }
+  ((QPopupMenu*)action1->parent())->setItemChecked(0,true);
+  ((QPopupMenu*)action1->parent())->setItemChecked(1,true);
+
+  if (nCheck ==1)
+    ((QPopupMenu*)action1->parent())->setItemChecked(0,true);
+  else
+    ((QPopupMenu*)action1->parent())->setItemChecked(1,true);
+   
+  QObject ::connect(action1, SIGNAL(triggered(bool)),action2, SLOT(toggle()));
+  QObject ::connect(action2, SIGNAL(triggered(bool)),action1, SLOT(toggle()));
+
+  QObject ::connect(action1, SIGNAL(toggled(bool)),this, method.c_str());
+}
+
+#else
 void G4OpenGLQtViewer::createRadioAction(QAction *action1,QAction *action2, const std::string& method,unsigned int nCheck) {
 
@@ -431 +651 @@
 
 }
+#endif
 
 /**
@@ -770 +991 @@
    @param mButtons mouse button active
 */
+
+#if QT_VERSION < 0x040000
+void G4OpenGLQtViewer::G4MouseMoveEvent(int pos_x, int pos_y,Qt::ButtonState mButtons)
+#else
 void G4OpenGLQtViewer::G4MouseMoveEvent(int pos_x, int pos_y,Qt::MouseButtons mButtons)
+#endif
 {
   int dx = pos_x - lastPos.x();

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

@@ -25 +25 @@
 //
 //
-// $Id: G4OpenGLStoredQt.cc,v 1.1 2007/09/28 14:44:13 lgarnier Exp $
+// $Id: G4OpenGLStoredQt.cc,v 1.2 2007/11/09 15:03:22 lgarnier Exp $
 // GEANT4 tag $Name:  $
 //

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

@@ -25 +25 @@
 //
 //
-// $Id: G4OpenGLStoredQtViewer.cc,v 1.2 2007/11/08 17:00:51 lgarnier Exp $
+// $Id: G4OpenGLStoredQtViewer.cc,v 1.3 2007/11/09 15:03:22 lgarnier Exp $
 // GEANT4 tag $Name:  $
 //

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

@@ -25 +25 @@
 //
 //
-// $Id: G4OpenGLViewerMessenger.cc,v 1.9 2007/06/15 09:52:52 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-00-ref-01 $
+// $Id: G4OpenGLViewerMessenger.cc,v 1.10 2007/11/10 14:51:28 allison Exp $
+// GEANT4 tag $Name:  $
 
 #include "G4OpenGLViewerMessenger.hh"
@@ -64 +64 @@
   fpCommandPrintEPS->SetGuidance
     ("Generates files with names G4OpenGL_n.eps, where n is a sequence"
-     "\nnumber, starting at 0.");
+     "\nnumber, starting at 0."
+     "\nCan be \"vectored\" or \"pixmap\" - see \"/vis/ogl/set/printMode\".");
 
   fpDirectorySet = new G4UIdirectory ("/vis/ogl/set/");