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

Copy changes from dev-branch into main

Browse Source 
History of main branch was difficult to merge. Take a copy of dev-branch, and merge both ways between dev and main after the release.
This commit is contained in:
Magne Sjaastad
2023-10-23 08:12:19 +02:00
parent 5688838899
commit 06f9c6126d
1778 changed files with 35036 additions and 12457 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
ApplicationLibCode/Commands/RicImportFormationNamesFeature.cpp
View File

@@ -96,14 +96,6 @@ RimFormationNames* RicImportFormationNamesFeature::importFormationFiles( const Q
return nullptr;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool RicImportFormationNamesFeature::isCommandEnabled()
{
return true;
}
//--------------------------------------------------------------------------------------------------
/// If only one formation file is imported, the formation will automatically be set in the active
/// view<65>s case. Import of LYR files with colors create custom color legends according to color
@@ -135,8 +127,7 @@ void RicImportFormationNamesFeature::onActionTriggered( bool isChecked )
{
RimProject* proj = RimProject::current();
std::vector<RimCase*> cases;
proj->allCases( cases );
std::vector<RimCase*> cases = proj->allGridCases();
// Legend name is base name of the one formation file, c.f. RicImportFormationNamesFeature::importFormationFiles()
QString legendName = QFileInfo( fileNames.last() ).baseName();