Changeset 742 for trunk/geant4
- Timestamp:
- Mar 5, 2008, 6:36:30 PM (17 years ago)
- Location:
- trunk/geant4/visualization/OpenGL
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/geant4/visualization/OpenGL/include/G4OpenGLQtViewer.hh
r741 r742 122 122 QString createTempFolder(); 123 123 QString removeTempFolder(); 124 bool saveVideo(); 124 125 125 126 #if QT_VERSION < 0x040000 -
trunk/geant4/visualization/OpenGL/src/G4OpenGLQtMovieDialog.cc
r740 r742 291 291 void G4OpenGLQtMovieDialog::selectSaveFileNameAction() 292 292 { 293 QString nomFich = QFileDialog::get OpenFileName ( this,293 QString nomFich = QFileDialog::getSaveFileName ( this, 294 294 "Select saved file", 295 295 tr("Select saved file ...")); -
trunk/geant4/visualization/OpenGL/src/G4OpenGLQtViewer.cc
r740 r742 2108 2108 } 2109 2109 fMovieParametersDialog->setStatus("Stop Recording\n"); 2110 2111 // check parameters if they were modified (Re APPLY them...) 2110 2112 fMovieParametersDialog->checkAllParameters(); 2111 if (getEncoderPath() == "") {2112 fMovieParametersDialog->setStatus("No valid encoder found. Frames saved in "+fMovieTempFolderPath);2113 } else if (getSaveFileName() =="") { // if no saved file2114 if (generateMpegEncoderParameters()) {2115 fMovieParametersDialog->setEncodeButtonEnabled(true);2116 fMovieParametersDialog->setStatus("Parameter file "+fParameterFileName+" generated in "+fMovieTempFolderPath);2117 } else { // try to encode without dialog2118 fMovieParametersDialog->setStatus("Generation of parameter file failed");2113 if (getEncoderPath() != "") { 2114 if (getSaveFileName() != "") { 2115 if (generateMpegEncoderParameters()) { 2116 fMovieParametersDialog->setEncodeButtonEnabled(true); 2117 fMovieParametersDialog->setStatus("Parameter file "+fParameterFileName+" generated in "+fMovieTempFolderPath); 2118 } else { // try to encode without dialog 2119 fMovieParametersDialog->setStatus("Generation of parameter file failed"); 2120 } 2119 2121 } 2120 2122 } … … 2132 2134 } else { 2133 2135 // remove temp folder if it was create 2134 QString tmp = removeTempFolder() 2136 QString tmp = removeTempFolder(); 2135 2137 if (tmp !="") { 2136 2138 fMovieParametersDialog->setStatus(tmp); … … 2138 2140 return; 2139 2141 } 2140 QStringtmp = createTempFolder();2142 tmp = createTempFolder(); 2141 2143 if (tmp != "") { 2142 2144 fMovieParametersDialog->setStatus("Can't create temp folder. \n"+tmp); … … 2354 2356 QString G4OpenGLQtViewer::removeTempFolder() { 2355 2357 // remove files in Qt_temp folder 2358 if (fMovieTempFolderPath == "") { 2359 return ""; 2360 } 2356 2361 QDir *d = new QDir(QDir::cleanPath(fMovieTempFolderPath)); 2357 2362 if (!d->exists()) { … … 2368 2373 res = false; 2369 2374 QString file = QDir::fromNativeSeparators(fMovieTempFolderPath+currentFile); 2370 error +="Removing file failed : "+file .toStdString()+"\n";2375 error +="Removing file failed : "+file+"\n"; 2371 2376 } 2372 2377 } … … 2433 2438 fprintf (fp,"PATTERN IBBPBBPBBPBBPBBP\n"); 2434 2439 #if QT_VERSION < 0x040000 2435 fprintf (fp,"OUTPUT %s\n", outputName.ascii());2436 #else 2437 fprintf (fp,"OUTPUT %s\n", outputName.toStdString().c_str());2440 fprintf (fp,"OUTPUT %s\n",getSaveFileName().ascii()); 2441 #else 2442 fprintf (fp,"OUTPUT %s\n",getSaveFileName().toStdString().c_str()); 2438 2443 #endif 2439 2444 fprintf (fp,"\n");
Note: See TracChangeset
for help on using the changeset viewer.