Changeset 709 for trunk/geant4/visualization/OpenGL/src/G4OpenGLStoredQtViewer.cc

Timestamp:

Feb 4, 2008, 3:57:01 PM (16 years ago)

Author:

garnier

Message:

last commit :suppresion du move button dans le menu contextuel, on garde juste le zoom et pick. Improvments for Qt3

File:

• trunk/geant4/visualization/OpenGL/src/G4OpenGLStoredQtViewer.cc (modified) (3 diffs)

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

@@ -49 +49 @@
   G4OpenGLViewer (sceneHandler),
   G4OpenGLQtViewer (sceneHandler),
-  G4OpenGLStoredViewer (sceneHandler),
-  QGLWidget(QGLFormat(QGL::SampleBuffers))             // FIXME : gerer le pb du parent !
-{
+  G4OpenGLStoredViewer (sceneHandler)             // FIXME : gerer le pb du parent !
+{
+#if QT_VERSION < 0x040000
+  setFocusPolicy(QWidget::StrongFocus); // enable keybord events
+#else
   setFocusPolicy(Qt::StrongFocus); // enable keybord events
+#endif
   nbPaint =0;
   hasToRepaint =false;
@@ -299 +302 @@
 void G4OpenGLStoredQtViewer::mousePressEvent(QMouseEvent *event)
 {
+#if QT_VERSION < 0x040000
+  if ((event->button() & Qt::LeftButton)
+      && !((event->state() & Qt::ShiftButton)
+           || (event->state() & Qt::ControlButton)
+           || (event->state() & Qt::AltButton)
+           || (event->state() & Qt::MetaButton))) {
+#else
   if ((event->buttons() & Qt::LeftButton)
       && !((event->modifiers() & Qt::ShiftModifier)
@@ -304 +314 @@
            || (event->modifiers() & Qt::AltModifier)
            || (event->modifiers() & Qt::MetaModifier))) {
+#endif
 #ifdef GEANT4_QT_DEBUG
     printf("G4OpenGLStoredQtViewer::mousePressEvent\n");