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

#1957 Observed Data : Add handling of custom well name

Browse Source
This commit is contained in:
Magne Sjaastad
2017-10-03 22:07:07 +02:00
parent 2546dc631a
commit 54063aece2
9 changed files with 109 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

71
ApplicationCode/ProjectDataModel/Summary/RimObservedData.cpp
View File

@@ -34,13 +34,14 @@ RimObservedData::RimObservedData()
{
m_isObservedData = true;
CAF_PDM_InitFieldNoDefault(&m_summaryCategory, "SummaryType", "Summary Type", "", "", "");
CAF_PDM_InitFieldNoDefault(&m_identifierName, "IdentifierName", "Identifier Name", "", "", "");
CAF_PDM_InitFieldNoDefault(&m_importedSummaryData, "ImportedSummaryData", "Imported Summary Data", "", "", "");
m_importedSummaryData.uiCapability()->setUiEditorTypeName(caf::PdmUiTextEditor::uiEditorTypeName());
m_importedSummaryData.uiCapability()->setUiReadOnly(true);
m_importedSummaryData.xmlCapability()->disableIO();
CAF_PDM_InitFieldNoDefault(&m_useCustomIdentifier, "UseCustomIdentifier", "Use Custom Identifier", "", "", "");
CAF_PDM_InitField(&m_summaryCategory, "SummaryType", caf::AppEnum<RifEclipseSummaryAddress::SummaryVarCategory>(RifEclipseSummaryAddress::SUMMARY_WELL), "Summary Type", "", "", "");
CAF_PDM_InitFieldNoDefault(&m_identifierName, "IdentifierName", "Identifier Name", "", "", "");
}
//--------------------------------------------------------------------------------------------------
@@ -96,3 +97,67 @@ void RimObservedData::updateMetaData()
m_importedSummaryData = QString::fromStdString(metaDataString);
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
QString RimObservedData::customWellName() const
{
if (m_useCustomIdentifier() && m_summaryCategory() == RifEclipseSummaryAddress::SUMMARY_WELL)
{
return m_identifierName();
}
return "";
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
QString RimObservedData::customWellGroupName() const
{
if (m_useCustomIdentifier() && m_summaryCategory() == RifEclipseSummaryAddress::SUMMARY_WELL_GROUP)
{
return m_identifierName();
}
return "";
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
QList<caf::PdmOptionItemInfo> RimObservedData::calculateValueOptions(const caf::PdmFieldHandle* fieldNeedingOptions, bool* useOptionsOnly)
{
if (fieldNeedingOptions == &m_summaryCategory)
{
QList<caf::PdmOptionItemInfo> options;
using AddressAppEnum = caf::AppEnum<RifEclipseSummaryAddress::SummaryVarCategory>;
options.push_back(caf::PdmOptionItemInfo(AddressAppEnum::uiText(RifEclipseSummaryAddress::SUMMARY_WELL), RifEclipseSummaryAddress::SUMMARY_WELL));
options.push_back(caf::PdmOptionItemInfo(AddressAppEnum::uiText(RifEclipseSummaryAddress::SUMMARY_WELL_GROUP), RifEclipseSummaryAddress::SUMMARY_WELL_GROUP));
return options;
}
return RimSummaryCase::calculateValueOptions(fieldNeedingOptions, useOptionsOnly);
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimObservedData::fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue)
{
if (changedField == &m_useCustomIdentifier ||
changedField == &m_summaryCategory ||
changedField == &m_identifierName)
{
createSummaryReaderInterface();
updateMetaData();
return;
}
RimSummaryCase::fieldChangedByUi(changedField, oldValue, newValue);
}

9
ApplicationCode/ProjectDataModel/Summary/RimObservedData.h
View File

@@ -44,9 +44,18 @@ public:
void updateMetaData();
protected:
QString customWellName() const;
QString customWellGroupName() const;
private:
virtual QList<caf::PdmOptionItemInfo> calculateValueOptions(const caf::PdmFieldHandle* fieldNeedingOptions, bool* useOptionsOnly) override;
virtual void fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue) override;
private:
caf::PdmField<caf::AppEnum<RifEclipseSummaryAddress::SummaryVarCategory> > m_summaryCategory;
caf::PdmField<QString> m_identifierName;
caf::PdmField<bool> m_useCustomIdentifier;
caf::PdmField<QString> m_importedSummaryData;
};

4
ApplicationCode/ProjectDataModel/Summary/RimObservedEclipseUserData.cpp
View File

@@ -74,7 +74,7 @@ void RimObservedEclipseUserData::createSummaryReaderInterface()
if (RifKeywordVectorParser::canBeParsed(fileContents))
{
RifKeywordVectorUserData* keywordVectorUserData = new RifKeywordVectorUserData();
if (keywordVectorUserData->parse(fileContents))
if (keywordVectorUserData->parse(fileContents, customWellName()))
{
m_summeryReader = keywordVectorUserData;
}
@@ -82,7 +82,7 @@ void RimObservedEclipseUserData::createSummaryReaderInterface()
else
{
RifColumnBasedUserData* columnBaseUserData = new RifColumnBasedUserData();
if (!columnBaseUserData->parse(fileContents))
if (!columnBaseUserData->parse(fileContents, customWellName(), customWellGroupName()))
{
columnBaseUserData = nullptr;
}

3
ApplicationCode/ProjectDataModel/Summary/RimSummaryCase.h
View File

@@ -52,6 +52,7 @@ public:
bool isObservedData();
protected:
virtual void fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue);
void updateTreeItemName();
caf::PdmField<QString> m_shortName;
@@ -60,7 +61,5 @@ protected:
bool m_isObservedData;
private:
// Overridden PDM methods
virtual void fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue);
virtual void initAfterRead() override;
};