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

#3869 Annotations. Closing polyline support

Browse Source
This commit is contained in:
Bjørn Erik Jensen
2018-12-13 15:58:17 +01:00
parent a87c4efd93
commit 9c750c5287
8 changed files with 30 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
ApplicationCode/ProjectDataModel/Annotations/RimPolylinesAnnotation.cpp
View File

@@ -35,6 +35,7 @@ RimPolylinesAnnotation::RimPolylinesAnnotation()
{
CAF_PDM_InitObject("PolylineAnnotation", ":/WellCollection.png", "", "");
CAF_PDM_InitField(&m_closePolyline, "ClosePolyline", false, "Close Polyline", "", "", "");
}
//--------------------------------------------------------------------------------------------------
@@ -45,3 +46,11 @@ RimPolylinesAnnotation::~RimPolylinesAnnotation()
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool RimPolylinesAnnotation::closePolyline() const
{
return m_closePolyline;
}

5
ApplicationCode/ProjectDataModel/Annotations/RimPolylinesAnnotation.h
View File

@@ -41,4 +41,9 @@ public:
virtual cvf::ref<RigPolyLinesData> polyLinesData() = 0;
virtual bool isEmpty() = 0;
bool closePolyline() const;
protected:
caf::PdmField<bool> m_closePolyline;
};

2
ApplicationCode/ProjectDataModel/Annotations/RimPolylinesFromFileAnnotation.cpp
View File

@@ -178,6 +178,8 @@ void RimPolylinesFromFileAnnotation::setDescriptionFromFileName()
void RimPolylinesFromFileAnnotation::defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering)
{
uiOrdering.add(&m_polyLinesFileName);
uiOrdering.add(&m_closePolyline);
auto appearanceGroup = uiOrdering.addNewGroup("Line Appearance");
appearance()->uiOrdering(uiConfigName, *appearanceGroup);

1
ApplicationCode/ProjectDataModel/Annotations/RimReachCircleAnnotation.h
View File

@@ -56,6 +56,7 @@ class RimReachCircleAnnotation : public RimLineBasedAnnotation
public:
RimReachCircleAnnotation();
~RimReachCircleAnnotation() override {}
Vec3d centerPoint() const;
double radius() const;

1
ApplicationCode/ProjectDataModel/Annotations/RimUserDefinedPolylinesAnnotation.cpp
View File

@@ -228,6 +228,7 @@ void RimUserDefinedPolylinesAnnotation::defineUiOrdering(QString uiConfigName, c
uiOrdering.add(&m_name);
uiOrdering.add(&m_targets);
uiOrdering.add(&m_enablePicking);
uiOrdering.add(&m_closePolyline);
auto appearanceGroup = uiOrdering.addNewGroup("Line Appearance");
appearance()->uiOrdering(uiConfigName, *appearanceGroup);