Changeset 716 for trunk

Timestamp:

Feb 6, 2008, 7:03:12 PM (16 years ago)

Author:

garnier

Message:

tsj le pb du full screen.Correction de bug de compil sur Qt3

File:

• trunk/geant4/visualization/OpenGL/src/G4OpenGLQtViewer.cc (modified) (4 diffs)

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

@@ -839 +839 @@
     action2->setOn(true);
    
-  //FIXME : Should not work on Qt3
   QObject ::connect(action1, SIGNAL(activated()),action2, SLOT(toggle()));
   QObject ::connect(action2, SIGNAL(activated()),action1, SLOT(toggle()));
@@ -1871 +1870 @@
   }
 #if QT_VERSION < 0x040000
-  else if ((event->key() == Qt::Key_Right) && (event->modifiers() & Qt::ShiftModifier)) { // rotate theta
+  else if ((event->key() == Qt::Key_Right) && (event->state() & Qt::ShiftButton)) { // rotate theta
 #else
   else if ((event->key() == Qt::Key_Right) && (event->modifiers() & Qt::ShiftModifier)) { // rotate theta
@@ -1879 +1878 @@
   if (event->key() == Qt::Key_Escape) { // escaped from full screen
     toggleFullScreen();
-    emit toggleMouseAction();
   }
   if (event->key() == Qt::Key_Plus) { // zoom in
@@ -1890 +1888 @@
   }
   // with no modifiers
-  if (!event->modifiers()) {
+#if QT_VERSION < 0x040000
+  if (event->state() == Qt::NoButton) {
+#else
+  if (event->modifiers() == Qt::NoModifier) {
+#endif
     if (event->key() == Qt::Key_Down) { // go down
       G4MouseMoveEvent(0,1,0);