Changeset 740 for trunk/geant4/visualization

Timestamp:

Mar 5, 2008, 5:23:40 PM (16 years ago)

Author:

garnier

Message:

merge fini corrections en cours NE COMPILE PAS

Location:

trunk/geant4/visualization/OpenGL

Files:

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

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

@@ -62 +62 @@
   ~G4OpenGLQtMovieDialog();
   void setStatus(QString);
+  void setEncodeButtonEnabled(bool);
 
 private :
@@ -72 +73 @@
   QLabel *fSaveFileStatus;
   QLabel *fGlobalStatus;
-  QPushButton *fButtonEmcode;
+  QPushButton *fButtonEncode;
 
   void checkEncoderParameters(QString);
@@ -78 +79 @@
   void checkSaveFileNameParameters(QString);
 
+public slots :
+  void checkAllParameters();
+
 private slots :
   void selectEncoderPathAction();
   void selectTempPathAction();
   void selectSaveFileNameAction();
-  void checkAllParameters();
   void encode();
 };

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

@@ -78 +78 @@
   QString setSaveFileName(QString path);
   QString getSaveFileName();
+  bool getRecordFrames();
 
 protected:
@@ -106 +107 @@
   bool hasPendingEvents();
   void savePPMToTemp();
-  bool saveVideo(QString);
+  bool generateMpegEncoderParameters();
   bool fRecordFrames;
   int fRecordFrameNumber;
@@ -155 +156 @@
   QString fMovieTempFolderPath;
   QString fSaveFileName;
+  QString fParameterFileName;
   QAction *fRotateAction;
   QAction *fMoveAction;

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

@@ -231 +231 @@
 
   fButtonEncode = new QPushButton( tr( "&Encode" ),buttonBox );
-  fButtonEncode->setEnabled(false); 
+  fButtonEncode->setEnabled(fParentViewer->getRecordFrames()); 
   fButtonEncode->setAutoDefault( TRUE );
   buttonBoxLayout->addWidget(fButtonEncode);
@@ -309 +309 @@
   checkTempFolderParameters(fTempFolderPath->text());
   checkSaveFileNameParameters(fSaveFileName->text());
+
+  // set state of encode button
+  // if frames had been generated and parameters are valid : enabled encode button
+//  if ((fParentViewer->getRecordFrames() == false) && (fRecordFrameNumber >1)) {
+//  }
+
 }
 
@@ -321 +327 @@
   QString temp = fParentViewer->setEncoderPath(param);
   setStatus("");
-    fEncoderStatus->setText(temp);
+  fEncoderStatus->setText(temp);
   if (temp != "") {
     palette.setColor( QPalette::Base, Qt::red);
@@ -380 +386 @@
 }
 
-#endif
+void G4OpenGLQtMovieDialog::setEncodeButtonEnabled(bool b) {
+  fButtonEncode->setEnabled(b);
+}
+#endif

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

@@ -306 +306 @@
   ,fMovieTempFolderPath("")
   ,fSaveFileName("")
+  ,fParameterFileName("mpeg_encode_parameter_file.par")
   ,fMovieParametersDialog(NULL)
 {
@@ -322 +323 @@
 //!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!//
 {
-  removeTempFolder();
+  G4cout <<removeTempFolder().toStdString().c_str();
 #ifdef GEANT4_QT_DEBUG
   printf("G4OpenGLQtViewer::~G4OpenGLQtViewer \n");
@@ -1304 +1305 @@
     return;
   }
-  QString nomFich =fMovieTempFolderPath+"/Test"+QString::number(fRecordFrameNumber)
+  QString nomFich =fMovieTempFolderPath+"Test"+QString::number(fRecordFrameNumber);
 
   QImage image;
@@ -2095 +2096 @@
 #endif
   }
-
+  // several case here : If return is pressed, in every case -> display the movie parameters dialog
+  // If one parameter is wrong -> put it in red (only save filenam could be wrong..)
+  // If encoder not found-> does nothing.Only display a message in status box
+  // If all ok-> generate parameter file
+  // If ok -> put encoder button enabled
+ 
   if ((event->key() == Qt::Key_Return) || (event->key() == Qt::Key_Enter)){ // end of video
    // if encoder parameter is wrong, display parameters dialog and return
@@ -2102 +2108 @@
     }
     fMovieParametersDialog->setStatus("Stop Recording\n");
+    fMovieParametersDialog->checkAllParameters();
     if (getEncoderPath() == "") {
-      fMovieParametersDialog->setStatus("No valid encoder found. Frames saved in "+fTempFolder);
-    }
-    if (generateMpegEncoderParameters()) {      
-      ...
-      if (
-          ...
-          if (fMovieParametersDialog) {
-            fMovieParametersDialog->setEncodeButtonEnable(true);
-          }
+      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");
       }
     }
@@ -2126 +2131 @@
           return;
         } else  {
-          //          printf("record+premier image+temp<>.. \n");
           // remove temp folder if it was create
-          if (!removeTempFolder()) {
+          QString tmp = removeTempFolder()
+          if (tmp !="") {
+            fMovieParametersDialog->setStatus(tmp);
             fHoldKeyEvent = false;
             return;
           }
-
-          //          printf("create tmp dir.. \n");
-          // create temp dir if not 
-          QString time = QDir::fromNativeSeparators ("/"+QDateTime::currentDateTime ().toString("dd-MM-yyyy_hh-mm-ss"));
-          QDir dir(fTempFolderBasePath);
-          if (dir.mkdir(fTempFolderBasePath+time)) {
-            fTempFolder = fTempFolderBasePath+time;
+          QString tmp = createTempFolder();
+          if (tmp != "") {
+            fMovieParametersDialog->setStatus("Can't create temp folder. \n"+tmp);
+            fHoldKeyEvent = false;
+            return;
           }
         }
@@ -2222 +2226 @@
     return "File does not exist";
   }
+  path =  QDir::cleanPath(path);
   QFile *f = new QFile(path);
   if (!f->exists()) {
@@ -2233 +2238 @@
 }
 
+bool G4OpenGLQtViewer::getRecordFrames(){
+  return fRecordFrames;
+}
+
 /**
  * set the temp folder path
@@ -2242 +2251 @@
     return "Path does not exist";
   }
+  path =  QDir::cleanPath(path);
   QDir *d = new QDir(path);
   if (!d->exists(path)) {
@@ -2281 +2291 @@
     return "Path does not exist";
   }
-  QDir *d = new QDir(path);
-  if (!d->exists(path)) {
-    return "Path does not exist";
-  }
-
-  d->setFilter( QDir::Dirs | QDir::Readable | QDir::Writable );
-  QStringList subDirList = d->entryList();
+  path =  QDir::cleanPath(path);
+  QFileInfo *fileInfo = new QFileInfo(path);
+  QDir dir = fileInfo->absoluteDir();
+  if (!dir.exists()) {
+    return "Folder does not exist\n";
+  }
+
+  dir.setFilter( QDir::Dirs | QDir::Writable );
+  QStringList subDirList = dir.entryList();
   bool found = false;
 
@@ -2312 +2324 @@
 
 /** Create a Qt_temp folder in the temp folder given
-*/
-bool G4OpenGLQtViewer::createTempFolder() {
+* The temp folder will be like this /tmp/QtMovie_12-02-2008_12_12_58/
+* @return "" if success. Error message if not.
+*/
+QString G4OpenGLQtViewer::createTempFolder() {
   fMovieTempFolderPath = "";
 
   //check
-  if (setTempFolderPath(fTempFolderPath) != "") {
-    return false;
-  }
-  QString path = QString("/QtMovie_")+QDateTime::currentDateTime ().toString("dd-MM-yyyy_hh-mm-ss"); 
-  QDir *d = new QDir(fTempFolderPath);
+  QString tmp = setTempFolderPath(fTempFolderPath);
+  if (tmp != "") {
+    return tmp;
+  }
+  QString path = QDir::fromNativeSeparators(QString("/QtMovie_")+QDateTime::currentDateTime ().toString("dd-MM-yyyy_hh-mm-ss/")); 
+  QDir *d = new QDir(QDir::cleanPath(fTempFolderPath));
   // check if it is already present
   if (d->exists(path)) {
-          return false;
+    return "Folder "+path+" already exists.\nPlease remove it first";
   }
   if (d->mkdir(fTempFolderPath+path)) {
     fMovieTempFolderPath = fTempFolderPath+path;
-    return true;
-  }
-  return false;
+    return "";
+  } else {
+    return "Can't create "+fTempFolderPath+path+"\n";
+  }
+  return "-";
 }
 
 /** Remove the Qt_temp folder in the temp folder
 */
-bool G4OpenGLQtViewer::removeTempFolder() {
+QString G4OpenGLQtViewer::removeTempFolder() {
         // remove files in Qt_temp folder
-  QDir *d = new QDir(fMovieTempFolderPath);
+  QDir *d = new QDir(QDir::cleanPath(fMovieTempFolderPath));
   if (!d->exists()) {
-    return false;  // already remove
+    return "";  // already remove
   }
 
@@ -2345 +2362 @@
   QStringList subDirList = d->entryList();
   int res = true;
-
+  QString error = "";
   for (QStringList::ConstIterator it = subDirList.begin() ;(it != subDirList.end()) ; it++) {
     const QString currentFile = *it;
     if (!d->remove(currentFile)) {
       res = false;
-      G4cout << "Try to remove Movie temp directory:"<<fMovieTempFolderPath.toStdString()<<" but failed to remove:"<<fMovieTempFolderPath.toStdString()<<"/"<<currentFile.toStdString() <<"\n" << G4endl;
+      QString file = QDir::fromNativeSeparators(fMovieTempFolderPath+currentFile);
+      error +="Removing file failed : "+file.toStdString()+"\n";
     }
   }
   if (res) {
     if (d->rmdir(fMovieTempFolderPath)) {
-      return true;
-    }
-  }
-  return false;
+      return "";
+    } else {
+      return "Dir "+fMovieTempFolderPath+" should be empty,\n but could not remove it";
+    }
+
+  }
+  return "Could not remove "+fMovieTempFolderPath+" because \nof the following errors :"+error;
 }
 
@@ -2367 +2388 @@
 }
 
-bool G4OpenGLQtViewer::saveVideo (QString outputName) {
+bool G4OpenGLQtViewer::generateMpegEncoderParameters () {
 
   // save the parameter file
   FILE* fp;
-  fp = fopen ("/temp/parameter_file.par", "w");
+#if QT_VERSION < 0x040000
+  fp = fopen (QString(fMovieTempFolderPath+fParameterFileName).ascii, "w");
+#else
+  fp = fopen (QString(fMovieTempFolderPath+fParameterFileName).toStdString().c_str(), "w");
+#endif
 
   if (fp == NULL) {
@@ -2472 +2497 @@
   fprintf (fp,"\n");
   fprintf (fp,"# directory to get all input files from (makes this file easier to read)\n");
-  fprintf (fp,"INPUT_DIR        /temp\n");
+#if QT_VERSION < 0x040000
+  fprintf (fp,"INPUT_DIR        %s\n",fMovieTempFolderPath.ascii());
+#else
+  fprintf (fp,"INPUT_DIR        %s\n",fMovieTempFolderPath.toStdString().c_str());
+#endif
   fprintf (fp,"\n");
   fprintf (fp,"# There are a bunch of ways to specify the input files.\n");
@@ -2550 +2579 @@
   fclose (fp);
 
-  QProcess::execute (fEncoderPath, QStringList("/temp/parameter_file.par"));
+  fMovieParametersDialog->setStatus("Parameter file generated : "+fMovieTempFolderPath+fParameterFileName);
+  return true;
+}
+
+bool G4OpenGLQtViewer::saveVideo()
+{
+  QProcess::execute (fEncoderPath, QStringList(fMovieTempFolderPath+fParameterFileName));
+  fMovieParametersDialog->setStatus(removeTempFolder());
+
+  // reset
+  fRecordFrameNumber = 0;
   return true;
 }