#1807 Add option to use visible cells in view as region selection in flow characteristics plot

This commit is contained in:
Bjørnar Grip Fjær
2017-08-24 09:27:08 +02:00
parent ee5a2530fd
commit 5ead49e01e
13 changed files with 173 additions and 18 deletions

View File

@@ -28,6 +28,7 @@
#include "cvfBase.h"
#include "cvfObject.h"
#include "cvfArray.h"
#include <vector>
#include <map>
@@ -44,9 +45,10 @@ public:
enum CellFilter
{
CELLS_ACTIVE,
CELLS_VISIBLE,
CELLS_COMMUNICATION,
CELLS_FLOODED,
CELLS_DRAINED
CELLS_DRAINED,
};
typedef caf::AppEnum<CellFilter> CellFilterEnum;
@@ -84,6 +86,10 @@ public:
const std::vector<QString>& tracerNames,
double max_pv_fraction);
RigFlowDiagSolverInterface::FlowCharacteristicsResultFrame flowCharacteristicsResults(int frameIndex,
const std::vector<char>& visibleActiveCells,
double max_pv_fraction);
private:
const std::vector<double>* findOrCalculateResult (const RigFlowDiagResultAddress& resVarAddr, size_t frameIndex);
void calculateNativeResultsIfNotPreviouslyAttempted(size_t frameIndex, RigFlowDiagResultAddress::PhaseSelection phaseSelection);