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

#4239 Show Well Allocation Plots: Add well name to suggested view name

Browse Source
This commit is contained in:
Magne Sjaastad
2019-03-27 19:19:19 +01:00
parent 50aac466e6
commit d0a23252ab
9 changed files with 33 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ApplicationCode/Commands/FlowCommands/RicSelectViewUI.cpp
View File

@@ -59,6 +59,14 @@ void RicSelectViewUI::setCase(RimEclipseResultCase* currentCase)
m_currentCase = currentCase;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RicSelectViewUI::setNewViewName(const QString& name)
{
m_newViewName = name;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------

1
ApplicationCode/Commands/FlowCommands/RicSelectViewUI.h
View File

@@ -37,6 +37,7 @@ public:
void setView(RimEclipseView* currentView);
void setCase(RimEclipseResultCase* currentCase);
void setNewViewName(const QString& name);
RimEclipseView* selectedView() const;
bool createNewView() const;

2
ApplicationCode/Commands/FlowCommands/RicShowContributingWellsFeature.cpp
View File

@@ -89,7 +89,7 @@ void RicShowContributingWellsFeature::onActionTriggered(bool isChecked)
RimEclipseResultCase* eclipseResultCase = nullptr;
well->firstAncestorOrThisOfTypeAsserted(eclipseResultCase);
RimEclipseView* modifiedView = RicShowContributingWellsFeatureImpl::maniuplateSelectedView(eclipseResultCase, well->name(), eclipseView->currentTimeStep());
RimEclipseView* modifiedView = RicShowContributingWellsFeatureImpl::manipulateSelectedView(eclipseResultCase, well->name(), eclipseView->currentTimeStep());
if (modifiedView)
{
modifiedView->createDisplayModelAndRedraw();

6
ApplicationCode/Commands/FlowCommands/RicShowContributingWellsFeatureImpl.cpp
View File

@@ -45,13 +45,13 @@
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimEclipseView* RicShowContributingWellsFeatureImpl::maniuplateSelectedView(RimEclipseResultCase* eclipseResultCase, QString wellName, int timeStep)
RimEclipseView* RicShowContributingWellsFeatureImpl::manipulateSelectedView(RimEclipseResultCase* eclipseResultCase, QString wellName, int timeStep)
{
RimEclipseView* viewToManipulate = RicSelectOrCreateViewFeatureImpl::showViewSelection(eclipseResultCase, "lastUsedWellAllocationView", "Show Contributing Wells in View");
RimEclipseView* viewToManipulate = RicSelectOrCreateViewFeatureImpl::showViewSelection(
eclipseResultCase, "lastUsedWellAllocationView", "ContributingWells_" + wellName, "Show Contributing Wells in View");
if (!viewToManipulate) return nullptr;
RicShowContributingWellsFeatureImpl::modifyViewToShowContributingWells(viewToManipulate, wellName, timeStep);
auto* feature = caf::CmdFeatureManager::instance()->getCommandFeature("RicShowMainWindowFeature");

2
ApplicationCode/Commands/FlowCommands/RicShowContributingWellsFeatureImpl.h
View File

@@ -34,7 +34,7 @@ class RimSimWellInView;
class RicShowContributingWellsFeatureImpl
{
public:
static RimEclipseView* maniuplateSelectedView(RimEclipseResultCase* wellAllocationResultCase, QString wellName, int timeStep);
static RimEclipseView* manipulateSelectedView(RimEclipseResultCase* wellAllocationResultCase, QString wellName, int timeStep);
private:
static void modifyViewToShowContributingWells(RimEclipseView* viewToModify, const QString& wellName, int timeStep);

2
ApplicationCode/Commands/FlowCommands/RicShowContributingWellsFromPlotFeature.cpp
View File

@@ -56,7 +56,7 @@ void RicShowContributingWellsFromPlotFeature::onActionTriggered(bool isChecked)
RimEclipseResultCase* wellAllocationResultCase = wellAllocationPlot->rimCase();
RicShowContributingWellsFeatureImpl::maniuplateSelectedView(wellAllocationResultCase, wellName, timeStep);
RicShowContributingWellsFeatureImpl::manipulateSelectedView(wellAllocationResultCase, wellName, timeStep);
}
//--------------------------------------------------------------------------------------------------

6
ApplicationCode/Commands/RicSelectOrCreateViewFeatureImpl.cpp
View File

@@ -33,11 +33,15 @@
//==================================================================================================
///
//==================================================================================================
RimEclipseView* RicSelectOrCreateViewFeatureImpl::showViewSelection(RimEclipseResultCase* resultCase, const QString& lastUsedViewKey, const QString& dialogTitle)
RimEclipseView* RicSelectOrCreateViewFeatureImpl::showViewSelection(RimEclipseResultCase* resultCase,
const QString& lastUsedViewKey,
const QString& newViewName,
const QString& dialogTitle)
{
RimEclipseView* defaultSelectedView = getDefaultSelectedView(resultCase, lastUsedViewKey);
RicSelectViewUI featureUi;
featureUi.setNewViewName(newViewName);
if (defaultSelectedView)
{
featureUi.setView(defaultSelectedView);

7
ApplicationCode/Commands/RicSelectOrCreateViewFeatureImpl.h
View File

@@ -29,11 +29,12 @@ class RimEclipseResultCase;
class RicSelectOrCreateViewFeatureImpl
{
public:
static RimEclipseView* showViewSelection(RimEclipseResultCase* resultCase, const QString& lastUsedViewKey, const QString& dialogTitle);
static RimEclipseView* showViewSelection(RimEclipseResultCase* resultCase,
const QString& lastUsedViewKey,
const QString& newViewName,
const QString& dialogTitle);
static void focusView(RimEclipseView* view);
private:
static RimEclipseView* getDefaultSelectedView(RimEclipseResultCase* resultCase, const QString& lastUsedViewKey);
};

3
ApplicationCode/ProjectDataModel/Flow/RimFlowCharacteristicsPlot.cpp
View File

@@ -457,7 +457,8 @@ void RimFlowCharacteristicsPlot::fieldChangedByUi(const caf::PdmFieldHandle* cha
{
if (m_cellFilter() != RigFlowDiagResults::CELLS_ACTIVE)
{
RimEclipseView* view = RicSelectOrCreateViewFeatureImpl::showViewSelection(m_case, "FlowCharacteristicsLastUsedView", "Show Region in View");
RimEclipseView* view = RicSelectOrCreateViewFeatureImpl::showViewSelection(
m_case, "FlowCharacteristicsLastUsedView", "RegionView", "Show Region in View");
if (view != nullptr)
{