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

#3957 Add button to valve for creating new valve template or editing existing template

Browse Source 
* Also added separate delete valve feature so we can clear the template and update the valves referencing it.
This commit is contained in:
Gaute Lindkvist
2019-01-15 13:49:46 +01:00
parent a32ebe4dff
commit 5c24153646
13 changed files with 223 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -47,7 +47,6 @@ public:
QString typeLabel() const;
QString fullLabel() const;
void setUserLabel(const QString& userLabel);
protected:
QList<caf::PdmOptionItemInfo> calculateValueOptions(const caf::PdmFieldHandle* fieldNeedingOptions,
bool* useOptionsOnly) override;
@@ -68,6 +67,5 @@ private:
caf::PdmField<double> m_flowCoefficient;
// AICDs
caf::PdmChildField<RimWellPathAicdParameters*> m_aicdParameters;
};

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

@@ -66,6 +66,15 @@ void RimValveTemplateCollection::addValveTemplate(RimValveTemplate* valveTemplat
m_valveDefinitions.push_back(valveTemplate);
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimValveTemplateCollection::removeAndDeleteValveTemplate(RimValveTemplate* valveTemplate)
{
m_valveDefinitions.removeChildObject(valveTemplate);
delete valveTemplate;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------

1
ApplicationCode/ProjectDataModel/Completions/RimValveTemplateCollection.h
View File

@@ -40,6 +40,7 @@ public:
std::vector<RimValveTemplate*> valveTemplates() const;
void addValveTemplate(RimValveTemplate* valveTemplate);
void removeAndDeleteValveTemplate(RimValveTemplate* valveTemplate);
RiaEclipseUnitTools::UnitSystemType defaultUnitSystemType() const;
void setDefaultUnitSystemBasedOnLoadedCases();

61
ApplicationCode/ProjectDataModel/Completions/RimWellPathValve.cpp
View File

@@ -22,6 +22,8 @@
#include "RiaColorTables.h"
#include "RiaEclipseUnitTools.h"
#include "Riu3DMainWindowTools.h"
#include "RigWellPath.h"
#include "RimMultipleValveLocations.h"
@@ -30,7 +32,10 @@
#include "RimValveTemplate.h"
#include "RimWellPath.h"
#include "CompletionCommands/RicNewValveTemplateFeature.h"
#include "cafPdmUiDoubleSliderEditor.h"
#include "cafPdmUiToolButtonEditor.h"
CAF_PDM_SOURCE_INIT(RimWellPathValve, "WellPathValve");
@@ -42,14 +47,15 @@ RimWellPathValve::RimWellPathValve()
CAF_PDM_InitObject("WellPathValve", ":/ICDValve16x16.png", "", "");
CAF_PDM_InitFieldNoDefault(&m_valveTemplate, "ValveTemplate", "Valve Template", "", "", "");
CAF_PDM_InitField(&m_measuredDepth, "StartMeasuredDepth", 0.0, "Start MD", "", "", "");
m_measuredDepth.uiCapability()->setUiEditorTypeName(caf::PdmUiDoubleSliderEditor::uiEditorTypeName());
CAF_PDM_InitField(&m_measuredDepth, "StartMeasuredDepth", 0.0, "Start MD", "", "", "");
CAF_PDM_InitFieldNoDefault(&m_multipleValveLocations, "ValveLocations", "Valve Locations", "", "", "");
CAF_PDM_InitField(&m_createOrEditValveTemplate, "CreateTemplate", false, "Create new", "", "", "");
m_measuredDepth.uiCapability()->setUiEditorTypeName(caf::PdmUiDoubleSliderEditor::uiEditorTypeName());
m_multipleValveLocations = new RimMultipleValveLocations;
m_multipleValveLocations.uiCapability()->setUiTreeHidden(true);
m_multipleValveLocations.uiCapability()->setUiTreeChildrenHidden(true);
m_createOrEditValveTemplate.uiCapability()->setUiEditorTypeName(caf::PdmUiToolButtonEditor::uiEditorTypeName());
nameField()->uiCapability()->setUiReadOnly(true);
}
@@ -150,6 +156,14 @@ double RimWellPathValve::flowCoefficient() const
return 0.0;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimValveTemplate* RimWellPathValve::valveTemplate() const
{
return m_valveTemplate;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
@@ -407,6 +421,18 @@ void RimWellPathValve::fieldChangedByUi(const caf::PdmFieldHandle* changedField,
applyValveLabelAndIcon();
this->updateConnectedEditors();
}
else if (changedField == &m_createOrEditValveTemplate)
{
m_createOrEditValveTemplate = false;
if (m_valveTemplate == nullptr)
{
RicNewValveTemplateFeature::createNewValveTemplateForValveAndUpdate(this);
}
else
{
Riu3DMainWindowTools::selectAsCurrentItem(m_valveTemplate());
}
}
RimPerforationInterval* perfInterval;
this->firstAncestorOrThisOfTypeAsserted(perfInterval);
@@ -426,7 +452,23 @@ void RimWellPathValve::defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering
uiOrdering.add(&m_valveTemplate);
if (componentType() == RiaDefines::UNDEFINED_COMPONENT) return;
{
uiOrdering.add(&m_createOrEditValveTemplate, false);
if (m_valveTemplate() == nullptr)
{
m_createOrEditValveTemplate.uiCapability()->setUiName("New");
}
else
{
m_createOrEditValveTemplate.uiCapability()->setUiName("Edit");
}
}
if (m_valveTemplate())
{
caf::PdmUiGroup* group = uiOrdering.addNewGroup("Parameters from Template");
m_valveTemplate->uiOrdering("InsideValve", *group);
}
if (componentType() == RiaDefines::ICV || componentType() == RiaDefines::ICD)
{
@@ -454,13 +496,8 @@ void RimWellPathValve::defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering
caf::PdmUiGroup* group = uiOrdering.addNewGroup("Multiple Valve Locations");
m_multipleValveLocations->uiOrdering(uiConfigName, *group);
}
if (m_valveTemplate)
{
caf::PdmUiGroup* group = uiOrdering.addNewGroup("Parameters from Template");
m_valveTemplate->uiOrdering("InsideValve", *group);
}
uiOrdering.skipRemainingFields(true);
}
//--------------------------------------------------------------------------------------------------

3
ApplicationCode/ProjectDataModel/Completions/RimWellPathValve.h
View File

@@ -50,6 +50,7 @@ public:
std::vector<double> valveLocations() const;
double orificeDiameter(RiaEclipseUnitTools::UnitSystem unitSystem) const;
double flowCoefficient() const;
RimValveTemplate* valveTemplate() const;
void setValveTemplate(RimValveTemplate* valveTemplate);
void applyValveLabelAndIcon();
const RimWellPathAicdParameters* aicdParameters() const;
@@ -82,7 +83,7 @@ private:
caf::PdmPtrField<RimValveTemplate*> m_valveTemplate;
caf::PdmField<double> m_measuredDepth;
caf::PdmChildField<RimMultipleValveLocations*> m_multipleValveLocations;
caf::PdmField<bool> m_createOrEditValveTemplate;
};