Changeset 709

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

Location:

trunk/geant4

Files:

• specific-geant4-dev.sh (modified) (1 diff)
• visualization/OpenGL/src/G4OpenGLQtViewer.cc (modified) (4 diffs)
• visualization/OpenGL/src/G4OpenGLStoredQtViewer.cc (modified) (3 diffs)

trunk/geant4/specific-geant4-dev.sh

@@ -107 +107 @@
 
 alias "appG4"="cd $G4WORKDIR/bin/Darwin-g++; rm exampleN03.app;csh ~/Work/svn/trunk/configuration/scripts/make_app exampleN03;cp -rf $G4WORKDIR/examples/novice/N03/vis.mac exampleN03.app/Contents/Resources/.;cp -rf $G4WORKDIR/examples/novice/N03/visTutor exampleN03.app/Contents/Resources/."
+
+alias "make"='make -j20 CXX="distcc /usr/bin/g++"'
+export DYLD_LIBRARY_PATH=/Users/laurentgarnier/Work/Geant4-Dev/lib/geant4//Darwin-g++
+
+export CVSROOT=:ext:lgarnier@geant4.cvs.cern.ch:/cvs/Geant4
+export CVS_RSH=ssh

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

@@ -102 +102 @@
 void G4OpenGLQtViewer::setupViewport(int aWidth, int aHeight)
 {
-  int side = qMin(aWidth, aHeight);
+  int side = aWidth;
+  if (aHeight < aWidth) side = aHeight;
   glViewport((aWidth - side) / 2, (aHeight - side) / 2, side, side);
   
@@ -357 +358 @@
   // INIT mMouse
 #if QT_VERSION < 0x040000
-  fMouseRotate->setItemCheckeded(0,true);
+  fMouseRotate->setItemChecked(0,true);
 
   QObject ::connect(fMouseRotate, 
@@ -1532 +1533 @@
   glRenderMode (GL_FEEDBACK);
   
-  int side = qMin(aWidth, aHeight);
+  int side = aWidth;
+  if (aHeight < aWidth) side = aHeight;
   glViewport((aWidth - side) / 2, (aHeight - side) / 2, side, side);
   DrawView();
@@ -1778 +1780 @@
   holdKeyEvent = true;
 
+#if QT_VERSION < 0x040000
+  if ((event->key() == Qt::Key_Down) && (event->state() & Qt::AltButton )) { // go backward
+#else
   if ((event->key() == Qt::Key_Down) && (event->modifiers() & Qt::AltModifier )) { // go backward
+#endif
     G4MouseMoveEvent(0,0,1);
   }
+#if QT_VERSION < 0x040000
+  else if ((event->key() == Qt::Key_Up) && (event->state() & Qt::AltButton)) { // go forward
+#else
   else if ((event->key() == Qt::Key_Up) && (event->modifiers() & Qt::AltModifier)) { // go forward
+#endif
     G4MouseMoveEvent(0,0,-1);
   }
+#if QT_VERSION < 0x040000
+  if ((event->key() == Qt::Key_Down) && (event->state() & Qt::ShiftButton)) { // rotate phi
+#else
   if ((event->key() == Qt::Key_Down) && (event->modifiers() & Qt::ShiftModifier)) { // rotate phi
+#endif
     G4MouseRotateEvent(0,-1);
   }
+#if QT_VERSION < 0x040000
+  else if ((event->key() == Qt::Key_Up) && (event->state() & Qt::ShiftButton)) { // rotate phi
+#else
   else if ((event->key() == Qt::Key_Up) && (event->modifiers() & Qt::ShiftModifier)) { // rotate phi
+#endif
     G4MouseRotateEvent(0,1);
   }
+#if QT_VERSION < 0x040000
+  if ((event->key() == Qt::Key_Left) && (event->state() & Qt::ShiftButton)) { // rotate theta
+#else
   if ((event->key() == Qt::Key_Left) && (event->modifiers() & Qt::ShiftModifier)) { // rotate theta
+#endif
     G4MouseRotateEvent(1,0);
   }
+#if QT_VERSION < 0x040000
   else if ((event->key() == Qt::Key_Right) && (event->modifiers() & Qt::ShiftModifier)) { // rotate theta
+#else
+  else if ((event->key() == Qt::Key_Right) && (event->modifiers() & Qt::ShiftModifier)) { // rotate theta
+#endif
     G4MouseRotateEvent(-1,0);
   }

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");