mirror of
https://github.com/OPM/ResInsight.git
synced 2026-10-12 16:32:12 -05:00
Improve grid cell calculator
* Use full name for grid case view * FIx signed / unsigned issue * Support drag/drop of file names into Main Window * Add function to check if two grid cases are of equal size * Result Info: Show cell result text for all linked views * Improve how to specify cells to be included in calculation - move view filter to calculation - improve how to assign values to non-visible cells - avoid computation between grids of different size Closes #9482
This commit is contained in:
1 parent
ffc3830110
commit
e7c864c6d8
18 files changed
+392
-180
No files matched your search
@@ -25,10 +25,10 @@
|
||||
#include "cafPdmField.h"
|
||||
#include "cafPdmObject.h"
|
||||
#include "cafPdmPtrField.h"
|
||||
#include "cafSignal.h"
|
||||
|
||||
class RimEclipseCase;
|
||||
class RimEclipseResultAddress;
|
||||
class RimGridView;
|
||||
class RigCaseCellResultsData;
|
||||
|
||||
//==================================================================================================
|
||||
@@ -40,27 +40,16 @@ class RimGridCalculationVariable : public RimUserDefinedCalculationVariable
|
||||
CAF_PDM_HEADER_INIT;
|
||||
|
||||
public:
|
||||
enum class DefaultValueType
|
||||
{
|
||||
POSITIVE_INFINITY,
|
||||
FROM_PROPERTY,
|
||||
USER_DEFINED
|
||||
};
|
||||
|
||||
RimGridCalculationVariable();
|
||||
|
||||
caf::Signal<> eclipseResultChanged;
|
||||
|
||||
QString displayString() const override;
|
||||
|
||||
RimEclipseCase* eclipseCase() const;
|
||||
RiaDefines::ResultCatType resultCategoryType() const;
|
||||
QString resultVariable() const;
|
||||
int timeStep() const;
|
||||
RimGridView* cellFilterView() const;
|
||||
double defaultValue() const;
|
||||
DefaultValueType defaultValueType() const;
|
||||
|
||||
using DefaultValueConfig = std::pair<RimGridCalculationVariable::DefaultValueType, double>;
|
||||
DefaultValueConfig defaultValueConfiguration() const;
|
||||
|
||||
static int allTimeStepsValue();
|
||||
|
||||
@@ -81,7 +70,4 @@ private:
|
||||
caf::PdmField<caf::AppEnum<RiaDefines::ResultCatType>> m_resultType;
|
||||
caf::PdmField<QString> m_resultVariable;
|
||||
caf::PdmField<int> m_timeStep;
|
||||
caf::PdmPtrField<RimGridView*> m_cellFilterView;
|
||||
caf::PdmField<caf::AppEnum<DefaultValueType>> m_defaultValueType;
|
||||
caf::PdmField<double> m_defaultValue;
|
||||
};
|
||||
Reference in new issue
Block a user