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

Add preferences setting for maximum search depth in script folders. Clean up context menu a bit. (#9012)

Browse Source
This commit is contained in:
jonjenssen
2022-06-02 06:53:05 +02:00
committed by GitHub
parent 41904df681
commit fd7821a10b
12 changed files with 44 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ApplicationLibCode/ProjectDataModel/RimCalcScript.cpp
View File

@@ -37,7 +37,7 @@ RimCalcScript::RimCalcScript()
CAF_PDM_InitObject( "CalcScript", ":/OctaveScriptFile16x16.png", "Calc Script", "" );
CAF_PDM_InitField( &absoluteFileName, "AbsolutePath", QString(), "Location" );
absoluteFileName.uiCapability()->setUiReadOnly( true );
absoluteFileName.uiCapability()->setUiEditorTypeName( caf::PdmUiFilePathEditor::uiEditorTypeName() );
}

4
ApplicationLibCode/ProjectDataModel/RimProject.cpp
View File

@@ -376,7 +376,7 @@ bool RimProject::writeProjectFile()
//--------------------------------------------------------------------------------------------------
/// Support list of multiple script paths divided by ';'
//--------------------------------------------------------------------------------------------------
void RimProject::setScriptDirectories( const QString& scriptDirectories )
void RimProject::setScriptDirectories( const QString& scriptDirectories, int maxFolderDepth )
{
scriptCollection->calcScripts().deleteChildren();
scriptCollection->subDirectories().deleteChildren();
@@ -391,7 +391,7 @@ void RimProject::setScriptDirectories( const QString& scriptDirectories )
sharedScriptLocation->directory = path;
sharedScriptLocation->setUiName( dir.dirName() );
sharedScriptLocation->readContentFromDisc();
sharedScriptLocation->readContentFromDisc( maxFolderDepth );
scriptCollection->subDirectories.push_back( sharedScriptLocation );
}

2
ApplicationLibCode/ProjectDataModel/RimProject.h
View File

@@ -113,7 +113,7 @@ public:
bool writeProjectFile();
void setScriptDirectories( const QString& scriptDirectories );
void setScriptDirectories( const QString& scriptDirectories, int maxFolderDepth );
void setPlotTemplateFolders( const QStringList& plotTemplateFolders );
QString projectFileVersionString() const;

40
ApplicationLibCode/ProjectDataModel/RimScriptCollection.cpp
View File

@@ -38,14 +38,13 @@ RimScriptCollection::RimScriptCollection()
CAF_PDM_InitObject( "ScriptLocation", ":/Folder.png" );
CAF_PDM_InitFieldNoDefault( &directory, "ScriptDirectory", "Folder" );
directory.uiCapability()->setUiReadOnly( true );
directory.uiCapability()->setUiEditorTypeName( caf::PdmUiFilePathEditor::uiEditorTypeName() );
CAF_PDM_InitFieldNoDefault( &calcScripts, "CalcScripts", "" );
calcScripts.uiCapability()->setUiTreeHidden( true );
CAF_PDM_InitFieldNoDefault( &subDirectories, "SubDirectories", "" );
subDirectories.uiCapability()->setUiTreeHidden( true );
CAF_PDM_InitField( &m_searchSubFolders, "SearchSubFolders", false, "Add Subfolders" );
directory.uiCapability()->setUiEditorTypeName( caf::PdmUiFilePathEditor::uiEditorTypeName() );
}
//--------------------------------------------------------------------------------------------------
@@ -60,15 +59,19 @@ RimScriptCollection::~RimScriptCollection()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimScriptCollection::readContentFromDisc()
void RimScriptCollection::readContentFromDisc( int folderLevelsLeft )
{
calcScripts.deleteChildren();
subDirectories.deleteChildren();
folderLevelsLeft--;
if ( folderLevelsLeft < 0 ) return;
if ( directory().isEmpty() )
{
for ( size_t i = 0; i < subDirectories.size(); ++i )
{
if ( subDirectories[i] ) subDirectories[i]->readContentFromDisc();
if ( subDirectories[i] ) subDirectories[i]->readContentFromDisc( folderLevelsLeft );
}
return;
}
@@ -104,9 +107,7 @@ void RimScriptCollection::readContentFromDisc()
}
}
subDirectories.deleteChildren();
if ( m_searchSubFolders() )
if ( folderLevelsLeft > 0 )
{
QDir dir( directory );
QFileInfoList fileInfoList = dir.entryInfoList( QDir::AllDirs | QDir::NoDotAndDotDot | QDir::Readable );
@@ -120,7 +121,7 @@ void RimScriptCollection::readContentFromDisc()
RimScriptCollection* scriptLocation = new RimScriptCollection;
scriptLocation->directory = fi.absoluteFilePath();
scriptLocation->setUiName( fi.baseName() );
scriptLocation->readContentFromDisc();
scriptLocation->readContentFromDisc( folderLevelsLeft );
subDirectories.push_back( scriptLocation );
}
@@ -128,25 +129,6 @@ void RimScriptCollection::readContentFromDisc()
}
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimScriptCollection::fieldChangedByUi( const caf::PdmFieldHandle* changedField,
const QVariant& oldValue,
const QVariant& newValue )
{
if ( &directory == changedField )
{
QFileInfo fi( directory );
this->setUiName( fi.baseName() );
this->readContentFromDisc();
}
else if ( &m_searchSubFolders == changedField )
{
this->readContentFromDisc();
}
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------

12
ApplicationLibCode/ProjectDataModel/RimScriptCollection.h
View File

@@ -43,23 +43,17 @@ public:
RimScriptCollection();
~RimScriptCollection() override;
public: // Pdm Fields
public:
caf::PdmField<QString> directory;
caf::PdmChildArrayField<RimCalcScript*> calcScripts;
caf::PdmChildArrayField<RimScriptCollection*> subDirectories;
public: // Methods
void readContentFromDisc();
// Overrides from PdmObject
void fieldChangedByUi( const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue ) override;
public:
void readContentFromDisc( int folderLevelsLeft );
protected:
void defineEditorAttribute( const caf::PdmFieldHandle* field,
QString uiConfigName,
caf::PdmUiEditorAttribute* attribute ) override;
private:
caf::PdmField<bool> m_searchSubFolders;
};