Ignore:
Timestamp:
Mar 5, 2008, 5:23:40 PM (16 years ago)
Author:
garnier
Message:

merge fini corrections en cours NE COMPILE PAS

Location:
trunk/geant4/visualization/OpenGL/include
Files:
2 edited

Legend:

Unmodified
Added
Removed

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

    r739 r740  
    6262  ~G4OpenGLQtMovieDialog();
    6363  void setStatus(QString);
     64  void setEncodeButtonEnabled(bool);
    6465
    6566private :
    … …  
    7273  QLabel *fSaveFileStatus;
    7374  QLabel *fGlobalStatus;
    74   QPushButton *fButtonEmcode;
     75  QPushButton *fButtonEncode;
    7576
    7677  void checkEncoderParameters(QString);
    … …  
    7879  void checkSaveFileNameParameters(QString);
    7980
     81public slots :
     82  void checkAllParameters();
     83
    8084private slots :
    8185  void selectEncoderPathAction();
    8286  void selectTempPathAction();
    8387  void selectSaveFileNameAction();
    84   void checkAllParameters();
    8588  void encode();
    8689};

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

    r739 r740  
    7878  QString setSaveFileName(QString path);
    7979  QString getSaveFileName();
     80  bool getRecordFrames();
    8081
    8182protected:
    … …  
    106107  bool hasPendingEvents();
    107108  void savePPMToTemp();
    108   bool saveVideo(QString);
     109  bool generateMpegEncoderParameters();
    109110  bool fRecordFrames;
    110111  int fRecordFrameNumber;
    … …  
    155156  QString fMovieTempFolderPath;
    156157  QString fSaveFileName;
     158  QString fParameterFileName;
    157159  QAction *fRotateAction;
    158160  QAction *fMoveAction;
Note: See TracChangeset for help on using the changeset viewer.