Preferences: Read faults on import and fault default visibility

This commit is contained in:
Magne Sjaastad
2013-12-20 08:48:54 +01:00
parent d165d6ce38
commit b7141dde50
6 changed files with 62 additions and 28 deletions

View File

@@ -62,7 +62,8 @@ RimFaultCollection::RimFaultCollection()
{
CAF_PDM_InitObject("Faults", ":/draw_style_faults_24x24.png", "", "");
CAF_PDM_InitField(&showFaultCollection, "Active", true, "Active", "", "", "");
RiaPreferences* prefs = RiaApplication::instance()->preferences();
CAF_PDM_InitField(&showFaultCollection, "Active", prefs->defaultShowFaults(), "Active", "", "", "");
showFaultCollection.setUiHidden(true);
CAF_PDM_InitField(&showGeometryDetectedFaults, "ShowGeometryDetectedFaults", false, "Show geometry detected faults", "", "", "");

View File

@@ -44,6 +44,7 @@
#include "Rim3dOverlayInfoConfig.h"
#include "RimOilField.h"
#include "RimAnalysisModels.h"
#include "RiaPreferences.h"
CAF_PDM_SOURCE_INIT(RimResultCase, "EclipseCase");
//--------------------------------------------------------------------------------------------------
@@ -97,10 +98,15 @@ bool RimResultCase::openEclipseGridFile()
return false;
}
cvf::ref<RigCaseData> eclipseCase = new RigCaseData;
readerInterface = new RifReaderEclipseOutput;
cvf::ref<RifReaderEclipseOutput> outputInterface = new RifReaderEclipseOutput;
RiaPreferences* prefs = RiaApplication::instance()->preferences();
outputInterface->enableFaultsImport(prefs->enableFaultsImport());
readerInterface = outputInterface;
readerInterface->setFilenamesWithFaults(this->filesContainingFaults());
cvf::ref<RigCaseData> eclipseCase = new RigCaseData;
if (!readerInterface->open(caseFileName(), eclipseCase.p()))
{
return false;