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

Simplify "New ... script" enable logic.

Browse Source
This commit is contained in:
Jon Jenssen 2022-06-07 12:00:57 +02:00 committed by jonjenssen
parent ed392e6300
commit fa1f189709
2 changed files with 4 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ApplicationLibCode/Commands/OctaveScriptCommands/RicNewOctaveScriptFeature.cpp
View File

@ -45,17 +45,9 @@ CAF_CMD_SOURCE_INIT( RicNewOctaveScriptFeature, "RicNewOctaveScriptFeature" );
//--------------------------------------------------------------------------------------------------
bool RicNewOctaveScriptFeature::isCommandEnabled()
{
std::vector<RimCalcScript*> calcScripts = RicScriptFeatureImpl::selectedScripts();
std::vector<RimScriptCollection*> calcScriptCollections = RicScriptFeatureImpl::selectedScriptCollections();
if ( calcScripts.size() == 1u && calcScripts.front()->scriptType() == RimCalcScript::OCTAVE )
{
return true;
}
else if ( calcScriptCollections.size() == 1u && !calcScriptCollections.front()->directory().isEmpty() )
{
return true;
}
return false;
if ( calcScriptCollections.empty() ) return false;
return !calcScriptCollections.front()->directory().isEmpty();
}
//--------------------------------------------------------------------------------------------------

12
ApplicationLibCode/Commands/OctaveScriptCommands/RicNewPythonScriptFeature.cpp
View File

@ -46,17 +46,9 @@ CAF_CMD_SOURCE_INIT( RicNewPythonScriptFeature, "RicNewPythonScriptFeature" );
//--------------------------------------------------------------------------------------------------
bool RicNewPythonScriptFeature::isCommandEnabled()
{
std::vector<RimCalcScript*> calcScripts = RicScriptFeatureImpl::selectedScripts();
std::vector<RimScriptCollection*> calcScriptCollections = RicScriptFeatureImpl::selectedScriptCollections();
if ( calcScripts.size() == 1u && calcScripts.front()->scriptType() == RimCalcScript::PYTHON )
{
return true;
}
else if ( calcScriptCollections.size() == 1u && !calcScriptCollections.front()->directory().isEmpty() )
{
return true;
}
return false;
if ( calcScriptCollections.empty() ) return false;
return !calcScriptCollections.front()->directory().isEmpty();
}
//--------------------------------------------------------------------------------------------------