OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-14 17:44:20 -06:00
Code Issues Packages Projects Releases Wiki Activity

Whitespace

Browse Source
This commit is contained in:
Magne Sjaastad 2019-04-03 15:04:21 +02:00
parent 4ba6e6959b
commit f7be3c4bf2
1 changed files with 31 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
ApplicationCode/ProjectDataModel/RimScriptCollection.cpp
View File

@ -37,10 +37,10 @@ RimScriptCollection::RimScriptCollection()
{ {
CAF_PDM_InitObject("ScriptLocation", ":/Folder.png", "", ""); CAF_PDM_InitObject("ScriptLocation", ":/Folder.png", "", "");
CAF_PDM_InitFieldNoDefault(&directory, "ScriptDirectory", "Dir", "", "", ""); CAF_PDM_InitFieldNoDefault(&directory, "ScriptDirectory", "Dir", "", "", "");
CAF_PDM_InitFieldNoDefault(&calcScripts, "CalcScripts", "", "", "", ""); CAF_PDM_InitFieldNoDefault(&calcScripts, "CalcScripts", "", "", "", "");
calcScripts.uiCapability()->setUiHidden(true); calcScripts.uiCapability()->setUiHidden(true);
CAF_PDM_InitFieldNoDefault(&subDirectories, "SubDirectories", "", "", "", ""); CAF_PDM_InitFieldNoDefault(&subDirectories, "SubDirectories", "", "", "", "");
subDirectories.uiCapability()->setUiHidden(true); subDirectories.uiCapability()->setUiHidden(true);
CAF_PDM_InitField(&m_searchSubFolders, "SearchSubFolders", false, "Add Subfolders", "", "", ""); CAF_PDM_InitField(&m_searchSubFolders, "SearchSubFolders", false, "Add Subfolders", "", "", "");
@ -53,8 +53,8 @@ RimScriptCollection::RimScriptCollection()
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
RimScriptCollection::~RimScriptCollection() RimScriptCollection::~RimScriptCollection()
{ {
calcScripts.deleteAllChildObjects(); calcScripts.deleteAllChildObjects();
subDirectories.deleteAllChildObjects(); subDirectories.deleteAllChildObjects();
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
@ -81,18 +81,18 @@ void RimScriptCollection::readContentFromDisc()
// Build a list of all scripts in the specified directory // Build a list of all scripts in the specified directory
{ {
QString filter = "*.m"; QString filter = "*.m";
QStringList fileList = caf::Utils::getFilesInDirectory(directory, filter, true); QStringList fileList = caf::Utils::getFilesInDirectory(directory, filter, true);
int i; int i;
for (i = 0; i < fileList.size(); i++) for (i = 0; i < fileList.size(); i++)
{ {
QString fileName = fileList.at(i); const QString& fileName = fileList.at(i);
if (caf::Utils::fileExists(fileName)) if (caf::Utils::fileExists(fileName))
{ {
RimCalcScript* calcScript = new RimCalcScript; RimCalcScript* calcScript = new RimCalcScript;
calcScript->absolutePath = fileName; calcScript->absolutePath = fileName;
QFileInfo fi(fileName); QFileInfo fi(fileName);
calcScript->setUiName(fi.baseName()); calcScript->setUiName(fi.baseName());
@ -106,7 +106,7 @@ void RimScriptCollection::readContentFromDisc()
if (m_searchSubFolders()) if (m_searchSubFolders())
{ {
QDir dir(directory); QDir dir(directory);
QFileInfoList fileInfoList = dir.entryInfoList(QDir::AllDirs | QDir::NoDotAndDotDot | QDir::Readable); QFileInfoList fileInfoList = dir.entryInfoList(QDir::AllDirs | QDir::NoDotAndDotDot | QDir::Readable);
QListIterator<QFileInfo> it(fileInfoList); QListIterator<QFileInfo> it(fileInfoList);
@ -115,7 +115,7 @@ void RimScriptCollection::readContentFromDisc()
QFileInfo fi = it.next(); QFileInfo fi = it.next();
RimScriptCollection* scriptLocation = new RimScriptCollection; RimScriptCollection* scriptLocation = new RimScriptCollection;
scriptLocation->directory = fi.absoluteFilePath(); scriptLocation->directory = fi.absoluteFilePath();
scriptLocation->setUiName(fi.baseName()); scriptLocation->setUiName(fi.baseName());
scriptLocation->readContentFromDisc(); scriptLocation->readContentFromDisc();
@ -138,7 +138,7 @@ void RimScriptCollection::pathsAndSubPaths(QStringList& pathList)
} }
} }
for (size_t i= 0; i < this->subDirectories.size(); ++i) for (size_t i = 0; i < this->subDirectories.size(); ++i)
{ {
if (this->subDirectories[i]) if (this->subDirectories[i])
{ {
@ -150,7 +150,7 @@ void RimScriptCollection::pathsAndSubPaths(QStringList& pathList)
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
RimScriptCollection * RimScriptCollection::findScriptCollection(const QString& path) RimScriptCollection* RimScriptCollection::findScriptCollection(const QString& path)
{ {
if (!this->directory().isEmpty()) if (!this->directory().isEmpty())
{ {
@ -161,9 +161,9 @@ RimScriptCollection * RimScriptCollection::findScriptCollection(const QString& p
for (size_t i = 0; i < this->subDirectories.size(); ++i) for (size_t i = 0; i < this->subDirectories.size(); ++i)
{ {
RimScriptCollection* foundColl = nullptr; RimScriptCollection* foundColl = nullptr;
if (this->subDirectories[i]) foundColl = this->subDirectories[i]->findScriptCollection(path); if (this->subDirectories[i]) foundColl = this->subDirectories[i]->findScriptCollection(path);
if (foundColl) return foundColl; if (foundColl) return foundColl;
} }
return nullptr; return nullptr;
@ -172,7 +172,9 @@ RimScriptCollection * RimScriptCollection::findScriptCollection(const QString& p
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RimScriptCollection::fieldChangedByUi(const caf::PdmFieldHandle *changedField, const QVariant &oldValue, const QVariant &newValue) void RimScriptCollection::fieldChangedByUi(const caf::PdmFieldHandle* changedField,
const QVariant& oldValue,
const QVariant& newValue)
{ {
if (&directory == changedField) if (&directory == changedField)
{ {
@ -189,7 +191,9 @@ void RimScriptCollection::fieldChangedByUi(const caf::PdmFieldHandle *changedFie
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RimScriptCollection::defineEditorAttribute(const caf::PdmFieldHandle* field, QString uiConfigName, caf::PdmUiEditorAttribute* attribute) void RimScriptCollection::defineEditorAttribute(const caf::PdmFieldHandle* field,
QString uiConfigName,
caf::PdmUiEditorAttribute* attribute)
{ {
if (field == &directory) if (field == &directory)
{ {