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

#4062 #4081 Make time and case diff apply immediately and don't change variable name

Browse Source 
* Instead show the change in the Result label, legend and info box.
This commit is contained in:
Gaute Lindkvist
2019-02-15 09:37:17 +01:00
parent 69bbf6921c
commit 833a29c3c2
8 changed files with 286 additions and 254 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
ApplicationCode/ProjectDataModel/RimEclipseResultDefinition.h
View File

@@ -93,6 +93,10 @@ public:
QString resultVariableUiName() const;
QString resultVariableUiShortName() const;
QString diffResultUiName() const;
QString diffResultUiShortName() const;
QString diffResultUiShortNameHTML() const;
void loadResult();
RigEclipseResultAddress eclipseResultAddress() const;
bool hasStaticResult() const;
@@ -116,7 +120,7 @@ public:
void updateUiFieldsFromActiveResult();
void enableUiForDerivedDifferenceResults();
void setDiffResultOptionsEnabled(bool enabled);
protected:
virtual void updateLegendCategorySettings() {};
@@ -150,9 +154,6 @@ protected:
caf::PdmField< caf::AppEnum< RiaDefines::ResultCatType > > m_resultTypeUiField;
caf::PdmField< caf::AppEnum< RiaDefines::PorosityModelType > > m_porosityModelUiField;
caf::PdmField<QString> m_resultVariableUiField;
caf::PdmField<int> m_timeLapseBaseTimestepUiField;
caf::PdmPtrField<RimEclipseCase*> m_differenceCaseUiField;
caf::PdmField< caf::AppEnum< FlowTracerSelectionType > > m_flowTracerSelectionMode;
caf::PdmPtrField<RimFlowDiagSolution*> m_flowSolutionUiField;
@@ -182,10 +183,6 @@ private:
QString flowDiagResUiText(bool shortLabel, int maxTracerStringLength = std::numeric_limits<int>::max()) const;
static QString timeDiffResultName(const QString& resultName, int timeStepIndex);
static QString caseDiffResultName(const QString& resultName, int caseId);
QString convertToTimeOrCaseDiffUiVarName(const QString& resultName);
QList<caf::PdmOptionItemInfo> calcOptionsForVariableUiFieldStandard();
QList<caf::PdmOptionItemInfo> calcOptionsForSelectedTracerField(bool injector);
@@ -207,9 +204,13 @@ private:
void syncInjectorToProducerSelection();
void syncProducerToInjectorSelection();
bool enableDiffResultOptions() const;
bool isTimeDiffResultAvailable() const;
bool isTimeDiffResult() const;
bool isCaseDifferenceResult() const;
bool isCaseDiffResultAvailable() const;
bool isCaseDiffResult() const;
bool m_showUiForDerivedDifferenceResults;
private:
bool m_diffResultOptionsEnabled;
};