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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ApplicationCode/Commands/CompletionCommands/CMakeLists_files.cmake
View File

@ -8,6 +8,7 @@ ${CMAKE_CURRENT_LIST_DIR}/RicNewPerforationIntervalFeature.h
${CMAKE_CURRENT_LIST_DIR}/RicNewPerforationIntervalAtMeasuredDepthFeature.h
${CMAKE_CURRENT_LIST_DIR}/RicNewValveFeature.h
${CMAKE_CURRENT_LIST_DIR}/RicNewValveTemplateFeature.h
${CMAKE_CURRENT_LIST_DIR}/RicDeleteValveTemplateFeature.h
${CMAKE_CURRENT_LIST_DIR}/RicWellPathImportCompletionsFileFeature.h
${CMAKE_CURRENT_LIST_DIR}/RicWellPathImportPerforationIntervalsFeature.h
)
@ -21,6 +22,7 @@ ${CMAKE_CURRENT_LIST_DIR}/RicNewPerforationIntervalFeature.cpp
${CMAKE_CURRENT_LIST_DIR}/RicNewPerforationIntervalAtMeasuredDepthFeature.cpp
${CMAKE_CURRENT_LIST_DIR}/RicNewValveFeature.cpp
${CMAKE_CURRENT_LIST_DIR}/RicNewValveTemplateFeature.cpp
${CMAKE_CURRENT_LIST_DIR}/RicDeleteValveTemplateFeature.cpp
${CMAKE_CURRENT_LIST_DIR}/RicWellPathImportCompletionsFileFeature.cpp
${CMAKE_CURRENT_LIST_DIR}/RicWellPathImportPerforationIntervalsFeature.cpp
)

82
ApplicationCode/Commands/CompletionCommands/RicDeleteValveTemplateFeature.cpp Normal file
View File

@ -0,0 +1,82 @@
/////////////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2019- Equinor ASA
//
// ResInsight is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
// ResInsight is distributed in the hope that it will be useful, but WITHOUT ANY
// WARRANTY; without even the implied warranty of MERCHANTABILITY or
// FITNESS FOR A PARTICULAR PURPOSE.
//
// See the GNU General Public License at <http://www.gnu.org/licenses/gpl.html>
// for more details.
//
/////////////////////////////////////////////////////////////////////////////////
#include "RicDeleteValveTemplateFeature.h"
#include "RimProject.h"
#include "RimValveTemplate.h"
#include "RimValveTemplateCollection.h"
#include "RimWellPathValve.h"
#include "cafSelectionManager.h"
#include <QAction>
CAF_CMD_SOURCE_INIT(RicDeleteValveTemplateFeature, "RicDeleteValveTemplateFeature");
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool RicDeleteValveTemplateFeature::isCommandEnabled()
{
if (caf::SelectionManager::instance()->selectedItemOfType<RimValveTemplate>())
{
return true;
}
return false;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RicDeleteValveTemplateFeature::onActionTriggered(bool isChecked)
{
RimValveTemplate* valveTemplate = caf::SelectionManager::instance()->selectedItemOfType<RimValveTemplate>();
if (valveTemplate)
{
RimProject* project = nullptr;
valveTemplate->firstAncestorOrThisOfTypeAsserted(project);
std::vector<RimWellPathValve*> valves;
project->descendantsIncludingThisOfType(valves);
for (RimWellPathValve* valve : valves)
{
if (valve->valveTemplate() == valveTemplate)
{
valve->setValveTemplate(nullptr);
valve->updateAllRequiredEditors();
}
}
RimValveTemplateCollection* collection = nullptr;
valveTemplate->firstAncestorOrThisOfTypeAsserted(collection);
collection->removeAndDeleteValveTemplate(valveTemplate);
collection->updateAllRequiredEditors();
project->scheduleCreateDisplayModelAndRedrawAllViews();
}
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RicDeleteValveTemplateFeature::setupActionLook(QAction* actionToSetup)
{
actionToSetup->setText("Delete Valve Template");
actionToSetup->setIcon(QIcon(":/Erase.png"));
}

35
ApplicationCode/Commands/CompletionCommands/RicDeleteValveTemplateFeature.h Normal file
View File

@ -0,0 +1,35 @@
/////////////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2019- Equinor ASA
//
// ResInsight is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
// ResInsight is distributed in the hope that it will be useful, but WITHOUT ANY
// WARRANTY; without even the implied warranty of MERCHANTABILITY or
// FITNESS FOR A PARTICULAR PURPOSE.
//
// See the GNU General Public License at <http://www.gnu.org/licenses/gpl.html>
// for more details.
//
/////////////////////////////////////////////////////////////////////////////////
#pragma once
#include "cafCmdFeature.h"
//==================================================================================================
///
//==================================================================================================
class RicDeleteValveTemplateFeature : public caf::CmdFeature
{
CAF_CMD_HEADER_INIT;
protected:
// Overrides
bool isCommandEnabled() override;
void onActionTriggered(bool isChecked) override;
void setupActionLook(QAction* actionToSetup) override;
};

41
ApplicationCode/Commands/CompletionCommands/RicNewValveTemplateFeature.cpp
View File

@ -25,6 +25,7 @@
#include "RimValveTemplateCollection.h"
#include "RimOilField.h"
#include "RimProject.h"
#include "RimWellPathValve.h"
#include "Riu3DMainWindowTools.h"
@ -39,12 +40,16 @@ CAF_CMD_SOURCE_INIT(RicNewValveTemplateFeature, "RicNewValveTemplateFeature");
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RicNewValveTemplateFeature::selectValveTemplateAndUpdate(RimValveTemplateCollection* templateCollection,
RimValveTemplate* valveTemplate)
void RicNewValveTemplateFeature::selectValveTemplateAndUpdate(RimValveTemplate* valveTemplate)
{
valveTemplate->loadDataAndUpdate();
templateCollection->updateConnectedEditors();
RimValveTemplateCollection* templateCollection = nullptr;
valveTemplate->firstAncestorOrThisOfType(templateCollection);
if (templateCollection)
{
templateCollection->updateConnectedEditors();
}
RimProject* project = RiaApplication::instance()->project();
@ -65,26 +70,48 @@ void RicNewValveTemplateFeature::selectValveTemplateAndUpdate(RimValveTemplateCo
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RicNewValveTemplateFeature::onActionTriggered(bool isChecked)
void RicNewValveTemplateFeature::createNewValveTemplateForValveAndUpdate(RimWellPathValve* valve)
{
RimValveTemplate* valveTemplate = createNewValveTemplate();
valve->setValveTemplate(valveTemplate);
selectValveTemplateAndUpdate(valveTemplate);
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimValveTemplate* RicNewValveTemplateFeature::createNewValveTemplate()
{
RimProject* project = RiaApplication::instance()->project();
CVF_ASSERT(project);
RimOilField* oilfield = project->activeOilField();
if (oilfield == nullptr) return;
if (oilfield == nullptr) return nullptr;
RimValveTemplateCollection* valveTemplateColl = oilfield->valveTemplateCollection();
if (valveTemplateColl)
{
RimValveTemplate* valveTemplate = new RimValveTemplate();
QString userLabel = QString("Valve Template #%1").arg(valveTemplateColl->valveTemplates().size() + 1);
QString userLabel = QString("Valve Template #%1").arg(valveTemplateColl->valveTemplates().size() + 1);
valveTemplate->setUserLabel(userLabel);
valveTemplateColl->addValveTemplate(valveTemplate);
valveTemplate->setUnitSystem(valveTemplateColl->defaultUnitSystemType());
valveTemplate->setDefaultValuesFromUnits();
return valveTemplate;
}
return nullptr;
}
selectValveTemplateAndUpdate(valveTemplateColl, valveTemplate);
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RicNewValveTemplateFeature::onActionTriggered(bool isChecked)
{
RimValveTemplate* valveTemplate = createNewValveTemplate();
if (valveTemplate)
{
selectValveTemplateAndUpdate(valveTemplate);
}
}

7
ApplicationCode/Commands/CompletionCommands/RicNewValveTemplateFeature.h
View File

@ -24,6 +24,7 @@
class RimValveTemplate;
class RimValveTemplateCollection;
class RimWellPathValve;
//==================================================================================================
///
@ -33,10 +34,10 @@ class RicNewValveTemplateFeature : public caf::CmdFeature
CAF_CMD_HEADER_INIT;
public:
static void selectValveTemplateAndUpdate(RimValveTemplateCollection* templateCollection,
RimValveTemplate* valveTemplate);
static void selectValveTemplateAndUpdate(RimValveTemplate* valveTemplate);
static void createNewValveTemplateForValveAndUpdate(RimWellPathValve* valve);
protected:
static RimValveTemplate* createNewValveTemplate();
void onActionTriggered(bool isChecked) override;
void setupActionLook(QAction* actionToSetup) override;
bool isCommandEnabled() override;

6
ApplicationCode/Commands/RicDeleteItemExec.cpp
View File

@ -51,8 +51,6 @@
#include "RiuPlotMainWindow.h"
#include "RimFractureTemplateCollection.h"
#include "RimValveTemplateCollection.h"
#include "cafNotificationCenter.h"
#include "cafPdmChildArrayField.h"
@ -156,11 +154,9 @@ void RicDeleteItemExec::redo()
}
RimValveTemplateCollection* valveTemplateColl;
RimFractureTemplateCollection* fracTemplateColl;
parentObj->firstAncestorOrThisOfType(fracTemplateColl);
parentObj->firstAncestorOrThisOfType(valveTemplateColl);
if (fracTemplateColl || valveTemplateColl)
if (fracTemplateColl)
{
RimProject* proj = nullptr;
parentObj->firstAncestorOrThisOfType(proj);

2
ApplicationCode/Commands/RicDeleteItemFeature.cpp
View File

@ -60,7 +60,6 @@
#include "RimSimWellFracture.h"
#include "RimSimWellFractureCollection.h"
#include "RimStimPlanFractureTemplate.h"
#include "RimValveTemplate.h"
#include "RimWellPathFracture.h"
#include "RimWellPathFractureCollection.h"
@ -123,7 +122,6 @@ bool isDeletable(caf::PdmUiItem* uiItem)
if (dynamic_cast<RimWellPathFracture*>(uiItem)) return true;
if (dynamic_cast<RimEllipseFractureTemplate*>(uiItem)) return true;
if (dynamic_cast<RimStimPlanFractureTemplate*>(uiItem)) return true;
if (dynamic_cast<RimValveTemplate*>(uiItem)) return true;
if (dynamic_cast<RimSimWellFractureCollection*>(uiItem)) return true;
if (dynamic_cast<RimSimWellFracture*>(uiItem)) return true;
if (dynamic_cast<RimEnsembleCurveSet*>(uiItem)) return true;

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;
};

4
ApplicationCode/ProjectDataModel/RimContextCommandBuilder.cpp
View File

@ -664,6 +664,10 @@ caf::CmdFeatureMenuBuilder RimContextCommandBuilder::commandsFromSelection()
{
menuBuilder << "RicNewValveTemplateFeature";
}
else if (dynamic_cast<RimValveTemplate*>(uiItem))
{
menuBuilder << "RicDeleteValveTemplateFeature";
}
else if (dynamic_cast<RimFractureTemplateCollection*>(uiItem))
{
menuBuilder << "RicPasteEllipseFractureFeature";