#3755 Annotations. Reach circle name field

This commit is contained in:
Bjørn Erik Jensen
2018-11-28 07:45:53 +01:00
parent 4685d5981d
commit aae3665539
2 changed files with 21 additions and 0 deletions

View File

@@ -36,6 +36,7 @@ RimReachCircleAnnotation::RimReachCircleAnnotation()
CAF_PDM_InitField(&m_centerPoint, "CenterPoint", Vec3d::ZERO, "Center Point", "", "", "");
CAF_PDM_InitField(&m_radius, "Radius", 0.0, "Radius", "", "", "");
CAF_PDM_InitField(&m_name, "Name", QString("Circle Annotation"), "Name", "", "", "");
}
//--------------------------------------------------------------------------------------------------
@@ -54,11 +55,20 @@ double RimReachCircleAnnotation::radius() const
return m_radius;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
QString RimReachCircleAnnotation::name() const
{
return m_name;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimReachCircleAnnotation::defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering)
{
uiOrdering.add(&m_name);
uiOrdering.add(&m_centerPoint);
uiOrdering.add(&m_radius);
@@ -81,6 +91,14 @@ void RimReachCircleAnnotation::fieldChangedByUi(const caf::PdmFieldHandle* chang
annColl->scheduleRedrawOfRelevantViews();
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
caf::PdmFieldHandle* RimReachCircleAnnotation::userDescriptionField()
{
return &m_name;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------

View File

@@ -57,10 +57,12 @@ public:
Vec3d centerPoint() const;
double radius() const;
QString name() const;
protected:
void defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering) override;
void fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue) override;
caf::PdmFieldHandle* userDescriptionField() override;
private:
std::vector<RimGridView*> gridViewsContainingAnnotations() const;
@@ -68,4 +70,5 @@ private:
private:
caf::PdmField<Vec3d> m_centerPoint;
caf::PdmField<double> m_radius;
caf::PdmField<QString> m_name;
};