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

2
ApplicationCode/ProjectDataModel/Rim2dIntersectionView.cpp
View File

@@ -302,7 +302,7 @@ void Rim2dIntersectionView::updateName()
{
Rim3dView * parentView = nullptr;
m_intersection->firstAncestorOrThisOfTypeAsserted(parentView);
name = parentView->name() + ": " + m_intersection->name();
this->setName(parentView->name() + ": " + m_intersection->name());
}
}

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();

6
ApplicationCode/ProjectDataModel/Rim3dView.h
View File

@@ -84,7 +84,6 @@ public:
// Public fields:
caf::PdmField<QString> name;
caf::PdmField<double> scaleZ;
caf::PdmField<bool> isPerspectiveView;
caf::PdmField<int> maximumFrameRate;
@@ -100,6 +99,8 @@ public:
RiuViewer* viewer() const;
void setName(const QString& name);
QString name() const;
void setMeshOnlyDrawstyle();
void setMeshSurfDrawstyle();
void setSurfOnlyDrawstyle();
@@ -199,7 +200,7 @@ protected:
private:
// Overridden PdmObject methods:
virtual caf::PdmFieldHandle* userDescriptionField() override { return &name; }
virtual caf::PdmFieldHandle* userDescriptionField() override { return &m_name; }
virtual void setupBeforeSave() override;
protected:
virtual void fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue) override;
@@ -225,6 +226,7 @@ private:
virtual void setMdiWindowGeometry(const RimMdiWindowGeometry& windowGeometry) override;
private:
caf::PdmField<QString> m_name;
caf::PdmField<bool> m_disableLighting;
caf::PdmField<cvf::Mat4d> m_cameraPosition;
caf::PdmField<cvf::Vec3d> m_cameraPointOfInterest;

2
ApplicationCode/ProjectDataModel/RimEclipseCase.cpp
View File

@@ -267,7 +267,7 @@ RimEclipseView* RimEclipseCase::createAndAddReservoirView()
caf::PdmDocument::updateUiIconStateRecursively(rimEclipseView);
size_t i = reservoirViews().size();
rimEclipseView->name = QString("View %1").arg(i + 1);
rimEclipseView->setName(QString("View %1").arg(i + 1));
reservoirViews().push_back(rimEclipseView);

2
ApplicationCode/ProjectDataModel/RimGeoMechCase.cpp
View File

@@ -168,7 +168,7 @@ RimGeoMechView* RimGeoMechCase::createAndAddReservoirView()
{
RimGeoMechView* gmv = new RimGeoMechView();
size_t i = geoMechViews().size();
gmv->name = QString("View %1").arg(i + 1);
gmv->setName(QString("View %1").arg(i + 1));
gmv->setGeoMechCase(this);

2
ApplicationCode/ProjectDataModel/RimViewController.cpp
View File

@@ -1018,7 +1018,7 @@ void RimViewController::applyRangeFilterCollectionByUserChoice()
return;
}
bool restoreOriginal = askUserToRestoreOriginalRangeFilterCollection(m_managedView->name);
bool restoreOriginal = askUserToRestoreOriginalRangeFilterCollection(m_managedView->name());
if (restoreOriginal)
{
m_managedView->setOverrideRangeFilterCollection(nullptr);

2
ApplicationCode/ProjectDataModel/RimViewLinker.cpp
View File

@@ -288,7 +288,7 @@ QString RimViewLinker::displayNameForView(RimGridView* view)
view->firstAncestorOrThisOfType(rimCase);
if (rimCase)
{
displayName = rimCase->caseUserDescription() + ": " + view->name;
displayName = rimCase->caseUserDescription() + ": " + view->name();
}
}