Changeset 750 for trunk

Timestamp:

Mar 10, 2008, 2:17:54 PM (16 years ago)

Author:

garnier

Message:

avancement sur le encode

Location:

trunk/geant4/visualization/OpenGL

Files:

• include/G4OpenGLQtMovieDialog.hh (modified) (2 diffs)
• include/G4OpenGLQtViewer.hh (modified) (4 diffs)
• src/G4OpenGLQtMovieDialog.cc (modified) (10 diffs)
• src/G4OpenGLQtViewer.cc (modified) (8 diffs)

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

@@ -75 +75 @@
   QLabel *fRecordingInfos;
   QPushButton *fButtonEncode;
+  QPushButton *fButtonApply;
 
   bool checkEncoderParameters(QString);
@@ -88 +89 @@
   void selectSaveFileNameAction();
   void encode();
+  void resetRecording();
 };
 

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

@@ -57 +57 @@
 class QMouseEvent;
 class QKeyEvent;
+class QProcess;
 
 class G4OpenGLSceneHandler;
@@ -81 +82 @@
   bool isStopped();
   bool isReadyToEncode();
-  bool encodeVideo();
+  void resetRecording();
+  void encodeVideo();
   bool generateMpegEncoderParameters();
 
@@ -115 +117 @@
 private:
   enum mouseActions {STYLE1,STYLE2,STYLE3,STYLE4}; 
-  enum RECORDING_STEP {WAIT,START,PAUSE,CONTINUE,STOP,READY_TO_ENCODE,ENCODE}; 
+  enum RECORDING_STEP {WAIT,START,PAUSE,CONTINUE,STOP,READY_TO_ENCODE,ENCODE,FAILED,SUCCESS}; 
 
   void createPopupMenu();
@@ -202 +204 @@
   void toggleAux(bool);
   void toggleFullScreen(bool);
+  void processFinished(int);
+  void processStdout();
   // Only use for Qt>4.0
   //  void dialogClosed();

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

@@ -238 +238 @@
   buttonBoxLayout->addWidget(buttonCancel);
 
-  QPushButton *buttonApply = new QPushButton( tr( "&Apply" ),buttonBox );
-  buttonApply->setAutoDefault( TRUE );
-  buttonApply->setDefault( TRUE );
-  buttonBoxLayout->addWidget(buttonApply);
+  QPushButton *buttonReset = new QPushButton( tr( "&Reset" ),buttonBox );
+  buttonReset->setAutoDefault( TRUE );
+  buttonBoxLayout->addWidget(buttonReset);
+
+  fButtonApply = new QPushButton( tr( "&Apply" ),buttonBox );
+  fButtonApply->setAutoDefault( TRUE );
+  fButtonApply->setEnabled(true);
+  buttonBoxLayout->addWidget(fButtonApply);
 
   fButtonEncode = new QPushButton( tr( "&Encode" ),buttonBox );
@@ -260 +264 @@
 
   // signals and slots connections
-  connect( buttonApply, SIGNAL( clicked() ), this, SLOT( checkAllParameters() ) );
+  connect( fButtonApply, SIGNAL( clicked() ), this, SLOT( checkAllParameters() ) );
+  connect( buttonReset, SIGNAL( clicked() ), this, SLOT( resetRecording() ) );
   connect( buttonCancel, SIGNAL( clicked() ), this, SLOT( reject() ) );
   connect( fButtonEncode, SIGNAL( clicked() ), this, SLOT( encode() ) );
@@ -268 +273 @@
   fEncoderPath->setText(fParentViewer->getEncoderPath());
   fTempFolderPath->setText(fParentViewer->getTempFolderPath());
+
+  // connect line edit signals
+  connect (fEncoderPath,SIGNAL(textEdited ( const QString&)),fButtonApply,SLOT(setEnabled(true)));
+  connect (fTempFolderPath,SIGNAL(textEdited ( const QString&)),fButtonApply,SLOT(setEnabled(true)));
+  connect (fSaveFileName,SIGNAL(textEdited ( const QString&)),fButtonApply,SLOT(setEnabled(true)));
 
   if (fParentViewer->getEncoderPath() == "") {
@@ -289 +299 @@
     return;
   }
-  checkEncoderParameters(nomFich);
+  fEncoderPath->setText(nomFich);
+  checkAllParameters();
  }
+
 
 void G4OpenGLQtMovieDialog::selectTempPathAction()
@@ -300 +312 @@
     return;
   }
-  checkTempFolderParameters(nomFich);
+  fTempFolderPath->setText(nomFich);
+  checkAllParameters();
  }
+
 
 void G4OpenGLQtMovieDialog::selectSaveFileNameAction()
@@ -311 +325 @@
     return;
   }
-  checkSaveFileNameParameters(nomFich);
+  fSaveFileName->setText(nomFich);
+  checkAllParameters();
  }
+
 
 void G4OpenGLQtMovieDialog::encode() {
@@ -334 +350 @@
     }
   }
+  fButtonApply->setEnabled(false);
 }
 
@@ -397 +414 @@
 
   QString temp = fParentViewer->setSaveFileName(param);
-    fSaveFileStatus->setText(temp);
+  fSaveFileStatus->setText(temp);
   if (temp != "") { 
     palette.setColor( QPalette::Base, Qt::red);
@@ -410 +427 @@
 
 
+void G4OpenGLQtMovieDialog::resetRecording() {
+  fParentViewer->resetRecording();
+}
+
+
 void G4OpenGLQtMovieDialog::setRecordingStatus(QString txt) {
   fButtonEncode->setEnabled(fParentViewer->isReadyToEncode());
@@ -415 +437 @@
 }
 
+
 void G4OpenGLQtMovieDialog::setRecordingInfos(QString txt) {
   fRecordingInfos->setText(txt);

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

@@ -324 +324 @@
 //!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!//
 {
-  G4cout <<removeTempFolder().toStdString().c_str();
+  G4cout <<removeTempFolder().toStdString().c_str() <<G4endl;
 #ifdef GEANT4_QT_DEBUG
   printf("G4OpenGLQtViewer::~G4OpenGLQtViewer \n");
@@ -1319 +1319 @@
 #endif
   if (res == false) { 
-    setRecordingStatus(WAIT);
+    resetRecording();
     setRecordingInfos("Can't save tmp file "+filePath);
     return;
@@ -2129 +2129 @@
     fMovieParametersDialog->checkAllParameters();
   } else {
-    setRecordingStatus(WAIT);
+    resetRecording();
     setRecordingInfos("No frame to encode.");
   }
@@ -2175 +2175 @@
 void G4OpenGLQtViewer::setRecordingStatus(RECORDING_STEP step) {
   
-#ifdef GEANT4_QT_DEBUG
-  printf("setRecordingStatus \n");
-#endif
   QString txt = "";
   if (step == WAIT) {
@@ -2194 +2191 @@
   } else if (step == ENCODE) {
     txt  = "Encoding...";
+  } else if (step == FAILED) {
+    txt  = "Failed to encode...";
   } else {
   }
@@ -2297 +2296 @@
 }
 
+void G4OpenGLQtViewer::resetRecording() {
+    setRecordingStatus(WAIT);
+}
 
 /**
@@ -2432 +2434 @@
   if (res) {
     if (d->rmdir(fMovieTempFolderPath)) {
+      fMovieTempFolderPath = "";
       return "";
     } else {
@@ -2646 +2649 @@
 void G4OpenGLQtViewer::encodeVideo()
 {
+#ifdef GEANT4_QT_DEBUG
+  printf("G4OpenGLQtViewer::encodeVideo \n");
+#endif
   if ((getEncoderPath() != "") && (getSaveFileName() != "")) {
     fProcess = new QProcess();
     fProcess->execute (fEncoderPath, QStringList(fMovieTempFolderPath+fParameterFileName));
-  QObject ::connect(fProcess, 
-                    SIGNAL(finished ( int exitCode, QProcess::ExitStatus exitStatus )),
-                    this,
-                    SLOT(processFinished( int exitCode, QProcess::ExitStatus exitStatus ));
-  }
-}
-
-      setRecordingStatus(WAIT);
-      setRecordingInfos(removeTempFolder());
+#if QT_VERSION > 0x040100
+        QObject ::connect(fProcess,SIGNAL(finished ( int,QProcess::ExitStatus)),
+                      this,SLOT(processFinished( int));
+#else
+#if QT_VERSION > 0x040000
+        QObject ::connect(fProcess,SIGNAL(finished ( int)),
+                      this,SLOT(processFinished( int)));
+        QObject ::connect(fProcess,SIGNAL(readyReadStandardOutput ()),
+                      this,SLOT(processStdout()));
+#else
+        QObject ::connect(fProcess,SIGNAL(finished ( int)),
+                      this,SLOT(processFinished( int)));
+        QObject ::connect(fProcess,SIGNAL(readyReadStdOut ()),
+                      this,SLOT(processStdout()));
+#endif
+#endif
+  }
+#ifdef GEANT4_QT_DEBUG
+  printf("G4OpenGLQtViewer::encodeVideo END\n");
+#endif
+}
+
+
+void G4OpenGLQtViewer::processStdout()
+{
+#ifdef GEANT4_QT_DEBUG
+  printf("processStdout \n");
+#endif
+#ifdef GEANT4_QT_DEBUG
+#if QT_VERSION > 0x040100
+#else
+#if QT_VERSION > 0x040000
+  printf("processStdout %s\n",fProcess->readAllStandardOutput ().data());
+#else
+  printf("processStdout %s\n",fProcess->readStdout ().data());
+
+#endif
+#endif
+#endif
+#ifdef GEANT4_QT_DEBUG
+  printf("processStdout END\n");
+#endif
+}
+
+
+void G4OpenGLQtViewer::processFinished(int exitCode)
+{
+#ifdef GEANT4_QT_DEBUG
+  printf("processFinished \n");
+#endif
+
+  QString txt = "";
+  if (exitCode) {
+    setRecordingStatus(SUCCESS);
+  } else {
+    QString txt;
+        switch (fProcess->error()) {
+          case QProcess::FailedToStart:
+        txt = "The process failed to start. Either the invoked program is missing, or you may have insufficient permissions to invoke the program.";
+                break;
+          case QProcess::Crashed:
+        txt = "The process crashed some time after starting successfully.";
+                break;
+          case QProcess::Timedout:
+        txt = "The last waitFor...() function timed out. The state of QProcess is unchanged, and you can try calling waitFor...() again.";
+                break;
+          case QProcess::WriteError:
+        txt = "An error occurred when attempting to write to the process. For example, the process may not be running, or it may have closed its input channel.";
+            break;
+          case QProcess::ReadError:
+        txt = "An error occurred when attempting to read from the process. For example, the process may not be running.";
+            break;
+          case QProcess::UnknownError:
+        txt = "An unknown error occurred. This is the default return value of error().";
+                break;
+    }
+    setRecordingStatus(FAILED);
+  }
+  setRecordingInfos(txt+"\n"+removeTempFolder());
+#ifdef GEANT4_QT_DEBUG
+  printf("processFinished END\n");
+#endif
+}
 
 /*