Changeset 713 for trunk/geant4/visualization

Timestamp:

Feb 5, 2008, 4:46:54 PM (16 years ago)

Author:

garnier

Message:

correction du ticket #120

Location:

trunk/geant4/visualization/OpenGL

Files:

• include/G4OpenGLQtViewer.hh (modified) (5 diffs)
• src/G4OpenGLQtViewer.cc (modified) (12 diffs)

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

@@ -84 +84 @@
   void G4MouseEvent(int, int, Qt::MouseButtons);
 #endif
-  void G4MouseRotateEvent(int, int);
-  void G4MouseMoveEvent(int, int, int);
+  void G4MouseRotateEvent(G4double, G4double);
+  void G4MouseMoveEvent(G4double, G4double, G4double);
   void G4keyPressEvent (QKeyEvent * event); 
 
@@ -108 +108 @@
   QMenu *fContextMenu;
 #endif
-  enum mouseActions {STYLE1,STYLE2,STYLE3}; 
-  mouseActions fMouseAction; // 1: rotate 2:zoom 3:pick
+  enum mouseActions {STYLE1,STYLE2,STYLE3,STYLE4}; 
+  mouseActions fMouseAction; // 1: rotate 2:move 3:pick 4:shortcuts 
   QPoint fLastPos;
+  /** delta of scene rotation. This delta is put in degree */
+  G4double fDeltaRotation;
   /** delta of scene translation. This delta is put in % of the scene view */
   G4double fDeltaSceneTranslation;
@@ -121 +123 @@
 #if QT_VERSION < 0x040000
   QPopupMenu *fMouseRotate;
+  QPopupMenu *fMouseMove;
   QPopupMenu *fMousePick;
   QPopupMenu *fMouseShortcuts;
@@ -129 +132 @@
 #else
   QAction *fMouseRotate;
+  QAction *fMouseMove;
   QAction *fMousePick;
   QAction *fMouseShortcuts;
@@ -139 +143 @@
 private slots :
   void actionMouseRotate();
+  void actionMouseMove();
   void actionMousePick();
   void actionMouseShortcuts();

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

@@ -287 +287 @@
   ,fContextMenu(0)
   ,fMouseAction(STYLE1)
+  ,fDeltaRotation(1)
   ,fDeltaSceneTranslation(0.01)
   ,fDeltaDepth(0.01)
@@ -330 +331 @@
   // === Mouse menu ===
 
+  mMouseAction->setCheckable(true);
+
   fMouseRotate = new QPopupMenu(mMouseAction);
   mMouseAction->insertItem("&Rotate",fMouseRotate);
-
-  mMouseAction->setCheckable(true);
   fMouseRotate->setCheckable(true);
+
+  fMouseMove = new QPopupMenu(mMouseAction);
+  mMouseAction->insertItem("&Move",fMouseMove);
+  fMouseMove->setCheckable(true);
 
   fMousePick = new QPopupMenu(mMouseAction);
@@ -349 +354 @@
   fMouseRotate = mMouseAction->addAction("Rotate");
   fMouseRotate->setCheckable(true);
+
+  fMouseMove = mMouseAction->addAction("Move");
+  fMouseMove->setCheckable(true);
 
   fMousePick = mMouseAction->addAction("Pick");
@@ -366 +374 @@
                     SLOT(actionMouseRotate()));
 
+  QObject ::connect(fMouseMove, 
+                    SIGNAL(activated(int)),
+                    this, 
+                    SLOT(actionMouseMove()));
+
   QObject ::connect(fMousePick, 
                     SIGNAL(activated(int)),
@@ -383 +396 @@
                     this, 
                     SLOT(actionMouseRotate()));
+
+  QObject ::connect(fMouseMove, 
+                    SIGNAL(triggered(bool)),
+                    this, 
+                    SLOT(actionMouseMove()));
 
   QObject ::connect(fMousePick, 
@@ -834 +852 @@
 
 /**
+   Slot activate when mouseAction->rotate menu is set 
+ */
+void G4OpenGLQtViewer::actionMouseMove() {
+  emit toggleMouseAction(STYLE2);
+}
+
+
+/**
    Slot activate when mouseAction->zoom menu is set 
  */
@@ -850 +876 @@
   printf("G4OpenGLQtViewer::actionMouseShortcuts \n");
 #endif
-  emit toggleMouseAction(STYLE3);
+  emit toggleMouseAction(STYLE4);
 }
 
@@ -888 +914 @@
 void G4OpenGLQtViewer::toggleMouseAction(mouseActions aAction) {
   
+  if ((aAction == STYLE1) || //initialize all
+      (aAction == STYLE2) ||
+      (aAction == STYLE3) ||
+      (aAction == STYLE4))  {
+#if QT_VERSION < 0x040000
+    fMouseRotate->setItemChecked (0,false);
+    fMouseMove->setItemChecked (0,false);
+    fMousePick->setItemChecked (0,false);
+    fMouseShortcuts->setItemChecked (0,false);
+#else
+    fMouseRotate->setChecked (false);
+    fMouseMove->setChecked (false);
+    fMousePick->setChecked (false);
+    fMouseShortcuts->setChecked (false);
+#endif
+    fVP.SetPicking(false);
+    fMouseAction = aAction;
+  }
+  // rotate
   if (aAction == STYLE1) {  // rotate
     G4cout << "Click and move mouse to rotate volume \n" << G4endl;
@@ -898 +943 @@
 #if QT_VERSION < 0x040000
     fMouseRotate->setItemChecked (0,true);
-    fMousePick->setItemChecked (0,false);
-    fMouseShortcuts->setItemChecked (0,false);
 #else
     fMouseRotate->setChecked (true);
-    fMousePick->setChecked (false);
-    fMouseShortcuts->setChecked (false);
-#endif
-    fMouseAction = STYLE1;
-    fVP.SetPicking(false);
-  } else  if (aAction == STYLE2) { //pick
+#endif
+  } else  if (aAction == STYLE2) { //move
+    G4cout << "Move camera point of view with mouse\n" << G4endl;
+#if QT_VERSION < 0x040000
+    fMouseMove->setItemChecked (0,true);
+#else
+    fMouseMove->setChecked (true);
+#endif
+  } else  if (aAction == STYLE3) { //pick
     G4cout << "Click and pick \n" << G4endl;
 #if QT_VERSION < 0x040000
-    fMouseRotate->setItemChecked (0,false);
     fMousePick->setItemChecked (0,true);
 #else
-    fMouseRotate->setChecked (false);
     fMousePick->setChecked (true);
 #endif
     fVP.SetPicking(true);
-    fMouseAction = STYLE2;
-  } else  if (aAction == STYLE3) {  // display shortcuts
-#if QT_VERSION < 0x040000
-    fMouseRotate->setItemChecked (0,false);
-    fMousePick->setItemChecked (0,false);
+  } else  if (aAction == STYLE4) {  // display shortcuts
+#if QT_VERSION < 0x040000
     fMouseShortcuts->setItemChecked (0,true);
 #else
-    fMouseRotate->setChecked (false);
-    fMousePick->setChecked (false);
     fMouseShortcuts->setChecked (true);
 #endif
-    fMouseAction = STYLE3;
-    fVP.SetPicking(false);
 
     G4cout << "Click and move mouse to rotate volume \n" << G4endl;
@@ -1376 +1413 @@
 #endif
 {
+
   int dx = fLastPos.x() - pos_x;
   int dy = fLastPos.y() - pos_y;
+
+
   if (fMouseAction == STYLE1) {  // rotate
     if (mButtons & Qt::LeftButton) {
       G4MouseRotateEvent(dx,dy);
     }
+  } else if (fMouseAction == STYLE2) {  // move
+    if (mButtons & Qt::LeftButton) {
+      G4double coef = ((G4double)getSceneNearWidth())/((G4double)WinSize_x);
+      if (WinSize_y <WinSize_x) {
+        coef = ((G4double)getSceneNearWidth())/((G4double)WinSize_y);
+      }
+      fVP.IncrementPan(dx*coef,-dy*coef);
+      updateQWidget();
+    }
   }
   fLastPos = QPoint(pos_x, pos_y);
@@ -1388 +1437 @@
 /**
    Move the scene of dx, dy, dz values.
-   Values are in 
-   100 moves of 1 => move of 10cm of the scene
    @param dx delta mouse x position
    @param dy delta mouse y position
 */
 
-void G4OpenGLQtViewer::G4MouseMoveEvent(int dx, int dy, int dz)
+void G4OpenGLQtViewer::G4MouseMoveEvent(G4double dx,G4double dy, G4double dz)
 {
   GLdouble coefTrans = getSceneNearWidth()*fDeltaSceneTranslation;
   GLdouble coefDepth = getSceneDepth()*fDeltaDepth;
 
-  printf("Increment : %f %f\n",getSceneNearWidth(),getSceneDepth());
-  printf("Increment : %f %f %f \n",-dx*coefTrans,dy*coefTrans,dz*coefDepth);
- fVP.IncrementPan(-dx*coefTrans,dy*coefTrans,dz*coefDepth);
+  fVP.IncrementPan(-dx*coefTrans,dy*coefTrans,dz*coefDepth);
  
- updateQWidget();
+  updateQWidget();
 }
 
@@ -1412 +1457 @@
 */
 
-void G4OpenGLQtViewer::G4MouseRotateEvent(int dx, int dy)
+void G4OpenGLQtViewer::G4MouseRotateEvent(G4double dx, G4double dy)
 {
+  dx = dx * fDeltaRotation;
+  dy = dy * fDeltaRotation;
+
   //phi spin stuff here