Changeset 863 for trunk/source/visualization/OpenGL

Timestamp:

Oct 7, 2008, 5:35:57 AM (16 years ago)

Author:

garnier

Message:

add picking for Qt

Location:

trunk/source/visualization/OpenGL

Files:

• include/G4OpenGLQtMovieDialog.hh (modified) (1 diff)
• src/G4OpenGLQtViewer.cc (modified) (1 diff)
• src/G4OpenGLStoredQtViewer.cc (modified) (2 diffs)

trunk/source/visualization/OpenGL/include/G4OpenGLQtMovieDialog.hh

@@ -25 +25 @@
 //
 //
-// $Id: G4OpenGLQtMovieDialog.hh,v 1.1 2008/03/10 16:57:04 lgarnier Exp $
+// $Id: G4OpenGLQtMovieDialog.hh,v 1.3 2008/10/07 01:03:04 lgarnier Exp $
 // GEANT4 tag $Name: 
 //

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

@@ -1531 +1531 @@
   fLastPos3 = fLastPos2;
   fLastEventTime->start();
-  if (fMouseAction == STYLE2){  // pick
+  if (fMouseAction == STYLE3){  // pick
     Pick(p.x(),p.y());
   }

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

@@ -51 +51 @@
   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;
-
   // if no scene...
   if (fSceneHandler.GetScene() == 0) {
@@ -65 +57 @@
     return;
   }
+
+  //set true to picking
+  fVP.SetPicking(true);
+#if QT_VERSION < 0x040000
+  setFocusPolicy(QWidget::StrongFocus); // enable keybord events
+#else
+  setFocusPolicy(Qt::StrongFocus); // enable keybord events
+#endif
+  nbPaint =0;
+  hasToRepaint =false;
+
   if (fViewId < 0) return;  // In case error in base class instantiation.
 }