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

Add import/export grid calculations to Grid Calculator

Browse Source 
Refactoring
This commit is contained in:
Magne Sjaastad
2023-11-10 09:16:06 +01:00
parent f49053c61d
commit 69f132ffa5
15 changed files with 403 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
ApplicationLibCode/Application/RiaPreferences.cpp
View File

@@ -229,6 +229,8 @@ RiaPreferences::RiaPreferences()
CAF_PDM_InitField( &m_useQtChartsPlotByDefault, "useQtChartsPlotByDefault", false, "Use QtChart as Default Plot Type" );
caf::PdmUiNativeCheckBoxEditor::configureFieldForEditor( &m_useQtChartsPlotByDefault );
CAF_PDM_InitFieldNoDefault( &m_gridCalculationExpressionFolder, "gridCalculationExpressionFolder", "Grid Calculation Expression Folder" );
CAF_PDM_InitField( &m_surfaceImportResamplingDistance,
"SurfaceImportResamplingDistance",
100.0,
@@ -292,6 +294,10 @@ void RiaPreferences::defineEditorAttribute( const caf::PdmFieldHandle* field, QS
myAttr->m_selectDirectory = true;
myAttr->m_appendUiSelectedFolderToText = true;
}
else if ( field == &m_gridCalculationExpressionFolder )
{
myAttr->m_selectDirectory = true;
}
}
}
@@ -448,6 +454,9 @@ void RiaPreferences::defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering&
exportGroup->add( &csvTextExportFieldSeparator );
exportGroup->add( &m_openExportedPdfInViewer );
exportGroup->add( &m_writeEchoInGrdeclFiles );
caf::PdmUiGroup* otherGroup = uiOrdering.addNewGroup( "Other" );
otherGroup->add( &m_gridCalculationExpressionFolder );
}
else if ( RiaApplication::enableDevelopmentFeatures() && uiConfigName == RiaPreferences::tabNameSystem() )
{
@@ -838,6 +847,14 @@ QString RiaPreferences::defaultMultiLateralWellNamePattern()
return "?*Y*";
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
QString RiaPreferences::gridCalculationExpressionFolder() const
{
return m_gridCalculationExpressionFolder().path();
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------

4
ApplicationLibCode/Application/RiaPreferences.h
View File

@@ -102,6 +102,8 @@ public:
QString multiLateralWellNamePattern() const;
static QString defaultMultiLateralWellNamePattern();
QString gridCalculationExpressionFolder() const;
// 3D view
RiaDefines::MeshModeType defaultMeshModeType() const;
RiaDefines::RINavigationPolicy navigationPolicy() const;
@@ -193,6 +195,8 @@ private:
caf::PdmField<caf::FilePath> m_lastUsedPlotTemplate;
caf::PdmField<bool> m_useQtChartsPlotByDefault;
caf::PdmField<caf::FilePath> m_gridCalculationExpressionFolder;
// Script paths
caf::PdmField<QString> m_octaveExecutable;
caf::PdmField<QString> m_pythonExecutable;