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 Connected the Property filter code together.

Browse Source 
Now working !
This commit is contained in:
Jacob Støren
2015-06-22 21:57:52 +02:00
parent 6191422103
commit 515fb8b8d7
3 changed files with 19 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ApplicationCode/ModelVisualization/RivGeoMechVizLogic.cpp
View File

@@ -33,6 +33,7 @@
#include "RivCellSetEnum.h"
#include "RivFemElmVisibilityCalculator.h"
#include "RigFemPartResultsCollection.h"
#include "RimGeoMechPropertyFilterCollection.h"
//--------------------------------------------------------------------------------------------------
///
@@ -124,7 +125,7 @@ std::vector<RivGeoMechPartMgrCache::Key> RivGeoMechVizLogic::keysToVisiblePartMg
{
std::vector<RivGeoMechPartMgrCache::Key> visiblePartMgrs;
if (false)//m_geomechView->propertyFilterCollection()->hasActiveFilters())
if (timeStepIndex >= 0 && m_geomechView->propertyFilterCollection()->hasActiveFilters())
{
visiblePartMgrs.push_back(RivGeoMechPartMgrCache::Key(PROPERTY_FILTERED, timeStepIndex));
}
@@ -181,8 +182,7 @@ RivGeoMechPartMgr* RivGeoMechVizLogic::getUpdatedPartMgr(RivGeoMechPartMgrCache:
caseData->femParts()->part(femPartIdx),
pMgrKey.frameIndex(),
rangeFiltVisibility.p(),
NULL
//m_geomechView->propertyFilterCollection()
m_geomechView->propertyFilterCollection()
);
}
else