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

System : Move name to private field

Browse Source
This commit is contained in:
Magne Sjaastad
2018-09-24 22:15:34 +02:00
parent b2d055db63
commit dc9edccb54
11 changed files with 36 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
ApplicationCode/ProjectDataModel/Rim3dView.cpp
View File

@@ -86,7 +86,7 @@ Rim3dView::Rim3dView(void)
CVF_ASSERT(preferences);
CAF_PDM_InitField(&name, "UserDescription", QString(""), "Name", "", "", "");
CAF_PDM_InitField(&m_name, "UserDescription", QString(""), "Name", "", "", "");
CAF_PDM_InitField(&m_cameraPosition, "CameraPosition", cvf::Mat4d::IDENTITY, "", "", "", "");
m_cameraPosition.uiCapability()->setUiHidden(true);
@@ -151,6 +151,22 @@ RiuViewer* Rim3dView::viewer() const
return m_viewer;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void Rim3dView::setName(const QString& name)
{
m_name = name;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
QString Rim3dView::name() const
{
return m_name;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
@@ -207,11 +223,11 @@ void Rim3dView::updateMdiWindowTitle()
QString windowTitle;
if (ownerCase())
{
windowTitle = QString("%1 - %2").arg(ownerCase()->caseUserDescription()).arg(name);
windowTitle = QString("%1 - %2").arg(ownerCase()->caseUserDescription()).arg(m_name);
}
else
{
windowTitle = name;
windowTitle = m_name;
}
m_viewer->layoutWidget()->setWindowTitle(windowTitle);
@@ -236,7 +252,7 @@ void Rim3dView::deleteViewWidget()
void Rim3dView::defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering)
{
caf::PdmUiGroup* viewGroup = uiOrdering.addNewGroup("Viewer");
viewGroup->add(&name);
viewGroup->add(&m_name);
viewGroup->add(&m_backgroundColor);
viewGroup->add(&m_showGridBox);
viewGroup->add(&isPerspectiveView);
@@ -567,7 +583,7 @@ void Rim3dView::fieldChangedByUi(const caf::PdmFieldHandle* changedField, const
RiuMainWindow::instance()->refreshDrawStyleActions();
RiuMainWindow::instance()->refreshAnimationActions();
}
else if (changedField == &name)
else if (changedField == &m_name)
{
updateMdiWindowTitle();