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

#4007 Create new combined import button and move the others to an opt… (#4021)

Browse Source 
* #4007 Create new combined import button and move the others to an optional "Import"-toolbar

* #4007 Make sure we check that fileName vector isn't empty before accessing it
This commit is contained in:
Gaute Lindkvist
2019-01-31 09:02:09 +01:00
committed by GitHub
parent 61e9a2a696
commit 69b20a2aa9
9 changed files with 205 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
ApplicationCode/Commands/RicImportSummaryCaseFeature.cpp
View File

@@ -40,6 +40,24 @@
CAF_CMD_SOURCE_INIT(RicImportSummaryCaseFeature, "RicImportSummaryCaseFeature");
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool RicImportSummaryCaseFeature::openSummaryCaseFromFileNames(const QStringList& fileNames)
{
std::vector<RimSummaryCase*> newCases;
if (RicImportSummaryCasesFeature::createAndAddSummaryCasesFromFiles(fileNames, &newCases))
{
RicImportSummaryCasesFeature::addCasesToGroupIfRelevant(newCases);
for (const RimSummaryCase* newCase : newCases)
{
RiaApplication::instance()->addToRecentFiles(newCase->summaryHeaderFilename());
}
return true;
}
return false;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
@@ -67,20 +85,12 @@ void RicImportSummaryCaseFeature::onActionTriggered(bool isChecked)
fileNames.push_back(RiaFilePathTools::toInternalSeparator(s));
}
if (fileNames.isEmpty()) return;
// Remember the path to next time
app->setLastUsedDialogDirectory("INPUT_FILES", QFileInfo(fileNames.last()).absolutePath());
if (fileNames.isEmpty()) return;
std::vector<RimSummaryCase*> newCases;
if (RicImportSummaryCasesFeature::createAndAddSummaryCasesFromFiles(fileNames, &newCases))
{
RicImportSummaryCasesFeature::addCasesToGroupIfRelevant(newCases);
for (const RimSummaryCase* newCase : newCases)
{
RiaApplication::instance()->addToRecentFiles(newCase->summaryHeaderFilename());
}
}
openSummaryCaseFromFileNames(fileNames);
}
//--------------------------------------------------------------------------------------------------