Changeset 742

Timestamp:

Mar 5, 2008, 6:36:30 PM (16 years ago)

Author:

garnier

Message:

ok compile reste a tester les messages

Location:

trunk/geant4/visualization/OpenGL

Files:

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

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

@@ -122 +122 @@
   QString createTempFolder();
   QString removeTempFolder();
+  bool saveVideo();
 
 #if QT_VERSION < 0x040000

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

@@ -291 +291 @@
 void G4OpenGLQtMovieDialog::selectSaveFileNameAction()
 {
-  QString nomFich =  QFileDialog::getOpenFileName ( this,
+  QString nomFich =  QFileDialog::getSaveFileName ( this,
                                                     "Select saved file",
                                                     tr("Select saved file ...")); 

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

@@ -2108 +2108 @@
     }
     fMovieParametersDialog->setStatus("Stop Recording\n");
+
+    // check parameters if they were modified (Re APPLY them...)
     fMovieParametersDialog->checkAllParameters();
-    if (getEncoderPath() == "") {
-      fMovieParametersDialog->setStatus("No valid encoder found. Frames saved in "+fMovieTempFolderPath);
-    } else if (getSaveFileName() =="") {   // if no saved file
-      if (generateMpegEncoderParameters()) {
-        fMovieParametersDialog->setEncodeButtonEnabled(true);
-        fMovieParametersDialog->setStatus("Parameter file "+fParameterFileName+" generated in "+fMovieTempFolderPath);
-      } else {  // try to encode without dialog
-        fMovieParametersDialog->setStatus("Generation of parameter file failed");
+    if (getEncoderPath() != "") {
+      if (getSaveFileName() != "") {
+        if (generateMpegEncoderParameters()) {
+          fMovieParametersDialog->setEncodeButtonEnabled(true);
+          fMovieParametersDialog->setStatus("Parameter file "+fParameterFileName+" generated in "+fMovieTempFolderPath);
+        } else {  // try to encode without dialog
+          fMovieParametersDialog->setStatus("Generation of parameter file failed");
+        }
       }
     }
@@ -2132 +2134 @@
         } else  {
           // remove temp folder if it was create
-          QString tmp = removeTempFolder()
+          QString tmp = removeTempFolder();
           if (tmp !="") {
             fMovieParametersDialog->setStatus(tmp);
@@ -2138 +2140 @@
             return;
           }
-          QString tmp = createTempFolder();
+          tmp = createTempFolder();
           if (tmp != "") {
             fMovieParametersDialog->setStatus("Can't create temp folder. \n"+tmp);
@@ -2354 +2356 @@
 QString G4OpenGLQtViewer::removeTempFolder() {
         // remove files in Qt_temp folder
+  if (fMovieTempFolderPath == "") {
+    return "";
+  }
   QDir *d = new QDir(QDir::cleanPath(fMovieTempFolderPath));
   if (!d->exists()) {
@@ -2368 +2373 @@
       res = false;
       QString file = QDir::fromNativeSeparators(fMovieTempFolderPath+currentFile);
-      error +="Removing file failed : "+file.toStdString()+"\n";
+      error +="Removing file failed : "+file+"\n";
     }
   }
@@ -2433 +2438 @@
   fprintf (fp,"PATTERN          IBBPBBPBBPBBPBBP\n");
 #if QT_VERSION < 0x040000
-  fprintf (fp,"OUTPUT           %s\n",outputName.ascii());
-#else
-  fprintf (fp,"OUTPUT           %s\n",outputName.toStdString().c_str());
+  fprintf (fp,"OUTPUT           %s\n",getSaveFileName().ascii());
+#else
+  fprintf (fp,"OUTPUT           %s\n",getSaveFileName().toStdString().c_str());
 #endif
   fprintf (fp,"\n");