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

Made RimNamedObject more robust and made name field private

Browse Source
This commit is contained in:
Magne Sjaastad 2017-06-08 10:09:39 +02:00
parent b82bda5905
commit 9759354148
8 changed files with 23 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ApplicationCode/ProjectDataModel/Completions/RimFishboneWellPath.cpp
View File

@ -36,7 +36,7 @@ RimFishboneWellPath::RimFishboneWellPath()
m_coordinates.uiCapability()->setUiHidden(true); m_coordinates.uiCapability()->setUiHidden(true);
CAF_PDM_InitFieldNoDefault(&m_measuredDepths, "MeasuredDepth", "MeasuredDepth", "", "", ""); CAF_PDM_InitFieldNoDefault(&m_measuredDepths, "MeasuredDepth", "MeasuredDepth", "", "", "");
m_measuredDepths.uiCapability()->setUiHidden(true); m_measuredDepths.uiCapability()->setUiHidden(true);
m_name.uiCapability()->setUiHidden(true); userDescriptionField()->uiCapability()->setUiHidden(true);
CAF_PDM_InitFieldNoDefault(&m_displayCoordinates, "DisplayCoordinates", "Coordinates", "", "", ""); CAF_PDM_InitFieldNoDefault(&m_displayCoordinates, "DisplayCoordinates", "Coordinates", "", "", "");
m_displayCoordinates.registerGetMethod(this, &RimFishboneWellPath::displayCoordinates); m_displayCoordinates.registerGetMethod(this, &RimFishboneWellPath::displayCoordinates);

4
ApplicationCode/ProjectDataModel/Completions/RimFishboneWellPathCollection.cpp
View File

@ -40,8 +40,8 @@ RimFishboneWellPathCollection::RimFishboneWellPathCollection()
{ {
CAF_PDM_InitObject("WellPathCompletions", ":/FishBoneGroupFromFile16x16.png", "", ""); CAF_PDM_InitObject("WellPathCompletions", ":/FishBoneGroupFromFile16x16.png", "", "");
m_name.uiCapability()->setUiHidden(true); name()->uiCapability()->setUiHidden(true);
m_name = "Well Paths"; this->setName("Well Paths");
CAF_PDM_InitFieldNoDefault(&m_wellPaths, "WellPaths", "Well Paths", "", "", ""); CAF_PDM_InitFieldNoDefault(&m_wellPaths, "WellPaths", "Well Paths", "", "", "");
m_wellPaths.uiCapability()->setUiHidden(true); m_wellPaths.uiCapability()->setUiHidden(true);

4
ApplicationCode/ProjectDataModel/Completions/RimFishbonesCollection.cpp
View File

@ -40,8 +40,8 @@ RimFishbonesCollection::RimFishbonesCollection()
{ {
CAF_PDM_InitObject("Fishbones", ":/FishBones16x16.png", "", ""); CAF_PDM_InitObject("Fishbones", ":/FishBones16x16.png", "", "");
m_name.uiCapability()->setUiHidden(true); name()->uiCapability()->setUiHidden(true);
m_name = "Fishbones"; this->setName("Fishbones");
CAF_PDM_InitFieldNoDefault(&fishbonesSubs, "FishbonesSubs", "fishbonesSubs", "", "", ""); CAF_PDM_InitFieldNoDefault(&fishbonesSubs, "FishbonesSubs", "fishbonesSubs", "", "", "");

4
ApplicationCode/ProjectDataModel/Completions/RimFishbonesMultipleSubs.cpp
View File

@ -100,7 +100,7 @@ RimFishbonesMultipleSubs::RimFishbonesMultipleSubs()
m_pipeProperties = new RimFishbonesPipeProperties; m_pipeProperties = new RimFishbonesPipeProperties;
m_name.uiCapability()->setUiReadOnly(true); name()->uiCapability()->setUiReadOnly(true);
m_rigFishbonesGeometry = std::unique_ptr<RigFisbonesGeometry>(new RigFisbonesGeometry(this)); m_rigFishbonesGeometry = std::unique_ptr<RigFisbonesGeometry>(new RigFisbonesGeometry(this));
@ -468,7 +468,7 @@ void RimFishbonesMultipleSubs::defineUiTreeOrdering(caf::PdmUiTreeOrdering& uiTr
CVF_ASSERT(container); CVF_ASSERT(container);
size_t index = container->index(this); size_t index = container->index(this);
m_name = QString("Fishbone %1").arg(index); this->setName(QString("Fishbone %1").arg(index));
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------

4
ApplicationCode/ProjectDataModel/Completions/RimPerforationCollection.cpp
View File

@ -40,8 +40,8 @@ RimPerforationCollection::RimPerforationCollection()
{ {
CAF_PDM_InitObject("Perforations", ":/PerforationIntervals16x16.png", "", ""); CAF_PDM_InitObject("Perforations", ":/PerforationIntervals16x16.png", "", "");
m_name.uiCapability()->setUiHidden(true); name()->uiCapability()->setUiHidden(true);
m_name = "Perforations"; this->setName("Perforations");
CAF_PDM_InitFieldNoDefault(&m_perforations, "Perforations", "Perforations", "", "", ""); CAF_PDM_InitFieldNoDefault(&m_perforations, "Perforations", "Perforations", "", "", "");
m_perforations.uiCapability()->setUiHidden(true); m_perforations.uiCapability()->setUiHidden(true);

4
ApplicationCode/ProjectDataModel/Completions/RimPerforationInterval.cpp
View File

@ -46,7 +46,7 @@ RimPerforationInterval::RimPerforationInterval()
CAF_PDM_InitFieldNoDefault(&m_date, "StartDate", "Start Date", "", "", ""); CAF_PDM_InitFieldNoDefault(&m_date, "StartDate", "Start Date", "", "", "");
m_date.uiCapability()->setUiEditorTypeName(caf::PdmUiLineEditor::uiEditorTypeName()); m_date.uiCapability()->setUiEditorTypeName(caf::PdmUiLineEditor::uiEditorTypeName());
m_name.uiCapability()->setUiReadOnly(true); name()->uiCapability()->setUiReadOnly(true);
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
@ -153,7 +153,7 @@ void RimPerforationInterval::fieldChangedByUi(const caf::PdmFieldHandle* changed
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RimPerforationInterval::defineUiTreeOrdering(caf::PdmUiTreeOrdering& uiTreeOrdering, QString uiConfigName /*= ""*/) void RimPerforationInterval::defineUiTreeOrdering(caf::PdmUiTreeOrdering& uiTreeOrdering, QString uiConfigName /*= ""*/)
{ {
m_name = QString("%1 - %2").arg(m_startMD).arg(m_endMD); this->setName(QString("%1 - %2").arg(m_startMD).arg(m_endMD));
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------

8
ApplicationCode/ProjectDataModel/RimNamedObject.cpp
View File

@ -56,6 +56,14 @@ void RimNamedObject::setName(const QString& name)
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
caf::PdmFieldHandle* RimNamedObject::userDescriptionField() caf::PdmFieldHandle* RimNamedObject::userDescriptionField()
{
return name();
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
caf::PdmFieldHandle* RimNamedObject::name()
{ {
return &m_name; return &m_name;
} }

5
ApplicationCode/ProjectDataModel/RimNamedObject.h
View File

@ -39,8 +39,11 @@ public:
protected: protected:
virtual caf::PdmFieldHandle* userDescriptionField() override; virtual caf::PdmFieldHandle* userDescriptionField() override;
// To be used from derived objects when manipulating visibility and ui ordering
caf::PdmFieldHandle* name();
protected: private:
caf::PdmField<QString> m_name; caf::PdmField<QString> m_name;
}; };