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

#3763 Annotations. Define annotation plane Z for global annotations

Browse Source
This commit is contained in:
Bjørn Erik Jensen
2018-11-28 11:58:38 +01:00
parent 0083618dd2
commit c3dd6a14a7
15 changed files with 292 additions and 145 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
ApplicationCode/ProjectDataModel/Annotations/RimAnnotationInViewCollection.h
View File

@@ -18,6 +18,8 @@
#pragma once
#include "RimAnnotationCollectionBase.h"
#include "cafAppEnum.h"
#include "cafPdmChildArrayField.h"
#include "cafPdmField.h"
@@ -31,7 +33,7 @@ class RimTextAnnotation;
///
///
//==================================================================================================
class RimAnnotationInViewCollection : public caf::PdmObject
class RimAnnotationInViewCollection : public RimAnnotationCollectionBase
{
CAF_PDM_HEADER_INIT;
public:
@@ -39,10 +41,6 @@ public:
RimAnnotationInViewCollection();
~RimAnnotationInViewCollection() override;
void addAnnotation(RimTextAnnotation* annotation);
void onAnnotationDeleted();
std::vector<RimTextAnnotation*> textAnnotations() const;
bool isActive() const;
protected:
@@ -50,6 +48,5 @@ protected:
caf::PdmFieldHandle* objectToggleField() override;
private:
caf::PdmChildArrayField<RimTextAnnotation*> m_textAnnotations;
caf::PdmField<bool> m_isActive;
};