Changeset 747 for trunk

Timestamp:

Mar 7, 2008, 10:40:13 AM (16 years ago)

Author:

garnier

Message:

modifs sur windows

Location:

trunk/geant4/visualization/OpenGL

Files:

• include/G4OpenGLQtMovieDialog.hh (modified) (2 diffs)
• include/G4OpenGLQtViewer.hh (modified) (2 diffs)
• src/G4OpenGLQtMovieDialog.cc (modified) (11 diffs)
• src/G4OpenGLQtViewer.cc (modified) (5 diffs)

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

@@ -63 +63 @@
   void setRecordingStatus(QString);
   void setRecordingInfos(QString);
-  void setEncodeButtonEnabled(bool);
 
 private :
@@ -77 +76 @@
   QPushButton *fButtonEncode;
 
-  void checkEncoderParameters(QString);
-  void checkTempFolderParameters(QString);
-  void checkSaveFileNameParameters(QString);
+  bool checkEncoderParameters(QString);
+  bool checkTempFolderParameters(QString);
+  bool checkSaveFileNameParameters(QString);
 
 public slots :

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

@@ -81 +81 @@
   bool isReadyToEncode();
   bool encodeVideo();
+  bool generateMpegEncoderParameters();
 
 protected:
@@ -109 +110 @@
   bool hasPendingEvents();
   void savePPMToTemp();
-  bool generateMpegEncoderParameters();
   int fRecordFrameNumber;
 

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

@@ -316 +316 @@
 */
 void G4OpenGLQtMovieDialog::checkAllParameters() {
-  checkEncoderParameters(fEncoderPath->text());
-  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)) {
-//  }
-
-}
+  if (checkEncoderParameters(fEncoderPath->text())
+    && checkTempFolderParameters(fTempFolderPath->text())
+    && checkSaveFileNameParameters(fSaveFileName->text())) {
+        if (fParentViewer->isReadyToEncode()) {
+      if (fParentViewer->generateMpegEncoderParameters()) {
+        fButtonEncode->setEnabled(fParentViewer->;;isReadyToEncode() );
+          }
+        }
+  }
+}
+
 
         /**
@@ -331 +335 @@
  * If valid, save it
  */
-void G4OpenGLQtMovieDialog::checkEncoderParameters(QString param) {
-
+bool G4OpenGLQtMovieDialog::checkEncoderParameters(QString param) {
+
+  bool status = true;
   QPalette palette( fEncoderPath->palette() );
 
@@ -342 +347 @@
     if (fParentViewer->isReadyToEncode()) {
       setRecordingInfos("No valid encode defined, screen \ncapture are saved in the\ntemp folder in ppm format.Please define a encoder and clic on Apply button");
-    }
+        }
+    status = false;
   } else {
     palette.setColor( QPalette::Base, Qt::white);
@@ -348 +354 @@
     if (fParentViewer->getEncoderPath() == "") {
       setRecordingInfos("mpeg_encode is needed to encode in video format.\nIt is available here: \nhttp://bmrc.berkeley.edu/frame/research/mpeg/");
+      status = false;
     }
   }
   fEncoderPath->setPalette(palette);
+  return status;
 }
 
@@ -358 +366 @@
  * If valid, save it
  */
-void G4OpenGLQtMovieDialog::checkTempFolderParameters(QString param) {
-
+bool G4OpenGLQtMovieDialog::checkTempFolderParameters(QString param) {
+
+  bool status = true;
   QPalette palette( fTempFolderPath->palette() );
 
@@ -366 +375 @@
   if (temp != "") {
     palette.setColor( QPalette::Base, Qt::red);
+    status = false;
   } else {
     palette.setColor( QPalette::Base, Qt::white);
@@ -371 +381 @@
   }
   fTempFolderPath->setPalette(palette);
+  return status;
 }
 
@@ -378 +389 @@
  * If valid, save it
  */
-void G4OpenGLQtMovieDialog::checkSaveFileNameParameters(QString param) {
-
+bool G4OpenGLQtMovieDialog::checkSaveFileNameParameters(QString param) {
+
+  bool status = true;
   QPalette palette( fSaveFileName->palette() );
 
@@ -386 +398 @@
   if (temp != "") { 
     palette.setColor( QPalette::Base, Qt::red);
+    status = false;
   } else {
     palette.setColor( QPalette::Base, Qt::white);
@@ -391 +404 @@
   }
   fSaveFileName->setPalette(palette);
+  return status;
 }
 
@@ -402 +416 @@
 }
 
-void G4OpenGLQtMovieDialog::setEncodeButtonEnabled(bool b) {
-  fButtonEncode->setEnabled(b);
-}
-#endif
+#endif

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

@@ -2126 +2126 @@
   if (fRecordFrameNumber >0) {
     // check parameters if they were modified (Re APPLY them...)
+    // It will enable/disable encode button
     fMovieParametersDialog->checkAllParameters();
-pb du check et du bouton encode qui n est pas mis a jour si les param sont mauvais ici
-    if ((getEncoderPath() != "") && (getSaveFileName() != "")) {
-      if (generateMpegEncoderParameters()) {
-        fMovieParametersDialog->setEncodeButtonEnabled(true);
-        setRecordingInfos("Parameter file "+fParameterFileName+" generated in "+fMovieTempFolderPath);
-      } else {  // try to encode without dialog
-        setRecordingInfos("Generation of parameter file failed");
-      }
-    }
   } else {
     setRecordingStatus(WAIT);
@@ -2448 +2440 @@
 bool G4OpenGLQtViewer::generateMpegEncoderParameters () {
 
-  // save the parameter file
+                // save the parameter file
   FILE* fp;
 #if QT_VERSION < 0x040000
@@ -2457 +2449 @@
 
   if (fp == NULL) {
+    setRecordingInfos("Generation of parameter file failed");
     return false;
   }
@@ -2637 +2630 @@
   fclose (fp);
 
+  setRecordingInfos("Parameter file "+fParameterFileName+" generated in "+fMovieTempFolderPath);
+  setRecordingStatus(ENCODE);
   return true;
 }
@@ -2642 +2637 @@
 bool G4OpenGLQtViewer::encodeVideo()
 {
-  setRecordingStatus(ENCODE);
-  QProcess::execute (fEncoderPath, QStringList(fMovieTempFolderPath+fParameterFileName));
-
-  setRecordingStatus(WAIT);
-  setRecordingInfos(removeTempFolder());
-
+  if ((getEncoderPath() != "") && (getSaveFileName() != "")) {
+      QProcess::execute (fEncoderPath, QStringList(fMovieTempFolderPath+fParameterFileName));
+
+      setRecordingStatus(WAIT);
+      setRecordingInfos(removeTempFolder());
+  } else {
+    return false;
+  }
   return true;
 }