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

#1603 Ensure start MD is recalculated when new fishbones subs are created

Browse Source
This commit is contained in:
Bjørnar Grip Fjær
2017-06-15 12:08:05 +02:00
parent 16a2c232c7
commit 5365d92e66
2 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -55,6 +55,8 @@ RimFishbonesCollection::RimFishbonesCollection()
CAF_PDM_InitField(&m_mainBoreDiameter, "MainBoreDiameter", 0.216, "Main Bore Diameter", "", "", ""); CAF_PDM_InitField(&m_mainBoreDiameter, "MainBoreDiameter", 0.216, "Main Bore Diameter", "", "", "");
CAF_PDM_InitField(&m_linerDiameter, "LinerDiameter", 0.152, "Liner Inner Diameter", "", "", ""); CAF_PDM_InitField(&m_linerDiameter, "LinerDiameter", 0.152, "Liner Inner Diameter", "", "", "");
CAF_PDM_InitField(&m_roughnessFactor, "RoughnessFactor", 1e-05, "Roughness Factor", "", "", ""); CAF_PDM_InitField(&m_roughnessFactor, "RoughnessFactor", 1e-05, "Roughness Factor", "", "", "");
manuallyModifiedStartMD = false;
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
@@ -72,6 +74,11 @@ RimFishboneWellPathCollection* RimFishbonesCollection::wellPathCollection() cons
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RimFishbonesCollection::fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue) void RimFishbonesCollection::fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue)
{ {
if (changedField == &m_startMD)
{
manuallyModifiedStartMD = true;
}
RimProject* proj; RimProject* proj;
this->firstAncestorOrThisOfTypeAsserted(proj); this->firstAncestorOrThisOfTypeAsserted(proj);
proj->createDisplayModelAndRedrawAllViews(); proj->createDisplayModelAndRedrawAllViews();
@@ -136,7 +143,7 @@ void RimFishbonesCollection::recalculateStartMD()
} }
} }
if (minStartMD < m_startMD()) if (!manuallyModifiedStartMD || minStartMD < m_startMD())
{ {
m_startMD = minStartMD; m_startMD = minStartMD;
} }

2
ApplicationCode/ProjectDataModel/Completions/RimFishbonesCollection.h
View File

@@ -65,4 +65,6 @@ private:
caf::PdmField<double> m_mainBoreDiameter; caf::PdmField<double> m_mainBoreDiameter;
caf::PdmField<double> m_linerDiameter; caf::PdmField<double> m_linerDiameter;
caf::PdmField<double> m_roughnessFactor; caf::PdmField<double> m_roughnessFactor;
bool manuallyModifiedStartMD;
}; };