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

12
ApplicationLibCode/ProjectDataModelCommands/CommandRouter/RimcExtractSurfaces.cpp
View File

@@ -43,12 +43,12 @@ RimcCommandRouter_extractSurfaces::RimcCommandRouter_extractSurfaces( caf::PdmOb
{
CAF_PDM_InitObject( "Extract Layer Surface", "", "", "Extract Layer Surface" );
CAF_PDM_InitScriptableField( &m_gridModelFilename, "GridModelFilename", QString(), "Grid Model Case Filename", "", "", "" );
CAF_PDM_InitScriptableField( &m_layers, "Layers", std::vector<int>(), "Layers", "", "", "" );
CAF_PDM_InitScriptableField( &m_minimumI, "MinimumI", -1, "Minimum I", "", "", "" );
CAF_PDM_InitScriptableField( &m_maximumI, "MaximumI", -1, "Maximum I", "", "", "" );
CAF_PDM_InitScriptableField( &m_minimumJ, "MinimumJ", -1, "Minimum J", "", "", "" );
CAF_PDM_InitScriptableField( &m_maximumJ, "MaximumJ", -1, "Maximum J", "", "", "" );
CAF_PDM_InitScriptableField( &m_gridModelFilename, "GridModelFilename", QString(), "Grid Model Case Filename" );
CAF_PDM_InitScriptableField( &m_layers, "Layers", std::vector<int>(), "Layers" );
CAF_PDM_InitScriptableField( &m_minimumI, "MinimumI", -1, "Minimum I" );
CAF_PDM_InitScriptableField( &m_maximumI, "MaximumI", -1, "Maximum I" );
CAF_PDM_InitScriptableField( &m_minimumJ, "MinimumJ", -1, "Minimum J" );
CAF_PDM_InitScriptableField( &m_maximumJ, "MaximumJ", -1, "Maximum J" );
}
//--------------------------------------------------------------------------------------------------

4
ApplicationLibCode/ProjectDataModelCommands/RimcDataContainerDouble.cpp
View File

@@ -29,6 +29,6 @@ CAF_PDM_SOURCE_INIT( RimcDataContainerDouble, "DataContainerFloat" );
//--------------------------------------------------------------------------------------------------
RimcDataContainerDouble::RimcDataContainerDouble()
{
CAF_PDM_InitScriptableObject( "Data Container Float", "", "", "" );
CAF_PDM_InitScriptableFieldNoDefault( &m_doubleValues, "values", "Float Values", "", "", "" );
CAF_PDM_InitScriptableObject( "Data Container Float" );
CAF_PDM_InitScriptableFieldNoDefault( &m_doubleValues, "values", "Float Values" );
}

4
ApplicationLibCode/ProjectDataModelCommands/RimcDataContainerString.cpp
View File

@@ -29,6 +29,6 @@ CAF_PDM_SOURCE_INIT( RimcDataContainerString, "DataContainerString" );
//--------------------------------------------------------------------------------------------------
RimcDataContainerString::RimcDataContainerString()
{
CAF_PDM_InitScriptableObject( "Data Container String", "", "", "" );
CAF_PDM_InitScriptableFieldNoDefault( &m_stringValues, "values", "String Values", "", "", "" );
CAF_PDM_InitScriptableObject( "Data Container String" );
CAF_PDM_InitScriptableFieldNoDefault( &m_stringValues, "values", "String Values" );
}

4
ApplicationLibCode/ProjectDataModelCommands/RimcDataContainerTime.cpp
View File

@@ -29,6 +29,6 @@ CAF_PDM_SOURCE_INIT( RimcDataContainerTime, "DataContainerTime" );
//--------------------------------------------------------------------------------------------------
RimcDataContainerTime::RimcDataContainerTime()
{
CAF_PDM_InitScriptableObject( "Data Container Time", "", "", "" );
CAF_PDM_InitScriptableFieldNoDefault( &m_timeValues, "values", "Time Values", "", "", "" );
CAF_PDM_InitScriptableObject( "Data Container Time" );
CAF_PDM_InitScriptableFieldNoDefault( &m_timeValues, "values", "Time Values" );
}

6
ApplicationLibCode/ProjectDataModelCommands/RimcProject.cpp
View File

@@ -46,7 +46,7 @@ RimProject_importSummaryCase::RimProject_importSummaryCase( caf::PdmObjectHandle
: caf::PdmObjectMethod( self )
{
CAF_PDM_InitObject( "Import Summary Case", "", "", "Import Summary Case" );
CAF_PDM_InitScriptableFieldNoDefault( &m_fileName, "FileName", "", "", "", "" );
CAF_PDM_InitScriptableFieldNoDefault( &m_fileName, "FileName", "" );
}
//--------------------------------------------------------------------------------------------------
@@ -122,7 +122,7 @@ RimProject_summaryCase::RimProject_summaryCase( caf::PdmObjectHandle* self )
: caf::PdmObjectMethod( self )
{
CAF_PDM_InitObject( "Find Summary Case", "", "", "Find Summary Case" );
CAF_PDM_InitScriptableField( &m_caseId, "CaseId", -1, "", "", "", "" );
CAF_PDM_InitScriptableField( &m_caseId, "CaseId", -1, "" );
}
//--------------------------------------------------------------------------------------------------
@@ -174,7 +174,7 @@ RimProject_surfaceFolder::RimProject_surfaceFolder( caf::PdmObjectHandle* self )
: caf::PdmObjectMethod( self )
{
CAF_PDM_InitObject( "Get Surface Folder", "", "", "Get Surface Folder" );
CAF_PDM_InitScriptableFieldNoDefault( &m_folderName, "FolderName", "", "", "", "" );
CAF_PDM_InitScriptableFieldNoDefault( &m_folderName, "FolderName", "" );
}
//--------------------------------------------------------------------------------------------------

2
ApplicationLibCode/ProjectDataModelCommands/RimcStimPlanModelCollection.cpp
View File

@@ -43,7 +43,7 @@ RimcStimPlanModelCollection_appendStimPlanModel::RimcStimPlanModelCollection_app
{
CAF_PDM_InitObject( "Create StimPlan Model", "", "", "Create a new StimPlan Model" );
CAF_PDM_InitScriptableFieldNoDefault( &m_wellPath, "WellPath", "", "", "", "Well Path" );
CAF_PDM_InitScriptableField( &m_md, "MeasuredDepth", 0.0, "Measured Depth", "", "", "" );
CAF_PDM_InitScriptableField( &m_md, "MeasuredDepth", 0.0, "Measured Depth" );
CAF_PDM_InitScriptableFieldNoDefault( &m_stimPlanModelTemplate, "StimPlanModelTemplate", "", "", "", "StimPlan Model Template" );
}

6
ApplicationLibCode/ProjectDataModelCommands/RimcSummaryCase.cpp
View File

@@ -94,7 +94,7 @@ CAF_PDM_OBJECT_METHOD_SOURCE_INIT( RimSummaryCase, RimSummaryCase_availableAddre
RimSummaryCase_availableAddresses::RimSummaryCase_availableAddresses( caf::PdmObjectHandle* self )
: caf::PdmObjectMethod( self )
{
CAF_PDM_InitObject( "Available Addresses", "", "", "" );
CAF_PDM_InitObject( "Available Addresses" );
}
//--------------------------------------------------------------------------------------------------
@@ -146,7 +146,7 @@ CAF_PDM_OBJECT_METHOD_SOURCE_INIT( RimSummaryCase, RimSummaryCase_availableTimeS
RimSummaryCase_availableTimeSteps::RimSummaryCase_availableTimeSteps( caf::PdmObjectHandle* self )
: caf::PdmObjectMethod( self )
{
CAF_PDM_InitObject( "Available TimeSteps", "", "", "" );
CAF_PDM_InitObject( "Available TimeSteps" );
}
//--------------------------------------------------------------------------------------------------
@@ -191,7 +191,7 @@ CAF_PDM_OBJECT_METHOD_SOURCE_INIT( RimSummaryCase, RimSummaryCase_resampleValues
RimSummaryCase_resampleValues::RimSummaryCase_resampleValues( caf::PdmObjectHandle* self )
: caf::PdmObjectMethod( self )
{
CAF_PDM_InitObject( "Resample Values", "", "", "" );
CAF_PDM_InitObject( "Resample Values" );
CAF_PDM_InitScriptableFieldNoDefault( &m_addressString, "Address", "", "", "", "Formatted address specifying the summary vector" );
CAF_PDM_InitScriptableFieldNoDefault( &m_resamplingPeriod, "ResamplingPeriod", "", "", "", "Resampling Period" );

6
ApplicationLibCode/ProjectDataModelCommands/RimcSummaryResampleData.cpp
View File

@@ -29,7 +29,7 @@ CAF_PDM_SOURCE_INIT( RimcSummaryResampleData, "ResampleData" );
//--------------------------------------------------------------------------------------------------
RimcSummaryResampleData::RimcSummaryResampleData()
{
CAF_PDM_InitScriptableObject( "Resample Data", "", "", "" );
CAF_PDM_InitScriptableFieldNoDefault( &m_timeValues, "TimeSteps", "Time Steps", "", "", "" );
CAF_PDM_InitScriptableFieldNoDefault( &m_doubleValues, "Values", "Values", "", "", "" );
CAF_PDM_InitScriptableObject( "Resample Data" );
CAF_PDM_InitScriptableFieldNoDefault( &m_timeValues, "TimeSteps", "Time Steps" );
CAF_PDM_InitScriptableFieldNoDefault( &m_doubleValues, "Values", "Values" );
}

4
ApplicationLibCode/ProjectDataModelCommands/RimcSurfaceCollection.cpp
View File

@@ -141,8 +141,8 @@ RimcSurfaceCollection_newSurface::RimcSurfaceCollection_newSurface( caf::PdmObje
: caf::PdmObjectMethod( self )
{
CAF_PDM_InitObject( "New Surface", "", "", "Create a new surface" );
CAF_PDM_InitScriptableFieldNoDefault( &m_case, "Case", "", "", "", "" );
CAF_PDM_InitScriptableFieldNoDefault( &m_kIndex, "KIndex", "", "", "", "" );
CAF_PDM_InitScriptableFieldNoDefault( &m_case, "Case", "" );
CAF_PDM_InitScriptableFieldNoDefault( &m_kIndex, "KIndex", "" );
}
//--------------------------------------------------------------------------------------------------

2
ApplicationLibCode/ProjectDataModelCommands/RimcWellPath.cpp
View File

@@ -41,7 +41,7 @@ RimcWellPath_addFracture::RimcWellPath_addFracture( caf::PdmObjectHandle* self )
{
CAF_PDM_InitObject( "Add StimPlan Fracture", "", "", "Add StimPlan Fracture" );
CAF_PDM_InitScriptableField( &m_md, "MeasuredDepth", 0.0, "Measured Depth", "", "", "" );
CAF_PDM_InitScriptableField( &m_md, "MeasuredDepth", 0.0, "Measured Depth" );
CAF_PDM_InitScriptableFieldNoDefault( &m_stimPlanFractureTemplate,
"StimPlanFractureTemplate",
"",