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

(#314) Regenerating the display model when changing results in property filter

Browse Source 
Max and min values would be updated in the GUI for the newly selected
result, but the display model wasn't updated. This has now been fixed.
This commit is contained in:
Pål Hagen
2015-06-23 11:18:37 +02:00
parent 515fb8b8d7
commit 3c408f4ee8
2 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
ApplicationCode/ProjectDataModel/RimGeoMechPropertyFilter.cpp
View File

@@ -29,16 +29,6 @@
#include "RigGeoMechCaseData.h" #include "RigGeoMechCaseData.h"
#include "RimGeoMechView.h" #include "RimGeoMechView.h"
/*
#include "RigCaseCellResultsData.h"
#include "RimCellPropertyFilterCollection.h"
#include "RimReservoirCellResultsStorage.h"
#include "RimResultDefinition.h"
#include "cafPdmUiDoubleSliderEditor.h"
#include "cvfAssert.h"
*/
CAF_PDM_SOURCE_INIT(RimGeoMechPropertyFilter, "GeoMechPropertyFilter"); CAF_PDM_SOURCE_INIT(RimGeoMechPropertyFilter, "GeoMechPropertyFilter");

16
ApplicationCode/ProjectDataModel/RimGeoMechResultDefinition.cpp
View File

@@ -189,9 +189,11 @@ void RimGeoMechResultDefinition::fieldChangedByUi(const caf::PdmFieldHandle* cha
if (m_propertyFilter) if (m_propertyFilter)
{ {
m_propertyFilter->updateDefaultValues(); m_propertyFilter->updateDefaultValues();
((RimView*)reservoirView())->scheduleGeometryRegen(PROPERTY_FILTERED);
} }
m_reservoirView->createDisplayModelAndRedraw(); reservoirView()->scheduleCreateDisplayModelAndRedraw();
} }
} }
@@ -218,6 +220,9 @@ std::map<std::string, std::vector<std::string> > RimGeoMechResultDefinition::get
} }
} }
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimGeoMechResultDefinition::getUiAndResultVariableStringList(QStringList* uiNames, QStringList* variableNames, void RimGeoMechResultDefinition::getUiAndResultVariableStringList(QStringList* uiNames, QStringList* variableNames,
const std::map<std::string, std::vector<std::string> >& fieldCompNames) const std::map<std::string, std::vector<std::string> >& fieldCompNames)
{ {
@@ -246,6 +251,9 @@ void RimGeoMechResultDefinition::getUiAndResultVariableStringList(QStringList* u
} }
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
QString RimGeoMechResultDefinition::composeUiVarString(const QString& resultFieldName, const QString& resultComponentName) QString RimGeoMechResultDefinition::composeUiVarString(const QString& resultFieldName, const QString& resultComponentName)
{ {
return resultFieldName + " " + resultComponentName; return resultFieldName + " " + resultComponentName;
@@ -319,11 +327,17 @@ QString RimGeoMechResultDefinition::convertToUiResultFieldName(QString resultFie
return resultFieldName; return resultFieldName;
} }
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimGeoMechResultDefinition::setOwnerPropertyFilter( RimGeoMechPropertyFilter* propertyFilter ) void RimGeoMechResultDefinition::setOwnerPropertyFilter( RimGeoMechPropertyFilter* propertyFilter )
{ {
m_propertyFilter = propertyFilter; m_propertyFilter = propertyFilter;
} }
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimGeoMechResultDefinition::setResultAddress( const RigFemResultAddress& resultAddress ) void RimGeoMechResultDefinition::setResultAddress( const RigFemResultAddress& resultAddress )
{ {
m_resultPositionType = resultAddress.resultPosType; m_resultPositionType = resultAddress.resultPosType;