Merge remote-tracking branch 'origin/2020.04-patch-02' into dev

This commit is contained in:
Magne Sjaastad 2020-08-24 08:32:35 +02:00
commit 6bd99fcbea

View File

@ -43,6 +43,9 @@
#include "RimColorLegendItem.h" #include "RimColorLegendItem.h"
#include "RimRegularLegendConfig.h" #include "RimRegularLegendConfig.h"
#include "Riu3DMainWindowTools.h"
#include "RiuFileDialogTools.h"
#include <QAction> #include <QAction>
#include <QFileInfo> #include <QFileInfo>
@ -99,7 +102,7 @@ bool RicImportFormationNamesFeature::isCommandEnabled()
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// If only one formation file is imported, the formation will automatically be set in the active /// If only one formation file is imported, the formation will automatically be set in the active
/// views case. Import of LYR files with colors create custom color legends according to color /// view<EFBFBD>s case. Import of LYR files with colors create custom color legends according to color
/// definition on each file. However, color legend must be set by the user. /// definition on each file. However, color legend must be set by the user.
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RicImportFormationNamesFeature::onActionTriggered( bool isChecked ) void RicImportFormationNamesFeature::onActionTriggered( bool isChecked )