OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-10 23:46:00 -06:00
Code Issues Packages Projects Releases Wiki Activity

#3701 Add axis line option to 2d intersection view as well.

Browse Source
This commit is contained in:
Gaute Lindkvist 2018-11-15 14:58:22 +01:00
parent b20e801ae1
commit a1e094625a
3 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
ApplicationCode/ProjectDataModel/Rim2dIntersectionView.cpp
View File

@ -79,6 +79,7 @@ Rim2dIntersectionView::Rim2dIntersectionView(void)
m_ternaryLegendConfig = new RimTernaryLegendConfig(); m_ternaryLegendConfig = new RimTernaryLegendConfig();
CAF_PDM_InitField(&m_showDefiningPoints, "ShowDefiningPoints", true, "Show Points", "", "", ""); CAF_PDM_InitField(&m_showDefiningPoints, "ShowDefiningPoints", true, "Show Points", "", "", "");
CAF_PDM_InitField(&m_showAxisLines, "ShowAxisLines", false, "Show Axis Lines", "", "", "");
m_showWindow = false; m_showWindow = false;
m_scaleTransform = new cvf::Transform(); m_scaleTransform = new cvf::Transform();
@ -663,7 +664,7 @@ void Rim2dIntersectionView::resetLegendsInViewer()
m_viewer->showAnimationProgress(true); m_viewer->showAnimationProgress(true);
m_viewer->showHistogram(false); m_viewer->showHistogram(false);
m_viewer->showInfoText(false); m_viewer->showInfoText(false);
m_viewer->showEdgeTickMarksXZ(true); m_viewer->showEdgeTickMarksXZ(true, m_showAxisLines());
m_viewer->setMainScene(new cvf::Scene()); m_viewer->setMainScene(new cvf::Scene());
m_viewer->enableNavigationRotation(false); m_viewer->enableNavigationRotation(false);
@ -743,6 +744,12 @@ void Rim2dIntersectionView::fieldChangedByUi(const caf::PdmFieldHandle* changedF
{ {
this->loadDataAndUpdate(); this->loadDataAndUpdate();
} }
else if (changedField == &m_showAxisLines)
{
m_viewer->showEdgeTickMarksXZ(true, m_showAxisLines());
this->loadDataAndUpdate();
}
} }
@ -752,8 +759,14 @@ void Rim2dIntersectionView::fieldChangedByUi(const caf::PdmFieldHandle* changedF
void Rim2dIntersectionView::defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering) void Rim2dIntersectionView::defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering)
{ {
Rim3dView::defineUiOrdering(uiConfigName, uiOrdering); Rim3dView::defineUiOrdering(uiConfigName, uiOrdering);
uiOrdering.skipRemainingFields(true); caf::PdmUiGroup* viewGroup = uiOrdering.findGroup("ViewGroup");
if (viewGroup)
{
viewGroup->add(&m_showAxisLines);
}
uiOrdering.skipRemainingFields(true);
if (m_intersection->hasDefiningPoints()) if (m_intersection->hasDefiningPoints())
{ {
caf::PdmUiGroup* plGroup = uiOrdering.addNewGroup("Defining Points"); caf::PdmUiGroup* plGroup = uiOrdering.addNewGroup("Defining Points");

1
ApplicationCode/ProjectDataModel/Rim2dIntersectionView.h
View File

@ -111,6 +111,7 @@ protected:
cvf::ref<cvf::Transform> m_scaleTransform; cvf::ref<cvf::Transform> m_scaleTransform;
caf::PdmField<bool> m_showDefiningPoints; caf::PdmField<bool> m_showDefiningPoints;
caf::PdmField<bool> m_showAxisLines;
caf::PdmPointer<caf::PdmObject> m_legendObjectToSelect; caf::PdmPointer<caf::PdmObject> m_legendObjectToSelect;
}; };

3
ApplicationCode/ProjectDataModel/Rim3dView.cpp
View File

@ -253,7 +253,8 @@ void Rim3dView::deleteViewWidget()
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void Rim3dView::defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering) void Rim3dView::defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering)
{ {
caf::PdmUiGroup* viewGroup = uiOrdering.addNewGroup("Viewer"); caf::PdmUiGroup* viewGroup = uiOrdering.addNewGroupWithKeyword("Viewer", "ViewGroup");
viewGroup->add(&m_name); viewGroup->add(&m_name);
viewGroup->add(&m_backgroundColor); viewGroup->add(&m_backgroundColor);
viewGroup->add(&m_showGridBox); viewGroup->add(&m_showGridBox);