Changeset 724

Timestamp:

Feb 13, 2008, 5:47:04 PM (16 years ago)

Author:

garnier

Message:

video avec de vector:en test

Location:

trunk/geant4/visualization

Files:

• OpenGL/include/G4OpenGLQtViewer.hh (modified) (2 diffs)
• OpenGL/src/G4OpenGLQtViewer.cc (modified) (7 diffs)
• OpenGL/src/G4OpenGLStoredQtViewer.cc (modified) (2 diffs)
• visTutor/exN03Vis12.mac (modified) (2 diffs)
• visTutor/exN03Vis13.mac (modified) (1 diff)
• visTutor/gui.mac (modified) (1 diff)

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

@@ -88 +88 @@
 #endif
   void G4keyPressEvent (QKeyEvent * event); 
-  void rotateScene(G4double, G4double);
-  void moveScene(G4double, G4double, G4double,bool);
+  void rotateScene(G4double, G4double,bool mAutoRotate=false);
+  void moveScene(G4double, G4double, G4double,bool,bool mAutoMove=false);
 
 
@@ -146 +146 @@
   QAction *fDrawingLineSurfaceRemoval;
 
+  /** vector to store images in order to put them on disk after */
+  std::vector <QImage> fVideoVector;  
 
 private slots :

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

@@ -295 +295 @@
   ,fDeltaDepth(0.01)
   ,fDeltaZoom(0.1)
-  ,fDeltaMove(0.2)
+  ,fDeltaMove(0.05)
   ,fHoldKeyEvent(false)
   ,fAutoMove(false)
@@ -1280 +1280 @@
     return;
   }
-  nomFich += "."+QString("ppm");
+
   QImage image;
   image = fWindow->grabFrameBuffer();
   bool res = false;
   
-#if QT_VERSION < 0x040000
-  res = image.save(nomFich,"ppm");
-#else
-  res = image.save(nomFich,0);
-#endif
-  if (res == false) {
-#if QT_VERSION < 0x040000
-    G4cerr << "Error while saving file... "<<nomFich.ascii()<<"\n" << G4endl;
-#else
-    G4cerr << "Error while saving file... "<<nomFich.toStdString().c_str()<<"\n" << G4endl;
-#endif
-    fRecordFrames = false;
+  if (fVideoVector.size() <30) {
+    fVideoVector.push_back(image);
+    G4cerr << "Store image " <<fVideoVector.size()<<"\n" << G4endl;
+    return;
+  } else {
+    for (int a=0;a<30;a++) {
+      G4cerr << "Saving image " <<a <<"\n"<< G4endl;
+      printf("Saving image  %d\n",a );
+      nomFich = QString("/temp/Test")+QString::number(fRecordFrameNumber);
+      nomFich += "."+QString("ppm");
+#if QT_VERSION < 0x040000
+      res = fVideoVector[a].save(nomFich,"ppm");
+#else
+      res = fVideoVector[a].save(nomFich,0);
+#endif
+      if (res == false) {
+#if QT_VERSION < 0x040000
+        G4cerr << "Error while saving file... "<<nomFich.ascii()<<"\n" << G4endl;
+#else
+        G4cerr << "Error while saving file... "<<nomFich.toStdString().c_str()<<"\n" << G4endl;
+#endif
+        fRecordFrames = false;
+      }
+      fRecordFrameNumber++;
+    }
+    fVideoVector.clear();
+    fVideoVector.resize(0);
   }
 }
@@ -1491 +1506 @@
   if (fMouseAction == STYLE1) {  // rotate
     if (mButtons & Qt::LeftButton) {
-      if (fAutoMove) {
-        while (fAutoMove) {
-          rotateScene(fDeltaPosX,fDeltaPosY);
-          ((QApplication*)G4Qt::getInstance ())->processEvents();
-        }
-      } else {
-        rotateScene(fDeltaPosX,fDeltaPosY);
-      }
+      rotateScene(fDeltaPosX,fDeltaPosY,fAutoMove);
     }
   } else if (fMouseAction == STYLE2) {  // move
@@ -1504 +1512 @@
       if (fAutoMove) {
         while (fAutoMove) {
-          moveScene(-fDeltaPosX,-fDeltaPosY,0,true);
+          moveScene(-fDeltaPosX,-fDeltaPosY,0,true,true);
           ((QApplication*)G4Qt::getInstance ())->processEvents();
         }
       } else {
-        moveScene(-fDeltaPosX,-fDeltaPosY,0,true);
+        moveScene(-fDeltaPosX,-fDeltaPosY,0,true,false);
       }
     }
@@ -1530 +1538 @@
 */
 
-void G4OpenGLQtViewer::moveScene(G4double dx,G4double dy, G4double dz,bool mouseMove)
+void G4OpenGLQtViewer::moveScene(G4double dx,G4double dy, G4double dz,bool mouseMove,bool mAutoMove)
 {
+  if( mAutoMove == false) {
+    fAutoMove = true;
+  }
   G4double coefTrans = 0;
   GLdouble coefDepth = 0;
-  if(mouseMove) {
-    coefTrans = ((G4double)getSceneNearWidth())/((G4double)WinSize_x);
-    if (WinSize_y <WinSize_x) {
-      coefTrans = ((G4double)getSceneNearWidth())/((G4double)WinSize_y);
-    }
-  } else {
-    coefTrans = getSceneNearWidth()*fDeltaSceneTranslation;
-    coefDepth = getSceneDepth()*fDeltaDepth;
-  }
-  fVP.IncrementPan(-dx*coefTrans,dy*coefTrans,dz*coefDepth);
- 
-  updateQWidget();
+  while (fAutoMove) {
+    if( mAutoMove == false) {
+      fAutoMove = false;
+    }
+    if(mouseMove) {
+      coefTrans = ((G4double)getSceneNearWidth())/((G4double)WinSize_x);
+      if (WinSize_y <WinSize_x) {
+        coefTrans = ((G4double)getSceneNearWidth())/((G4double)WinSize_y);
+      }
+    } else {
+      coefTrans = getSceneNearWidth()*fDeltaSceneTranslation;
+      coefDepth = getSceneDepth()*fDeltaDepth;
+    }
+    fVP.IncrementPan(-dx*coefTrans,dy*coefTrans,dz*coefDepth);
+    
+    updateQWidget();
+    ((QApplication*)G4Qt::getInstance ())->processEvents();
+  }
 }
 
@@ -1554 +1571 @@
 */
 
-void G4OpenGLQtViewer::rotateScene(G4double dx, G4double dy)
+void G4OpenGLQtViewer::rotateScene(G4double dx, G4double dy,bool mAutoRotate)
 {
+  if( mAutoRotate == false) {
+    fAutoMove = true;
+  }
   dx = dx * fDeltaRotation;
   dy = dy * fDeltaRotation;
-
-  //phi spin stuff here
-  
-  G4Vector3D vp = fVP.GetViewpointDirection ().unit ();
-  G4Vector3D up = fVP.GetUpVector ().unit ();
-  
-  G4Vector3D yprime = (up.cross(vp)).unit();
-  G4Vector3D zprime = (vp.cross(yprime)).unit();
+  G4Vector3D vp;
+  G4Vector3D up;
+  
+  G4Vector3D xprime;
+  G4Vector3D yprime;
+  G4Vector3D zprime;
   
   G4double delta_alpha;
   G4double delta_theta;
   
-  if (fVP.GetLightsMoveWithCamera()) {
-    delta_alpha = dy;
-    delta_theta = -dx;
-  } else {
-    delta_alpha = -dy;
-    delta_theta = dx;
-  }    
-  
-  delta_alpha *= deg;
-  delta_theta *= deg;
-  
-  G4Vector3D new_vp = std::cos(delta_alpha) * vp + std::sin(delta_alpha) * zprime;
-  
+  G4Vector3D new_vp;
   G4Vector3D new_up;
-  if (fVP.GetLightsMoveWithCamera()) {
-    new_up = (new_vp.cross(yprime)).unit();
-    fVP.SetUpVector(new_up);
-  } else {
-    new_up = up;
-  }
-  ////////////////
-  // Rotates by fixed azimuthal angle delta_theta.
-  
-  G4double cosalpha = new_up.dot (new_vp.unit());
-  G4double sinalpha = std::sqrt (1. - std::pow (cosalpha, 2));
-  yprime = (new_up.cross (new_vp.unit())).unit ();
-  G4Vector3D xprime = yprime.cross (new_up);
-  // Projection of vp on plane perpendicular to up...
-  G4Vector3D a1 = sinalpha * xprime;
-  // Required new projection...
-  G4Vector3D a2 =
-    sinalpha * (std::cos (delta_theta) * xprime + std::sin (delta_theta) * yprime);
-  // Required Increment vector...
-  G4Vector3D delta = a2 - a1;
-  // So new viewpoint is...
-  G4Vector3D viewPoint = new_vp.unit() + delta;
-  
-  fVP.SetViewAndLights (viewPoint);
-  updateQWidget();
-  
+  
+  G4double cosalpha;
+  G4double sinalpha;
+  
+  G4Vector3D a1;
+  G4Vector3D a2;
+  G4Vector3D delta;
+  G4Vector3D viewPoint;
+
+  while (fAutoMove) {
+    if( mAutoRotate == false) {
+      fAutoMove = false;
+    }
+    
+    //phi spin stuff here
+  
+    vp = fVP.GetViewpointDirection ().unit ();
+    up = fVP.GetUpVector ().unit ();
+  
+    yprime = (up.cross(vp)).unit();
+    zprime = (vp.cross(yprime)).unit();
+  
+    if (fVP.GetLightsMoveWithCamera()) {
+      delta_alpha = dy;
+      delta_theta = -dx;
+    } else {
+      delta_alpha = -dy;
+      delta_theta = dx;
+    }    
+  
+    delta_alpha *= deg;
+    delta_theta *= deg;
+  
+    new_vp = std::cos(delta_alpha) * vp + std::sin(delta_alpha) * zprime;
+  
+    if (fVP.GetLightsMoveWithCamera()) {
+      new_up = (new_vp.cross(yprime)).unit();
+      fVP.SetUpVector(new_up);
+    } else {
+      new_up = up;
+    }
+    ////////////////
+    // Rotates by fixed azimuthal angle delta_theta.
+    
+    cosalpha = new_up.dot (new_vp.unit());
+    sinalpha = std::sqrt (1. - std::pow (cosalpha, 2));
+    yprime = (new_up.cross (new_vp.unit())).unit ();
+    xprime = yprime.cross (new_up);
+    // Projection of vp on plane perpendicular to up...
+    a1 = sinalpha * xprime;
+    // Required new projection...
+    a2 = sinalpha * (std::cos (delta_theta) * xprime + std::sin (delta_theta) * yprime);
+    // Required Increment vector...
+    delta = a2 - a1;
+    // So new viewpoint is...
+    viewPoint = new_vp.unit() + delta;
+    
+    fVP.SetViewAndLights (viewPoint);
+    updateQWidget();
+    
+    ((QApplication*)G4Qt::getInstance ())->processEvents();
+  }
 }
 
@@ -1993 +2035 @@
   if ((event->key() == Qt::Key_Return) || (event->key() == Qt::Key_Enter)){ // end of video
     fRecordFrames = false;
+    G4cout << "Recording Stop... \n" << G4endl;
+    G4cout << "Saving /temp/output.mpg \n" << G4endl;
     saveVideo("/temp/output.mpg");
   }
   if (event->key() == Qt::Key_Space){ // start/pause of video
     fRecordFrames = !fRecordFrames;
+    if (fRecordFrames) {
+      G4cout << "Recording Start... \n" << G4endl;
+    } else {
+      G4cout << "Recording Pause... \n" << G4endl;
+    }
   }
 

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

@@ -199 +199 @@
   }
 
+  if (fRecordFrames) {
+    saveForVideo(QString("/temp/Test")+QString::number(fRecordFrameNumber));
+    //    fRecordFrameNumber++;
+#ifdef GEANT4_QT_DEBUG
+    printf("G4OpenGLStoredQtViewer::record frame %d\n",fRecordFrameNumber);
+#endif
+  }
+
 #ifdef GEANT4_QT_DEBUG
   printf("G4OpenGLStoredQtViewer::DrawView %d %d ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ \n",WinSize_x, WinSize_y);
@@ -292 +300 @@
   DrawView();
      
-  if (fRecordFrames) {
-    saveForVideo(QString("/temp/Test")+QString::number(fRecordFrameNumber));
-    fRecordFrameNumber++;
-#ifdef GEANT4_QT_DEBUG
-    printf("G4OpenGLStoredQtViewer::record frame %d\n",fRecordFrameNumber);
-#endif
-  }
   hasToRepaint =false;
      

trunk/geant4/visualization/visTutor/exN03Vis12.mac

@@ -19 +19 @@
 /vis/verbose confirmations
 
-/vis/open OGLSX
+/vis/open OGLSQT
 /vis/drawVolume
 /vis/scene/add/eventID
@@ -65 +65 @@
 /vis/filtering/trajectories/particleFilter-0/invert true
 
-/gun/energy 1 GeV
+/gun/energy 10 GeV
 /run/beamOn
 /control/alias timeRange 0.1

trunk/geant4/visualization/visTutor/exN03Vis13.mac

@@ -19 +19 @@
 /vis/verbose confirmations
 
-/vis/open OGLSX 600x600-0+0
+/vis/open OGLSQT 600x600-0+0
 /vis/drawVolume
 /vis/scene/add/eventID

trunk/geant4/visualization/visTutor/gui.mac

@@ -42 +42 @@
 /gui/addButton vis Vis10(OIWin32) "/control/execute visTutor/exN03Vis10.mac"
 /gui/addButton vis Vis11(OGLSXm) "/control/execute visTutor/exN03Vis11.mac"
+/gui/addButton vis Vis12(OGLSQT) "/control/execute visTutor/exN03Vis12.mac"
+/gui/addButton vis Vis13(OGLSQT) "/control/execute visTutor/exN03Vis13.mac"
 #
 # Viewer menu :