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

#6388 Surface Import : Add coarsening distance to preferences

Browse Source
This commit is contained in:
Magne Sjaastad
2020-09-10 11:39:23 +02:00
committed by rubenthoms
parent a02abcde14
commit a6f77cdd32
2 changed files with 35 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
ApplicationCode/Application/RiaPreferences.cpp
View File

@@ -370,6 +370,14 @@ RiaPreferences::RiaPreferences( void )
m_openExportedPdfInViewer.uiCapability()->setUiLabelPosition( caf::PdmUiItemInfo::HIDDEN ); m_openExportedPdfInViewer.uiCapability()->setUiLabelPosition( caf::PdmUiItemInfo::HIDDEN );
CAF_PDM_InitField( &m_gtestFilter, "gtestFilter", QString(), "Unit Test Filter (gtest)", "", "", "" ); CAF_PDM_InitField( &m_gtestFilter, "gtestFilter", QString(), "Unit Test Filter (gtest)", "", "", "" );
CAF_PDM_InitField( &m_surfaceImportResamplingDistance,
"SurfaceImportResamplingDistance",
100.0,
"Surface Import Coarsening",
"",
"Defines preferred minimum distance between surface points in XY-plane",
"" );
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
@@ -552,6 +560,10 @@ void RiaPreferences::defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering&
uiOrdering.add( &csvTextExportFieldSeparator ); uiOrdering.add( &csvTextExportFieldSeparator );
uiOrdering.add( &m_openExportedPdfInViewer ); uiOrdering.add( &m_openExportedPdfInViewer );
} }
else if ( uiConfigName == RiaPreferences::tabNameImport() )
{
uiOrdering.add( &m_surfaceImportResamplingDistance );
}
else if ( RiaApplication::enableDevelopmentFeatures() && uiConfigName == RiaPreferences::tabNameSystem() ) else if ( RiaApplication::enableDevelopmentFeatures() && uiConfigName == RiaPreferences::tabNameSystem() )
{ {
{ {
@@ -708,6 +720,14 @@ QString RiaPreferences::tabNameSystem()
return "System"; return "System";
} }
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
QString RiaPreferences::tabNameImport()
{
return "Import";
}
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
@@ -736,6 +756,7 @@ QStringList RiaPreferences::tabNames()
names << tabNamePlotting(); names << tabNamePlotting();
names << tabNameScripting(); names << tabNameScripting();
names << tabNameExport(); names << tabNameExport();
names << tabNameImport();
if ( RiaApplication::enableDevelopmentFeatures() ) if ( RiaApplication::enableDevelopmentFeatures() )
{ {
@@ -1000,6 +1021,14 @@ QMarginsF RiaPreferences::margins() const
return QMarginsF( m_pageLeftMargin, m_pageTopMargin, m_pageRightMargin, m_pageBottomMargin ); return QMarginsF( m_pageLeftMargin, m_pageTopMargin, m_pageRightMargin, m_pageBottomMargin );
} }
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
double RiaPreferences::surfaceImportResamplingDistance() const
{
return m_surfaceImportResamplingDistance;
}
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------

6
ApplicationCode/Application/RiaPreferences.h
View File

@@ -118,6 +118,8 @@ public:
QPageLayout defaultPageLayout() const; QPageLayout defaultPageLayout() const;
QMarginsF margins() const; QMarginsF margins() const;
double surfaceImportResamplingDistance() const;
// 3D view // 3D view
RiaDefines::MeshModeType defaultMeshModeType() const; RiaDefines::MeshModeType defaultMeshModeType() const;
RiaGuiApplication::RINavigationPolicy navigationPolicy() const; RiaGuiApplication::RINavigationPolicy navigationPolicy() const;
@@ -183,6 +185,7 @@ private:
static QString tabNameScripting(); static QString tabNameScripting();
static QString tabNameExport(); static QString tabNameExport();
static QString tabNameSystem(); static QString tabNameSystem();
static QString tabNameImport();
static double defaultMarginSize( QPageSize::PageSizeId pageSizeId ); static double defaultMarginSize( QPageSize::PageSizeId pageSizeId );
@@ -219,6 +222,9 @@ private:
caf::PdmField<bool> m_searchPlotTemplateFoldersRecursively; caf::PdmField<bool> m_searchPlotTemplateFoldersRecursively;
caf::PdmField<caf::FilePath> m_defaultPlotTemplate; caf::PdmField<caf::FilePath> m_defaultPlotTemplate;
// Surface Import
caf::PdmField<double> m_surfaceImportResamplingDistance;
// 3d view // 3d view
caf::PdmField<caf::AppEnum<RiaDefines::MeshModeType>> m_defaultMeshModeType; caf::PdmField<caf::AppEnum<RiaDefines::MeshModeType>> m_defaultMeshModeType;
caf::PdmField<caf::AppEnum<RiaGuiApplication::RINavigationPolicy>> m_navigationPolicy; caf::PdmField<caf::AppEnum<RiaGuiApplication::RINavigationPolicy>> m_navigationPolicy;