mirror of
https://github.com/OPM/ResInsight.git
synced 2025-02-11 16:06:04 -06:00
commit
8e93fee5a5
@ -1579,8 +1579,8 @@ void RiaGuiApplication::applyGuiPreferences( const RiaPreferences* oldPreference
|
||||
existingViewsWithCustomColors = true;
|
||||
}
|
||||
if ( m_preferences->defaultScaleFactorZ() != oldPreferences->defaultScaleFactorZ() &&
|
||||
rim3dView->scaleZ() != static_cast<double>( oldPreferences->defaultScaleFactorZ ) &&
|
||||
rim3dView->scaleZ() != static_cast<double>( m_preferences->defaultScaleFactorZ ) )
|
||||
rim3dView->scaleZ() != static_cast<double>( oldPreferences->defaultScaleFactorZ() ) &&
|
||||
rim3dView->scaleZ() != static_cast<double>( m_preferences->defaultScaleFactorZ() ) )
|
||||
{
|
||||
existingViewsWithCustomZScale = true;
|
||||
}
|
||||
|
@ -90,7 +90,7 @@ CAF_PDM_SOURCE_INIT( RiaPreferences, "RiaPreferences" );
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
RiaPreferences::RiaPreferences( void )
|
||||
{
|
||||
CAF_PDM_InitField( &navigationPolicy,
|
||||
CAF_PDM_InitField( &m_navigationPolicy,
|
||||
"navigationPolicy",
|
||||
caf::AppEnum<RiaGuiApplication::RINavigationPolicy>( RiaGuiApplication::NAVIGATION_POLICY_RMS ),
|
||||
"Navigation Mode",
|
||||
@ -151,7 +151,7 @@ RiaPreferences::RiaPreferences( void )
|
||||
CAF_PDM_InitField( &ssihubAddress, "ssihubAddress", QString( "http://" ), "SSIHUB Address", "", "", "" );
|
||||
ssihubAddress.uiCapability()->setUiLabelPosition( caf::PdmUiItemInfo::TOP );
|
||||
|
||||
CAF_PDM_InitFieldNoDefault( &defaultMeshModeType, "defaultMeshModeType", "Show Grid Lines", "", "", "" );
|
||||
CAF_PDM_InitFieldNoDefault( &m_defaultMeshModeType, "defaultMeshModeType", "Show Grid Lines", "", "", "" );
|
||||
CAF_PDM_InitField( &defaultGridLineColors,
|
||||
"defaultGridLineColors",
|
||||
RiaColorTables::defaultGridLineColor(),
|
||||
@ -182,7 +182,7 @@ RiaPreferences::RiaPreferences( void )
|
||||
"The viewer background color for new views",
|
||||
"" );
|
||||
|
||||
CAF_PDM_InitField( &defaultScaleFactorZ, "defaultScaleFactorZ", 5, "Default Z Scale Factor", "", "", "" );
|
||||
CAF_PDM_InitField( &m_defaultScaleFactorZ, "defaultScaleFactorZ", 5, "Default Z Scale Factor", "", "", "" );
|
||||
|
||||
caf::AppEnum<RiaFontCache::FontSize> fontSize = RiaFontCache::FONT_SIZE_8;
|
||||
caf::AppEnum<RiaFontCache::FontSize> plotFontSize = RiaFontCache::FONT_SIZE_10;
|
||||
@ -234,8 +234,11 @@ RiaPreferences::RiaPreferences( void )
|
||||
"" );
|
||||
m_includeFractureDebugInfoFile.uiCapability()->setUiLabelPosition( caf::PdmUiItemInfo::HIDDEN );
|
||||
|
||||
CAF_PDM_InitField( &showLegendBackground, "showLegendBackground", true, "Show Box around Legends", "", "", "" );
|
||||
showLegendBackground.uiCapability()->setUiLabelPosition( caf::PdmUiItemInfo::HIDDEN );
|
||||
CAF_PDM_InitField( &m_showLegendBackground, "showLegendBackground", true, "Show Box around Legends", "", "", "" );
|
||||
m_showLegendBackground.uiCapability()->setUiLabelPosition( caf::PdmUiItemInfo::HIDDEN );
|
||||
|
||||
CAF_PDM_InitField( &m_enableFaultsByDefault, "enableFaultsByDefault", true, "Enable Faults By Default", "", "", "" );
|
||||
m_enableFaultsByDefault.uiCapability()->setUiLabelPosition( caf::PdmUiItemInfo::HIDDEN );
|
||||
|
||||
CAF_PDM_InitFieldNoDefault( &lastUsedProjectFileName, "lastUsedProjectFileName", "Last Used Project File", "", "", "" );
|
||||
lastUsedProjectFileName.uiCapability()->setUiHidden( true );
|
||||
@ -434,8 +437,9 @@ void RiaPreferences::defineEditorAttribute( const caf::PdmFieldHandle* field,
|
||||
field == &m_showTestToolbar || field == &m_includeFractureDebugInfoFile ||
|
||||
field == &showLasCurveWithoutTvdWarning || field == &holoLensDisableCertificateVerification ||
|
||||
field == &m_showProjectChangedDialog || field == &m_searchPlotTemplateFoldersRecursively ||
|
||||
field == &showLegendBackground || field == &m_showSummaryTimeAsLongString ||
|
||||
field == &m_showViewIdInProjectTree || field == &m_useMultipleThreadsWhenLoadingSummaryData )
|
||||
field == &m_showLegendBackground || field == &m_showSummaryTimeAsLongString ||
|
||||
field == &m_showViewIdInProjectTree || field == &m_useMultipleThreadsWhenLoadingSummaryData ||
|
||||
field == &m_enableFaultsByDefault )
|
||||
{
|
||||
caf::PdmUiCheckBoxEditorAttribute* myAttr = dynamic_cast<caf::PdmUiCheckBoxEditorAttribute*>( attribute );
|
||||
if ( myAttr )
|
||||
@ -479,10 +483,11 @@ void RiaPreferences::defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering&
|
||||
fontGroup->add( &defaultPlotFontSize, false );
|
||||
|
||||
caf::PdmUiGroup* viewsGroup = uiOrdering.addNewGroup( "3d Views" );
|
||||
viewsGroup->add( &defaultMeshModeType );
|
||||
viewsGroup->add( &navigationPolicy );
|
||||
viewsGroup->add( &defaultScaleFactorZ );
|
||||
viewsGroup->add( &showLegendBackground );
|
||||
viewsGroup->add( &m_defaultMeshModeType );
|
||||
viewsGroup->add( &m_navigationPolicy );
|
||||
viewsGroup->add( &m_defaultScaleFactorZ );
|
||||
viewsGroup->add( &m_showLegendBackground );
|
||||
viewsGroup->add( &m_enableFaultsByDefault );
|
||||
|
||||
caf::PdmUiGroup* otherGroup = uiOrdering.addNewGroup( "Other" );
|
||||
otherGroup->add( &ssihubAddress );
|
||||
@ -995,3 +1000,43 @@ QMarginsF RiaPreferences::margins() const
|
||||
{
|
||||
return QMarginsF( m_pageLeftMargin, m_pageTopMargin, m_pageRightMargin, m_pageBottomMargin );
|
||||
}
|
||||
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
RiaDefines::MeshModeType RiaPreferences::defaultMeshModeType() const
|
||||
{
|
||||
return m_defaultMeshModeType();
|
||||
}
|
||||
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
RiaGuiApplication::RINavigationPolicy RiaPreferences::navigationPolicy() const
|
||||
{
|
||||
return m_navigationPolicy();
|
||||
}
|
||||
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
int RiaPreferences::defaultScaleFactorZ() const
|
||||
{
|
||||
return m_defaultScaleFactorZ();
|
||||
}
|
||||
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
bool RiaPreferences::showLegendBackground() const
|
||||
{
|
||||
return m_showLegendBackground();
|
||||
}
|
||||
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
bool RiaPreferences::enableFaultsByDefault() const
|
||||
{
|
||||
return m_enableFaultsByDefault;
|
||||
}
|
||||
|
@ -71,6 +71,8 @@ public:
|
||||
typedef caf::AppEnum<QPageSize::PageSizeId> PageSizeEnum;
|
||||
typedef caf::AppEnum<QPageLayout::Orientation> PageOrientationEnum;
|
||||
|
||||
bool enableFaultsByDefault() const;
|
||||
|
||||
public:
|
||||
RiaPreferences( void );
|
||||
~RiaPreferences( void ) override;
|
||||
@ -107,9 +109,13 @@ public:
|
||||
QPageLayout defaultPageLayout() const;
|
||||
QMarginsF margins() const;
|
||||
|
||||
public: // Pdm Fields
|
||||
caf::PdmField<caf::AppEnum<RiaGuiApplication::RINavigationPolicy>> navigationPolicy;
|
||||
// 3D view
|
||||
RiaDefines::MeshModeType defaultMeshModeType() const;
|
||||
RiaGuiApplication::RINavigationPolicy navigationPolicy() const;
|
||||
int defaultScaleFactorZ() const;
|
||||
bool showLegendBackground() const;
|
||||
|
||||
public: // Pdm Fields
|
||||
caf::PdmField<bool> enableGrpcServer;
|
||||
caf::PdmField<int> defaultGrpcPortNumber;
|
||||
|
||||
@ -124,9 +130,6 @@ public: // Pdm Fields
|
||||
|
||||
caf::PdmField<QString> ssihubAddress;
|
||||
|
||||
caf::PdmField<caf::AppEnum<RiaDefines::MeshModeType>> defaultMeshModeType;
|
||||
|
||||
caf::PdmField<int> defaultScaleFactorZ;
|
||||
caf::PdmField<cvf::Color3f> defaultGridLineColors;
|
||||
caf::PdmField<cvf::Color3f> defaultFaultGridLineColors;
|
||||
caf::PdmField<cvf::Color3f> defaultViewerBackgroundColor;
|
||||
@ -138,8 +141,6 @@ public: // Pdm Fields
|
||||
caf::PdmField<FontSizeType> defaultAnnotationFontSize;
|
||||
caf::PdmField<FontSizeType> defaultPlotFontSize;
|
||||
|
||||
caf::PdmField<bool> showLegendBackground;
|
||||
|
||||
caf::PdmField<QString> lastUsedProjectFileName;
|
||||
|
||||
caf::PdmField<bool> autocomputeDepthRelatedProperties;
|
||||
@ -208,6 +209,13 @@ private:
|
||||
caf::PdmField<bool> m_searchPlotTemplateFoldersRecursively;
|
||||
caf::PdmField<caf::FilePath> m_defaultPlotTemplate;
|
||||
|
||||
// 3d view
|
||||
caf::PdmField<caf::AppEnum<RiaDefines::MeshModeType>> m_defaultMeshModeType;
|
||||
caf::PdmField<caf::AppEnum<RiaGuiApplication::RINavigationPolicy>> m_navigationPolicy;
|
||||
caf::PdmField<int> m_defaultScaleFactorZ;
|
||||
caf::PdmField<bool> m_showLegendBackground;
|
||||
caf::PdmField<bool> m_enableFaultsByDefault;
|
||||
|
||||
QStringList m_tabNames;
|
||||
|
||||
caf::PdmField<FontSizeType> m_defaultSceneFontSize_OBSOLETE;
|
||||
|
@ -106,7 +106,7 @@ Rim3dView::Rim3dView( void )
|
||||
|
||||
CAF_PDM_InitField( &isPerspectiveView, "PerspectiveProjection", true, "Perspective Projection", "", "", "" );
|
||||
|
||||
double defaultScaleFactor = preferences->defaultScaleFactorZ;
|
||||
double defaultScaleFactor = preferences->defaultScaleFactorZ();
|
||||
CAF_PDM_InitField( &scaleZ, "GridZScale", defaultScaleFactor, "Z Scale", "", "Scales the scene in the Z direction", "" );
|
||||
|
||||
cvf::Color3f defBackgColor = preferences->defaultViewerBackgroundColor();
|
||||
|
@ -48,6 +48,7 @@
|
||||
#include "RimEclipsePropertyFilterCollection.h"
|
||||
#include "RimEclipseStatisticsCase.h"
|
||||
#include "RimEclipseView.h"
|
||||
#include "RimFaultInViewCollection.h"
|
||||
#include "RimFormationNames.h"
|
||||
#include "RimGridCollection.h"
|
||||
#include "RimIntersectionCollection.h"
|
||||
@ -288,11 +289,14 @@ RimEclipseView* RimEclipseCase::createAndAddReservoirView()
|
||||
{
|
||||
rimEclipseView->cellResult()->setResultType( RiaDefines::DYNAMIC_NATIVE );
|
||||
|
||||
if ( RiaApplication::instance()->preferences()->loadAndShowSoil )
|
||||
auto prefs = RiaApplication::instance()->preferences();
|
||||
if ( prefs->loadAndShowSoil )
|
||||
{
|
||||
rimEclipseView->cellResult()->setResultVariable( "SOIL" );
|
||||
}
|
||||
|
||||
rimEclipseView->faultCollection()->showFaultCollection = prefs->enableFaultsByDefault();
|
||||
|
||||
rimEclipseView->hasUserRequestedAnimation = true;
|
||||
|
||||
rimEclipseView->cellEdgeResult()->setResultVariable( "MULT" );
|
||||
|
Loading…
Reference in New Issue
Block a user