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

#1805 Better naming of cell filter options in flow characteristics plot

Browse Source
This commit is contained in:
Bjørnar Grip Fjær 2017-08-21 11:42:08 +02:00
parent 172eb2ed14
commit 3658811ed2
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ApplicationCode/ProjectDataModel/Flow/RimFlowCharacteristicsPlot.h
View File

@ -94,7 +94,7 @@ private:
caf::PdmField<bool> m_showLegend; caf::PdmField<bool> m_showLegend;
caf::PdmField<double> m_maxPvFraction; caf::PdmField<double> m_maxPvFraction;
caf::PdmField<RigFlowDiagResults::CellSelectionEnum> m_cellFilter; caf::PdmField<RigFlowDiagResults::CellFilterEnum> m_cellFilter;
caf::PdmField<QString> m_tracerFilter; caf::PdmField<QString> m_tracerFilter;
caf::PdmField< std::vector<QString> > m_selectedTracerNames; caf::PdmField< std::vector<QString> > m_selectedTracerNames;
caf::PdmField<bool> m_showRegion; caf::PdmField<bool> m_showRegion;

12
ApplicationCode/ReservoirDataModel/RigFlowDiagResults.cpp
View File

@ -34,12 +34,12 @@
namespace caf namespace caf
{ {
template<> template<>
void RigFlowDiagResults::CellSelectionEnum::setUp() void RigFlowDiagResults::CellFilterEnum::setUp()
{ {
addItem(RigFlowDiagResults::CELLS_ACTIVE, "CELLS_ACTIVE", "Active cells"); addItem(RigFlowDiagResults::CELLS_ACTIVE, "CELLS_ACTIVE", "All Active cells");
addItem(RigFlowDiagResults::CELLS_COMMUNICATION, "CELLS_COMMUNICATION", "Communication cells"); addItem(RigFlowDiagResults::CELLS_COMMUNICATION, "CELLS_COMMUNICATION", "Injector Producer Communication");
addItem(RigFlowDiagResults::CELLS_FLOODED, "CELLS_FLOODED", "Flooded cells"); addItem(RigFlowDiagResults::CELLS_FLOODED, "CELLS_FLOODED", "Flooded by Injector");
addItem(RigFlowDiagResults::CELLS_DRAINED, "CELLS_DRAINED", "Drained cells"); addItem(RigFlowDiagResults::CELLS_DRAINED, "CELLS_DRAINED", "Drained by Producer");
setDefault(RigFlowDiagResults::CELLS_ACTIVE); setDefault(RigFlowDiagResults::CELLS_ACTIVE);
} }
} }
@ -692,7 +692,7 @@ std::vector<int> RigFlowDiagResults::calculatedTimeSteps(RigFlowDiagResultAddres
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
RigFlowDiagSolverInterface::FlowCharacteristicsResultFrame RigFlowDiagResults::flowCharacteristicsResults(int frameIndex, RigFlowDiagSolverInterface::FlowCharacteristicsResultFrame RigFlowDiagResults::flowCharacteristicsResults(int frameIndex,
CellSelection cellSelection, CellFilter cellSelection,
const std::vector<QString>& tracerNames, const std::vector<QString>& tracerNames,
double max_pv_fraction) double max_pv_fraction)
{ {

6
ApplicationCode/ReservoirDataModel/RigFlowDiagResults.h
View File

@ -41,7 +41,7 @@ class RigFlowDiagResults: public cvf::Object
{ {
public: public:
enum CellSelection enum CellFilter
{ {
CELLS_ACTIVE, CELLS_ACTIVE,
CELLS_COMMUNICATION, CELLS_COMMUNICATION,
@ -49,7 +49,7 @@ public:
CELLS_DRAINED CELLS_DRAINED
}; };
typedef caf::AppEnum<CellSelection> CellSelectionEnum; typedef caf::AppEnum<CellFilter> CellFilterEnum;
public: public:
RigFlowDiagResults(RimFlowDiagSolution* flowSolution, size_t timeStepCount); RigFlowDiagResults(RimFlowDiagSolution* flowSolution, size_t timeStepCount);
virtual ~RigFlowDiagResults(); virtual ~RigFlowDiagResults();
@ -80,7 +80,7 @@ public:
RigFlowDiagSolverInterface::FlowCharacteristicsResultFrame flowCharacteristicsResults(int frameIndex, RigFlowDiagSolverInterface::FlowCharacteristicsResultFrame flowCharacteristicsResults(int frameIndex,
CellSelection cellSelection, CellFilter cellSelection,
const std::vector<QString>& tracerNames, const std::vector<QString>& tracerNames,
double max_pv_fraction); double max_pv_fraction);