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

#2331 Add 2d Intersection View collection with automatic views. The create command is adjusted into a "Show" command.

Browse Source
This commit is contained in:
Jacob Støren
2018-01-23 14:23:28 +01:00
parent 9cfd2ff3cf
commit d34b3a7c74
19 changed files with 321 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ApplicationCode/ProjectDataModel/RimCase.h
View File

@@ -35,6 +35,7 @@ class RimFormationNames;
class RimTimeStepFilter;
class Rim2dIntersectionView;
class RimIntersection;
class Rim2dIntersectionViewCollection;
namespace cvf {
class BoundingBox;
@@ -72,8 +73,7 @@ public:
size_t uiToNativeTimeStepIndex(size_t uiTimeStepIndex);
Rim2dIntersectionView* createAndAddIntersectionView(RimIntersection* intersection);
Rim2dIntersectionViewCollection* intersectionViewCollection();
protected:
virtual QList<caf::PdmOptionItemInfo> calculateValueOptions(const caf::PdmFieldHandle* fieldNeedingOptions, bool * useOptionsOnly) override;
virtual std::vector<Rim3dView*> allSpecialViews() const = 0;
@@ -83,7 +83,7 @@ private:
protected:
caf::PdmChildField<RimTimeStepFilter*> m_timeStepFilter;
caf::PdmChildArrayField<Rim2dIntersectionView*> m_intersectionViews;
caf::PdmChildField<Rim2dIntersectionViewCollection*> m_2dIntersectionViewCollection;
private:
bool m_isInActiveDestruction;