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

Browse Source
This commit is contained in:
Jacob Støren
2017-06-02 08:05:07 +02:00
parent 4c873b6925 d024baab95
commit e7244d0b0b
28 changed files with 407 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ApplicationCode/ProjectDataModel/RimProject.h
View File

@@ -20,6 +20,8 @@
#pragma once
#include "RimDefines.h"
#include "cafPdmChildArrayField.h"
#include "cafPdmChildField.h"
#include "cafPdmDocument.h"
@@ -100,13 +102,16 @@ public:
void computeUtmAreaOfInterest();
RimOilField* activeOilField();
RimOilField* activeOilField();
const RimOilField* activeOilField() const;
void actionsBasedOnSelection(QMenu& contextMenu);
bool show3DWindow() const;
bool showPlotWindow() const;
void removeResult(RimDefines::ResultCatType type, const QString& resultName);
protected:
// Overridden methods
void initScriptDirectories();