Changeset 745 for trunk/geant4/visualization/OpenGL

Timestamp:

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

Author:

garnier

Message:

ok pour sauver les images

Location:

trunk/geant4/visualization/OpenGL

Files:

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

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

@@ -78 +78 @@
   QString setSaveFileName(QString path);
   QString getSaveFileName();
-  enum RECORDING_STEP {WAIT=0,START,PAUSE,CONTINUE,STOP,ENCODE}; 
-  RECORDING_STEP getRecordingStep();
+  bool isRecording();
+  bool isReadyToEncode();
   bool encodeVideo();
 
@@ -113 +113 @@
 
 private:
+  enum mouseActions {STYLE1,STYLE2,STYLE3,STYLE4}; 
+  enum RECORDING_STEP {WAIT,START,PAUSE,CONTINUE,STOP,ENCODE}; 
+
   void createPopupMenu();
   void createRadioAction(QAction *,QAction *, const std::string&,unsigned int a=1);
@@ -134 +137 @@
   QMenu *fContextMenu;
 #endif
-  enum mouseActions {STYLE1,STYLE2,STYLE3,STYLE4}; 
 
   mouseActions fMouseAction; // 1: rotate 2:move 3:pick 4:shortcuts 

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

@@ -240 +240 @@
 
   fButtonEncode = new QPushButton( tr( "&Encode" ),buttonBox );
-  if (fParentViewer->getRecordingStep() == G4OpenGLQtViewer::ENCODE) {
-    fButtonEncode->setEnabled(true); 
-  } else {
-    fButtonEncode->setEnabled(false); 
-  }
+  fButtonEncode->setEnabled(fParentViewer->isReadyToEncode()); 
   fButtonEncode->setAutoDefault( TRUE );
   buttonBoxLayout->addWidget(fButtonEncode);

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

@@ -1326 +1326 @@
   setRecordingInfos("File "+fileName+" saved");
   fRecordFrameNumber++;
-#ifdef GEANT4_QT_DEBUG
-  printf("G4OpenGLStoredQtViewer::record frame %d\n",fRecordFrameNumber);
-#endif
 }
 
@@ -2172 +2169 @@
   }
   if (fRecordingStep == WAIT) {
-    fRecordingStep = START; 
+    setRecordingStatus(START); 
   } else if (fRecordingStep == START) {
-    fRecordingStep = PAUSE;
+    setRecordingStatus(PAUSE);
   } else if (fRecordingStep == PAUSE) {
-    fRecordingStep = CONTINUE;
+    setRecordingStatus(CONTINUE);
   } else if (fRecordingStep == CONTINUE) {
-    fRecordingStep = PAUSE;
+    setRecordingStatus(PAUSE);
   }
 }
@@ -2185 +2182 @@
 void G4OpenGLQtViewer::setRecordingStatus(RECORDING_STEP step) {
   
+#ifdef GEANT4_QT_DEBUG
+  printf("setRecordingStatus \n");
+#endif
   QString txt = "";
   if (step == WAIT) {
@@ -2202 +2202 @@
   }
 
+  fRecordingStep = step;
+
   if (fMovieParametersDialog) {
-    setRecordingInfos(txt);
+    fMovieParametersDialog->setRecordingStatus(txt);
   } else {
 #if QT_VERSION < 0x040000
@@ -2216 +2218 @@
 void G4OpenGLQtViewer::setRecordingInfos(QString txt) {
   if (fMovieParametersDialog) {
-    setRecordingInfos(txt);
+    fMovieParametersDialog->setRecordingInfos(txt);
   } else {
 #if QT_VERSION < 0x040000
@@ -2277 +2279 @@
 }
 
-G4OpenGLQtViewer::RECORDING_STEP G4OpenGLQtViewer::getRecordingStep(){
-  return fRecordingStep;
-}
+
+bool G4OpenGLQtViewer::isRecording(){
+  if ((fRecordingStep == START) || (fRecordingStep == PAUSE) || (fRecordingStep == CONTINUE)) {
+    return true;
+  }
+  return false;
+}
+
+
+bool G4OpenGLQtViewer::isReadyToEncode(){
+  if (fRecordingStep == STOP) {
+    return true;
+  }
+  return false;
+}
+
 
 /**

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

@@ -34 +34 @@
 #ifdef G4VIS_BUILD_OPENGLQT_DRIVER
 
-//#define GEANT4_QT_DEBUG
+#define GEANT4_QT_DEBUG
 
 #include "G4OpenGLStoredQtViewer.hh"
@@ -199 +199 @@
   }
 
-  if ((getRecordingStep() == START) || (getRecordingStep() == PAUSE) || (getRecordingStep() == CONTINUE)) {
+  if (isRecording()) {
     savePPMToTemp();
-    fRecordFrameNumber++;
-#ifdef GEANT4_QT_DEBUG
-    printf("G4OpenGLStoredQtViewer::record frame %d\n",fRecordFrameNumber);
-#endif
   }