Changeset 752 for trunk/geant4/visualization

Timestamp:

Mar 10, 2008, 5:13:30 PM (16 years ago)

Author:

garnier

Message:

on bloque si l encoder est un dir+le status est mis a jour des le debut

Location:

trunk/geant4/visualization/OpenGL

Files:

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

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

@@ -85 +85 @@
   void encodeVideo();
   bool generateMpegEncoderParameters();
+  void displayRecordingStatus();
 
 protected:

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

@@ -286 +286 @@
     setRecordingInfos("mpeg_encode is needed to encode in video format. It is available here: http://bmrc.berkeley.edu/frame/research/mpeg/");
   }
-
+  
+  checkAllParameters();
 }
 

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

@@ -1466 +1466 @@
   if (!fMovieParametersDialog) {
     fMovieParametersDialog= new G4OpenGLQtMovieDialog(this,GLWindow);
+    displayRecordingStatus();
   }
   fMovieParametersDialog->show();
@@ -2174 +2175 @@
 
 void G4OpenGLQtViewer::setRecordingStatus(RECORDING_STEP step) {
+
+  fRecordingStep = step;
+  displayRecordingStatus();
+}
+
+
+void G4OpenGLQtViewer::displayRecordingStatus() {
   
   QString txt = "";
-  if (step == WAIT) {
+  if (fRecordingStep == WAIT) {
     txt  = "Waiting to start...";
     fRecordFrameNumber = 0; // reset the frame number
-  } else if (step == START) {
+  } else if (fRecordingStep == START) {
     txt  = "Start Recording...";
-  } else if (step == PAUSE) {
+  } else if (fRecordingStep == PAUSE) {
     txt  = "Pause Recording...";
-  } else if (step == CONTINUE) {
+  } else if (fRecordingStep == CONTINUE) {
     txt  = "Continue Recording...";
-  } else if (step == STOP) {
+  } else if (fRecordingStep == STOP) {
     txt  = "Stop Recording...";
-  } else if (step == READY_TO_ENCODE) {
+  } else if (fRecordingStep == READY_TO_ENCODE) {
     txt  = "Ready to Encode...";
-  } else if (step == ENCODING) {
+  } else if (fRecordingStep == ENCODING) {
     txt  = "Encoding...";
-  } else if (step == FAILED) {
+  } else if (fRecordingStep == FAILED) {
     txt  = "Failed to encode...";
-  } else if (step == SUCCESS) {
+  } else if (fRecordingStep == SUCCESS) {
     txt  = "File encoded successfully";
   } else {
   }
-
-  fRecordingStep = step;
 
   if (fMovieParametersDialog) {
@@ -2211 +2217 @@
   setRecordingInfos("");
 }
+
 
 void G4OpenGLQtViewer::setRecordingInfos(QString txt) {
@@ -2263 +2270 @@
     return "File does not exist";
   }
+  // check if it is not a dir
+  QDir dir(path);
+  dir.setFilter( QDir::Dirs);
+  QStringList subDirList = dir.entryList();
+
+  if (!subDirList.isEmpty()) {
+    return "This is a directory";
+  }
+
   path =  QDir::cleanPath(path);
   QFile *f = new QFile(path);
@@ -2351 +2367 @@
     return "Path does not exist";
   }
+  // check if it is not a dir
+  QDir dir(path);
+  dir.setFilter( QDir::Dirs);
+  QStringList subDirList = dir.entryList();
+
+  if (!subDirList.isEmpty()) {
+    return "This is a directory";
+  }
+
   path =  QDir::cleanPath(path);
   QFileInfo *fileInfo = new QFileInfo(path);