Changeset 737 for trunk/geant4/visualization

Timestamp:

Mar 4, 2008, 6:42:41 PM (16 years ago)

Author:

garnier

Message:

fenetre encoder ok

Location:

trunk/geant4/visualization/OpenGL

Files:

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

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

@@ -62 +62 @@
   /** Destroys G4OpenGLQtMovieDialog */
   ~G4OpenGLQtMovieDialog();
+  void setStatus(QString);
 
 private :

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

@@ -117 +117 @@
   connect( encoderButton, SIGNAL( clicked( ) ), this, SLOT(selectEncoderPathAction() ) );
 
-  fEncoderPath->setText(fParentViewer->getEncoderPath());
-
 
   // temp folder group box
@@ -155 +153 @@
   connect( tempButton, SIGNAL( clicked( ) ), this, SLOT(selectTempPathAction() ) );
 
-  fTempFolderPath->setText(fParentViewer->getTempFolderPath());
 
 
@@ -204 +201 @@
   QVBoxLayout *statusVGroupBoxLayout = new QVBoxLayout(statusGroupBox);
   fGlobalStatus = new QLabel(statusGroupBox);
-  fGlobalStatus->setText("");
+  setStatus("");
 
 #if QT_VERSION < 0x040000
@@ -253 +250 @@
   connect( buttonCancel, SIGNAL( clicked() ), this, SLOT( reject() ) );
   connect( buttonEncode, SIGNAL( clicked() ), this, SLOT( encode() ) );
+
+  // fill
+  fEncoderPath->setText(fParentViewer->getEncoderPath());
+  fTempFolderPath->setText(fParentViewer->getTempFolderPath());
+
+  if (fParentViewer->getEncoderPath() == "") {
+    setStatus("mpeg_encode is needed to encode in video format.\nIt is available here: \nhttp://bmrc.berkeley.edu/frame/research/mpeg/");
+  }
+
 }
 
@@ -314 +320 @@
 
   QString temp = fParentViewer->setEncoderPath(param);
-  fGlobalStatus->setText("");
+  setStatus("");
     fEncoderStatus->setText(temp);
   if (temp != "") {
     palette.setColor( QPalette::Base, Qt::red);
-    fGlobalStatus->setText("If no valid encode defined, screen \ncapture files will be saved in the\ntemp folder in ppm format.");
+    setStatus("If no valid encode defined, screen \ncapture files will be saved in the\ntemp folder in ppm format.");
   } else {
     palette.setColor( QPalette::Base, Qt::white);
     fEncoderPath->setText(fParentViewer->getEncoderPath());
+    if (fParentViewer->getEncoderPath() == "") {
+      setStatus("mpeg_encode is needed to encode in video format.\nIt is available here: \nhttp://bmrc.berkeley.edu/frame/research/mpeg/");
+    }
   }
   fEncoderPath->setPalette(palette);
@@ -365 +374 @@
   fSaveFileName->setPalette(palette);
 }
-#endif
+
+
+void G4OpenGLQtMovieDialog::setStatus(QString txt) {
+  fGlobalStatus->setText(txt);
+}
+
+#endif

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

@@ -2147 +2147 @@
  */
 QString G4OpenGLQtViewer::getEncoderPath() {
-
-   if (!fEncoderPath.isNull())
-    return fEncoderPath ;
-   return "";
+  return fEncoderPath;
 }
  
@@ -2209 +2206 @@
  */
 QString G4OpenGLQtViewer::getTempFolderPath() {
-  if (!fTempFolderPath.isNull())
-    return fTempFolderPath ;
-return "";
+  return fTempFolderPath ;
 }
  
@@ -2256 +2251 @@
 */
 void G4OpenGLQtViewer::initMovieParameters() {
-#ifdef GEANT4_QT_DEBUG
-  printf("G4OpenGLQtViewer::--------\n");
-#endif
   //init encoder
   
@@ -2278 +2270 @@
 // init temp folder
   setTempFolderPath(QDir::temp ().absolutePath ());
-#ifdef GEANT4_QT_DEBUG
-  printf("G4OpenGLQtViewer::--------\n");
-#endif
 }