OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-25 18:55:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge patch into dev : Snapshot : Always use _ in generated file names #2446

Browse Source
This commit is contained in:
Magne Sjaastad 2018-02-09 11:34:05 +01:00
commit 123a2830aa
2 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
ApplicationCode/Commands/ExportCommands/RicSnapshotFilenameGenerator.cpp
View File

@ -51,7 +51,7 @@ QString RicSnapshotFilenameGenerator::generateSnapshotFileName(RimViewWindow* vi
fileName = viewWindow->uiCapability()->uiName();
}
fileName = caf::Utils::makeValidFileBasename(fileName);
fileName = makeValidFileName(fileName);
return fileName;
}
@ -71,9 +71,7 @@ QString RicSnapshotFilenameGenerator::generateSnapshotFilenameForRimView(Rim3dVi
if ( !timeSteps.empty() ) fileName += QString("_%1_%2").arg(timeStep, 2, 10, QChar('0'))
.arg(timeSteps[timeStep]);
fileName.replace("-", "_");
fileName = caf::Utils::makeValidFileBasename(fileName);
fileName = makeValidFileName(fileName);
return fileName;
}
@ -111,3 +109,18 @@ QString RicSnapshotFilenameGenerator::resultName(Rim3dView * rimView)
return "";
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
QString RicSnapshotFilenameGenerator::makeValidFileName(const QString& filename)
{
QString trimmedString = filename;
// Use lowercase instead of dash before calling caf::Utils::makeValidFileBasename
trimmedString.replace("-", "_");
trimmedString = caf::Utils::makeValidFileBasename(trimmedString);
return trimmedString;
}

1
ApplicationCode/Commands/ExportCommands/RicSnapshotFilenameGenerator.h
View File

@ -34,4 +34,5 @@ public:
private:
static QString generateSnapshotFilenameForRimView(Rim3dView* rimView);
static QString resultName(Rim3dView* rimView);
static QString makeValidFileName(const QString& filename);
};