(#639) Updated axis cross texts

This commit is contained in:
Magne Sjaastad
2015-11-23 07:24:50 +01:00
parent 0b097ec2eb
commit 95e22b581c
6 changed files with 55 additions and 33 deletions

View File

@@ -155,7 +155,6 @@ void RimGeoMechView::loadDataAndUpdate()
progress.setProgressDescription("Create Display model");
updateViewerWidget();
setCustomAxisCrossLabels();
this->geoMechPropertyFilterCollection()->loadAndInitializePropertyFilters();
@@ -483,7 +482,6 @@ void RimGeoMechView::fieldChangedByUi(const caf::PdmFieldHandle* changedField, c
{
bool generateDisplayModel = (viewer() == NULL);
updateViewerWidget();
setCustomAxisCrossLabels();
if (generateDisplayModel)
{
@@ -516,18 +514,6 @@ void RimGeoMechView::initAfterRead()
this->updateUiIconFromToggleField();
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimGeoMechView::setCustomAxisCrossLabels()
{
// Minimalistic - size of axis cross does not have to be adjusted
if (m_viewer) m_viewer->setAxisLabels("E-x1", "N-y2", "Z-3");
// A bit larger - size of axis cross is slightly larger
//if (m_viewer) m_viewer->setAxisLabels("E(x,1)", "N(y,2)", "Z(3)");
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
@@ -642,6 +628,18 @@ void RimGeoMechView::updateIconStateForFilterCollections()
m_propertyFilterCollection()->uiCapability()->updateConnectedEditors();
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimGeoMechView::axisLabels(cvf::String* xLabel, cvf::String* yLabel, cvf::String* zLabel)
{
CVF_ASSERT(xLabel && yLabel && zLabel);
*xLabel = "E(X,1)";
*yLabel = "N(Y,2)";
*zLabel = "Z(3)";
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------