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

#1954 Observed Data : Display imported variables as text in property editor

Browse Source
This commit is contained in:
Magne Sjaastad 2017-10-03 15:31:45 +02:00
parent 64a8a07f6a
commit b36fcb5f09
4 changed files with 43 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ApplicationCode/Application/RiaApplication.cpp
View File

@ -34,25 +34,26 @@
#include "RigGridManager.h"
#include "RigEclipseCaseData.h"
#include "Rim3dOverlayInfoConfig.h"
#include "RimCaseCollection.h"
#include "RimCellEdgeColors.h"
#include "RimCellRangeFilterCollection.h"
#include "RimCommandObject.h"
#include "RimEclipseCase.h"
#include "RimEclipseCaseCollection.h"
#include "RimEclipseView.h"
#include "RimFaultCollection.h"
#include "RimFlowCharacteristicsPlot.h"
#include "RimFlowPlotCollection.h"
#include "RimFormationNamesCollection.h"
#include "RimEclipseCase.h"
#include "RimGeoMechCase.h"
#include "RimGeoMechCellColors.h"
#include "RimGeoMechModels.h"
#include "RimGeoMechView.h"
#include "RimIdenticalGridCaseGroup.h"
#include "RimMainPlotCollection.h"
#include "RimObservedData.h"
#include "RimObservedDataCollection.h"
#include "RimOilField.h"
#include "RimProject.h"
@ -63,7 +64,6 @@
#include "RimSummaryCurve.h"
#include "RimSummaryPlot.h"
#include "RimSummaryPlotCollection.h"
#include "cafQTreeViewStateSerializer.h"
#include "RimViewLinker.h"
#include "RimViewLinkerCollection.h"
#include "RimWellAllocationPlot.h"
@ -492,6 +492,12 @@ bool RiaApplication::loadProject(const QString& projectFileName, ProjectLoadActi
for (auto observedCases : oilField->observedDataCollection()->allObservedData())
{
observedCases->createSummaryReaderInterface();
RimObservedData* rimObservedData = dynamic_cast<RimObservedData*>(observedCases);
if (rimObservedData)
{
rimObservedData->updateMetaData();
}
}
#ifdef USE_PROTOTYPE_FEATURE_FRACTURES

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

@ -18,8 +18,11 @@
#include "RimObservedData.h"
#include "RifSummaryReaderInterface.h"
#include "RimTools.h"
#include "cafPdmUiTextEditor.h"
#include <QFileInfo>
CAF_PDM_ABSTRACT_SOURCE_INIT(RimObservedData, "ObservedData");
@ -33,6 +36,11 @@ RimObservedData::RimObservedData()
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();
}
//--------------------------------------------------------------------------------------------------
@ -69,3 +77,22 @@ RifEclipseSummaryAddress::SummaryVarCategory RimObservedData::summaryCategory()
return m_summaryCategory();
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimObservedData::updateMetaData()
{
std::string metaDataString;
RifSummaryReaderInterface* readerInterface = summaryReader();
if (readerInterface)
{
for (const auto& a : readerInterface->allResultAddresses())
{
metaDataString += a.uiText();
metaDataString += "\n";
}
}
m_importedSummaryData = QString::fromStdString(metaDataString);
}

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

@ -36,13 +36,17 @@ class RimObservedData : public RimSummaryCase
public:
RimObservedData();
virtual QString caseName() override;
virtual void updateFilePathsFromProjectPath(const QString& newProjectPath, const QString& oldProjectPath) override;
virtual QString caseName() override;
virtual void updateFilePathsFromProjectPath(const QString& newProjectPath, const QString& oldProjectPath) override;
QString identifierName() const;
RifEclipseSummaryAddress::SummaryVarCategory summaryCategory() const;
void updateMetaData();
private:
caf::PdmField<caf::AppEnum<RifEclipseSummaryAddress::SummaryVarCategory> > m_summaryCategory;
caf::PdmField<QString> m_identifierName;
caf::PdmField<QString> m_importedSummaryData;
};

1
ApplicationCode/ProjectDataModel/Summary/RimObservedDataCollection.cpp
View File

@ -112,6 +112,7 @@ RimObservedData* RimObservedDataCollection::createAndAddObservedDataFromFileName
this->m_observedDataArray.push_back(observedData);
observedData->setSummaryHeaderFileName(fileName);
observedData->createSummaryReaderInterface();
observedData->updateMetaData();
observedData->updateOptionSensitivity();
this->updateConnectedEditors();