Merge branch '2018.01.01-patch' into dev

This commit is contained in:
Magne Sjaastad 2018-01-08 11:48:16 +01:00
commit 8a2066eac2
2 changed files with 4 additions and 3 deletions

View File

@ -238,8 +238,9 @@ void RicExportMultipleSnapshotsFeature::exportViewVariationsToFolder(RimView* ri
if (msd->sliceDirection == RimMultiSnapshotDefinition::NO_RANGEFILTER) if (msd->sliceDirection == RimMultiSnapshotDefinition::NO_RANGEFILTER)
{ {
QString fileName = viewCaseResultString + "_" + timeStepString; QString fileName = viewCaseResultString + "_" + timeStepString;
fileName.replace(" ", "_");
QString absoluteFileName = caf::Utils::constructFullFileName(folder, fileName, ".png"); QString absoluteFileName = caf::Utils::constructFullFileName(folder, fileName, ".png");
absoluteFileName.replace(" ", "_");
RicSnapshotViewToFileFeature::saveSnapshotAs(absoluteFileName, rimView); RicSnapshotViewToFileFeature::saveSnapshotAs(absoluteFileName, rimView);
} }
@ -274,9 +275,9 @@ void RicExportMultipleSnapshotsFeature::exportViewVariationsToFolder(RimView* ri
} }
rimView->rangeFilterCollection()->updateDisplayModeNotifyManagedViews(rangeFilter); rimView->rangeFilterCollection()->updateDisplayModeNotifyManagedViews(rangeFilter);
fileName.replace(" ", "_");
QString absoluteFileName = caf::Utils::constructFullFileName(folder, fileName, ".png"); QString absoluteFileName = caf::Utils::constructFullFileName(folder, fileName, ".png");
absoluteFileName.replace(" ", "_");
RicSnapshotViewToFileFeature::saveSnapshotAs(absoluteFileName, rimView); RicSnapshotViewToFileFeature::saveSnapshotAs(absoluteFileName, rimView);
} }

View File

@ -92,9 +92,9 @@ void RicSnapshotAllPlotsToFileFeature::exportSnapshotOfAllPlotsIntoFolder(QStrin
if (viewWindow->isMdiWindow() && viewWindow->viewWidget()) if (viewWindow->isMdiWindow() && viewWindow->viewWidget())
{ {
QString fileName = RicSnapshotFilenameGenerator::generateSnapshotFileName(viewWindow); QString fileName = RicSnapshotFilenameGenerator::generateSnapshotFileName(viewWindow);
fileName.replace(" ", "_");
QString absoluteFileName = caf::Utils::constructFullFileName(absSnapshotPath, fileName, ".png"); QString absoluteFileName = caf::Utils::constructFullFileName(absSnapshotPath, fileName, ".png");
absoluteFileName.replace(" ", "_");
RicSnapshotViewToFileFeature::saveSnapshotAs(absoluteFileName, viewWindow); RicSnapshotViewToFileFeature::saveSnapshotAs(absoluteFileName, viewWindow);
} }