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

#3775 Annotations. Use depth in GUI, not z

Browse Source
This commit is contained in:
Bjørn Erik Jensen
2018-11-28 13:07:21 +01:00
parent 0f384cf4f7
commit 02eea4bc84
6 changed files with 23 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
ApplicationCode/ProjectDataModel/Annotations/RimTextAnnotation.cpp
View File

@@ -33,8 +33,8 @@ RimTextAnnotation::RimTextAnnotation()
{
CAF_PDM_InitObject("TextAnnotation", ":/WellCollection.png", "", "");
CAF_PDM_InitField(&m_anchorPoint, "AnchorPoint", Vec3d::ZERO, "Anchor Point", "", "", "");
CAF_PDM_InitField(&m_labelPoint, "LabelPoint", Vec3d::ZERO, "Label Point", "", "", "");
CAF_PDM_InitField(&m_anchorPointXyd, "AnchorPointXyd", Vec3d::ZERO, "Anchor Point", "", "", "");
CAF_PDM_InitField(&m_labelPointXyd, "LabelPointXyd", Vec3d::ZERO, "Label Point", "", "", "");
CAF_PDM_InitField(&m_text, "Text", QString("(New text)"), "Text", "", "", "");
}
@@ -43,7 +43,9 @@ RimTextAnnotation::RimTextAnnotation()
//--------------------------------------------------------------------------------------------------
cvf::Vec3d RimTextAnnotation::anchorPoint() const
{
return m_anchorPoint;
auto pos = m_anchorPointXyd();
pos.z() = -pos.z();
return pos;
}
//--------------------------------------------------------------------------------------------------
@@ -51,7 +53,9 @@ cvf::Vec3d RimTextAnnotation::anchorPoint() const
//--------------------------------------------------------------------------------------------------
cvf::Vec3d RimTextAnnotation::labelPoint() const
{
return m_labelPoint;
auto pos = m_labelPointXyd();
pos.z() = -pos.z();
return pos;
}
//--------------------------------------------------------------------------------------------------
@@ -75,8 +79,8 @@ const QString& RimTextAnnotation::text() const
//--------------------------------------------------------------------------------------------------
void RimTextAnnotation::defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering)
{
uiOrdering.add(&m_anchorPoint);
uiOrdering.add(&m_labelPoint);
uiOrdering.add(&m_anchorPointXyd);
uiOrdering.add(&m_labelPointXyd);
uiOrdering.add(&m_text);
uiOrdering.skipRemainingFields(true);
@@ -92,7 +96,7 @@ void RimTextAnnotation::fieldChangedByUi(const caf::PdmFieldHandle* changedField
auto views = gridViewsContainingAnnotations();
if (!views.empty())
{
if (changedField == &m_text || changedField == &m_anchorPoint || changedField == &m_labelPoint)
if (changedField == &m_text || changedField == &m_anchorPointXyd || changedField == &m_labelPointXyd)
{
for (auto& view : views)
{