Changeset 731 for trunk

Timestamp:

Feb 26, 2008, 12:50:22 PM (16 years ago)

Author:

garnier

Message:

debut de la boite de dialog pour les param video

Location:

trunk/geant4/visualization/OpenGL

Files:

• include/G4OpenGLQtMovieDialog.hh (modified) (3 diffs)
• include/G4OpenGLQtViewer.hh (modified) (4 diffs)
• src/G4OpenGLQtMovieDialog.cc (modified) (2 diffs)
• src/G4OpenGLQtViewer.cc (modified) (7 diffs)

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

@@ -45 +45 @@
 class QLabel;
 class QLineEdit;
+class G4OpenGLQtViewer;
 
 #if QT_VERSION >= 0x040000
@@ -61 +62 @@
       @param parent : parent widget
   */
-  G4OpenGLQtMovieDialog(QWidget* parent);
+  G4OpenGLQtMovieDialog(G4OpenGLQtViewer*,QWidget*);
 
   /** Destroys G4OpenGLQtMovieDialog */
@@ -69 +70 @@
   QLineEdit* fSelectPath;
   QString fTmpDir;
-  QWidget *fParent;
+  G4OpenGLQtViewer *fParentViewer;
 
 private slots :

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

@@ -59 +59 @@
 
 class G4OpenGLSceneHandler;
+class G4OpenGLQtMovieDialog;
 
 class G4OpenGLQtViewer: public QObject, virtual public G4OpenGLViewer {
@@ -112 +113 @@
   bool generateVectorEPS (QString,int,int,QImage);
   bool generatePS_PDF(QString,int,QImage);  
+  void showMovieParametersDialog();
 
 #if QT_VERSION < 0x040000
@@ -152 +154 @@
   QAction *fDrawingSurfaceRemoval;
   QAction *fDrawingLineSurfaceRemoval;
+  G4OpenGLQtMovieDialog* movieParametersDialog;
 
 private slots :
@@ -161 +164 @@
   void actionDrawingSurfaceRemoval();
   void actionDrawingLineSurfaceRemoval();
-  void actionCreateEPS();
-  void actionCreateMovie();
+  void actionSaveImage();
+  void actionMovieParameters();
 
   void showShortcuts();

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

@@ -66 +66 @@
 
 G4OpenGLQtMovieDialog::G4OpenGLQtMovieDialog(
- QWidget* parent
+ G4OpenGLQtViewer* parentViewer,
+ QWidget* parentWidget
 )
-  : QDialog( parent ),
-    fParent(parent)
+  : QDialog( parentWidget ),
+    fParentViewer(parentViewer)
 {
   setModal(false);
@@ -126 +127 @@
 #endif
 
-  fSelectPath->setText(((G4OpenGLQtViewer*)fParent)->getEncoderPath());
+  fSelectPath->setText(fParentViewer->getEncoderPath());
 
   QLabel *infoLabel = new QLabel("  Press SPACE to Start/Pause video recording \n  Press RETURN to Stop video recording");

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

@@ -301 +301 @@
   ,fHoldRotateEvent(false)
   ,fAutoMove(false)
-  ,fEncoderPath(NULL)
 {
 #ifdef GEANT4_QT_DEBUG
+  fEncoderPath = "";
   printf("G4OpenGLQtViewer::G4OpenGLQtViewer \n");
 #endif
@@ -645 +645 @@
                     SIGNAL(activated()),
                     this,
-                    SLOT(actionCreateEPS()));
+                    SLOT(actionSaveImage()));
 
 #else
@@ -654 +654 @@
                     SIGNAL(triggered()),
                     this,
-                    SLOT(actionCreateEPS()));
+                    SLOT(actionSaveImage()));
 #endif
 
 #if QT_VERSION < 0x040000
 #if QT_VERSION < 0x030200
-  QAction *createMovie =  new QAction("&Make movie ...","&Make movie ...",CTRL+Key_M,mActions,0,true);
-#else
-  QAction *createMovie =  new QAction("&Make movie ...",CTRL+Key_M,mActions);
-#endif
-  createMovie->addTo(mActions);
-  QObject ::connect(createMovie, 
+  QAction *movieParameters =  new QAction("&Movie parameters...","&Make movie ...",CTRL+Key_M,mActions,0,true);
+#else
+  QAction *movieParameters =  new QAction("&Make parameters...",CTRL+Key_M,mActions);
+#endif
+  movieParameters->addTo(mActions);
+  QObject ::connect(movieParameters, 
                     SIGNAL(activated()),
                     this,
-                    SLOT(actionCreateMovie()));
+                    SLOT(actionMovieParameters()));
 
 #else
   // === Action Menu ===
-  QAction *createMovie = mActions->addAction("Make movie ...");
-  QObject ::connect(createMovie, 
+  QAction *movieParameters = mActions->addAction("Movie parameters...");
+  QObject ::connect(movieParameters, 
                     SIGNAL(triggered()),
                     this,
-                    SLOT(actionCreateMovie()));
+                    SLOT(actionMovieParameters()));
 #endif
 
@@ -1324 +1324 @@
 
 
-void G4OpenGLQtViewer::actionCreateEPS() {
+void G4OpenGLQtViewer::actionSaveImage() {
   QString filters;
 #if QT_VERSION < 0x040000
@@ -1443 +1443 @@
   
 #ifdef GEANT4_QT_DEBUG
-  printf("G4OpenGLQtViewer::actionCreateEPS() \n");
-#endif
-}
-
-
-void G4OpenGLQtViewer::actionCreateMovie() {
-
-  G4OpenGLQtMovieDialog* movieDialog= new G4OpenGLQtMovieDialog(GLWindow);
-  movieDialog->show();
+  printf("G4OpenGLQtViewer::actionSaveImage() \n");
+#endif
+}
+
+
+void G4OpenGLQtViewer::actionMovieParameters() {
+
+  showMovieParametersDialog();
 #ifdef GEANT4_QT_DEBUG
-  printf("G4OpenGLQtViewer::actionCreateMovie() \n");
-#endif
-}
+  printf("G4OpenGLQtViewer::actionMovieParameters() \n");
+#endif
+}
+
+
+void G4OpenGLQtViewer::showMovieParametersDialog() {
+  if (!movieParametersDialog) {
+    movieParametersDialog= new G4OpenGLQtMovieDialog(this,GLWindow);
+  }
+  movieParametersDialog->show();
+}
+
 
 /*
@@ -2066 +2074 @@
 
   if ((event->key() == Qt::Key_Return) || (event->key() == Qt::Key_Enter)){ // end of video
-    fRecordFrames = false;
-    G4cout << "Recording Stop... \n" << G4endl;
+    GLWidget->setCaption( tr( " Stop Recording " ));
+    G4cout << "Stop Recording \n" << G4endl;
     G4cout << "Saving /temp/output.mpg \n" << G4endl;
     saveVideo("/temp/output.mpg");
+    fRecordFrames = false;
   }
   if (event->key() == Qt::Key_Space){ // start/pause of video
+
+    // first time, if parameters are wrong, display parameters dialog and return
+    if ((fRecordFrames == false) && (getEncoderPath() == NULL)) {
+      showMovieParametersDialog();
+      return;
+    }
     fRecordFrames = !fRecordFrames;
     if (fRecordFrames) {
-      G4cout << "Recording Start... \n" << G4endl;
+      GLWidget->setCaption( tr( " Start Recording " ));
+      G4cout << " Start Recording \n" << G4endl;
     } else {
-      G4cout << "Recording Pause... \n" << G4endl;
+      GLWidget->setCaption( tr( " Pause Recording" ));
+      G4cout << "Pause Recording \n" << G4endl;
     }
   }
@@ -2103 +2120 @@
   
 
-/** @return if encoder path was not specified, try to guess it and open the movie parameter dialog box.
- * if path was already specified, return it.
+/** @return if encoder path was not specified, try to guess it.
+ * if path was already specified, return it.Else return ""
  */
 QString G4OpenGLQtViewer::getEncoderPath() {
-  if (fEncoderPath == NULL) {
-    
-    //look for encoderPath
-    QProcess search;
-    search.setReadChannelMode(QProcess::MergedChannels);
-    search.start ("which mpeg_encode");
-    
-    if (search.waitForFinished()) {
-      fEncoderPath = QString::fromLocal8Bit(search.readAll());
-    }
-    G4OpenGLQtMovieDialog* movieDialog= new G4OpenGLQtMovieDialog(GLWindow);
-    movieDialog->show();
-  } else {
-    return fEncoderPath ;
-  }
+
+   if (fEncoderPath.isNull())
+     fEncoderPath ="";
+   if (fEncoderPath.isEmpty()) {
+  
+     //look for encoderPath
+     QProcess search;
+     search.setReadChannelMode(QProcess::MergedChannels);
+     search.start ("which mpeg_encode");
+  
+     if (search.waitForFinished()) {
+       fEncoderPath = QString::fromLocal8Bit(search.readAll());
+       // if not found, return "not found"
+       if (fEncoderPath.contains(" ")) {
+         fEncoderPath = "";
+       } else if (!fEncoderPath.contains("mpeg_encode")) {
+         fEncoderPath = "";
+       }
+     }
+   }
+  return fEncoderPath ;
 }