#924 Cleaned up includes and use RimGeoMechResultDefinition instead of RimGeoMechCellColors

This commit is contained in:
Magne Sjaastad
2016-10-18 07:31:02 +02:00
parent 941eed6625
commit 649c11efcb
12 changed files with 91 additions and 79 deletions

View File

@@ -24,12 +24,12 @@
#include "RimGeoMechPropertyFilterCollection.h"
#include "RimGeoMechView.h"
#include "RimGeoMechResultDefinition.h"
#include "RimGeoMechCellColors.h"
#include "RiuMainWindow.h"
#include "cafSelectionManager.h"
#include "cvfAssert.h"
#include "RiuMainWindow.h"
//--------------------------------------------------------------------------------------------------
///
@@ -125,7 +125,7 @@ void RicGeoMechPropertyFilterFeatureImpl::setDefaults(RimGeoMechPropertyFilter*
CVF_ASSERT(reservoirView);
propertyFilter->resultDefinition->setGeoMechCase(reservoirView->geoMechCase());
propertyFilter->resultDefinition->setResultAddress(reservoirView->cellResult()->resultAddress());
propertyFilter->resultDefinition->setResultAddress(reservoirView->cellResultResultDefinition()->resultAddress());
propertyFilter->resultDefinition->loadResult();
propertyFilter->setToDefaultValues();
propertyFilter->updateFilterName();