#4117 Refactor Grid Cross plot result extraction and categorisation

This commit is contained in:
Gaute Lindkvist
2019-02-27 10:57:17 +01:00
parent b6348b8374
commit 1b9a0fe5a7
10 changed files with 383 additions and 240 deletions

View File

@@ -17,17 +17,36 @@
/////////////////////////////////////////////////////////////////////////////////
#pragma once
#include "RigGridCrossPlotCurveCategorization.h"
#include <map>
#include <utility>
#include <vector>
class RigEclipseCaseData;
class RigEclipseResultAddress;
class RigEclipseCrossPlotDataExtractor
class QString;
struct RigEclipseCrossPlotResult
{
static std::vector<std::pair<double, double>> extract(RigEclipseCaseData* caseData,
int timeStep,
const RigEclipseResultAddress& xAxisProperty,
const RigEclipseResultAddress& yAxisProperty);
typedef std::pair<std::vector<double>, std::vector<double>> ResultXYValues;
typedef std::map<int, ResultXYValues> CategorySamplesMap;
typedef std::map<int, QString> CategoryNameMap;
CategorySamplesMap categorySamplesMap;
CategoryNameMap categoryNameMap;
};
class RigEclipseCrossPlotDataExtractor
{
public:
static RigEclipseCrossPlotResult extract(RigEclipseCaseData* eclipseCase,
int resultTimeStep,
const RigEclipseResultAddress& xAddress,
const RigEclipseResultAddress& yAddress,
RigGridCrossPlotCurveCategorization categorizationType,
const RigEclipseResultAddress& categoryAddress,
int categoryBinCount);
};