Changeset 744 for trunk/geant4/visualization

Timestamp:

Mar 6, 2008, 3:18:56 PM (16 years ago)

Author:

garnier

Message:

modif de structre et passage des recording step sur un enum

Location:

trunk/geant4/visualization/OpenGL

Files:

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

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

@@ -61 +61 @@
   /** Destroys G4OpenGLQtMovieDialog */
   ~G4OpenGLQtMovieDialog();
-  void setStatus(QString);
+  void setRecordingStatus(QString);
+  void setRecordingInfos(QString);
   void setEncodeButtonEnabled(bool);
 
@@ -72 +73 @@
   QLabel *fTempFolderStatus;
   QLabel *fSaveFileStatus;
-  QLabel *fGlobalStatus;
+  QLabel *fRecordingStatus;
+  QLabel *fRecordingInfos;
   QPushButton *fButtonEncode;
 

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

@@ -78 +78 @@
   QString setSaveFileName(QString path);
   QString getSaveFileName();
-  bool getRecordFrames();
+  enum RECORDING_STEP {WAIT=0,START,PAUSE,CONTINUE,STOP,ENCODE}; 
+  RECORDING_STEP getRecordingStep();
+  bool encodeVideo();
 
 protected:
@@ -108 +110 @@
   void savePPMToTemp();
   bool generateMpegEncoderParameters();
-  bool fRecordFrames;
   int fRecordFrameNumber;
 
@@ -122 +123 @@
   QString createTempFolder();
   QString removeTempFolder();
-  bool saveVideo();
+  void startPauseVideo();
+  void stopVideo();
+  void setRecordingStatus(RECORDING_STEP);
+  void setRecordingInfos(QString);
+
 
 #if QT_VERSION < 0x040000
@@ -130 +135 @@
 #endif
   enum mouseActions {STYLE1,STYLE2,STYLE3,STYLE4}; 
+
   mouseActions fMouseAction; // 1: rotate 2:move 3:pick 4:shortcuts 
   QPoint fLastPos;
@@ -168 +174 @@
   QAction *fDrawingLineSurfaceRemoval;
   G4OpenGLQtMovieDialog* fMovieParametersDialog;
+  RECORDING_STEP fRecordingStep;
 
 private slots :

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

@@ -200 +200 @@
   QGroupBox *statusGroupBox = new QGroupBox(tr("Status"));
   QVBoxLayout *statusVGroupBoxLayout = new QVBoxLayout(statusGroupBox);
-  fGlobalStatus = new QLabel(statusGroupBox);
-  setStatus("");
+
+  fRecordingStatus = new QLabel(statusGroupBox);
+  setRecordingStatus("");
+  QPalette palette( fRecordingStatus->palette() );
+  palette.setColor( QPalette::Text, Qt::green);
+  fRecordingStatus->setPalette(palette);
+
+  fRecordingInfos = new QLabel(statusGroupBox);
+  setRecordingInfos("");
 
 #if QT_VERSION < 0x040000
-  statusVGroupBoxLayout->add(fGlobalStatus);
+  statusVGroupBoxLayout->add(fRecordingStatus);
+  statusVGroupBoxLayout->add(fRecordingInfos);
 
   globalVLayout->add(infoLabel);
   globalVLayout->add(statusGroupBox);
 #else
-  statusVGroupBoxLayout->addWidget(fGlobalStatus);
+  statusVGroupBoxLayout->addWidget(fRecordingStatus);
+  statusVGroupBoxLayout->addWidget(fRecordingInfos);
 
   statusGroupBox->setLayout(statusVGroupBoxLayout);
@@ -231 +240 @@
 
   fButtonEncode = new QPushButton( tr( "&Encode" ),buttonBox );
-  fButtonEncode->setEnabled(fParentViewer->getRecordFrames()); 
+  if (fParentViewer->getRecordingStep() == G4OpenGLQtViewer::ENCODE) {
+    fButtonEncode->setEnabled(true); 
+  } else {
+    fButtonEncode->setEnabled(false); 
+  }
   fButtonEncode->setAutoDefault( TRUE );
   buttonBoxLayout->addWidget(fButtonEncode);
@@ -256 +269 @@
 
   if (fParentViewer->getEncoderPath() == "") {
-    setStatus("mpeg_encode is needed to encode in video format.\nIt is available here: \nhttp://bmrc.berkeley.edu/frame/research/mpeg/");
+    setRecordingInfos("mpeg_encode is needed to encode in video format.\nIt is available here: \nhttp://bmrc.berkeley.edu/frame/research/mpeg/");
   }
 
@@ -301 +314 @@
 
 void G4OpenGLQtMovieDialog::encode() {
+  fParentViewer->encodeVideo();
 }
 
@@ -326 +340 @@
 
   QString temp = fParentViewer->setEncoderPath(param);
-  setStatus("");
+  setRecordingInfos("");
   fEncoderStatus->setText(temp);
   if (temp != "") {
     palette.setColor( QPalette::Base, Qt::red);
-    setStatus("If no valid encode defined, screen \ncapture files will be saved in the\ntemp folder in ppm format.");
+    setRecordingInfos("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/");
+      setRecordingInfos("mpeg_encode is needed to encode in video format.\nIt is available here: \nhttp://bmrc.berkeley.edu/frame/research/mpeg/");
     }
   }
@@ -382 +396 @@
 
 
-void G4OpenGLQtMovieDialog::setStatus(QString txt) {
-  fGlobalStatus->setText(txt);
+void G4OpenGLQtMovieDialog::setRecordingStatus(QString txt) {
+  fRecordingStatus->setText(txt);
+}
+
+void G4OpenGLQtMovieDialog::setRecordingInfos(QString txt) {
+  fRecordingInfos->setText(txt);
 }
 

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

@@ -289 +289 @@
   ,G4OpenGLViewer (scene)
   ,fWindow(0)
-  ,fRecordFrames(false)
   ,fRecordFrameNumber(0)
   ,fContextMenu(0)
@@ -308 +307 @@
   ,fParameterFileName("mpeg_encode_parameter_file.par")
   ,fMovieParametersDialog(NULL)
+  ,fRecordingStep(WAIT)
+
 {
 
@@ -1305 +1306 @@
     return;
   }
-  QString nomFich =fMovieTempFolderPath+"Test"+QString::number(fRecordFrameNumber);
+  QString fileName ="Test"+QString::number(fRecordFrameNumber)+".ppm";
+  QString filePath =fMovieTempFolderPath+fileName;
 
   QImage image;
@@ -1311 +1313 @@
   bool res = false;
   
-  nomFich += "."+QString("ppm");
-#if QT_VERSION < 0x040000
-  res = image.save(nomFich,"ppm");
-#else
-  res = image.save(nomFich,0);
-#endif
- if (res == false) { 
-    fRecordFrames = false;
-    if (fMovieParametersDialog) {
-      fMovieParametersDialog->setStatus("Can't save tmp file "+nomFich);
-    } else {
-#if QT_VERSION < 0x040000
-      G4cout << "Can't save tmp file "<<nomFich.ascii()<<"\n" << G4endl;
-#else
-      G4cout << "Can't save tmp file "<<nomFich.toStdString().c_str()<<"\n" << G4endl;
-#endif
-    }
+#if QT_VERSION < 0x040000
+  res = image.save(filePath,"ppm");
+#else
+  res = image.save(filePath,0);
+#endif
+  if (res == false) { 
+    setRecordingStatus(WAIT);
+    setRecordingInfos("Can't save tmp file "+filePath);
     return;
   }
   
-  if (fMovieParametersDialog) {
-    fMovieParametersDialog->setStatus("File "+nomFich+" saved");
-  } else {
-#if QT_VERSION < 0x040000
-    G4cout << "File "<<nomFich.ascii()<<" saved\n" << G4endl;
-#else
-    G4cout << "File "<<nomFich.toStdString().c_str()<<" saved\n" << G4endl;
-#endif
-  }
+  setRecordingInfos("File "+fileName+" saved");
   fRecordFrameNumber++;
 #ifdef GEANT4_QT_DEBUG
@@ -2103 +2088 @@
  
   if ((event->key() == Qt::Key_Return) || (event->key() == Qt::Key_Enter)){ // end of video
-   // if encoder parameter is wrong, display parameters dialog and return
-    if (!fMovieParametersDialog) {
-      showMovieParametersDialog();
-    }
-    fMovieParametersDialog->setStatus("Stop Recording\n");
-
+   stopVideo();
+  }
+  if (event->key() == Qt::Key_Space){ // start/pause of video
+   startPauseVideo();
+  }
+
+  // with no modifiers
+#if QT_VERSION < 0x040000
+  if (event->state() == Qt::NoButton) {
+#else
+  if (event->modifiers() == Qt::NoModifier) {
+#endif
+    if (event->key() == Qt::Key_Down) { // go down
+      moveScene(0,1,0,false);
+    }
+    else if (event->key() == Qt::Key_Up) {  // go up
+      moveScene(0,-1,0,false);
+    }
+    if (event->key() == Qt::Key_Left) { // go left
+      moveScene(-1,0,0,false);
+    }
+    else if (event->key() == Qt::Key_Right) { // go right
+      moveScene(1,0,0,false);
+    }
+  }
+  fHoldKeyEvent = false;
+}
+  
+
+/** Stop the video. Check all parameters and enable encoder button if all is ok.
+*/
+void G4OpenGLQtViewer::stopVideo() {
+
+ // if encoder parameter is wrong, display parameters dialog and return
+  if (!fMovieParametersDialog) {
+    showMovieParametersDialog();
+  }
+  setRecordingStatus(STOP);
+
+  if (fRecordFrameNumber >0) {
     // check parameters if they were modified (Re APPLY them...)
     fMovieParametersDialog->checkAllParameters();
-    if (getEncoderPath() != "") {
-      if (getSaveFileName() != "") {
-        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");
+    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);
+    setRecordingInfos("No frame to encode.");
+  }
+}
+
+
+/** Start/Pause the video..
+*/
+void G4OpenGLQtViewer::startPauseVideo() {
+   
+  // first time, if temp parameter is wrong, display parameters dialog and return
+  if ( fRecordingStep == WAIT) {
+    if ( fRecordFrameNumber == 0) {
+      if (getTempFolderPath() == "") {
+        showMovieParametersDialog();
+        setRecordingInfos("You should specified the temp folder in order to make movie");
+        return;
+      } else  {
+        // remove temp folder if it was create
+        QString tmp = removeTempFolder();
+        if (tmp !="") {
+          setRecordingInfos(tmp);
+          return;
+        }
+        tmp = createTempFolder();
+        if (tmp != "") {
+          setRecordingInfos("Can't create temp folder. \n"+tmp);
+          return;
         }
       }
     }
-    fRecordFrames = false;
-  }
-  if (event->key() == Qt::Key_Space){ // start/pause of video
-   // first time, if temp parameter is wrong, display parameters dialog and return
-    if (fRecordFrames == false) {
-      if ( fRecordFrameNumber == 0) {
-        if (getTempFolderPath() == "") {
-          showMovieParametersDialog();
-          fMovieParametersDialog->setStatus("You should specified the temp folder in order to make movie");
-          fHoldKeyEvent = false;
-          return;
-        } else  {
-          // remove temp folder if it was create
-          QString tmp = removeTempFolder();
-          if (tmp !="") {
-            fMovieParametersDialog->setStatus(tmp);
-            fHoldKeyEvent = false;
-            return;
-          }
-          tmp = createTempFolder();
-          if (tmp != "") {
-            fMovieParametersDialog->setStatus("Can't create temp folder. \n"+tmp);
-            fHoldKeyEvent = false;
-            return;
-          }
-        }
-      }
-    }
-    fRecordFrames = !fRecordFrames;
-    if (fRecordFrames) {
-
-      if (fMovieParametersDialog) {
-        fMovieParametersDialog->setStatus("Start Recording\n");
-      } else {
-        G4cout << " Start Recording \n" << G4endl;
-      }
-    } else {
-      if (fMovieParametersDialog) {
-        fMovieParametersDialog->setStatus("Pause Recording\n");
-      } else {
-        G4cout << "Pause Recording \n" << G4endl;
-      }
-    }    
-  }
-
-  // with no modifiers
-#if QT_VERSION < 0x040000
-  if (event->state() == Qt::NoButton) {
-#else
-  if (event->modifiers() == Qt::NoModifier) {
-#endif
-    if (event->key() == Qt::Key_Down) { // go down
-      moveScene(0,1,0,false);
-    }
-    else if (event->key() == Qt::Key_Up) {  // go up
-      moveScene(0,-1,0,false);
-    }
-    if (event->key() == Qt::Key_Left) { // go left
-      moveScene(-1,0,0,false);
-    }
-    else if (event->key() == Qt::Key_Right) { // go right
-      moveScene(1,0,0,false);
-    }
-  }
-  fHoldKeyEvent = false;
-}
-  
+  }
+  if (fRecordingStep == WAIT) {
+    fRecordingStep = START; 
+  } else if (fRecordingStep == START) {
+    fRecordingStep = PAUSE;
+  } else if (fRecordingStep == PAUSE) {
+    fRecordingStep = CONTINUE;
+  } else if (fRecordingStep == CONTINUE) {
+    fRecordingStep = PAUSE;
+  }
+}
+
+
+void G4OpenGLQtViewer::setRecordingStatus(RECORDING_STEP step) {
+  
+  QString txt = "";
+  if (step == WAIT) {
+    txt  = "Waiting to start...";
+    fRecordFrameNumber = 0; // reset the frame number
+  } else if (step == START) {
+    txt  = "Start Recording...";
+  } else if (step == PAUSE) {
+    txt  = "Pause Recording...";
+  } else if (step == CONTINUE) {
+    txt  = "Continue Recording...";
+  } else if (step == STOP) {
+    txt  = "Stop Recording...";
+  } else if (step == ENCODE) {
+    txt  = "Encoding...";
+  } else {
+  }
+
+  if (fMovieParametersDialog) {
+    setRecordingInfos(txt);
+  } else {
+#if QT_VERSION < 0x040000
+    G4cout << txt.ascii() << G4endl;
+#else
+    G4cout << txt.toStdString().c_str() << G4endl;
+#endif
+  }
+  setRecordingInfos("");
+}
+
+void G4OpenGLQtViewer::setRecordingInfos(QString txt) {
+  if (fMovieParametersDialog) {
+    setRecordingInfos(txt);
+  } else {
+#if QT_VERSION < 0x040000
+    G4cout << txt.ascii() << G4endl;
+#else
+    G4cout << txt.toStdString().c_str() << G4endl;
+#endif
+  }
+}
 
 /** Init the movie parameters. Temp dir and encoder path
@@ -2240 +2277 @@
 }
 
-bool G4OpenGLQtViewer::getRecordFrames(){
-  return fRecordFrames;
+G4OpenGLQtViewer::RECORDING_STEP G4OpenGLQtViewer::getRecordingStep(){
+  return fRecordingStep;
 }
 
@@ -2337 +2374 @@
     return tmp;
   }
-  QString path = QDir::separator()+"QtMovie_"+QDateTime::currentDateTime ().toString("dd-MM-yyyy_hh-mm-ss")+QDir::separator(); 
+  QString path = QString(QDir::separator())+"QtMovie_"+QDateTime::currentDateTime ().toString("dd-MM-yyyy_hh-mm-ss")+QString(QDir::separator()); 
   QDir *d = new QDir(QDir::cleanPath(fTempFolderPath));
   // check if it is already present
@@ -2584 +2621 @@
   fclose (fp);
 
-  fMovieParametersDialog->setStatus("Parameter file generated : "+fMovieTempFolderPath+fParameterFileName);
   return true;
 }
 
-bool G4OpenGLQtViewer::saveVideo()
+bool G4OpenGLQtViewer::encodeVideo()
 {
+  setRecordingStatus(ENCODE);
   QProcess::execute (fEncoderPath, QStringList(fMovieTempFolderPath+fParameterFileName));
-  fMovieParametersDialog->setStatus(removeTempFolder());
-
-  // reset
-  fRecordFrameNumber = 0;
+
+  setRecordingStatus(WAIT);
+  setRecordingInfos(removeTempFolder());
+
   return true;
 }

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

@@ -199 +199 @@
   }
 
-  if (fRecordFrames) {
+  if ((getRecordingStep() == START) || (getRecordingStep() == PAUSE) || (getRecordingStep() == CONTINUE)) {
     savePPMToTemp();
     fRecordFrameNumber++;