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

Merge remote-tracking branch 'origin/dev' into pre-proto

Browse Source
This commit is contained in:
Magne Sjaastad
2017-08-21 10:42:11 +02:00
parent 4eed4b4261 23ecdffe01
commit 51c30448e9
668 changed files with 11424 additions and 3918 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Fwk/AppFwk/CommonCode/cafUtils.cpp
View File

@@ -251,4 +251,20 @@ QString Utils::fileExtension(const QString & fileName)
return fi.suffix();
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool Utils::isStringMatch(const QString& filterString, const QString& value)
{
if (filterString.isEmpty()) return true;
if (filterString.trimmed() == "*")
{
if (!value.isEmpty()) return true;
else return false;
}
QRegExp searcher(filterString, Qt::CaseInsensitive, QRegExp::WildcardUnix);
return searcher.exactMatch(value);
}
} // namespace caf

2
Fwk/AppFwk/CommonCode/cafUtils.h
View File

@@ -66,6 +66,8 @@ public:
static bool fileExists(const QString& fileName);
static QString fileExtension(const QString& fileName);
static bool isStringMatch(const QString& filterString, const QString& value);
};
}

2
Fwk/AppFwk/cafProjectDataModel/cafPdmUiCore/cafPdmUiObjectHandle.h
View File

@@ -56,7 +56,7 @@ public: // Virtual
virtual void fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue) {}
/// Method to re-implement to supply option values for a specific field
virtual QList<PdmOptionItemInfo>
virtual QList<caf::PdmOptionItemInfo>
calculateValueOptions(const caf::PdmFieldHandle* fieldNeedingOptions, bool* useOptionsOnly) { return QList<PdmOptionItemInfo>(); }
protected:

9
Fwk/AppFwk/cafUserInterface/cafPdmUiFilePathEditor.cpp
View File

@@ -154,7 +154,14 @@ void PdmUiFilePathEditor::fileSelectionClicked()
QString defaultPath;
if ( m_lineEdit->text().isEmpty())
{
defaultPath = QDir::homePath();
if (m_attributes.m_defaultPath.isNull())
{
defaultPath = QDir::homePath();
}
else
{
defaultPath = m_attributes.m_defaultPath;
}
}
else
{

2
Fwk/AppFwk/cafUserInterface/cafPdmUiFilePathEditor.h
View File

@@ -61,6 +61,7 @@ public:
m_selectSaveFileName = false;
m_fileSelectionFilter = "All files (*.* *)";
m_defaultPath = QString();
m_selectDirectory = false;
m_appendUiSelectedFolderToText = false;
m_multipleItemSeparator = ';';
@@ -69,6 +70,7 @@ public:
bool m_selectSaveFileName;
QString m_fileSelectionFilter;
QString m_defaultPath;
bool m_selectDirectory;
bool m_appendUiSelectedFolderToText;
QChar m_multipleItemSeparator;