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 branch 'dev' into pre-proto

Browse Source
This commit is contained in:
Bjørnar Grip Fjær
2017-08-01 12:44:11 +02:00
parent 5b34414977 29e40b6dbb
commit 7179aaeac9
128 changed files with 5129 additions and 423 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ApplicationCode/ProjectDataModel/RimProject.h
View File

@@ -34,6 +34,7 @@ class RigMainGrid;
class RimCase;
class RimCommandObject;
class RimDialogData;
class RimEclipseCase;
class RimEllipseFractureTemplate;
class RimWellPathFractureCollection;
@@ -113,6 +114,7 @@ public:
void reloadCompletionTypeResultsInAllViews();
void reloadCompletionTypeResultsForEclipseCase(RimEclipseCase* eclipseCase);
RimDialogData* dialogData() const;
protected:
// Overridden methods
@@ -128,6 +130,9 @@ private:
private:
caf::PdmField<QString> m_projectFileVersionString;
caf::PdmChildField<RimDialogData*> m_dialogData;
caf::PdmField<bool> m_show3DWindow;
caf::PdmField<bool> m_showPlotWindow;