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

#8250 Use variadic macros and remove obsolete parameters

Browse Source
This commit is contained in:
Magne Sjaastad
2021-11-14 14:15:12 +01:00
parent 1b869a9356
commit 2a65636ba3
392 changed files with 2275 additions and 2533 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
ApplicationLibCode/Commands/ExportCommands/RicCellRangeUi.cpp
View File

@@ -40,20 +40,20 @@ CAF_PDM_SOURCE_INIT( RicCellRangeUi, "RicCellRangeUi" );
//--------------------------------------------------------------------------------------------------
RicCellRangeUi::RicCellRangeUi()
{
CAF_PDM_InitObject( "Cell Range", "", "", "" );
CAF_PDM_InitObject( "Cell Range" );
CAF_PDM_InitFieldNoDefault( &m_case, "Case", "Case", "", "", "" );
CAF_PDM_InitFieldNoDefault( &m_case, "Case", "Case" );
m_case.uiCapability()->setUiHidden( true );
CAF_PDM_InitField( &m_gridIndex, "GridIndex", 0, "Grid", "", "", "" );
CAF_PDM_InitField( &m_gridIndex, "GridIndex", 0, "Grid" );
CAF_PDM_InitField( &m_startIndexI, "StartIndexI", 1, "Start Index I", "", "", "" );
CAF_PDM_InitField( &m_startIndexJ, "StartIndexJ", 1, "Start Index J", "", "", "" );
CAF_PDM_InitField( &m_startIndexK, "StartIndexK", 1, "Start Index K", "", "", "" );
CAF_PDM_InitField( &m_startIndexI, "StartIndexI", 1, "Start Index I" );
CAF_PDM_InitField( &m_startIndexJ, "StartIndexJ", 1, "Start Index J" );
CAF_PDM_InitField( &m_startIndexK, "StartIndexK", 1, "Start Index K" );
CAF_PDM_InitField( &m_cellCountI, "CellCountI", 1, "Cell Count I", "", "", "" );
CAF_PDM_InitField( &m_cellCountJ, "CellCountJ", 1, "Cell Count J", "", "", "" );
CAF_PDM_InitField( &m_cellCountK, "CellCountK", 1, "Cell Count K", "", "", "" );
CAF_PDM_InitField( &m_cellCountI, "CellCountI", 1, "Cell Count I" );
CAF_PDM_InitField( &m_cellCountJ, "CellCountJ", 1, "Cell Count J" );
CAF_PDM_InitField( &m_cellCountK, "CellCountK", 1, "Cell Count K" );
m_startIndexI.uiCapability()->setUiEditorTypeName( caf::PdmUiSliderEditor::uiEditorTypeName() );
m_startIndexJ.uiCapability()->setUiEditorTypeName( caf::PdmUiSliderEditor::uiEditorTypeName() );

16
ApplicationLibCode/Commands/ExportCommands/RicExportCarfinUi.cpp
View File

@@ -33,20 +33,20 @@ CAF_PDM_SOURCE_INIT( RicExportCarfinUi, "RicExportCarfinUi" );
//--------------------------------------------------------------------------------------------------
RicExportCarfinUi::RicExportCarfinUi()
{
CAF_PDM_InitObject( "Export CARFIN", "", "", "" );
CAF_PDM_InitObject( "Export CARFIN" );
CAF_PDM_InitFieldNoDefault( &m_cellRange, "CellRange", "Cell Range", "", "", "" );
CAF_PDM_InitFieldNoDefault( &m_cellRange, "CellRange", "Cell Range" );
m_cellRange = new RicCellRangeUi;
CAF_PDM_InitFieldNoDefault( &m_exportFileName, "ExportFileName", "Export Filename", "", "", "" );
CAF_PDM_InitFieldNoDefault( &m_exportFileName, "ExportFileName", "Export Filename" );
m_exportFileName.uiCapability()->setUiEditorTypeName( caf::PdmUiFilePathEditor::uiEditorTypeName() );
CAF_PDM_InitFieldNoDefault( &m_caseToApply, "CaseToApply", "Source Case", "", "", "" );
CAF_PDM_InitFieldNoDefault( &m_caseToApply, "CaseToApply", "Source Case" );
CAF_PDM_InitField( &m_cellCountI, "CellCountI", 2, "Cell Count I", "", "", "" );
CAF_PDM_InitField( &m_cellCountJ, "CellCountJ", 2, "Cell Count J", "", "", "" );
CAF_PDM_InitField( &m_cellCountK, "CellCountK", 2, "Cell Count K", "", "", "" );
CAF_PDM_InitField( &m_maxWellCount, "MaxWellCount", 8, "Max Well Count", "", "", "" );
CAF_PDM_InitField( &m_cellCountI, "CellCountI", 2, "Cell Count I" );
CAF_PDM_InitField( &m_cellCountJ, "CellCountJ", 2, "Cell Count J" );
CAF_PDM_InitField( &m_cellCountK, "CellCountK", 2, "Cell Count K" );
CAF_PDM_InitField( &m_maxWellCount, "MaxWellCount", 8, "Max Well Count" );
}
//--------------------------------------------------------------------------------------------------

36
ApplicationLibCode/Commands/ExportCommands/RicExportEclipseSectorModelUi.cpp
View File

@@ -75,10 +75,10 @@ void RicExportEclipseSectorModelUi::GridBoxSelectionEnum::setUp()
//--------------------------------------------------------------------------------------------------
RicExportEclipseSectorModelUi::RicExportEclipseSectorModelUi()
{
CAF_PDM_InitObject( "Export Visible Cells as Eclipse Input Grid", "", "", "" );
CAF_PDM_InitObject( "Export Visible Cells as Eclipse Input Grid" );
CAF_PDM_InitField( &exportGrid, "ExportGrid", true, "Export Grid Data", "", "Includes COORD, ZCORN and ACTNUM", "" );
CAF_PDM_InitField( &exportGridFilename, "ExportGridFilename", QString(), "Grid File Name", "", "", "" );
CAF_PDM_InitField( &exportGridFilename, "ExportGridFilename", QString(), "Grid File Name" );
exportGridFilename.uiCapability()->setUiEditorTypeName( caf::PdmUiFilePathEditor::uiEditorTypeName() );
CAF_PDM_InitField( &exportInLocalCoordinates,
"ExportInLocalCoords",
@@ -87,39 +87,39 @@ RicExportEclipseSectorModelUi::RicExportEclipseSectorModelUi()
"",
"Remove UTM location on export",
"" );
CAF_PDM_InitField( &makeInvisibleCellsInactive, "InvisibleCellActnum", false, "Make Invisible Cells Inactive", "", "", "" );
CAF_PDM_InitField( &makeInvisibleCellsInactive, "InvisibleCellActnum", false, "Make Invisible Cells Inactive" );
CAF_PDM_InitFieldNoDefault( &exportGridBox, "GridBoxSelection", "Cells to Export", "", "", "" );
CAF_PDM_InitFieldNoDefault( &exportGridBox, "GridBoxSelection", "Cells to Export" );
QString minIJKLabel = "Min I, J, K";
CAF_PDM_InitField( &minI, "MinI", std::numeric_limits<int>::max(), minIJKLabel, "", "", "" );
CAF_PDM_InitField( &minJ, "MinJ", std::numeric_limits<int>::max(), "", "", "", "" );
CAF_PDM_InitField( &minI, "MinI", std::numeric_limits<int>::max(), minIJKLabel );
CAF_PDM_InitField( &minJ, "MinJ", std::numeric_limits<int>::max(), "" );
minJ.uiCapability()->setUiLabelPosition( caf::PdmUiItemInfo::HIDDEN );
CAF_PDM_InitField( &minK, "MinK", std::numeric_limits<int>::max(), "", "", "", "" );
CAF_PDM_InitField( &minK, "MinK", std::numeric_limits<int>::max(), "" );
minK.uiCapability()->setUiLabelPosition( caf::PdmUiItemInfo::HIDDEN );
QString maxIJKLabel = "Max I, J, K";
CAF_PDM_InitField( &maxI, "MaxI", -std::numeric_limits<int>::max(), maxIJKLabel, "", "", "" );
CAF_PDM_InitField( &maxJ, "MaxJ", -std::numeric_limits<int>::max(), "", "", "", "" );
CAF_PDM_InitField( &maxI, "MaxI", -std::numeric_limits<int>::max(), maxIJKLabel );
CAF_PDM_InitField( &maxJ, "MaxJ", -std::numeric_limits<int>::max(), "" );
maxJ.uiCapability()->setUiLabelPosition( caf::PdmUiItemInfo::HIDDEN );
CAF_PDM_InitField( &maxK, "MaxK", -std::numeric_limits<int>::max(), "", "", "", "" );
CAF_PDM_InitField( &maxK, "MaxK", -std::numeric_limits<int>::max(), "" );
maxK.uiCapability()->setUiLabelPosition( caf::PdmUiItemInfo::HIDDEN );
CAF_PDM_InitFieldNoDefault( &exportFaults, "ExportFaults", "Export Fault Data", "", "", "" );
CAF_PDM_InitFieldNoDefault( &exportFaults, "ExportFaults", "Export Fault Data" );
exportFaults = EXPORT_TO_SINGLE_SEPARATE_FILE;
CAF_PDM_InitField( &exportFaultsFilename, "ExportFaultsFilename", QString(), "Faults File Name", "", "", "" );
CAF_PDM_InitField( &exportFaultsFilename, "ExportFaultsFilename", QString(), "Faults File Name" );
exportFaultsFilename.uiCapability()->setUiEditorTypeName( caf::PdmUiFilePathEditor::uiEditorTypeName() );
QString ijkLabel = "Cell Count I, J, K";
CAF_PDM_InitField( &refinementCountI, "RefinementCountI", 1, ijkLabel, "", "", "" );
CAF_PDM_InitField( &refinementCountJ, "RefinementCountJ", 1, "", "", "", "" );
CAF_PDM_InitField( &refinementCountK, "RefinementCountK", 1, "", "", "", "" );
CAF_PDM_InitField( &refinementCountI, "RefinementCountI", 1, ijkLabel );
CAF_PDM_InitField( &refinementCountJ, "RefinementCountJ", 1, "" );
CAF_PDM_InitField( &refinementCountK, "RefinementCountK", 1, "" );
CAF_PDM_InitFieldNoDefault( &exportParameters, "ExportParams", "Export Parameters", "", "", "" );
CAF_PDM_InitField( &exportParametersFilename, "ExportParamsFilename", QString(), "File Name", "", "", "" );
CAF_PDM_InitFieldNoDefault( &exportParameters, "ExportParams", "Export Parameters" );
CAF_PDM_InitField( &exportParametersFilename, "ExportParamsFilename", QString(), "File Name" );
exportParametersFilename.uiCapability()->setUiEditorTypeName( caf::PdmUiFilePathEditor::uiEditorTypeName() );
CAF_PDM_InitFieldNoDefault( &selectedKeywords, "ExportMainKeywords", "Keywords to Export", "", "", "" );
CAF_PDM_InitFieldNoDefault( &selectedKeywords, "ExportMainKeywords", "Keywords to Export" );
exportGridFilename = defaultGridFileName();
exportParametersFilename = defaultResultsFileName();

22
ApplicationLibCode/Commands/ExportCommands/RicExportLgrUi.cpp
View File

@@ -50,27 +50,27 @@ void Lgr::SplitTypeEnum::setUp()
//--------------------------------------------------------------------------------------------------
RicExportLgrUi::RicExportLgrUi()
{
CAF_PDM_InitObject( "Export CARFIN", "", "", "" );
CAF_PDM_InitObject( "Export CARFIN" );
CAF_PDM_InitFieldNoDefault( &m_exportFolder, "ExportFolder", "Export Folder", "", "", "" );
CAF_PDM_InitFieldNoDefault( &m_exportFolder, "ExportFolder", "Export Folder" );
m_exportFolder.uiCapability()->setUiEditorTypeName( caf::PdmUiFilePathEditor::uiEditorTypeName() );
CAF_PDM_InitFieldNoDefault( &m_caseToApply, "CaseToApply", "Source Case", "", "", "" );
CAF_PDM_InitFieldNoDefault( &m_timeStep, "TimeStepIndex", "Time Step", "", "", "" );
CAF_PDM_InitFieldNoDefault( &m_caseToApply, "CaseToApply", "Source Case" );
CAF_PDM_InitFieldNoDefault( &m_timeStep, "TimeStepIndex", "Time Step" );
CAF_PDM_InitField( &m_includePerforations, "IncludePerforations", true, "Perforations", "", "", "" );
CAF_PDM_InitField( &m_includeFractures, "IncludeFractures", true, "Fractures", "", "", "" );
CAF_PDM_InitField( &m_includeFishbones, "IncludeFishbones", true, "Fishbones", "", "", "" );
CAF_PDM_InitField( &m_includePerforations, "IncludePerforations", true, "Perforations" );
CAF_PDM_InitField( &m_includeFractures, "IncludeFractures", true, "Fractures" );
CAF_PDM_InitField( &m_includeFishbones, "IncludeFishbones", true, "Fishbones" );
QString ijkLabel = "Cell Count I, J, K";
CAF_PDM_InitField( &m_cellCountI, "CellCountI", 2, ijkLabel, "", "", "" );
CAF_PDM_InitField( &m_cellCountJ, "CellCountJ", 2, "", "", "", "" );
CAF_PDM_InitField( &m_cellCountK, "CellCountK", 2, "", "", "", "" );
CAF_PDM_InitField( &m_cellCountI, "CellCountI", 2, ijkLabel );
CAF_PDM_InitField( &m_cellCountJ, "CellCountJ", 2, "" );
CAF_PDM_InitField( &m_cellCountK, "CellCountK", 2, "" );
m_cellCountJ.uiCapability()->setUiLabelPosition( caf::PdmUiItemInfo::HIDDEN );
m_cellCountK.uiCapability()->setUiLabelPosition( caf::PdmUiItemInfo::HIDDEN );
CAF_PDM_InitField( &m_splitType, "SplitType", Lgr::SplitTypeEnum(), "Split Type", "", "", "" );
CAF_PDM_InitField( &m_splitType, "SplitType", Lgr::SplitTypeEnum(), "Split Type" );
}
//--------------------------------------------------------------------------------------------------

22
ApplicationLibCode/Commands/ExportCommands/RicExportToLasFileResampleUi.cpp
View File

@@ -45,9 +45,9 @@ CAF_PDM_SOURCE_INIT( RicExportToLasFileObj, "RicExportToLasFileObj" );
//--------------------------------------------------------------------------------------------------
RicExportToLasFileObj::RicExportToLasFileObj( void )
{
CAF_PDM_InitObject( "RicExportToLasFileObj", "", "", "" );
CAF_PDM_InitObject( "RicExportToLasFileObj" );
CAF_PDM_InitField( &tvdrkbOffset, "tvdrkbOffset", QString( "" ), "TVDRKB offset (RKB - MSL) [m]", "", "", "" );
CAF_PDM_InitField( &tvdrkbOffset, "tvdrkbOffset", QString( "" ), "TVDRKB offset (RKB - MSL) [m]" );
}
CAF_PDM_SOURCE_INIT( RicExportToLasFileResampleUi, "RicExportToLasFileResampleUi" );
@@ -58,23 +58,23 @@ CAF_PDM_SOURCE_INIT( RicExportToLasFileResampleUi, "RicExportToLasFileResampleUi
RicExportToLasFileResampleUi::RicExportToLasFileResampleUi( void )
: m_enableCurveUnitConversion( false )
{
CAF_PDM_InitObject( "Resample LAS curves for export", "", "", "" );
CAF_PDM_InitObject( "Resample LAS curves for export" );
CAF_PDM_InitField( &exportFolder, "ExportFolder", QString(), "Export Folder", "", "", "" );
CAF_PDM_InitField( &exportFolder, "ExportFolder", QString(), "Export Folder" );
exportFolder.uiCapability()->setUiEditorTypeName( caf::PdmUiFilePathEditor::uiEditorTypeName() );
CAF_PDM_InitField( &filePrefix, "FilePrefix", QString( "" ), "File Prefix", "", "", "" );
CAF_PDM_InitField( &capitalizeFileName, "CapitalizeFileName", false, "Capitalize File Name", "", "", "" );
CAF_PDM_InitFieldNoDefault( &curveUnitConversion, "CurveUnitConversion", "Curve Units", "", "", "" );
CAF_PDM_InitField( &filePrefix, "FilePrefix", QString( "" ), "File Prefix" );
CAF_PDM_InitField( &capitalizeFileName, "CapitalizeFileName", false, "Capitalize File Name" );
CAF_PDM_InitFieldNoDefault( &curveUnitConversion, "CurveUnitConversion", "Curve Units" );
CAF_PDM_InitField( &activateResample, "ActivateResample", false, "Resample Curve Data", "", "", "" );
CAF_PDM_InitField( &activateResample, "ActivateResample", false, "Resample Curve Data" );
caf::PdmUiNativeCheckBoxEditor::configureFieldForEditor( &activateResample );
CAF_PDM_InitField( &resampleInterval, "ResampleInterval", 1.0, "Resample Interval [m]", "", "", "" );
CAF_PDM_InitField( &resampleInterval, "ResampleInterval", 1.0, "Resample Interval [m]" );
CAF_PDM_InitField( &exportTvdrkb, "ExportTvdrkb", false, "Export TVDRKB", "", "", "" );
CAF_PDM_InitField( &exportTvdrkb, "ExportTvdrkb", false, "Export TVDRKB" );
caf::PdmUiNativeCheckBoxEditor::configureFieldForEditor( &exportTvdrkb );
CAF_PDM_InitFieldNoDefault( &m_tvdrkbOffsets, "tvdrkbOffsets", "", "", "", "" );
CAF_PDM_InitFieldNoDefault( &m_tvdrkbOffsets, "tvdrkbOffsets", "" );
updateFieldVisibility();
}

6
ApplicationLibCode/Commands/ExportCommands/RicExportWellPathsUi.cpp
View File

@@ -34,12 +34,12 @@ CAF_PDM_SOURCE_INIT( RicExportWellPathsUi, "RicExportWellPathsUi" );
//--------------------------------------------------------------------------------------------------
RicExportWellPathsUi::RicExportWellPathsUi()
{
CAF_PDM_InitObject( "Resample LAS curves for export", "", "", "" );
CAF_PDM_InitObject( "Resample LAS curves for export" );
CAF_PDM_InitField( &m_exportFolder, "ExportFolder", QString(), "Export Folder", "", "", "" );
CAF_PDM_InitField( &m_exportFolder, "ExportFolder", QString(), "Export Folder" );
m_exportFolder.uiCapability()->setUiEditorTypeName( caf::PdmUiFilePathEditor::uiEditorTypeName() );
CAF_PDM_InitField( &m_mdStepSize, "MdStepSize", 5.0, "MD Step Size", "", "", "" );
CAF_PDM_InitField( &m_mdStepSize, "MdStepSize", 5.0, "MD Step Size" );
}
//--------------------------------------------------------------------------------------------------

12
ApplicationLibCode/Commands/ExportCommands/RicSaveEclipseInputVisibleCellsUi.cpp
View File

@@ -45,14 +45,14 @@ CAF_PDM_SOURCE_INIT( RicSaveEclipseInputVisibleCellsUi, "RicSaveEclipseInputVisi
RicSaveEclipseInputVisibleCellsUi::RicSaveEclipseInputVisibleCellsUi()
: exportFilenameManuallyChanged( false )
{
CAF_PDM_InitObject( "Export Visible Cells FLUXNUM/MULTNUM/ACTNUM", "", "", "" );
CAF_PDM_InitObject( "Export Visible Cells FLUXNUM/MULTNUM/ACTNUM" );
CAF_PDM_InitField( &exportFilename, "ExportFilename", QString(), "Export Filename", "", "", "" );
CAF_PDM_InitField( &exportFilename, "ExportFilename", QString(), "Export Filename" );
exportFilename.uiCapability()->setUiEditorTypeName( caf::PdmUiFilePathEditor::uiEditorTypeName() );
CAF_PDM_InitFieldNoDefault( &exportKeyword, "ExportKeyword", "Export Keyword", "", "", "" );
CAF_PDM_InitField( &visibleActiveCellsValue, "VisibleActiveCellsValue", 1, "Visible Active Cells Value", "", "", "" );
CAF_PDM_InitField( &hiddenActiveCellsValue, "HiddenActiveCellsValue", 0, "Hidden Active Cells Value", "", "", "" );
CAF_PDM_InitField( &inactiveCellsValue, "InactiveCellsValue", 0, "Inactive Cells Value", "", "", "" );
CAF_PDM_InitFieldNoDefault( &exportKeyword, "ExportKeyword", "Export Keyword" );
CAF_PDM_InitField( &visibleActiveCellsValue, "VisibleActiveCellsValue", 1, "Visible Active Cells Value" );
CAF_PDM_InitField( &hiddenActiveCellsValue, "HiddenActiveCellsValue", 0, "Hidden Active Cells Value" );
CAF_PDM_InitField( &inactiveCellsValue, "InactiveCellsValue", 0, "Inactive Cells Value" );
exportFilename = getDefaultExportPath();
}