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

Release 2023.06

Browse Source
This commit is contained in:
Magne Sjaastad
2023-06-19 13:48:44 +02:00
committed by GitHub
parent a7108f0a09
commit 77bf792b1a
1390 changed files with 66974 additions and 11511 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
ApplicationLibCode/ProjectDataModel/RimProject.h
View File

@@ -90,8 +90,8 @@ class RimProject : public caf::PdmDocument
CAF_PDM_HEADER_INIT;
public:
RimProject( void );
~RimProject( void ) override;
RimProject();
~RimProject() override;
static RimProject* current();
caf::PdmChildArrayField<RimOilField*> oilFields;
@@ -196,7 +196,7 @@ public:
std::vector<caf::FilePath*> allFilePaths() const;
protected:
// Overridden methods
void beforeInitAfterRead() override;
void initAfterRead() override;
void setupBeforeSave() override;
@@ -247,8 +247,7 @@ void RimProject::fieldContentsByType( const caf::PdmObjectHandle* object, std::v
{
if ( !object ) return;
std::vector<caf::PdmFieldHandle*> allFieldsInObject;
object->fields( allFieldsInObject );
std::vector<caf::PdmFieldHandle*> allFieldsInObject = object->fields();
std::vector<caf::PdmObjectHandle*> children;
@@ -269,7 +268,8 @@ void RimProject::fieldContentsByType( const caf::PdmObjectHandle* object, std::v
}
}
field->children( &children );
auto other = field->children();
children.insert( children.end(), other.begin(), other.end() );
}
for ( const auto& child : children )