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

#5300 Formations : Fix update issues

Browse Source
This commit is contained in:
Magne Sjaastad
2020-01-06 14:33:54 +01:00
parent a7366fbebf
commit 7d05a8bd0a
11 changed files with 33 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
ApplicationCode/ProjectDataModel/RimCase.h
View File

@@ -53,8 +53,6 @@ public:
caf::PdmField<int> caseId;
caf::PdmField<QString> caseUserDescription;
caf::PdmPtrField<RimFormationNames*> activeFormationNames;
std::vector<Rim3dView*> views() const;
std::vector<RimGridView*> gridViews() const;
@@ -69,8 +67,9 @@ public:
virtual cvf::Vec3d displayModelOffset() const;
virtual void updateFormationNamesData() = 0;
virtual void setFormationNames( RimFormationNames* formationNames );
void setFormationNames( RimFormationNames* formationNames );
RimFormationNames* activeFormationNames() const;
virtual void updateFormationNamesData() = 0;
virtual double characteristicCellSize() const = 0;
@@ -85,14 +84,12 @@ protected:
void initAfterRead() override;
private:
caf::PdmFieldHandle* userDescriptionField() override
{
return &caseUserDescription;
}
caf::PdmFieldHandle* userDescriptionField() override;
protected:
caf::PdmChildField<RimTimeStepFilter*> m_timeStepFilter;
caf::PdmChildField<Rim2dIntersectionViewCollection*> m_2dIntersectionViewCollection;
caf::PdmPtrField<RimFormationNames*> m_activeFormationNames;
private:
bool m_isInActiveDestruction;