Changeset 733 for trunk

Timestamp:

Mar 4, 2008, 2:29:54 PM (16 years ago)

Author:

garnier

Message:

remise a niveau de movie parameters

Location:

trunk/geant4/visualization/OpenGL

Files:

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

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

@@ -65 +65 @@
 private :
   QLineEdit* fEncoderPath;
-  QLineEdit* fTempPath;
+  QLineEdit* fTempFolderPath;
+  QLineEdit* fSaveFileName;
   G4OpenGLQtViewer *fParentViewer;
-  QLabel *fCheckLabel;
+  QLabel *fEncoderStatus;
+  QLabel *fTempFolderStatus;
+  QLabel *fSaveFileStatus;
+  QLabel *fGlobalStatus;
+
+  void checkEncoderParameters(QString);
+  void checkTempFolderParameters(QString);
+  void checkSaveFileNameParameters(QString);
 
 private slots :
-  void selectPathAction();
-  void checkMovieParameters();
+  void selectEncoderPathAction();
+  void selectTempPathAction();
+  void selectSaveFileNameAction();
+  void checkAllParameters();
+  void encode();
 };
 

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

@@ -72 +72 @@
   virtual void updateQWidget()=0;
   void setupViewport(int, int);
-  bool setEncoderPath(QString path);
+  QString setEncoderPath(QString path);
   QString getEncoderPath();
-  bool setTempFolderPath(QString path);
+  QString setTempFolderPath(QString path);
   QString getTempFolderPath();
+  QString setSaveFileName(QString path);
+  QString getSaveFileName();
 
 protected:
@@ -148 +150 @@
   QString fEncoderPath;
   QString fTempFolderPath;
+  QString fSaveFileName;
   QAction *fRotateAction;
   QAction *fMoveAction;

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

@@ -39 +39 @@
 #include <qpalette.h>
 #include <qlabel.h>
+#include <qgroupbox.h>
 #include <qlayout.h>
 #include <qlineedit.h>
@@ -82 +83 @@
   globalVLayout->setSpacing(10);
   
-  QLabel *pathLabel = new QLabel("Select path for encoder :");
-
-#if QT_VERSION < 0x040000
-  globalVLayout->add(pathLabel);
-#else
-  globalVLayout->addWidget(pathLabel);
-#endif
-
+  // Encoder group box
+  QGroupBox *encoderGroupBox = new QGroupBox(tr("Encoder path"));               
+  QVBoxLayout *encoderVBoxLayout = new QVBoxLayout(encoderGroupBox);
+#ifdef GEANT4_QT_DEBUG
+  printf("1111\n");
+#endif
 
   // Encoder Path 
-
-  QWidget *selectEncoderWidget = new QWidget(this);
-  QHBoxLayout *selectPathLineLayout = new QHBoxLayout(selectEncoderWidget);
-  fEncoderPath = new QLineEdit("",selectEncoderWidget);
-#if QT_VERSION < 0x040000
-  selectPathLineLayout->add(fEncoderPath);
-#else
-  selectPathLineLayout->addWidget(fEncoderPath);
-#endif
-
-  QPushButton *encoderButton = new QPushButton(tr("..."),selectEncoderWidget);
+  QWidget *encoderHBox = new QWidget(encoderGroupBox);
+  QHBoxLayout *encoderHBoxLayout = new QHBoxLayout(encoderHBox);
+  fEncoderPath = new QLineEdit("",encoderHBox);
+
+  QPushButton *encoderButton = new QPushButton(tr("..."),encoderHBox);
   encoderButton->setMaximumWidth (30);
 
-#if QT_VERSION < 0x040000
-  selectPathLineLayout->add(encoderButton);
-#else
-  selectPathLineLayout->addWidget(encoderButton);
-#endif
-
+  fEncoderStatus = new QLabel(encoderGroupBox);
+  fEncoderStatus->setText("");
+
+#ifdef GEANT4_QT_DEBUG
+  printf("2222\n");
+#endif
+#if QT_VERSION < 0x040000
+  encoderHBoxLayout->add(fEncoderPath);
+  encoderHBoxLayout->add(encoderButton);
+  encoderVBoxLayout->add(fEncoderStatus);
+#else
+  encoderHBoxLayout->addWidget(fEncoderPath);
+  encoderHBoxLayout->addWidget(encoderButton);
+  encoderVBoxLayout->addWidget(fEncoderStatus);
+#endif
+
+#ifdef GEANT4_QT_DEBUG
+  printf("33333\n");
+#endif
 #if QT_VERSION >= 0x040000
-  selectEncoderWidget->setLayout(selectPathLineLayout);
-#endif
-  connect( encoderButton, SIGNAL( clicked( ) ), this, SLOT(selectPathAction() ) );
-
-#if QT_VERSION < 0x040000
-  globalVLayout->add(selectEncoderWidget);
-#else
-  globalVLayout->addWidget(selectEncoderWidget);
+//  encoderHBox->setLayout(encoderHBoxLayout);
+  encoderGroupBox->setLayout(encoderVBoxLayout);
+#endif
+  connect( encoderButton, SIGNAL( clicked( ) ), this, SLOT(selectEncoderPathAction() ) );
+#ifdef GEANT4_QT_DEBUG
+  printf("4444\n");
+#endif
+
+#if QT_VERSION < 0x040000
+  globalVLayout->add(encoderGroupBox);
+#else
+  globalVLayout->addWidget(encoderGroupBox);
 #endif
 
@@ -125 +135 @@
 
 
+  // temp folder group box
+  QGroupBox *tempFolderGroupBox = new QGroupBox(tr("Temporary folder path"));           
+  QVBoxLayout *tempFolderVBoxLayout = new QVBoxLayout(tempFolderGroupBox);
+
   // temp folder Path 
-  QWidget *selectTempFolderWidget = new QWidget(this);
-  QHBoxLayout *selectEncoderLineLayout = new QHBoxLayout(selectTempFolderWidget);
-
-  fTempPath = new QLineEdit("",selectTempFolderWidget);
-#if QT_VERSION < 0x040000
-  selectEncoderLineLayout->add(fTempPath);
-#else
-  selectEncoderLineLayout->addWidget(fTempPath);
-#endif
-
-  QPushButton *tempButton = new QPushButton(tr("..."),selectTempFolderWidget);
+  QWidget *tempFolderHBox = new QWidget(tempFolderGroupBox);
+  QHBoxLayout *tempFolderHBoxLayout = new QHBoxLayout(tempFolderGroupBox);
+
+  fTempFolderPath = new QLineEdit("",tempFolderHBox);
+
+  QPushButton *tempButton = new QPushButton(tr("..."),tempFolderHBox);
   tempButton->setMaximumWidth (30);
 
-#if QT_VERSION < 0x040000
-  selectEncoderLineLayout->add(tempButton);
-#else
-  selectEncoderLineLayout->addWidget(tempButton);
-#endif
-
+  fTempFolderStatus = new QLabel(tempFolderGroupBox);
+  fTempFolderStatus->setText("");
+
+#ifdef GEANT4_QT_DEBUG
+  printf("5555\n");
+#endif
+#if QT_VERSION < 0x040000
+  tempFolderHBoxLayout->add(fTempFolderPath);
+  tempFolderHBoxLayout->add(tempButton);
+  tempFolderVBoxLayout->add(fTempFolderStatus);
+#else
+  tempFolderHBoxLayout->addWidget(fTempFolderPath);
+  tempFolderHBoxLayout->addWidget(tempButton);
+  tempFolderVBoxLayout->addWidget(fTempFolderStatus);
+#endif
+
+#ifdef GEANT4_QT_DEBUG
+  printf("6666\n");
+#endif
 #if QT_VERSION >= 0x040000
-  selectTempFolderWidget->setLayout(selectEncoderLineLayout);
-#endif
-  connect( tempButton, SIGNAL( clicked( ) ), this, SLOT(selectPathAction() ) );
-
-#if QT_VERSION < 0x040000
-  globalVLayout->add(selectTempFolderWidget);
-#else
-  globalVLayout->addWidget(selectTempFolderWidget);
-#endif
-
-  fTempPath->setText(fParentViewer->getTempFolderPath());
-
+//  tempFolderHBox->setLayout(tempFolderHBoxLayout);
+  tempFolderGroupBox->setLayout(tempFolderVBoxLayout);
+#endif
+  connect( tempButton, SIGNAL( clicked( ) ), this, SLOT(selectTempPathAction() ) );
+
+#ifdef GEANT4_QT_DEBUG
+  printf("77777\n");
+#endif
+#if QT_VERSION < 0x040000
+  globalVLayout->add(tempFolderGroupBox);
+#else
+  globalVLayout->addWidget(tempFolderGroupBox);
+#endif
+
+  fTempFolderPath->setText(fParentViewer->getTempFolderPath());
+
+  // save file group box
+  QGroupBox *saveFileGroupBox = new QGroupBox(tr("Save as"));           
+  QVBoxLayout *saveFileVBoxLayout = new QVBoxLayout(saveFileGroupBox);
+
+  // save file 
+  QWidget *saveFileHBox = new QWidget(saveFileGroupBox);
+  QHBoxLayout *saveFileHBoxLayout = new QHBoxLayout(saveFileHBox);
+
+  fSaveFileName = new QLineEdit("",saveFileHBox);
+
+  QPushButton *saveButton = new QPushButton(tr("..."),saveFileHBox);
+  saveButton->setMaximumWidth (30);
+
+  fSaveFileStatus = new QLabel(saveFileGroupBox);
+  fSaveFileStatus->setText("");
+
+#ifdef GEANT4_QT_DEBUG
+  printf("8888\n");
+#endif
+#if QT_VERSION < 0x040000
+  saveFileHBoxLayout->add(fTempFolderPath);
+  saveFileHBoxLayout->add(saveButton);
+  saveFileVBoxLayout->add(fSaveFileStatus);
+#else
+  saveFileHBoxLayout->addWidget(fTempFolderPath);
+  saveFileHBoxLayout->addWidget(saveButton);
+  saveFileVBoxLayout->addWidget(fSaveFileStatus);
+#endif
+
+#ifdef GEANT4_QT_DEBUG
+  printf("99999\n");
+#endif
+#if QT_VERSION >= 0x040000
+//  saveFileHBox->setLayout(saveFileHBoxLayout);
+  saveFileGroupBox->setLayout(saveFileVBoxLayout);
+#endif
+  connect( saveButton, SIGNAL( clicked( ) ), this, SLOT(selectSaveFileNameAction() ) );
+
+#ifdef GEANT4_QT_DEBUG
+  printf("11110000\n");
+#endif
+#if QT_VERSION < 0x040000
+  globalVLayout->add(saveFileGroupBox);
+#else
+  globalVLayout->addWidget(saveFileGroupBox);
+#endif
+
+#ifdef GEANT4_QT_DEBUG
+  printf("11111111111&\n");
+#endif
 
   // label
@@ -163 +239 @@
   QLabel *infoLabel = new QLabel("  Press SPACE to Start/Pause video recording \n  Press RETURN to Stop video recording");
 
+  // global status
+  fGlobalStatus = new QLabel("");
+
 #if QT_VERSION < 0x040000
   globalVLayout->add(infoLabel);
+  globalVLayout->add(fGlobalStatus);
 #else
   globalVLayout->addWidget(infoLabel);
-#endif
-
-  // check infos
-  fCheckLabel = new QLabel("");
-
-#if QT_VERSION < 0x040000
-  globalVLayout->add(fCheckLabel);
-#else
-  globalVLayout->addWidget(fCheckLabel);
+  globalVLayout->addWidget(fGlobalStatus);
+#endif
+#ifdef GEANT4_QT_DEBUG
+  printf("11112222222222é\n");
 #endif
 
@@ -187 +262 @@
   buttonBoxLayout->addWidget(buttonCancel);
 
-  QPushButton * buttonEncode = new QPushButton( tr( "&Apply" ),buttonBox );
+  QPushButton *buttonApply = new QPushButton( tr( "&Apply" ),buttonBox );
+  buttonApply->setAutoDefault( TRUE );
+  buttonBoxLayout->addWidget(buttonApply);
+
+  QPushButton * buttonEncode = new QPushButton( tr( "&Encode" ),buttonBox );
   buttonEncode->setAutoDefault( TRUE );
   buttonEncode->setDefault( TRUE );
   buttonBoxLayout->addWidget(buttonEncode);
 
+#ifdef GEANT4_QT_DEBUG
+  printf("1111333333333333\n");
+#endif
 #if QT_VERSION >= 0x040000
   buttonBox->setLayout(buttonBoxLayout);
@@ -198 +280 @@
 
 
+#ifdef GEANT4_QT_DEBUG
+  printf("1111444444444\n");
+#endif
 
 #if QT_VERSION >= 0x040000
@@ -204 +289 @@
 
   // signals and slots connections
-  connect( buttonEncode, SIGNAL( clicked() ), this, SLOT( checkMovieParameters() ) );
+  connect( buttonApply, SIGNAL( clicked() ), this, SLOT( checkAllParameters() ) );
   connect( buttonCancel, SIGNAL( clicked() ), this, SLOT( reject() ) );
+  connect( buttonEncode, SIGNAL( clicked() ), this, SLOT( encode() ) );
+#ifdef GEANT4_QT_DEBUG
+  printf("111155555555\n");
+#endif
 }
 
@@ -214 +303 @@
 }
 
-void G4OpenGLQtMovieDialog::selectPathAction()
+void G4OpenGLQtMovieDialog::selectEncoderPathAction()
 {
   QString nomFich =  QFileDialog::getOpenFileName ( this,
@@ -222 +311 @@
     return;
   }
-  fEncoderPath->setText(nomFich);
-}
+  checkEncoderParameters(nomFich);
+ }
+
+void G4OpenGLQtMovieDialog::selectTempPathAction()
+{
+  QString nomFich =  QFileDialog::getOpenFileName ( this,
+                                                    "Select temporary folder",
+                                                    tr("Select temporary folder ...")); 
+  if (nomFich == "") {
+    return;
+  }
+  checkTempFolderParameters(nomFich);
+ }
+
+void G4OpenGLQtMovieDialog::selectSaveFileNameAction()
+{
+  QString nomFich =  QFileDialog::getOpenFileName ( this,
+                                                    "Select saved file",
+                                                    tr("Select saved file ...")); 
+  if (nomFich == "") {
+    return;
+  }
+  checkSaveFileNameParameters(nomFich);
+ }
+
+void G4OpenGLQtMovieDialog::encode() {
+}
+
+/** Check all parameters
+*/
+void G4OpenGLQtMovieDialog::checkAllParameters() {
+  checkEncoderParameters(fEncoderPath->text());
+  checkTempFolderParameters(fTempFolderPath->text());
+  checkSaveFileNameParameters(fSaveFileName->text());
+}
+
+        /**
+ * If one of parameter is incorrect, put it in red and don't valid it
+ * If valid, save it
+ */
+void G4OpenGLQtMovieDialog::checkEncoderParameters(QString param) {
+
+  QPalette palette( fEncoderPath->palette() );
+
+  QString temp = fParentViewer->setEncoderPath(param);
+  fGlobalStatus->setText("");
+    fEncoderStatus->setText(temp);
+  if (temp != "") {
+    palette.setColor( QPalette::Base, Qt::red);
+    fGlobalStatus->setText("If no valid encode defined, screnn /ncapture files will be saved in /nthe temp folder in ppm format.");
+  } else {
+    palette.setColor( QPalette::Base, Qt::white);
+    fEncoderPath->setText(fParentViewer->getEncoderPath());
+  }
+  fEncoderPath->setPalette(palette);
+}
+
 
 /**
  * If one of parameter is incorrect, put it in red and don't valid it
+ * If valid, save it
  */
-void G4OpenGLQtMovieDialog::checkMovieParameters() {
-
-  fCheckLabel->setText("");
-  QPalette palette( fEncoderPath->palette() );
-
-  if (!fParentViewer->setEncoderPath(fEncoderPath->text())) {
+void G4OpenGLQtMovieDialog::checkTempFolderParameters(QString param) {
+
+  QPalette palette( fTempFolderPath->palette() );
+
+  QString temp = fParentViewer->setTempFolderPath(param);
+    fTempFolderStatus->setText(temp);
+  if (temp != "") { 
     palette.setColor( QPalette::Base, Qt::red);
-    fCheckLabel->setText ("Encoder path does not exist or file is not executable\n");
   } else {
     palette.setColor( QPalette::Base, Qt::white);
-  }
-  fEncoderPath->setPalette(palette);
-
-
-
-  if (!fParentViewer->setTempFolderPath(fTempPath->text())) {
+    fTempFolderPath->setText(fParentViewer->getEncoderPath());
+  }
+  fTempFolderPath->setPalette(palette);
+}
+
+
+/**
+ * If one of parameter is incorrect, put it in red and don't valid it
+ * If valid, save it
+ */
+void G4OpenGLQtMovieDialog::checkSaveFileNameParameters(QString param) {
+
+  QPalette palette( fSaveFileName->palette() );
+
+  QString temp = fParentViewer->setSaveFileName(param);
+    fSaveFileStatus->setText(temp);
+  if (temp != "") { 
     palette.setColor( QPalette::Base, Qt::red);
-    fCheckLabel->setText (fCheckLabel->text()+"Temp folder does not exist or no write access to write in\n");
   } else {
     palette.setColor( QPalette::Base, Qt::white);
-  }
-  fTempPath->setPalette(palette);
-}
-
-#endif
+    fSaveFileName->setText(fParentViewer->getSaveFileName());
+  }
+  fSaveFileName->setPalette(palette);
+}
+#endif

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

@@ -663 +663 @@
   QAction *movieParameters =  new QAction("&Movie parameters...","&Make movie ...",CTRL+Key_M,mActions,0,true);
 #else
-  QAction *movieParameters =  new QAction("&Make parameters...",CTRL+Key_M,mActions);
+  QAction *movieParameters =  new QAction("&Movie parameters...",CTRL+Key_M,mActions);
 #endif
   movieParameters->addTo(mActions);
@@ -1995 +1995 @@
 
   fHoldKeyEvent = true;
+  if (event->key() == Qt::Key_Down) {
+#ifdef GEANT4_QT_DEBUG
+  printf("G4OpenGLQtViewer::G4keyPressEvent Down\n");
+#endif
+  } else if (event->key() == Qt::Key_Up) {
+#ifdef GEANT4_QT_DEBUG
+  printf("G4OpenGLQtViewer::G4keyPressEvent Up\n");
+#endif
+  } else if (event->key() == Qt::Key_Plus) {
+#ifdef GEANT4_QT_DEBUG
+  printf("G4OpenGLQtViewer::G4keyPressEvent Plus\n");
+#endif
+  } else if (event->key() == Qt::Key_Minus) {
+#ifdef GEANT4_QT_DEBUG
+  printf("G4OpenGLQtViewer::G4keyPressEvent Minus\n");
+#endif
+  }
+  if (event->modifiers() & Qt::AltModifier ) {
+#ifdef GEANT4_QT_DEBUG
+  printf("G4OpenGLQtViewer::G4keyPressEvent Alt\n");
+#endif
+  } else if (event->modifiers() & Qt::ShiftModifier) {
+#ifdef GEANT4_QT_DEBUG
+  printf("G4OpenGLQtViewer::G4keyPressEvent Shift\n");
+#endif
+  }
 
 #if QT_VERSION < 0x040000
@@ -2149 +2175 @@
 /**
  * set the new encoder path
- * @return true if the path exist and file is executable, false otherwise
+ * @return "" if correct. The error otherwise
 */
-bool G4OpenGLQtViewer::setEncoderPath(QString path) {
+QString G4OpenGLQtViewer::setEncoderPath(QString path) {
   QFile *f = new QFile(path);
   if (!f->exists()) {
 #ifdef GEANT4_QT_DEBUG
-  printf("G4OpenGLQtViewer::setEncoderPath NOT E        XIST\n");
-#endif
-    return false;
+  printf("G4OpenGLQtViewer::setEncoderPath NOT EXIST\n");
+#endif
+    return "Path does not exist";
   }
   if (!(f->permissions() & QFile::ExeUser)) {
@@ -2163 +2189 @@
   printf("G4OpenGLQtViewer::setEncoderPath No WRITE ACCES\n");
 #endif
-    return false;
+    return "File exist but is not executable";
   }
   fEncoderPath = path;
-  return true;
+  return "";
 }
 
 /**
  * set the temp folder path
- * @return true if the path exist and we could write in, false otherwise
+ * @return "" if correct. The error otherwise
 */
-bool G4OpenGLQtViewer::setTempFolderPath(QString path) {
+QString G4OpenGLQtViewer::setTempFolderPath(QString path) {
 
   QDir *d = new QDir(path);
   if (!d->exists(path)) {
-    return false;
+    return "Path does not exist";
   }
 
@@ -2193 +2219 @@
 
   if (!found)
-    return false;
+    return "Path exist, but is not write accessible";
   
   fTempFolderPath = path;
-  return true;
+  return "";
 }
 
@@ -2205 +2231 @@
 }
  
+/**
+ * set the save file name path
+ * @return "" if correct. The error otherwise
+*/
+QString G4OpenGLQtViewer::setSaveFileName(QString path) {
+
+  QDir *d = new QDir(path);
+  if (!d->exists(path)) {
+    return "Path does not exist";
+  }
+
+  d->setFilter( QDir::Dirs | QDir::Readable | QDir::Writable );
+  QStringList subDirList = d->entryList();
+  bool found = false;
+
+  for (QStringList::ConstIterator it = subDirList.begin() ;(it != subDirList.end()) ; it++) {
+    const QString currentDir = *it;
+    
+    if (currentDir == ".") { // we found it
+      found = true;
+    }
+  }
+
+  if (!found)
+    return "Path exist, but is not write accessible";
+  
+  fSaveFileName = path;
+  return "";
+}
+
+/** @return the save file path
+ */
+QString G4OpenGLQtViewer::getSaveFileName() {
+  return fSaveFileName ;
+}