Changeset 681 for trunk/geant4

Timestamp:

Jan 11, 2008, 5:21:44 PM (16 years ago)

Author:

garnier

Message:

correction ticket #107 et ajout du picking

Location:

trunk/geant4/visualization/OpenGL

Files:

• include/G4OpenGLQtViewer.hh (modified) (4 diffs)
• src/G4OpenGLQtViewer.cc (modified) (8 diffs)

trunk/geant4/visualization/OpenGL/include/G4OpenGLQtViewer.hh

@@ -103 +103 @@
   QMenu *fContextMenu;
 #endif
-  enum mouseActions {ROTATE, MOVE, ZOOM}; 
+  enum mouseActions {ROTATE, MOVE, ZOOM, PICK}; 
   mouseActions fMouseAction; // 1: rotate 0:move
   QPoint lastPos;
@@ -110 +110 @@
   QPopupMenu *fMouseMove;
   QPopupMenu *fMouseZoom;
+  QPopupMenu *fMousePick;
   QPopupMenu *fDrawingWireframe;
   QPopupMenu *fDrawingLineRemoval;
@@ -118 +119 @@
   QAction *fMouseMove;
   QAction *fMouseZoom;
+  QAction *fMousePick;
   QAction *fDrawingWireframe;
   QAction *fDrawingLineRemoval;
@@ -128 +130 @@
   void actionMouseMove();
   void actionMouseZoom();
+  void actionMousePick();
   void actionDrawingWireframe();
   void actionDrawingLineRemoval();

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

@@ -339 +339 @@
   fMouseZoom->setCheckable(true);
 
+  fMousePick = new QPopupMenu(mMouseAction);
+  mMouseAction->insertItem("&Pick",fMousePick);
+  fMousePick->setCheckable(true);
+
 #else
   // === Mouse menu ===
@@ -350 +354 @@
   fMouseZoom = mMouseAction->addAction("Zoom");
   fMouseZoom->setCheckable(true);
+
+  fMousePick = mMouseAction->addAction("Pick");
+  fMousePick->setCheckable(true);
 #endif
 
@@ -371 +378 @@
                     SLOT(actionMouseZoom()));
 
+  QObject ::connect(fMousePick, 
+                    SIGNAL(activated(int)),
+                    this, 
+                    SLOT(actionMousePick()));
+
 #else
   fMouseRotate->setChecked(true);
@@ -388 +400 @@
                     this, 
                     SLOT(actionMouseZoom()));
+
+  QObject ::connect(fMousePick, 
+                    SIGNAL(triggered(bool)),
+                    this, 
+                    SLOT(actionMousePick()));
 #endif
 
@@ -835 +852 @@
 
 /**
+   Slot activate when mouseAction->pick menu is set 
+ */
+void G4OpenGLQtViewer::actionMouseZoom() {
+#ifdef GEANT4_QT_DEBUG
+  printf("G4OpenGLQtViewer::actionMouseZoom \n");
+#endif
+  emit toggleMouseAction(ZOOM);
+}
+
+/**
    Slot activate when mouseAction->zoom menu is set 
  */
-void G4OpenGLQtViewer::actionMouseZoom() {
-#ifdef GEANT4_QT_DEBUG
-  printf("G4OpenGLQtViewer::actionMouseZoom \n");
-#endif
-  emit toggleMouseAction(ZOOM);
+void G4OpenGLQtViewer::actionMousePick() {
+#ifdef GEANT4_QT_DEBUG
+  printf("G4OpenGLQtViewer::actionMousePick \n");
+#endif
+  emit toggleMouseAction(PICK);
 }
 
@@ -879 +906 @@
 void G4OpenGLQtViewer::toggleMouseAction(mouseActions aAction) {
   
-
-#ifdef GEANT4_QT_DEBUG
-  printf("G4OpenGLQtViewer::toggleMouseAction **** \n");
-#endif
   if (aAction == ROTATE) {
-#ifdef GEANT4_QT_DEBUG
-  printf("G4OpenGLQtViewer::toggleMouseAction ROTATE \n");
-#endif
 #if QT_VERSION < 0x040000
     fMouseRotate->setItemChecked (0,true);
     fMouseMove->setItemChecked (0,false);
     fMouseZoom->setItemChecked (0,false);
+    fMousePick->setItemChecked (0,false);
 #else
     fMouseRotate->setChecked (true);
     fMouseMove->setChecked (false);
     fMouseZoom->setChecked (false);
+    fMousePick->setChecked (false);
 #endif
     fMouseAction = ROTATE;
+    fVP.SetPicking(false);
   } else  if (aAction == MOVE) {
-#ifdef GEANT4_QT_DEBUG
-  printf("G4OpenGLQtViewer::toggleMouseAction MOVE \n");
-#endif
 #if QT_VERSION < 0x040000
     fMouseRotate->setItemChecked (0,false);
     fMouseMove->setItemChecked (0,true);
     fMouseZoom->setItemChecked (0,false);
+    fMousePick->setItemChecked (0,false);
 #else
     fMouseRotate->setChecked (false);
     fMouseMove->setChecked (true);
     fMouseZoom->setChecked (false);
+    fMousePick->setChecked (false);
 #endif
     fMouseAction = MOVE;
+    fVP.SetPicking(false);
   } else  if (aAction == ZOOM) {
-#ifdef GEANT4_QT_DEBUG
-  printf("G4OpenGLQtViewer::toggleMouseAction ZOOM \n");
-#endif
 #if QT_VERSION < 0x040000
     fMouseRotate->setItemChecked (0,false);
     fMouseMove->setItemChecked (0,false);
     fMouseZoom->setItemChecked (0,true);
+    fMousePick->setItemChecked (0,false);
 #else
     fMouseRotate->setChecked (false);
     fMouseMove->setChecked (false);
     fMouseZoom->setChecked (true);
+    fMousePick->setChecked (false);
 #endif
     fMouseAction = ZOOM;
-  }
-
-#ifdef GEANT4_QT_DEBUG
-  printf("G4OpenGLQtViewer::toggleMouseAction\n");
-#endif
+    fVP.SetPicking(false);
+  } else  if (aAction == PICK) {
+#if QT_VERSION < 0x040000
+    fMouseRotate->setItemChecked (0,false);
+    fMouseMove->setItemChecked (0,false);
+    fMouseZoom->setItemChecked (0,false);
+    fMousePick->setItemChecked (0,true);
+#else
+    fMouseRotate->setChecked (false);
+    fMouseMove->setChecked (false);
+    fMouseZoom->setChecked (false);
+    fMousePick->setChecked (true);
+#endif
+    fVP.SetPicking(true);
+    fMouseAction = PICK;
+  }
+
 }
 /**
@@ -1317 +1351 @@
 {
   lastPos = p;
+  if (fMouseAction == PICK){  // pick
+    Pick(p.x(),p.y());
+  }
 }
 
@@ -1394 +1431 @@
     }
   } else   if (fMouseAction == MOVE){  // move
+    if (mButtons & Qt::LeftButton) {
       
-    float dx = pos_x - lastPos.x();
-    float dy = pos_y - lastPos.y();
-    
-    G4Point3D stp
-      = GetSceneHandler()->GetScene()->GetStandardTargetPoint();
-    
-    G4Point3D tp = stp + fVP.GetCurrentTargetPoint ();
-    
-    const G4Vector3D& upVector = fVP.GetUpVector ();
-    const G4Vector3D& vpVector = fVP.GetViewpointDirection ();
-    
-    G4Vector3D unitRight = (upVector.cross (vpVector)).unit();
-    G4Vector3D unitUp    = (vpVector.cross (unitRight)).unit();
-    
-    tp += -dx * unitRight + dy * unitUp;
-    fVP.SetCurrentTargetPoint (tp - stp);
-    
-    updateQWidget();
+      float dx = pos_x - lastPos.x();
+      float dy = pos_y - lastPos.y();
+      
+      G4Point3D stp
+        = GetSceneHandler()->GetScene()->GetStandardTargetPoint();
+      
+      G4Point3D tp = stp + fVP.GetCurrentTargetPoint ();
+      
+      const G4Vector3D& upVector = fVP.GetUpVector ();
+      const G4Vector3D& vpVector = fVP.GetViewpointDirection ();
+      
+      G4Vector3D unitRight = (upVector.cross (vpVector)).unit();
+      G4Vector3D unitUp    = (vpVector.cross (unitRight)).unit();
+      
+      tp += -dx * unitRight + dy * unitUp;
+      fVP.SetCurrentTargetPoint (tp - stp);
+      
+      updateQWidget();
+    }
   } else   if (fMouseAction == ZOOM){  // zoom
     if (mButtons & Qt::LeftButton) {
-      Pick(pos_x,pos_y);
       G4cerr << "Zoom not implemented for the moment\n" << G4endl;
-    }
-  } else   if (fMouseAction == MOVE){  // pick
-    if (mButtons & Qt::LeftButton) {
-      Pick(pos_x,pos_y);
     }
   }