Merge remote-tracking branch 'origin/2018.01.01-patch' into dev

This commit is contained in:
Magne Sjaastad 2018-02-08 13:18:36 +01:00
commit a1c891cd99

View File

@ -68,8 +68,10 @@ QString RicSnapshotFilenameGenerator::generateSnapshotFilenameForRimView(Rim3dVi
.arg(rimView->name())
.arg(resultName(rimView));
if ( timeSteps.size() ) fileName += QString("_%1_%2").arg(timeStep, 2, 10, QChar('0'))
.arg(timeSteps[timeStep].replace(".", "-"));
if ( !timeSteps.empty() ) fileName += QString("_%1_%2").arg(timeStep, 2, 10, QChar('0'))
.arg(timeSteps[timeStep]);
fileName.replace("-", "_");
fileName = caf::Utils::makeValidFileBasename(fileName);