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

Whitespace

Browse Source
This commit is contained in:
Magne Sjaastad 2019-03-27 19:20:42 +01:00
parent d0a23252ab
commit 77dbd8a25f
5 changed files with 175 additions and 175 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -30,11 +30,11 @@
#include "RimEclipsePropertyFilterCollection.h" #include "RimEclipsePropertyFilterCollection.h"
#include "RimEclipseResultCase.h" #include "RimEclipseResultCase.h"
#include "RimEclipseView.h" #include "RimEclipseView.h"
#include "RimSimWellInViewCollection.h"
#include "RimFaultInViewCollection.h" #include "RimFaultInViewCollection.h"
#include "RimFlowDiagSolution.h" #include "RimFlowDiagSolution.h"
#include "RimProject.h" #include "RimProject.h"
#include "RimSimWellInView.h" #include "RimSimWellInView.h"
#include "RimSimWellInViewCollection.h"
#include "RimViewManipulator.h" #include "RimViewManipulator.h"
#include "Riu3DMainWindowTools.h" #include "Riu3DMainWindowTools.h"
@ -45,7 +45,9 @@
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
RimEclipseView* RicShowContributingWellsFeatureImpl::manipulateSelectedView(RimEclipseResultCase* eclipseResultCase, QString wellName, int timeStep) RimEclipseView* RicShowContributingWellsFeatureImpl::manipulateSelectedView(RimEclipseResultCase* eclipseResultCase,
QString wellName,
int timeStep)
{ {
RimEclipseView* viewToManipulate = RicSelectOrCreateViewFeatureImpl::showViewSelection( RimEclipseView* viewToManipulate = RicSelectOrCreateViewFeatureImpl::showViewSelection(
eclipseResultCase, "lastUsedWellAllocationView", "ContributingWells_" + wellName, "Show Contributing Wells in View"); eclipseResultCase, "lastUsedWellAllocationView", "ContributingWells_" + wellName, "Show Contributing Wells in View");
@ -65,7 +67,9 @@ RimEclipseView* RicShowContributingWellsFeatureImpl::manipulateSelectedView(RimE
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RicShowContributingWellsFeatureImpl::modifyViewToShowContributingWells(RimEclipseView* viewToModify, const QString& wellName, int timeStep) void RicShowContributingWellsFeatureImpl::modifyViewToShowContributingWells(RimEclipseView* viewToModify,
const QString& wellName,
int timeStep)
{ {
CVF_ASSERT(viewToModify); CVF_ASSERT(viewToModify);
@ -91,7 +95,7 @@ void RicShowContributingWellsFeatureImpl::modifyViewToShowContributingWells(RimE
flowDiagSolution = eclipseResultCase->defaultFlowDiagSolution(); flowDiagSolution = eclipseResultCase->defaultFlowDiagSolution();
} }
//assert(flowDiagSolution); // assert(flowDiagSolution);
CVF_ASSERT(flowDiagSolution); CVF_ASSERT(flowDiagSolution);
RimFlowDiagSolution::TracerStatusType tracerStatus = flowDiagSolution->tracerStatusInTimeStep(selectedWell->name(), timeStep); RimFlowDiagSolution::TracerStatusType tracerStatus = flowDiagSolution->tracerStatusInTimeStep(selectedWell->name(), timeStep);
@ -126,8 +130,8 @@ void RicShowContributingWellsFeatureImpl::modifyViewToShowContributingWells(RimE
for (RimSimWellInView* w : viewToModify->wellCollection()->wells()) for (RimSimWellInView* w : viewToModify->wellCollection()->wells())
{ {
if (std::find(tracerNames.begin(), tracerNames.end(), w->name()) != tracerNames.end() if (std::find(tracerNames.begin(), tracerNames.end(), w->name()) != tracerNames.end() ||
|| selectedWell->name() == w->name()) selectedWell->name() == w->name())
{ {
w->showWell = true; w->showWell = true;
} }
@ -168,8 +172,7 @@ void RicShowContributingWellsFeatureImpl::modifyViewToShowContributingWells(RimE
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
std::vector<QString> RicShowContributingWellsFeatureImpl::findContributingTracerNames( std::vector<QString> RicShowContributingWellsFeatureImpl::findContributingTracerNames(const RimFlowDiagSolution* flowDiagSolution,
const RimFlowDiagSolution* flowDiagSolution,
const RigSimWellData* simWellData, const RigSimWellData* simWellData,
int timeStep) int timeStep)
{ {
@ -180,8 +183,7 @@ std::vector<QString> RicShowContributingWellsFeatureImpl::findContributingTracer
RimFlowDiagSolution::TracerStatusType requestedTracerType = RimFlowDiagSolution::UNDEFINED; RimFlowDiagSolution::TracerStatusType requestedTracerType = RimFlowDiagSolution::UNDEFINED;
const RigWellResultFrame::WellProductionType prodType = simWellData->wellProductionType(timeStep); const RigWellResultFrame::WellProductionType prodType = simWellData->wellProductionType(timeStep);
if ( prodType == RigWellResultFrame::PRODUCER if (prodType == RigWellResultFrame::PRODUCER || prodType == RigWellResultFrame::UNDEFINED_PRODUCTION_TYPE)
|| prodType == RigWellResultFrame::UNDEFINED_PRODUCTION_TYPE)
{ {
requestedTracerType = RimFlowDiagSolution::INJECTOR; requestedTracerType = RimFlowDiagSolution::INJECTOR;
} }
@ -202,4 +204,3 @@ std::vector<QString> RicShowContributingWellsFeatureImpl::findContributingTracer
return tracerCellFractionValues; return tracerCellFractionValues;
} }

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

@ -35,7 +35,8 @@ CAF_CMD_SOURCE_INIT(RicShowContributingWellsFromPlotFeature, "RicShowContributin
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
bool RicShowContributingWellsFromPlotFeature::isCommandEnabled() bool RicShowContributingWellsFromPlotFeature::isCommandEnabled()
{ {
RimWellAllocationPlot* wellAllocationPlot = dynamic_cast<RimWellAllocationPlot*>(RiaApplication::instance()->activePlotWindow()); RimWellAllocationPlot* wellAllocationPlot =
dynamic_cast<RimWellAllocationPlot*>(RiaApplication::instance()->activePlotWindow());
if (wellAllocationPlot) return true; if (wellAllocationPlot) return true;
@ -47,7 +48,8 @@ bool RicShowContributingWellsFromPlotFeature::isCommandEnabled()
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RicShowContributingWellsFromPlotFeature::onActionTriggered(bool isChecked) void RicShowContributingWellsFromPlotFeature::onActionTriggered(bool isChecked)
{ {
RimWellAllocationPlot* wellAllocationPlot = dynamic_cast<RimWellAllocationPlot*>(RiaApplication::instance()->activePlotWindow()); RimWellAllocationPlot* wellAllocationPlot =
dynamic_cast<RimWellAllocationPlot*>(RiaApplication::instance()->activePlotWindow());
if (!wellAllocationPlot) return; if (!wellAllocationPlot) return;
@ -64,6 +66,6 @@ void RicShowContributingWellsFromPlotFeature::onActionTriggered(bool isChecked)
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RicShowContributingWellsFromPlotFeature::setupActionLook(QAction* actionToSetup) void RicShowContributingWellsFromPlotFeature::setupActionLook(QAction* actionToSetup)
{ {
//actionToSetup->setIcon(QIcon(":/new_icon16x16.png")); // actionToSetup->setIcon(QIcon(":/new_icon16x16.png"));
actionToSetup->setText("Show Contributing Wells"); actionToSetup->setText("Show Contributing Wells");
} }

8
ApplicationCode/Commands/FlowCommands/RicShowContributingWellsFromPlotFeature.h
View File

@ -20,7 +20,6 @@
#include "cafCmdFeature.h" #include "cafCmdFeature.h"
//================================================================================================== //==================================================================================================
/// ///
//================================================================================================== //==================================================================================================
@ -29,10 +28,7 @@ class RicShowContributingWellsFromPlotFeature : public caf::CmdFeature
CAF_CMD_HEADER_INIT; CAF_CMD_HEADER_INIT;
protected: protected:
// Overrides
bool isCommandEnabled() override; bool isCommandEnabled() override;
void onActionTriggered( bool isChecked ) override; void onActionTriggered(bool isChecked) override;
void setupActionLook( QAction* actionToSetup ) override; void setupActionLook(QAction* actionToSetup) override;
}; };

13
ApplicationCode/Commands/RicSelectOrCreateViewFeatureImpl.cpp
View File

@ -22,9 +22,9 @@
#include "RiaApplication.h" #include "RiaApplication.h"
#include "RimProject.h"
#include "RimEclipseView.h"
#include "RimEclipseResultCase.h" #include "RimEclipseResultCase.h"
#include "RimEclipseView.h"
#include "RimProject.h"
#include "RiuMainWindow.h" #include "RiuMainWindow.h"
@ -73,7 +73,8 @@ RimEclipseView* RicSelectOrCreateViewFeatureImpl::showViewSelection(RimEclipseRe
viewToManipulate = featureUi.selectedView(); viewToManipulate = featureUi.selectedView();
} }
QString refFromProjectToView = caf::PdmReferenceHelper::referenceFromRootToObject(RiaApplication::instance()->project(), viewToManipulate); QString refFromProjectToView =
caf::PdmReferenceHelper::referenceFromRootToObject(RiaApplication::instance()->project(), viewToManipulate);
RiaApplication::instance()->setCacheDataObject(lastUsedViewKey, refFromProjectToView); RiaApplication::instance()->setCacheDataObject(lastUsedViewKey, refFromProjectToView);
return viewToManipulate; return viewToManipulate;
@ -92,12 +93,14 @@ void RicSelectOrCreateViewFeatureImpl::focusView(RimEclipseView* view)
//================================================================================================== //==================================================================================================
/// ///
//================================================================================================== //==================================================================================================
RimEclipseView* RicSelectOrCreateViewFeatureImpl::getDefaultSelectedView(RimEclipseResultCase* resultCase, const QString& lastUsedViewKey) RimEclipseView* RicSelectOrCreateViewFeatureImpl::getDefaultSelectedView(RimEclipseResultCase* resultCase,
const QString& lastUsedViewKey)
{ {
RimEclipseView* defaultSelectedView = nullptr; RimEclipseView* defaultSelectedView = nullptr;
QString lastUsedViewRef = RiaApplication::instance()->cacheDataObject(lastUsedViewKey).toString(); QString lastUsedViewRef = RiaApplication::instance()->cacheDataObject(lastUsedViewKey).toString();
RimEclipseView* lastUsedView = dynamic_cast<RimEclipseView*>(caf::PdmReferenceHelper::objectFromReference(RiaApplication::instance()->project(), lastUsedViewRef)); RimEclipseView* lastUsedView = dynamic_cast<RimEclipseView*>(
caf::PdmReferenceHelper::objectFromReference(RiaApplication::instance()->project(), lastUsedViewRef));
if (lastUsedView) if (lastUsedView)
{ {
RimEclipseResultCase* lastUsedViewResultCase = nullptr; RimEclipseResultCase* lastUsedViewResultCase = nullptr;

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

@ -18,18 +18,18 @@
#include "RimFlowCharacteristicsPlot.h" #include "RimFlowCharacteristicsPlot.h"
#include "RigFlowDiagResults.h"
#include "RigEclipseCaseData.h"
#include "RigActiveCellInfo.h" #include "RigActiveCellInfo.h"
#include "RigEclipseCaseData.h"
#include "RigFlowDiagResults.h"
#include "RimEclipseResultCase.h"
#include "RimFlowDiagSolution.h"
#include "RimProject.h"
#include "RimEclipseCellColors.h" #include "RimEclipseCellColors.h"
#include "RimEclipseView.h"
#include "RimEclipsePropertyFilter.h" #include "RimEclipsePropertyFilter.h"
#include "RimEclipsePropertyFilterCollection.h" #include "RimEclipsePropertyFilterCollection.h"
#include "RimEclipseResultCase.h"
#include "RimEclipseView.h"
#include "RimFaultInViewCollection.h" #include "RimFaultInViewCollection.h"
#include "RimFlowDiagSolution.h"
#include "RimProject.h"
#include "RicEclipsePropertyFilterFeatureImpl.h" #include "RicEclipsePropertyFilterFeatureImpl.h"
#include "RicSelectOrCreateViewFeatureImpl.h" #include "RicSelectOrCreateViewFeatureImpl.h"
@ -46,21 +46,19 @@
#include <cmath> // Needed for HUGE_VAL on Linux #include <cmath> // Needed for HUGE_VAL on Linux
namespace caf namespace caf
{ {
template<> template<>
void AppEnum< RimFlowCharacteristicsPlot::TimeSelectionType >::setUp() void AppEnum<RimFlowCharacteristicsPlot::TimeSelectionType>::setUp()
{ {
addItem(RimFlowCharacteristicsPlot::ALL_AVAILABLE, "ALL_AVAILABLE", "All With Calculated Flow Diagnostics"); addItem(RimFlowCharacteristicsPlot::ALL_AVAILABLE, "ALL_AVAILABLE", "All With Calculated Flow Diagnostics");
addItem(RimFlowCharacteristicsPlot::SELECTED, "SELECTED", "Selected"); addItem(RimFlowCharacteristicsPlot::SELECTED, "SELECTED", "Selected");
setDefault(RimFlowCharacteristicsPlot::SELECTED); setDefault(RimFlowCharacteristicsPlot::SELECTED);
}
} }
} // namespace caf
CAF_PDM_SOURCE_INIT(RimFlowCharacteristicsPlot, "FlowCharacteristicsPlot"); CAF_PDM_SOURCE_INIT(RimFlowCharacteristicsPlot, "FlowCharacteristicsPlot");
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
@ -79,8 +77,13 @@ RimFlowCharacteristicsPlot::RimFlowCharacteristicsPlot()
CAF_PDM_InitFieldNoDefault(&m_applyTimeSteps, "ApplyTimeSteps", "", "", "", ""); CAF_PDM_InitFieldNoDefault(&m_applyTimeSteps, "ApplyTimeSteps", "", "", "", "");
caf::PdmUiPushButtonEditor::configureEditorForField(&m_applyTimeSteps); caf::PdmUiPushButtonEditor::configureEditorForField(&m_applyTimeSteps);
CAF_PDM_InitField(&m_maxPvFraction, "CellPVThreshold", 0.1, "Aquifer Cell Threshold", "", "Exclude Aquifer Effects by adding a Cell Pore Volume Threshold as Fraction of Total Pore Volume.", ""); CAF_PDM_InitField(&m_maxPvFraction,
"CellPVThreshold",
0.1,
"Aquifer Cell Threshold",
"",
"Exclude Aquifer Effects by adding a Cell Pore Volume Threshold as Fraction of Total Pore Volume.",
"");
CAF_PDM_InitField(&m_showLegend, "ShowLegend", true, "Legend", "", "", ""); CAF_PDM_InitField(&m_showLegend, "ShowLegend", true, "Legend", "", "", "");
@ -110,13 +113,12 @@ RimFlowCharacteristicsPlot::~RimFlowCharacteristicsPlot()
deleteViewWidget(); deleteViewWidget();
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RimFlowCharacteristicsPlot::setFromFlowSolution(RimFlowDiagSolution* flowSolution) void RimFlowCharacteristicsPlot::setFromFlowSolution(RimFlowDiagSolution* flowSolution)
{ {
if ( !flowSolution ) if (!flowSolution)
{ {
m_case = nullptr; m_case = nullptr;
m_cellFilterView = nullptr; m_cellFilterView = nullptr;
@ -146,7 +148,7 @@ void RimFlowCharacteristicsPlot::deleteViewWidget()
if (m_flowCharPlotWidget) if (m_flowCharPlotWidget)
{ {
m_flowCharPlotWidget->deleteLater(); m_flowCharPlotWidget->deleteLater();
m_flowCharPlotWidget= nullptr; m_flowCharPlotWidget = nullptr;
} }
} }
@ -169,30 +171,31 @@ void RimFlowCharacteristicsPlot::updateCurrentTimeStep()
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
QList<caf::PdmOptionItemInfo> RimFlowCharacteristicsPlot::calculateValueOptions(const caf::PdmFieldHandle* fieldNeedingOptions, bool* useOptionsOnly) QList<caf::PdmOptionItemInfo> RimFlowCharacteristicsPlot::calculateValueOptions(const caf::PdmFieldHandle* fieldNeedingOptions,
bool* useOptionsOnly)
{ {
QList<caf::PdmOptionItemInfo> options; QList<caf::PdmOptionItemInfo> options;
if ( fieldNeedingOptions == &m_case ) if (fieldNeedingOptions == &m_case)
{ {
RimProject* proj = nullptr; RimProject* proj = nullptr;
this->firstAncestorOrThisOfType(proj); this->firstAncestorOrThisOfType(proj);
if ( proj ) if (proj)
{ {
std::vector<RimEclipseResultCase*> cases; std::vector<RimEclipseResultCase*> cases;
proj->descendantsIncludingThisOfType(cases); proj->descendantsIncludingThisOfType(cases);
for ( RimEclipseResultCase* c : cases ) for (RimEclipseResultCase* c : cases)
{ {
if ( c->defaultFlowDiagSolution() ) if (c->defaultFlowDiagSolution())
{ {
options.push_back(caf::PdmOptionItemInfo(c->caseUserDescription(), c, false, c->uiIcon())); options.push_back(caf::PdmOptionItemInfo(c->caseUserDescription(), c, false, c->uiIcon()));
} }
} }
} }
} }
else if ( fieldNeedingOptions == &m_cellFilterView ) else if (fieldNeedingOptions == &m_cellFilterView)
{ {
if ( m_case ) if (m_case)
{ {
for (RimEclipseView* view : m_case()->reservoirViews()) for (RimEclipseView* view : m_case()->reservoirViews())
{ {
@ -200,25 +203,26 @@ QList<caf::PdmOptionItemInfo> RimFlowCharacteristicsPlot::calculateValueOptions(
} }
} }
} }
else if ( fieldNeedingOptions == &m_flowDiagSolution ) else if (fieldNeedingOptions == &m_flowDiagSolution)
{ {
if ( m_case ) if (m_case)
{ {
std::vector<RimFlowDiagSolution*> flowSols = m_case->flowDiagSolutions(); std::vector<RimFlowDiagSolution*> flowSols = m_case->flowDiagSolutions();
options.push_back(caf::PdmOptionItemInfo("None", nullptr)); options.push_back(caf::PdmOptionItemInfo("None", nullptr));
for ( RimFlowDiagSolution* flowSol : flowSols ) for (RimFlowDiagSolution* flowSol : flowSols)
{ {
options.push_back(caf::PdmOptionItemInfo(flowSol->userDescription(), flowSol, false, flowSol->uiIcon())); options.push_back(caf::PdmOptionItemInfo(flowSol->userDescription(), flowSol, false, flowSol->uiIcon()));
} }
} }
} }
else if ( fieldNeedingOptions == &m_selectedTimeStepsUi ) else if (fieldNeedingOptions == &m_selectedTimeStepsUi)
{ {
if ( m_flowDiagSolution && m_case ) if (m_flowDiagSolution && m_case)
{ {
QStringList timeStepDates = m_case->timeStepStrings(); QStringList timeStepDates = m_case->timeStepStrings();
std::vector<int> calculatedTimeSteps = m_flowDiagSolution()->flowDiagResults()->calculatedTimeSteps(RigFlowDiagResultAddress::PHASE_ALL); std::vector<int> calculatedTimeSteps =
m_flowDiagSolution()->flowDiagResults()->calculatedTimeSteps(RigFlowDiagResultAddress::PHASE_ALL);
for (int tsIdx = 0; tsIdx < timeStepDates.size(); ++tsIdx) for (int tsIdx = 0; tsIdx < timeStepDates.size(); ++tsIdx)
{ {
auto it = std::find(calculatedTimeSteps.begin(), calculatedTimeSteps.end(), tsIdx); auto it = std::find(calculatedTimeSteps.begin(), calculatedTimeSteps.end(), tsIdx);
@ -282,8 +286,7 @@ QList<caf::PdmOptionItemInfo> RimFlowCharacteristicsPlot::calculateValueOptions(
std::sort(sortedTracerNames.begin(), std::sort(sortedTracerNames.begin(),
sortedTracerNames.end(), sortedTracerNames.end(),
[](const std::pair<QString, QString>& a, const std::pair<QString, QString>& b) -> bool [](const std::pair<QString, QString>& a, const std::pair<QString, QString>& b) -> bool {
{
return a.first < b.first; return a.first < b.first;
}); });
@ -295,7 +298,6 @@ QList<caf::PdmOptionItemInfo> RimFlowCharacteristicsPlot::calculateValueOptions(
} }
return options; return options;
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
@ -348,8 +350,7 @@ void RimFlowCharacteristicsPlot::defineUiOrdering(QString uiConfigName, caf::Pdm
{ {
caf::PdmUiGroup* regionGroup = uiOrdering.addNewGroup("Region"); caf::PdmUiGroup* regionGroup = uiOrdering.addNewGroup("Region");
regionGroup->add(&m_cellFilter); regionGroup->add(&m_cellFilter);
if (m_cellFilter() == RigFlowDiagResults::CELLS_COMMUNICATION || if (m_cellFilter() == RigFlowDiagResults::CELLS_COMMUNICATION || m_cellFilter() == RigFlowDiagResults::CELLS_DRAINED ||
m_cellFilter() == RigFlowDiagResults::CELLS_DRAINED ||
m_cellFilter() == RigFlowDiagResults::CELLS_FLOODED) m_cellFilter() == RigFlowDiagResults::CELLS_FLOODED)
{ {
regionGroup->add(&m_tracerFilter); regionGroup->add(&m_tracerFilter);
@ -365,8 +366,7 @@ void RimFlowCharacteristicsPlot::defineUiOrdering(QString uiConfigName, caf::Pdm
{ {
regionGroup->add(&m_minCommunication); regionGroup->add(&m_minCommunication);
} }
else if (m_cellFilter() == RigFlowDiagResults::CELLS_DRAINED || else if (m_cellFilter() == RigFlowDiagResults::CELLS_DRAINED || m_cellFilter() == RigFlowDiagResults::CELLS_FLOODED)
m_cellFilter() == RigFlowDiagResults::CELLS_FLOODED)
{ {
regionGroup->add(&m_maxTof); regionGroup->add(&m_maxTof);
} }
@ -386,7 +386,9 @@ void RimFlowCharacteristicsPlot::defineUiOrdering(QString uiConfigName, caf::Pdm
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RimFlowCharacteristicsPlot::defineEditorAttribute(const caf::PdmFieldHandle* field, QString uiConfigName, caf::PdmUiEditorAttribute* attribute) void RimFlowCharacteristicsPlot::defineEditorAttribute(const caf::PdmFieldHandle* field,
QString uiConfigName,
caf::PdmUiEditorAttribute* attribute)
{ {
if (field == &m_applyTimeSteps) if (field == &m_applyTimeSteps)
{ {
@ -425,11 +427,13 @@ void RimFlowCharacteristicsPlot::zoomAll()
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RimFlowCharacteristicsPlot::fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue) void RimFlowCharacteristicsPlot::fieldChangedByUi(const caf::PdmFieldHandle* changedField,
const QVariant& oldValue,
const QVariant& newValue)
{ {
RimViewWindow::fieldChangedByUi(changedField, oldValue, newValue); RimViewWindow::fieldChangedByUi(changedField, oldValue, newValue);
if ( &m_case == changedField ) if (&m_case == changedField)
{ {
m_flowDiagSolution = m_case->defaultFlowDiagSolution(); m_flowDiagSolution = m_case->defaultFlowDiagSolution();
m_currentlyPlottedTimeSteps.clear(); m_currentlyPlottedTimeSteps.clear();
@ -481,7 +485,8 @@ void RimFlowCharacteristicsPlot::fieldChangedByUi(const caf::PdmFieldHandle* cha
{ {
if (m_flowDiagSolution) if (m_flowDiagSolution)
{ {
std::vector<int> timeSteps = m_flowDiagSolution()->flowDiagResults()->calculatedTimeSteps(RigFlowDiagResultAddress::PHASE_ALL); std::vector<int> timeSteps =
m_flowDiagSolution()->flowDiagResults()->calculatedTimeSteps(RigFlowDiagResultAddress::PHASE_ALL);
if (!timeSteps.empty()) if (!timeSteps.empty())
{ {
timeStep = timeSteps[0]; timeStep = timeSteps[0];
@ -610,12 +615,8 @@ void RimFlowCharacteristicsPlot::onLoadDataAndUpdate()
} }
else else
{ {
auto flowCharResults = flowResult->flowCharacteristicsResults(timeStepIdx, auto flowCharResults = flowResult->flowCharacteristicsResults(
m_cellFilter(), timeStepIdx, m_cellFilter(), selectedTracerNames, m_maxPvFraction(), m_minCommunication(), m_maxTof());
selectedTracerNames,
m_maxPvFraction(),
m_minCommunication(),
m_maxTof());
timeStepToFlowResultMap[timeStepIdx] = flowCharResults; timeStepToFlowResultMap[timeStepIdx] = flowCharResults;
} }
lorenzVals[timeStepIdx] = timeStepToFlowResultMap[timeStepIdx].m_lorenzCoefficient; lorenzVals[timeStepIdx] = timeStepToFlowResultMap[timeStepIdx].m_lorenzCoefficient;
@ -623,9 +624,8 @@ void RimFlowCharacteristicsPlot::onLoadDataAndUpdate()
m_flowCharPlotWidget->setLorenzCurve(timeStepStrings, timeStepDates, lorenzVals); m_flowCharPlotWidget->setLorenzCurve(timeStepStrings, timeStepDates, lorenzVals);
for ( int timeStepIdx: calculatedTimesteps ) for (int timeStepIdx : calculatedTimesteps)
{ {
const auto& flowCharResults = timeStepToFlowResultMap[timeStepIdx]; const auto& flowCharResults = timeStepToFlowResultMap[timeStepIdx];
m_flowCharPlotWidget->addFlowCapStorageCapCurve(timeStepDates[timeStepIdx], m_flowCharPlotWidget->addFlowCapStorageCapCurve(timeStepDates[timeStepIdx],
@ -660,5 +660,3 @@ QWidget* RimFlowCharacteristicsPlot::createViewWidget(QWidget* mainWindowParent)
m_flowCharPlotWidget = new RiuFlowCharacteristicsPlot(this, mainWindowParent); m_flowCharPlotWidget = new RiuFlowCharacteristicsPlot(this, mainWindowParent);
return m_flowCharPlotWidget; return m_flowCharPlotWidget;
} }