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

#8420 Janitor: Remove empty parameters in initialization macros

Browse Source
This commit is contained in:
Magne Sjaastad 2022-01-07 08:31:52 +01:00 committed by GitHub
parent 7db24e9353
commit 3c35244809
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
255 changed files with 443 additions and 1088 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ApplicationLibCode/Application/RiaMemoryCleanup.cpp
View File

@ -47,14 +47,14 @@ CAF_PDM_SOURCE_INIT( RiaMemoryCleanup, "RiaMemoryCleanup" );
RiaMemoryCleanup::RiaMemoryCleanup()
{
// clang-format off
CAF_PDM_InitFieldNoDefault(&m_case, "DataCase", "Case", "", "", "");
CAF_PDM_InitFieldNoDefault(&m_case, "DataCase", "Case");
m_case = nullptr;
CAF_PDM_InitFieldNoDefault(&m_resultsToDelete, "ResultsToDelete", "Results In Memory", "", "", "");
CAF_PDM_InitFieldNoDefault(&m_resultsToDelete, "ResultsToDelete", "Results In Memory");
m_resultsToDelete.uiCapability()->setUiLabelPosition(caf::PdmUiItemInfo::TOP);
m_resultsToDelete.uiCapability()->setUiEditorTypeName(caf::PdmUiTreeSelectionEditor::uiEditorTypeName());
CAF_PDM_InitFieldNoDefault(&m_performDelete, "ClearSelectedData", "", "", "", "");
CAF_PDM_InitFieldNoDefault(&m_performDelete, "ClearSelectedData", "");
caf::PdmUiPushButtonEditor::configureEditorForField(&m_performDelete);
// clang-format on
}

38
ApplicationLibCode/Application/RiaPreferences.cpp
View File

@ -81,10 +81,7 @@ RiaPreferences::RiaPreferences()
CAF_PDM_InitField( &m_navigationPolicy,
"navigationPolicy",
caf::AppEnum<RiaDefines::RINavigationPolicy>( RiaDefines::RINavigationPolicy::NAVIGATION_POLICY_RMS ),
"Navigation Mode",
"",
"",
"" );
"Navigation Mode" );
CAF_PDM_InitField( &enableGrpcServer,
"enableGrpcServer",
@ -122,10 +119,7 @@ RiaPreferences::RiaPreferences()
CAF_PDM_InitField( &octaveShowHeaderInfoWhenExecutingScripts,
"octaveShowHeaderInfoWhenExecutingScripts",
false,
"Show Text Header When Executing Scripts",
"",
"",
"" );
"Show Text Header When Executing Scripts" );
caf::PdmUiNativeCheckBoxEditor::configureFieldForEditor( &octaveShowHeaderInfoWhenExecutingScripts );
CAF_PDM_InitField( &m_pythonExecutable, "pythonExecutable", QString( "python" ), "Python Executable Location" );
@ -137,20 +131,11 @@ RiaPreferences::RiaPreferences()
ssihubAddress.uiCapability()->setUiLabelPosition( caf::PdmUiItemInfo::TOP );
CAF_PDM_InitFieldNoDefault( &m_defaultMeshModeType, "defaultMeshModeType", "Show Grid Lines" );
CAF_PDM_InitField( &defaultGridLineColors,
"defaultGridLineColors",
RiaColorTables::defaultGridLineColor(),
"Mesh Color",
"",
"",
"" );
CAF_PDM_InitField( &defaultGridLineColors, "defaultGridLineColors", RiaColorTables::defaultGridLineColor(), "Mesh Color" );
CAF_PDM_InitField( &defaultFaultGridLineColors,
"defaultFaultGridLineColors",
RiaColorTables::defaultFaultLineColor(),
"Mesh Color Along Faults",
"",
"",
"" );
"Mesh Color Along Faults" );
CAF_PDM_InitField( &defaultWellLabelColor,
"defaultWellLableColor",
RiaColorTables::defaultWellLabelColor(),
@ -204,19 +189,13 @@ RiaPreferences::RiaPreferences()
CAF_PDM_InitField( &holoLensDisableCertificateVerification,
"holoLensDisableCertificateVerification",
false,
"Disable SSL Certificate Verification (HoloLens)",
"",
"",
"" );
"Disable SSL Certificate Verification (HoloLens)" );
caf::PdmUiNativeCheckBoxEditor::configureFieldForEditor( &holoLensDisableCertificateVerification );
CAF_PDM_InitField( &csvTextExportFieldSeparator,
"csvTextExportFieldSeparator",
QString( "," ),
"CSV Text Export Field Separator",
"",
"",
"" );
"CSV Text Export Field Separator" );
CAF_PDM_InitFieldNoDefault( &m_readerSettings, "readerSettings", "Reader Settings" );
m_readerSettings = new RifReaderSettings;
@ -236,10 +215,7 @@ RiaPreferences::RiaPreferences()
CAF_PDM_InitField( &m_searchPlotTemplateFoldersRecursively,
"SearchPlotTemplateFoldersRecursively",
true,
"Search Plot Templates Recursively",
"",
"",
"" );
"Search Plot Templates Recursively" );
caf::PdmUiNativeCheckBoxEditor::configureFieldForEditor( &m_searchPlotTemplateFoldersRecursively );
CAF_PDM_InitFieldNoDefault( &m_defaultPlotTemplate, "defaultPlotTemplate", "Default Plot Template" );

38
ApplicationLibCode/Application/RiaPreferencesSummary.cpp
View File

@ -73,32 +73,20 @@ RiaPreferencesSummary::RiaPreferencesSummary()
CAF_PDM_InitField( &m_summaryImportMode,
"summaryImportMode",
SummaryRestartFilesImportModeType( RiaPreferencesSummary::SummaryRestartFilesImportMode::IMPORT ),
"Default Summary Import Option",
"",
"",
"" );
"Default Summary Import Option" );
CAF_PDM_InitField( &m_gridImportMode,
"gridImportMode",
SummaryRestartFilesImportModeType( RiaPreferencesSummary::SummaryRestartFilesImportMode::NOT_IMPORT ),
"Default Grid Import Option",
"",
"",
"" );
"Default Grid Import Option" );
CAF_PDM_InitField( &m_summaryEnsembleImportMode,
"summaryEnsembleImportMode",
SummaryRestartFilesImportModeType( RiaPreferencesSummary::SummaryRestartFilesImportMode::IMPORT ),
"Default Ensemble Summary Import Option",
"",
"",
"" );
"Default Ensemble Summary Import Option" );
CAF_PDM_InitField( &m_defaultSummaryHistoryCurveStyle,
"defaultSummaryHistoryCurveStyle",
SummaryHistoryCurveStyleModeType( RiaPreferencesSummary::SummaryHistoryCurveStyleMode::SYMBOLS ),
"Default Curve Style for History Vectors",
"",
"",
"" );
"Default Curve Style for History Vectors" );
CAF_PDM_InitField( &m_defaultSummaryCurvesTextFilter,
"defaultSummaryCurvesTextFilter",
QString( "FOPT" ),
@ -134,32 +122,20 @@ RiaPreferencesSummary::RiaPreferencesSummary()
"" );
caf::PdmUiNativeCheckBoxEditor::configureFieldForEditor( &m_createH5SummaryDataFile );
CAF_PDM_InitField( &m_createH5SummaryFileThreadCount,
"createH5SummaryFileThreadCount",
1,
"h5 Summary Export Thread Count",
"",
"",
"" );
CAF_PDM_InitField( &m_createH5SummaryFileThreadCount, "createH5SummaryFileThreadCount", 1, "h5 Summary Export Thread Count" );
CAF_PDM_InitFieldNoDefault( &m_summaryReader, "summaryReaderType_v01", "File Format" );
CAF_PDM_InitField( &m_showSummaryTimeAsLongString,
"showSummaryTimeAsLongString",
false,
"Show resample time text as long time text (2010-11-21 23:15:00)",
"",
"",
"" );
"Show resample time text as long time text (2010-11-21 23:15:00)" );
caf::PdmUiNativeCheckBoxEditor::configureFieldForEditor( &m_showSummaryTimeAsLongString );
CAF_PDM_InitField( &m_useMultipleThreadsWhenLoadingSummaryCases,
"useMultipleThreadsWhenLoadingSummaryCases",
true,
"Use Multiple Threads for Import of Summary Files",
"",
"",
"" );
"Use Multiple Threads for Import of Summary Files" );
caf::PdmUiNativeCheckBoxEditor::configureFieldForEditor( &m_useMultipleThreadsWhenLoadingSummaryCases );
}

23
ApplicationLibCode/Application/RiaPreferencesSystem.cpp
View File

@ -56,10 +56,7 @@ RiaPreferencesSystem::RiaPreferencesSystem()
CAF_PDM_InitField( &m_appendFieldKeywordToToolTipText,
"appendFieldKeywordToToolTipText",
false,
"Show Field Keyword in ToolTip",
"",
"",
"" );
"Show Field Keyword in ToolTip" );
caf::PdmUiNativeCheckBoxEditor::configureFieldForEditor( &m_appendFieldKeywordToToolTipText );
CAF_PDM_InitField( &m_showViewIdInProjectTree, "showViewIdInTree", false, "Show View Id in Project Tree" );
@ -71,23 +68,14 @@ RiaPreferencesSystem::RiaPreferencesSystem()
CAF_PDM_InitField( &m_includeFractureDebugInfoFile,
"includeFractureDebugInfoFile",
false,
"Include Fracture Debug Info for Completion Export",
"",
"",
"" );
"Include Fracture Debug Info for Completion Export" );
caf::PdmUiNativeCheckBoxEditor::configureFieldForEditor( &m_includeFractureDebugInfoFile );
CAF_PDM_InitFieldNoDefault( &m_holoLensExportFolder, "holoLensExportFolder", "HoloLens Export Folder" );
m_holoLensExportFolder.uiCapability()->setUiLabelPosition( caf::PdmUiItemInfo::TOP );
m_holoLensExportFolder.uiCapability()->setUiEditorTypeName( caf::PdmUiFilePathEditor::uiEditorTypeName() );
CAF_PDM_InitField( &m_showProjectChangedDialog,
"showProjectChangedDialog",
true,
"Show 'Project has changed' dialog",
"",
"",
"" );
CAF_PDM_InitField( &m_showProjectChangedDialog, "showProjectChangedDialog", true, "Show 'Project has changed' dialog" );
caf::PdmUiNativeCheckBoxEditor::configureFieldForEditor( &m_showProjectChangedDialog );
CAF_PDM_InitField( &m_showProgressBar, "showProgressBar", true, "Show Progress Bar" );
@ -98,10 +86,7 @@ RiaPreferencesSystem::RiaPreferencesSystem()
CAF_PDM_InitField( &m_eclipseReaderMode,
"eclipseReaderMode",
EclipseTextFileReaderModeType( RiaPreferencesSystem::EclipseTextFileReaderMode::FILE ),
"Eclipse Text File Import mode (GRDECL)",
"",
"",
"" );
"Eclipse Text File Import mode (GRDECL)" );
}
//--------------------------------------------------------------------------------------------------

24
ApplicationLibCode/Application/Tools/RiaRegressionTest.cpp
View File

@ -57,13 +57,7 @@ RiaRegressionTest::RiaRegressionTest( void )
regressionTestFolder.uiCapability()->setUiEditorTypeName( caf::PdmUiFilePathEditor::uiEditorTypeName() );
CAF_PDM_InitField( &showInteractiveDiffImages, "showInteractiveDiffImages", false, "Interactive Diff Images" );
CAF_PDM_InitField( &useOpenMPForGeometryCreation,
"useOpenMPForGeometryCreation",
true,
"Use OpenMP For Geometry Creation",
"",
"",
"" );
CAF_PDM_InitField( &useOpenMPForGeometryCreation, "useOpenMPForGeometryCreation", true, "Use OpenMP For Geometry Creation" );
CAF_PDM_InitField( &openReportInBrowser, "openReportInBrowser", false, "Open Generated Report in Browser" );
@ -76,21 +70,9 @@ RiaRegressionTest::RiaRegressionTest( void )
"" );
testFilter.uiCapability()->setUiEditorTypeName( caf::PdmUiTextEditor::uiEditorTypeName() );
CAF_PDM_InitField( &appendTestsAfterTestFilter,
"appendTestsAfterTestFilter",
false,
"Append All Tests After Test Filter",
"",
"",
"" );
CAF_PDM_InitField( &appendTestsAfterTestFilter, "appendTestsAfterTestFilter", false, "Append All Tests After Test Filter" );
CAF_PDM_InitField( &invalidateExternalFilePaths,
"invalidateExternalFilePaths",
false,
"Invalidate External File Paths",
"",
"",
"" );
CAF_PDM_InitField( &invalidateExternalFilePaths, "invalidateExternalFilePaths", false, "Invalidate External File Paths" );
}
//--------------------------------------------------------------------------------------------------

5
ApplicationLibCode/CommandFileInterface/RicfCreateMultipleFractures.cpp
View File

@ -69,10 +69,7 @@ RicfCreateMultipleFractures::RicfCreateMultipleFractures()
CAF_PDM_InitScriptableField( &m_action,
"action",
caf::AppEnum<MultipleFractures::Action>( MultipleFractures::Action::APPEND_FRACTURES ),
"Action",
"",
"",
"" );
"Action" );
}
//--------------------------------------------------------------------------------------------------

8
ApplicationLibCode/CommandFileInterface/RicfExportMsw.cpp
View File

@ -50,13 +50,7 @@ RicfExportMsw::RicfExportMsw()
CAF_PDM_InitScriptableField( &m_includePerforations, "includePerforations", true, "Include Perforations" );
CAF_PDM_InitScriptableField( &m_includeFishbones, "includeFishbones", true, "Include Fishbones" );
CAF_PDM_InitScriptableField( &m_includeFractures, "includeFractures", true, "Include Fractures" );
CAF_PDM_InitScriptableField( &m_fileSplit,
"fileSplit",
RicExportCompletionDataSettingsUi::ExportSplitType(),
"File Split",
"",
"",
"" );
CAF_PDM_InitScriptableField( &m_fileSplit, "fileSplit", RicExportCompletionDataSettingsUi::ExportSplitType(), "File Split" );
}
//--------------------------------------------------------------------------------------------------

12
ApplicationLibCode/CommandFileInterface/RicfExportProperty.cpp
View File

@ -47,12 +47,12 @@ CAF_PDM_SOURCE_INIT( RicfExportProperty, "exportProperty" );
RicfExportProperty::RicfExportProperty()
{
// clang-format off
CAF_PDM_InitScriptableField(&m_caseId, "caseId", -1, "Case ID", "", "", "");
CAF_PDM_InitScriptableField(&m_timeStepIndex, "timeStep", -1, "Time Step Index", "", "", "");
CAF_PDM_InitScriptableField(&m_propertyName, "property", QString(), "Property Name", "", "", "");
CAF_PDM_InitScriptableField(&m_eclipseKeyword, "eclipseKeyword", QString(), "Eclipse Keyword", "", "", "");
CAF_PDM_InitScriptableField(&m_undefinedValue, "undefinedValue", 0.0, "Undefined Value", "", "", "");
CAF_PDM_InitScriptableField(&m_exportFileName, "exportFile", QString(), "Export FileName", "", "", "");
CAF_PDM_InitScriptableField(&m_caseId, "caseId", -1, "Case ID");
CAF_PDM_InitScriptableField(&m_timeStepIndex, "timeStep", -1, "Time Step Index");
CAF_PDM_InitScriptableField(&m_propertyName, "property", QString(), "Property Name");
CAF_PDM_InitScriptableField(&m_eclipseKeyword, "eclipseKeyword", QString(), "Eclipse Keyword");
CAF_PDM_InitScriptableField(&m_undefinedValue, "undefinedValue", 0.0, "Undefined Value");
CAF_PDM_InitScriptableField(&m_exportFileName, "exportFile", QString(), "Export FileName");
// clang-format on
}

21
ApplicationLibCode/CommandFileInterface/RicfExportSimWellFractureCompletions.cpp
View File

@ -50,27 +50,12 @@ RicfExportSimWellFractureCompletions::RicfExportSimWellFractureCompletions()
CAF_PDM_InitScriptableField( &m_viewId, "viewId", -1, "View ID" );
CAF_PDM_InitScriptableField( &m_viewName, "viewName", QString( "" ), "View Name" );
CAF_PDM_InitScriptableField( &m_timeStep, "timeStep", -1, "Time Step Index" );
CAF_PDM_InitScriptableField( &m_simWellNames,
"simulationWellNames",
std::vector<QString>(),
"Simulation Well Names",
"",
"",
"" );
CAF_PDM_InitScriptableField( &m_fileSplit,
"fileSplit",
RicExportCompletionDataSettingsUi::ExportSplitType(),
"File Split",
"",
"",
"" );
CAF_PDM_InitScriptableField( &m_simWellNames, "simulationWellNames", std::vector<QString>(), "Simulation Well Names" );
CAF_PDM_InitScriptableField( &m_fileSplit, "fileSplit", RicExportCompletionDataSettingsUi::ExportSplitType(), "File Split" );
CAF_PDM_InitScriptableField( &m_compdatExport,
"compdatExport",
RicExportCompletionDataSettingsUi::CompdatExportType(),
"Compdat Export",
"",
"",
"" );
"Compdat Export" );
}
//--------------------------------------------------------------------------------------------------

13
ApplicationLibCode/CommandFileInterface/RicfExportVisibleCells.cpp
View File

@ -69,17 +69,8 @@ RicfExportVisibleCells::RicfExportVisibleCells()
CAF_PDM_InitScriptableField( &m_exportKeyword,
"exportKeyword",
caf::AppEnum<RicfExportVisibleCells::ExportKeyword>(),
"Export Keyword",
"",
"",
"" );
CAF_PDM_InitScriptableField( &m_visibleActiveCellsValue,
"visibleActiveCellsValue",
1,
"Visible Active Cells Value",
"",
"",
"" );
"Export Keyword" );
CAF_PDM_InitScriptableField( &m_visibleActiveCellsValue, "visibleActiveCellsValue", 1, "Visible Active Cells Value" );
CAF_PDM_InitScriptableField( &m_hiddenActiveCellsValue, "hiddenActiveCellsValue", 0, "Hidden Active Cells Value" );
CAF_PDM_InitScriptableField( &m_inactiveCellsValue, "inactiveCellsValue", 0, "Inactive Cells Value" );
}

57
ApplicationLibCode/CommandFileInterface/RicfExportWellPathCompletions.cpp
View File

@ -47,27 +47,15 @@ RicfExportWellPathCompletions::RicfExportWellPathCompletions()
CAF_PDM_InitScriptableField( &m_timeStep, "timeStep", -1, "Time Step Index" );
CAF_PDM_InitScriptableField( &m_wellPathNames, "wellPathNames", std::vector<QString>(), "Well Path Names" );
CAF_PDM_InitScriptableField( &m_fileSplit,
"fileSplit",
RicExportCompletionDataSettingsUi::ExportSplitType(),
"File Split",
"",
"",
"" );
CAF_PDM_InitScriptableField( &m_fileSplit, "fileSplit", RicExportCompletionDataSettingsUi::ExportSplitType(), "File Split" );
CAF_PDM_InitScriptableField( &m_compdatExport,
"compdatExport",
RicExportCompletionDataSettingsUi::CompdatExportType(),
"Compdat Export",
"",
"",
"" );
"Compdat Export" );
CAF_PDM_InitScriptableField( &m_combinationMode,
"combinationMode",
RicExportCompletionDataSettingsUi::CombinationModeType(),
"Combination Mode",
"",
"",
"" );
"Combination Mode" );
CAF_PDM_InitScriptableField( &m_includeMsw, "includeMsw", true, "Export Multi Segment Well Model" );
CAF_PDM_InitScriptableField( &m_useLateralNTG, "useNtgHorizontally", false, "Use NTG Horizontally" );
@ -78,47 +66,20 @@ RicfExportWellPathCompletions::RicfExportWellPathCompletions()
CAF_PDM_InitScriptableField( &m_excludeMainBoreForFishbones,
"excludeMainBoreForFishbones",
false,
"Exclude Main Bore for Fishbones",
"",
"",
"" );
"Exclude Main Bore for Fishbones" );
CAF_PDM_InitScriptableField( &m_performTransScaling,
"performTransScaling",
false,
"Perform Transmissibility Scaling",
"",
"",
"" );
CAF_PDM_InitScriptableField( &m_performTransScaling, "performTransScaling", false, "Perform Transmissibility Scaling" );
CAF_PDM_InitScriptableField( &m_transScalingTimeStep,
"transScalingTimeStep",
0,
"Transmissibility Scaling Pressure Time Step",
"",
"",
"" );
"Transmissibility Scaling Pressure Time Step" );
CAF_PDM_InitScriptableField( &m_transScalingInitialWBHP,
"transScalingWBHPFromSummary",
RicExportCompletionDataSettingsUi::TransScalingWBHPSource(),
"Transmissibility Scaling WBHP from summary",
"",
"",
"" );
CAF_PDM_InitScriptableField( &m_transScalingWBHP,
"transScalingWBHP",
200.0,
"Transmissibility Scaling Constant WBHP Value",
"",
"",
"" );
"Transmissibility Scaling WBHP from summary" );
CAF_PDM_InitScriptableField( &m_transScalingWBHP, "transScalingWBHP", 200.0, "Transmissibility Scaling Constant WBHP Value" );
CAF_PDM_InitScriptableField( &m_exportDataSourceAsComments,
"exportComments",
true,
"Export Data Source as Comments",
"",
"",
"" );
CAF_PDM_InitScriptableField( &m_exportDataSourceAsComments, "exportComments", true, "Export Data Source as Comments" );
CAF_PDM_InitScriptableField( &m_exportWelspec, "exportWelspec", true, "Export WELSPEC keyword" );
CAF_PDM_InitScriptableField( &m_customFileName, "customFileName", QString(), "Custom Filename" );
}

6
ApplicationLibCode/CommandFileInterface/RicfSetExportFolder.cpp
View File

@ -32,9 +32,9 @@ CAF_PDM_SOURCE_INIT( RicfSetExportFolder, "setExportFolder" );
RicfSetExportFolder::RicfSetExportFolder()
{
// clang-format off
CAF_PDM_InitScriptableField(&m_type, "type", RicfCommandFileExecutor::ExportTypeEnum(RicfCommandFileExecutor::ExportType::COMPLETIONS), "Type", "", "", "");
CAF_PDM_InitScriptableField(&m_path, "path", QString(), "Path", "", "", "");
CAF_PDM_InitScriptableField(&m_createFolder, "createFolder", false, "Create Folder", "", "", "");
CAF_PDM_InitScriptableField(&m_type, "type", RicfCommandFileExecutor::ExportTypeEnum(RicfCommandFileExecutor::ExportType::COMPLETIONS), "Type");
CAF_PDM_InitScriptableField(&m_path, "path", QString(), "Path");
CAF_PDM_InitScriptableField(&m_createFolder, "createFolder", false, "Create Folder");
// clang-format on
}

8
ApplicationLibCode/Commands/CompletionExportCommands/RicExportCompletionDataSettingsUi.cpp
View File

@ -109,13 +109,7 @@ RicExportCompletionDataSettingsUi::RicExportCompletionDataSettingsUi()
CAF_PDM_InitField( &m_exportDataSourceAsComment, "ExportDataSourceAsComment", true, "Comments" );
CAF_PDM_InitField( &m_exportWelspec, "ExportWelspec", true, "WELSPEC keyword" );
CAF_PDM_InitField( &m_completionWelspecAfterMainBore,
"CompletionWelspecAfterMainBore",
true,
"WELSEGS per Completion Type",
"",
"",
"" );
CAF_PDM_InitField( &m_completionWelspecAfterMainBore, "CompletionWelspecAfterMainBore", true, "WELSEGS per Completion Type" );
CAF_PDM_InitField( &m_useCustomFileName, "UseCustomFileName", false, "Use Custom Filename" );
CAF_PDM_InitField( &m_customFileName, "CustomFileName", {}, "Custom Filename" );

5
ApplicationLibCode/Commands/RicCreateEnsembleSurfaceUi.cpp
View File

@ -38,10 +38,7 @@ RicCreateEnsembleSurfaceUi::RicCreateEnsembleSurfaceUi()
CAF_PDM_InitField( &m_autoCreateEnsembleSurfaces,
"AutoCreateEnsembleSurfaces",
false,
"Create Ensemble Surfaces From Exported Files",
"",
"",
"" );
"Create Ensemble Surfaces From Exported Files" );
caf::PdmUiNativeCheckBoxEditor::configureFieldForEditor( &m_autoCreateEnsembleSurfaces );
CAF_PDM_InitFieldNoDefault( &m_minLayer, "MinLayer", "MinLayer" );

5
ApplicationLibCode/Commands/RicCreateEnsembleWellLogUi.cpp
View File

@ -60,10 +60,7 @@ RicCreateEnsembleWellLogUi::RicCreateEnsembleWellLogUi()
CAF_PDM_InitField( &m_autoCreateEnsembleWellLogs,
"AutoCreateEnsembleWellLogs",
true,
"Create Ensemble Well Logs From Exported Files",
"",
"",
"" );
"Create Ensemble Well Logs From Exported Files" );
caf::PdmUiNativeCheckBoxEditor::configureFieldForEditor( &m_autoCreateEnsembleWellLogs );
CAF_PDM_InitField( &m_timeStep, "TimeStep", 0, "Time Step" );

10
ApplicationLibCode/Commands/SummaryPlotCommands/RicPasteAsciiDataToSummaryPlotFeatureUi.cpp
View File

@ -196,17 +196,11 @@ RicPasteAsciiDataToSummaryPlotFeatureUi::RicPasteAsciiDataToSummaryPlotFeatureUi
"LineStyle",
caf::AppEnum<RiuQwtPlotCurveDefines::LineStyleEnum>(
RiuQwtPlotCurveDefines::LineStyleEnum::STYLE_NONE ),
"Line Style",
"",
"",
"" );
"Line Style" );
CAF_PDM_InitField( &m_curveSymbol,
"Symbol",
caf::AppEnum<RiuQwtSymbol::PointSymbolEnum>( RiuQwtSymbol::SYMBOL_ELLIPSE ),
"Symbol",
"",
"",
"" );
"Symbol" );
CAF_PDM_InitField( &m_curveSymbolSkipDistance, "SymbolSkipDinstance", 0.0f, "Symbol Skip Distance" );
CAF_PDM_InitFieldNoDefault( &m_cellSeparator, "CellSeparator", "Cell Separator" );

2
ApplicationLibCode/Commands/ViewLink/RicLinkVisibleViewsFeatureUi.cpp
View File

@ -34,7 +34,7 @@ CAF_PDM_SOURCE_INIT( RicLinkVisibleViewsFeatureUi, "RicLinkVisibleViewsFeatureUi
//--------------------------------------------------------------------------------------------------
RicLinkVisibleViewsFeatureUi::RicLinkVisibleViewsFeatureUi( void )
{
CAF_PDM_InitObject( "Link Visible Views Feature UI", ":/LinkView16x16.png", "", "" );
CAF_PDM_InitObject( "Link Visible Views Feature UI", ":/LinkView16x16.png" );
CAF_PDM_InitFieldNoDefault( &m_masterView, "MasterView", "Primary View" );
}

5
ApplicationLibCode/FileInterface/RifReaderSettings.cpp
View File

@ -39,10 +39,7 @@ RifReaderSettings::RifReaderSettings()
CAF_PDM_InitField( &includeInactiveCellsInFaultGeometry,
"includeInactiveCellsInFaultGeometry",
false,
"Include Inactive Cells",
"",
"",
"" );
"Include Inactive Cells" );
caf::PdmUiNativeCheckBoxEditor::configureFieldForEditor( &includeInactiveCellsInFaultGeometry );
CAF_PDM_InitField( &importAdvancedMswData, "importAdvancedMswData", false, "Import Advanced MSW Data" );

2
ApplicationLibCode/ProjectDataModel/AnalysisPlots/RimAnalysisPlot.cpp
View File

@ -91,7 +91,7 @@ CAF_PDM_SOURCE_INIT( RimAnalysisPlot, "AnalysisPlot" );
RimAnalysisPlot::RimAnalysisPlot()
: RimPlot()
{
CAF_PDM_InitObject( "Analysis Plot", ":/AnalysisPlot16x16.png", "", "" );
CAF_PDM_InitObject( "Analysis Plot", ":/AnalysisPlot16x16.png" );
// Variable selection

2
ApplicationLibCode/ProjectDataModel/AnalysisPlots/RimAnalysisPlotCollection.cpp
View File

@ -32,7 +32,7 @@ CAF_PDM_SOURCE_INIT( RimAnalysisPlotCollection, "AnalysisPlotCollection" );
//--------------------------------------------------------------------------------------------------
RimAnalysisPlotCollection::RimAnalysisPlotCollection()
{
CAF_PDM_InitObject( "Analysis Plots", ":/AnalysisPlots16x16.png", "", "" );
CAF_PDM_InitObject( "Analysis Plots", ":/AnalysisPlots16x16.png" );
CAF_PDM_InitFieldNoDefault( &m_analysisPlots, "AnalysisPlots", "Analysis Plots" );
m_analysisPlots.uiCapability()->setUiTreeHidden( true );

2
ApplicationLibCode/ProjectDataModel/AnalysisPlots/RimPlotDataFilterCollection.cpp
View File

@ -27,7 +27,7 @@ CAF_PDM_SOURCE_INIT( RimPlotDataFilterCollection, "PlotDataFilterCollection" );
RimPlotDataFilterCollection::RimPlotDataFilterCollection()
: filtersChanged( this )
{
CAF_PDM_InitObject( "Plot Data Filters", ":/AnalysisPlotFilter16x16.png", "", "" );
CAF_PDM_InitObject( "Plot Data Filters", ":/AnalysisPlotFilter16x16.png" );
CAF_PDM_InitField( &m_isActive, "IsActive", true, "IsActive" );
m_isActive.uiCapability()->setUiHidden( true );

2
ApplicationLibCode/ProjectDataModel/AnalysisPlots/RimPlotDataFilterItem.cpp
View File

@ -83,7 +83,7 @@ RimPlotDataFilterItem::RimPlotDataFilterItem()
, m_upperLimit( std::numeric_limits<double>::infinity() )
, filterChanged( this )
{
CAF_PDM_InitObject( "Plot Data Filter", ":/AnalysisPlotFilter16x16.png", "", "" );
CAF_PDM_InitObject( "Plot Data Filter", ":/AnalysisPlotFilter16x16.png" );
CAF_PDM_InitField( &m_isActive, "IsActive", true, "Active" );
m_isActive.uiCapability()->setUiHidden( true );

2
ApplicationLibCode/ProjectDataModel/Annotations/RimAnnotationCollection.cpp
View File

@ -41,7 +41,7 @@ CAF_PDM_SOURCE_INIT( RimAnnotationCollection, "RimAnnotationCollection" );
//--------------------------------------------------------------------------------------------------
RimAnnotationCollection::RimAnnotationCollection()
{
CAF_PDM_InitObject( "Annotations", ":/Annotations16x16.png", "", "" );
CAF_PDM_InitObject( "Annotations", ":/Annotations16x16.png" );
CAF_PDM_InitFieldNoDefault( &m_reachCircleAnnotations, "ReachCircleAnnotations", "Reach Circle Annotations" );
CAF_PDM_InitFieldNoDefault( &m_userDefinedPolylineAnnotations,

2
ApplicationLibCode/ProjectDataModel/Annotations/RimAnnotationCollectionBase.cpp
View File

@ -36,7 +36,7 @@ CAF_PDM_SOURCE_INIT( RimAnnotationCollectionBase, "RimAnnotationCollectionBase"
//--------------------------------------------------------------------------------------------------
RimAnnotationCollectionBase::RimAnnotationCollectionBase()
{
CAF_PDM_InitObject( "Annotations", ":/WellCollection.png", "", "" );
CAF_PDM_InitObject( "Annotations", ":/WellCollection.png" );
CAF_PDM_InitField( &m_isActive, "IsActive", true, "Is Active" );
m_isActive.uiCapability()->setUiHidden( true );

2
ApplicationLibCode/ProjectDataModel/Annotations/RimAnnotationGroupCollection.cpp
View File

@ -44,7 +44,7 @@ const QString RimAnnotationGroupCollection::POLYLINE_FROM_FILE_ANNOTATION_UI_NAM
//--------------------------------------------------------------------------------------------------
RimAnnotationGroupCollection::RimAnnotationGroupCollection()
{
CAF_PDM_InitObject( "Annotations", ":/WellCollection.png", "", "" );
CAF_PDM_InitObject( "Annotations", ":/WellCollection.png" );
CAF_PDM_InitField( &m_isActive, "IsActive", true, "Is Active" );
CAF_PDM_InitFieldNoDefault( &m_annotations, "Annotations", "Annotations" );

2
ApplicationLibCode/ProjectDataModel/Annotations/RimAnnotationInViewCollection.cpp
View File

@ -78,7 +78,7 @@ CAF_PDM_SOURCE_INIT( RimAnnotationInViewCollection, "Annotations" );
//--------------------------------------------------------------------------------------------------
RimAnnotationInViewCollection::RimAnnotationInViewCollection()
{
CAF_PDM_InitObject( "Annotations", ":/Annotations16x16.png", "", "" );
CAF_PDM_InitObject( "Annotations", ":/Annotations16x16.png" );
CAF_PDM_InitField( &m_annotationPlaneDepth, "AnnotationPlaneDepth", 0.0, "Annotation Plane Depth" );
CAF_PDM_InitField( &m_snapAnnotations, "SnapAnnotations", false, "Snap Annotations to Plane" );

4
ApplicationLibCode/ProjectDataModel/Annotations/RimAnnotationLineAppearance.cpp
View File

@ -63,7 +63,7 @@ CAF_PDM_SOURCE_INIT( RimAnnotationLineAppearance, "RimAnnotationLineAppearance"
RimAnnotationLineAppearance::RimAnnotationLineAppearance()
: objectChanged( this )
{
CAF_PDM_InitObject( "AnnotationLineAppearance", ":/WellCollection.png", "", "" );
CAF_PDM_InitObject( "AnnotationLineAppearance", ":/WellCollection.png" );
CAF_PDM_InitField( &m_lineFieldsHidden, "LineFieldsHidden", false, "Line Fields Hidden" );
CAF_PDM_InitField( &m_color, "Color", cvf::Color3f( cvf::Color3f::BLACK ), "Line Color" );
@ -170,7 +170,7 @@ CAF_PDM_SOURCE_INIT( RimPolylineAppearance, "RimPolylineAppearance" );
//--------------------------------------------------------------------------------------------------
RimPolylineAppearance::RimPolylineAppearance()
{
CAF_PDM_InitObject( "PolylineAppearance", ":/WellCollection.png", "", "" );
CAF_PDM_InitObject( "PolylineAppearance", ":/WellCollection.png" );
CAF_PDM_InitField( &m_sphereFieldsHidden, "SphereFieldsHidden", false, "Sphere Fields Hidden" );
CAF_PDM_InitField( &m_sphereColor, "SphereColor", cvf::Color3f( cvf::Color3f::BLACK ), "Sphere Color" );

10
ApplicationLibCode/ProjectDataModel/Annotations/RimAnnotationTextAppearance.cpp
View File

@ -30,7 +30,7 @@ CAF_PDM_SOURCE_INIT( RimAnnotationTextAppearance, "RimAnnotationTextAppearance"
//--------------------------------------------------------------------------------------------------
RimAnnotationTextAppearance::RimAnnotationTextAppearance()
{
CAF_PDM_InitObject( "TextAnnotation", ":/WellCollection.png", "", "" );
CAF_PDM_InitObject( "TextAnnotation", ":/WellCollection.png" );
auto prefs = RiaPreferences::current();
auto defaultBackgroundColor = prefs->defaultViewerBackgroundColor();
@ -40,13 +40,7 @@ RimAnnotationTextAppearance::RimAnnotationTextAppearance()
CAF_PDM_InitField( &m_fontColor, "FontColor", cvf::Color3f( cvf::Color3f::BLACK ), "Font Color" );
CAF_PDM_InitField( &m_backgroundColor, "BackgroundColor", defaultBackgroundColor, "Background Color" );
CAF_PDM_InitField( &m_anchorLineColor,
"AnchorLineColor",
cvf::Color3f( cvf::Color3f::BLACK ),
"Anchor Line Color",
"",
"",
"" );
CAF_PDM_InitField( &m_anchorLineColor, "AnchorLineColor", cvf::Color3f( cvf::Color3f::BLACK ), "Anchor Line Color" );
}
//--------------------------------------------------------------------------------------------------

2
ApplicationLibCode/ProjectDataModel/Annotations/RimPolylinesAnnotation.cpp
View File

@ -35,7 +35,7 @@ CAF_PDM_ABSTRACT_SOURCE_INIT( RimPolylinesAnnotation, "RimPolylinesAnnotation" )
//--------------------------------------------------------------------------------------------------
RimPolylinesAnnotation::RimPolylinesAnnotation()
{
CAF_PDM_InitObject( "PolylineAnnotation", ":/WellCollection.png", "", "" );
CAF_PDM_InitObject( "PolylineAnnotation", ":/WellCollection.png" );
CAF_PDM_InitField( &m_isActive, "IsActive", true, "Is Active" );
m_isActive.uiCapability()->setUiHidden( true );

2
ApplicationLibCode/ProjectDataModel/Annotations/RimPolylinesAnnotationInView.cpp
View File

@ -31,7 +31,7 @@ CAF_PDM_SOURCE_INIT( RimPolylinesAnnotationInView, "RimPolylinesAnnotationInView
//--------------------------------------------------------------------------------------------------
RimPolylinesAnnotationInView::RimPolylinesAnnotationInView()
{
CAF_PDM_InitObject( "PolyLinesAnnotationInView", ":/WellCollection.png", "", "" );
CAF_PDM_InitObject( "PolyLinesAnnotationInView", ":/WellCollection.png" );
CAF_PDM_InitField( &m_isActive, "IsActive", true, "Is Active" );
CAF_PDM_InitFieldNoDefault( &m_sourceAnnotation, "SourceAnnotation", "Source Annotation" );

2
ApplicationLibCode/ProjectDataModel/Annotations/RimPolylinesFromFileAnnotation.cpp
View File

@ -35,7 +35,7 @@ CAF_PDM_SOURCE_INIT( RimPolylinesFromFileAnnotation, "PolylinesFromFileAnnotatio
//--------------------------------------------------------------------------------------------------
RimPolylinesFromFileAnnotation::RimPolylinesFromFileAnnotation()
{
CAF_PDM_InitObject( "PolyLines Annotation", ":/PolylinesFromFile16x16.png", "", "" );
CAF_PDM_InitObject( "PolyLines Annotation", ":/PolylinesFromFile16x16.png" );
CAF_PDM_InitFieldNoDefault( &m_polyLinesFileName, "PolyLineFilePath", "File" );
CAF_PDM_InitField( &m_userDescription, "PolyLineDescription", QString( "" ), "Name" );

4
ApplicationLibCode/ProjectDataModel/Annotations/RimPolylinesFromFileAnnotationInView.cpp
View File

@ -26,7 +26,7 @@ CAF_PDM_SOURCE_INIT( RimPolylinesFromFileAnnotationInView, "RimPolylinesFromFile
//--------------------------------------------------------------------------------------------------
RimPolylinesFromFileAnnotationInView::RimPolylinesFromFileAnnotationInView()
{
CAF_PDM_InitObject( "PolyLines Annotation", ":/PolylinesFromFile16x16.png", "", "" );
CAF_PDM_InitObject( "PolyLines Annotation", ":/PolylinesFromFile16x16.png" );
}
//--------------------------------------------------------------------------------------------------
@ -35,5 +35,5 @@ RimPolylinesFromFileAnnotationInView::RimPolylinesFromFileAnnotationInView()
RimPolylinesFromFileAnnotationInView::RimPolylinesFromFileAnnotationInView( RimPolylinesFromFileAnnotation* sourceAnnotation )
: RimPolylinesAnnotationInView( sourceAnnotation )
{
CAF_PDM_InitObject( "PolyLines Annotation", ":/PolylinesFromFile16x16.png", "", "" );
CAF_PDM_InitObject( "PolyLines Annotation", ":/PolylinesFromFile16x16.png" );
}

2
ApplicationLibCode/ProjectDataModel/Annotations/RimReachCircleAnnotation.cpp
View File

@ -36,7 +36,7 @@ CAF_PDM_SOURCE_INIT( RimReachCircleAnnotation, "RimReachCircleAnnotation" );
//--------------------------------------------------------------------------------------------------
RimReachCircleAnnotation::RimReachCircleAnnotation()
{
CAF_PDM_InitObject( "CircleAnnotation", ":/ReachCircle16x16.png", "", "" );
CAF_PDM_InitObject( "CircleAnnotation", ":/ReachCircle16x16.png" );
CAF_PDM_InitField( &m_isActive, "IsActive", true, "Is Active" );
m_isActive.uiCapability()->setUiHidden( true );

2
ApplicationLibCode/ProjectDataModel/Annotations/RimReachCircleAnnotationInView.cpp
View File

@ -28,7 +28,7 @@ CAF_PDM_SOURCE_INIT( RimReachCircleAnnotationInView, "RimReachCircleAnnotationIn
//--------------------------------------------------------------------------------------------------
RimReachCircleAnnotationInView::RimReachCircleAnnotationInView()
{
CAF_PDM_InitObject( "ReachCircleAnnotationInView", ":/ReachCircle16x16.png", "", "" );
CAF_PDM_InitObject( "ReachCircleAnnotationInView", ":/ReachCircle16x16.png" );
CAF_PDM_InitField( &m_isActive, "IsActive", true, "Is Active" );
CAF_PDM_InitFieldNoDefault( &m_sourceAnnotation, "SourceAnnotation", "Source Annotation" );

2
ApplicationLibCode/ProjectDataModel/Annotations/RimTextAnnotation.cpp
View File

@ -44,7 +44,7 @@ CAF_PDM_SOURCE_INIT( RimTextAnnotation, "RimTextAnnotation" );
//--------------------------------------------------------------------------------------------------
RimTextAnnotation::RimTextAnnotation()
{
CAF_PDM_InitObject( "TextAnnotation", ":/TextAnnotation16x16.png", "", "" );
CAF_PDM_InitObject( "TextAnnotation", ":/TextAnnotation16x16.png" );
this->setUi3dEditorTypeName( RicTextAnnotation3dEditor::uiEditorTypeName() );
CAF_PDM_InitField( &m_anchorPointXyd, "AnchorPointXyd", Vec3d::ZERO, "Anchor Point" );

2
ApplicationLibCode/ProjectDataModel/Annotations/RimTextAnnotationInView.cpp
View File

@ -28,7 +28,7 @@ CAF_PDM_SOURCE_INIT( RimTextAnnotationInView, "RimTextAnnotationInView" );
//--------------------------------------------------------------------------------------------------
RimTextAnnotationInView::RimTextAnnotationInView()
{
CAF_PDM_InitObject( "TextAnnotationInView", ":/TextAnnotation16x16.png", "", "" );
CAF_PDM_InitObject( "TextAnnotationInView", ":/TextAnnotation16x16.png" );
CAF_PDM_InitField( &m_isActive, "IsActive", true, "Is Active" );
CAF_PDM_InitFieldNoDefault( &m_sourceAnnotation, "SourceAnnotation", "Source Annotation" );

2
ApplicationLibCode/ProjectDataModel/Annotations/RimUserDefinedPolylinesAnnotation.cpp
View File

@ -44,7 +44,7 @@ CAF_PDM_SOURCE_INIT( RimUserDefinedPolylinesAnnotation, "UserDefinedPolylinesAnn
RimUserDefinedPolylinesAnnotation::RimUserDefinedPolylinesAnnotation()
: m_pickTargetsEventHandler( new RicPolylineTargetsPickEventHandler( this ) )
{
CAF_PDM_InitObject( "PolyLines Annotation", ":/PolylinesFromFile16x16.png", "", "" );
CAF_PDM_InitObject( "PolyLines Annotation", ":/PolylinesFromFile16x16.png" );
CAF_PDM_InitField( &m_name, "Name", QString( "User Defined Polyline" ), "Name" );

4
ApplicationLibCode/ProjectDataModel/Annotations/RimUserDefinedPolylinesAnnotationInView.cpp
View File

@ -26,7 +26,7 @@ CAF_PDM_SOURCE_INIT( RimUserDefinedPolylinesAnnotationInView, "RimUserDefinedPol
//--------------------------------------------------------------------------------------------------
RimUserDefinedPolylinesAnnotationInView::RimUserDefinedPolylinesAnnotationInView()
{
CAF_PDM_InitObject( "PolyLinesAnnotationInView", ":/WellCollection.png", "", "" );
CAF_PDM_InitObject( "PolyLinesAnnotationInView", ":/WellCollection.png" );
}
//--------------------------------------------------------------------------------------------------
@ -35,5 +35,5 @@ RimUserDefinedPolylinesAnnotationInView::RimUserDefinedPolylinesAnnotationInView
RimUserDefinedPolylinesAnnotationInView::RimUserDefinedPolylinesAnnotationInView( RimUserDefinedPolylinesAnnotation* sourceAnnotation )
: RimPolylinesAnnotationInView( sourceAnnotation )
{
CAF_PDM_InitObject( "PolyLinesAnnotationInView", ":/WellCollection.png", "", "" );
CAF_PDM_InitObject( "PolyLinesAnnotationInView", ":/WellCollection.png" );
}

2
ApplicationLibCode/ProjectDataModel/CellFilters/RimCellFilterCollection.cpp
View File

@ -39,7 +39,7 @@ CAF_PDM_SOURCE_INIT( RimCellFilterCollection, "CellFilterCollection", "RimCellFi
//--------------------------------------------------------------------------------------------------
RimCellFilterCollection::RimCellFilterCollection()
{
CAF_PDM_InitScriptableObject( "Cell Filters", ":/CellFilter.png", "", "" );
CAF_PDM_InitScriptableObject( "Cell Filters", ":/CellFilter.png" );
CAF_PDM_InitScriptableField( &m_isActive, "Active", true, "Active" );
m_isActive.uiCapability()->setUiHidden( true );

2
ApplicationLibCode/ProjectDataModel/CellFilters/RimCellRangeFilter.cpp
View File

@ -38,7 +38,7 @@ CAF_PDM_SOURCE_INIT( RimCellRangeFilter, "CellRangeFilter" );
//--------------------------------------------------------------------------------------------------
RimCellRangeFilter::RimCellRangeFilter()
{
CAF_PDM_InitObject( "Cell Range Filter", ":/CellFilter_Range.png", "", "" );
CAF_PDM_InitObject( "Cell Range Filter", ":/CellFilter_Range.png" );
CAF_PDM_InitField( &startIndexI, "StartIndexI", 1, "Start Index I" );
startIndexI.uiCapability()->setUiEditorTypeName( caf::PdmUiSliderEditor::uiEditorTypeName() );

2
ApplicationLibCode/ProjectDataModel/CellFilters/RimEclipsePropertyFilter.cpp
View File

@ -52,7 +52,7 @@ CAF_PDM_SOURCE_INIT( RimEclipsePropertyFilter, "CellPropertyFilter" );
//--------------------------------------------------------------------------------------------------
RimEclipsePropertyFilter::RimEclipsePropertyFilter()
{
CAF_PDM_InitObject( "Cell Property Filter", ":/CellFilter_Values.png", "", "" );
CAF_PDM_InitObject( "Cell Property Filter", ":/CellFilter_Values.png" );
CAF_PDM_InitFieldNoDefault( &m_resultDefinition, "ResultDefinition", "Result Definition" );
m_resultDefinition = new RimEclipseResultDefinition();

2
ApplicationLibCode/ProjectDataModel/CellFilters/RimEclipsePropertyFilterCollection.cpp
View File

@ -36,7 +36,7 @@ CAF_PDM_SOURCE_INIT( RimEclipsePropertyFilterCollection, "CellPropertyFilters" )
//--------------------------------------------------------------------------------------------------
RimEclipsePropertyFilterCollection::RimEclipsePropertyFilterCollection()
{
CAF_PDM_InitObject( "Property Filters", ":/CellFilter_Values.png", "", "" );
CAF_PDM_InitObject( "Property Filters", ":/CellFilter_Values.png" );
CAF_PDM_InitFieldNoDefault( &propertyFilters, "PropertyFilters", "Property Filters" );
propertyFilters.uiCapability()->setUiTreeHidden( true );

2
ApplicationLibCode/ProjectDataModel/CellFilters/RimGeoMechPropertyFilter.cpp
View File

@ -42,7 +42,7 @@ CAF_PDM_SOURCE_INIT( RimGeoMechPropertyFilter, "GeoMechPropertyFilter" );
RimGeoMechPropertyFilter::RimGeoMechPropertyFilter()
: m_parentContainer( nullptr )
{
CAF_PDM_InitObject( "Property Filter", ":/CellFilter_Values.png", "", "" );
CAF_PDM_InitObject( "Property Filter", ":/CellFilter_Values.png" );
CAF_PDM_InitFieldNoDefault( &resultDefinition, "ResultDefinition", "Result Definition" );
resultDefinition = new RimGeoMechResultDefinition();

2
ApplicationLibCode/ProjectDataModel/CellFilters/RimGeoMechPropertyFilterCollection.cpp
View File

@ -34,7 +34,7 @@ CAF_PDM_SOURCE_INIT( RimGeoMechPropertyFilterCollection, "GeoMechPropertyFilters
//--------------------------------------------------------------------------------------------------
RimGeoMechPropertyFilterCollection::RimGeoMechPropertyFilterCollection()
{
CAF_PDM_InitObject( "Property Filters", ":/CellFilter_Values.png", "", "" );
CAF_PDM_InitObject( "Property Filters", ":/CellFilter_Values.png" );
CAF_PDM_InitFieldNoDefault( &propertyFilters, "PropertyFilters", "Property Filters" );
propertyFilters.uiCapability()->setUiTreeHidden( true );

2
ApplicationLibCode/ProjectDataModel/CellFilters/RimPolygonFilter.cpp
View File

@ -120,7 +120,7 @@ RimPolygonFilter::RimPolygonFilter()
: m_pickTargetsEventHandler( new RicPolylineTargetsPickEventHandler( this ) )
, m_intervalTool( true )
{
CAF_PDM_InitObject( "Polyline Filter", ":/CellFilter_Polygon.png", "", "" );
CAF_PDM_InitObject( "Polyline Filter", ":/CellFilter_Polygon.png" );
CAF_PDM_InitFieldNoDefault( &m_polyFilterMode, "PolygonFilterType", "Vertical Filter" );

2
ApplicationLibCode/ProjectDataModel/CellFilters/RimUserDefinedFilter.cpp
View File

@ -27,7 +27,7 @@ CAF_PDM_SOURCE_INIT( RimUserDefinedFilter, "UserDefinedFilter" );
//--------------------------------------------------------------------------------------------------
RimUserDefinedFilter::RimUserDefinedFilter()
{
CAF_PDM_InitObject( "User Defined Filter", ":/CellFilter_UserDefined.png", "", "" );
CAF_PDM_InitObject( "User Defined Filter", ":/CellFilter_UserDefined.png" );
CAF_PDM_InitFieldNoDefault( &m_individualCellIndices,
"IndividualCellIndices",
"Cells",

2
ApplicationLibCode/ProjectDataModel/Completions/Rim3dWellLogCurveCollection.cpp
View File

@ -32,7 +32,7 @@ CAF_PDM_SOURCE_INIT( Rim3dWellLogCurveCollection, "Rim3dWellLogCurveCollection"
//--------------------------------------------------------------------------------------------------
Rim3dWellLogCurveCollection::Rim3dWellLogCurveCollection()
{
CAF_PDM_InitObject( "3D Track", ":/WellLogCurve16x16.png", "", "" );
CAF_PDM_InitObject( "3D Track", ":/WellLogCurve16x16.png" );
CAF_PDM_InitField( &m_showPlot, "Show3dWellLogCurves", true, "Show 3d Well Log Curves" );
m_showPlot.uiCapability()->setUiHidden( true );

2
ApplicationLibCode/ProjectDataModel/Completions/RimCompletionTemplateCollection.cpp
View File

@ -34,7 +34,7 @@ CAF_PDM_SOURCE_INIT( RimCompletionTemplateCollection, "CompletionTemplateCollect
//--------------------------------------------------------------------------------------------------
RimCompletionTemplateCollection::RimCompletionTemplateCollection()
{
CAF_PDM_InitObject( "Completion Templates", ":/CompletionsSymbol16x16.png", "", "" );
CAF_PDM_InitObject( "Completion Templates", ":/CompletionsSymbol16x16.png" );
CAF_PDM_InitFieldNoDefault( &m_fractureTemplates, "FractureTemplates", "" );
m_fractureTemplates = new RimFractureTemplateCollection;

2
ApplicationLibCode/ProjectDataModel/Completions/RimEllipseFractureTemplate.cpp
View File

@ -50,7 +50,7 @@ CAF_PDM_SOURCE_INIT( RimEllipseFractureTemplate, "RimEllipseFractureTemplate" );
//--------------------------------------------------------------------------------------------------
RimEllipseFractureTemplate::RimEllipseFractureTemplate()
{
CAF_PDM_InitObject( "Fracture Template", ":/FractureTemplate16x16.png", "", "" );
CAF_PDM_InitObject( "Fracture Template", ":/FractureTemplate16x16.png" );
CAF_PDM_InitField( &m_halfLength, "HalfLength", 0.0, "Half Length X<sub>f</sub>" );
CAF_PDM_InitField( &m_height, "Height", 0.0, "Height" );

10
ApplicationLibCode/ProjectDataModel/Completions/RimEnsembleFractureStatistics.cpp
View File

@ -121,7 +121,7 @@ CAF_PDM_SOURCE_INIT( RimEnsembleFractureStatistics, "EnsembleFractureStatistics"
//--------------------------------------------------------------------------------------------------
RimEnsembleFractureStatistics::RimEnsembleFractureStatistics()
{
CAF_PDM_InitObject( "Ensemble Fracture Statistics", ":/FractureTemplate16x16.png", "", "" );
CAF_PDM_InitObject( "Ensemble Fracture Statistics", ":/FractureTemplate16x16.png" );
CAF_PDM_InitFieldNoDefault( &m_filePaths, "FilePaths", "" );
@ -131,13 +131,7 @@ RimEnsembleFractureStatistics::RimEnsembleFractureStatistics()
m_filePathsTable.uiCapability()->setUiReadOnly( true );
m_filePathsTable.xmlCapability()->disableIO();
CAF_PDM_InitField( &m_excludeZeroWidthFractures,
"ExcludeZeroWidthFractures",
true,
"Exclude Zero Width Fractures",
"",
"",
"" );
CAF_PDM_InitField( &m_excludeZeroWidthFractures, "ExcludeZeroWidthFractures", true, "Exclude Zero Width Fractures" );
CAF_PDM_InitFieldNoDefault( &m_statisticsTable, "StatisticsTable", "Statistics Table" );
m_statisticsTable.uiCapability()->setUiEditorTypeName( caf::PdmUiTextEditor::uiEditorTypeName() );

2
ApplicationLibCode/ProjectDataModel/Completions/RimEnsembleFractureStatisticsCollection.cpp
View File

@ -27,7 +27,7 @@ CAF_PDM_SOURCE_INIT( RimEnsembleFractureStatisticsCollection, "FractureGroupStat
//--------------------------------------------------------------------------------------------------
RimEnsembleFractureStatisticsCollection::RimEnsembleFractureStatisticsCollection()
{
CAF_PDM_InitObject( "Ensemble Fracture Statistics", ":/FractureTemplates16x16.png", "", "" );
CAF_PDM_InitObject( "Ensemble Fracture Statistics", ":/FractureTemplates16x16.png" );
CAF_PDM_InitFieldNoDefault( &m_fractureGroupStatistics, "FractureGroupStatistics", "" );
m_fractureGroupStatistics.uiCapability()->setUiTreeHidden( true );

49
ApplicationLibCode/ProjectDataModel/Completions/RimFishbones.cpp
View File

@ -69,7 +69,7 @@ void AppEnum<RimFishbones::LateralsOrientationType>::setUp()
//--------------------------------------------------------------------------------------------------
RimFishbones::RimFishbones()
{
CAF_PDM_InitObject( "FishbonesMultipleSubs", ":/FishBoneGroup16x16.png", "", "" );
CAF_PDM_InitObject( "FishbonesMultipleSubs", ":/FishBoneGroup16x16.png" );
CAF_PDM_InitField( &m_isActive, "Active", true, "Active" );
m_isActive.uiCapability()->setUiHidden( true );
@ -99,25 +99,10 @@ RimFishbones::RimFishbones()
CAF_PDM_InitField( &m_lateralOpenHoleRoghnessFactor,
"LateralOpenHoleRoghnessFactor",
0.001,
"Open Hole Roghness Factor [m]",
"",
"",
"" );
CAF_PDM_InitField( &m_lateralTubingRoghnessFactor,
"LateralTubingRoghnessFactor",
1e-5,
"Tubing Roghness Factor [m]",
"",
"",
"" );
"Open Hole Roghness Factor [m]" );
CAF_PDM_InitField( &m_lateralTubingRoghnessFactor, "LateralTubingRoghnessFactor", 1e-5, "Tubing Roghness Factor [m]" );
CAF_PDM_InitField( &m_lateralInstallSuccessFraction,
"LateralInstallSuccessFraction",
1.0,
"Install Success Rate [0..1]",
"",
"",
"" );
CAF_PDM_InitField( &m_lateralInstallSuccessFraction, "LateralInstallSuccessFraction", 1.0, "Install Success Rate [0..1]" );
CAF_PDM_InitField( &m_icdCount, "IcdCount", 2, "ICDs per Sub" );
CAF_PDM_InitField( &m_icdOrificeDiameter, "IcdOrificeDiameter", 7.0, "ICD Orifice Diameter [mm]" );
@ -133,22 +118,13 @@ RimFishbones::RimFishbones()
CAF_PDM_InitField( &m_subsOrientationMode,
"SubsOrientationMode",
caf::AppEnum<LateralsOrientationType>( FB_LATERAL_ORIENTATION_RANDOM ),
"Orientation",
"",
"",
"" );
"Orientation" );
CAF_PDM_InitFieldNoDefault( &m_installationRotationAngles,
"InstallationRotationAngles",
"Installation Rotation Angles [deg]" );
m_installationRotationAngles.uiCapability()->setUiHidden( true );
CAF_PDM_InitField( &m_fixedInstallationRotationAngle,
"FixedInstallationRotationAngle",
0.0,
" Fixed Angle [deg]",
"",
"",
"" );
CAF_PDM_InitField( &m_fixedInstallationRotationAngle, "FixedInstallationRotationAngle", 0.0, " Fixed Angle [deg]" );
CAF_PDM_InitFieldNoDefault( &m_pipeProperties, "PipeProperties", "Pipe Properties" );
m_pipeProperties.uiCapability()->setUiTreeHidden( true );
@ -758,10 +734,7 @@ void RimFishbones::initialiseObsoleteFields()
CAF_PDM_InitField( &m_subsLocationMode_OBSOLETE,
"SubsLocationMode",
caf::AppEnum<LocationType>( FB_SUB_UNDEFINED ),
"Location Defined By",
"",
"",
"" );
"Location Defined By" );
m_subsLocationMode_OBSOLETE.xmlCapability()->setIOWritable( false );
CAF_PDM_InitField( &m_rangeStart_OBSOLETE, "RangeStart", std::numeric_limits<double>::infinity(), "Start MD [m]" );
@ -770,13 +743,7 @@ void RimFishbones::initialiseObsoleteFields()
CAF_PDM_InitField( &m_rangeEnd_OBSOLETE, "RangeEnd", std::numeric_limits<double>::infinity(), "End MD [m]" );
m_rangeEnd_OBSOLETE.xmlCapability()->setIOWritable( false );
CAF_PDM_InitField( &m_rangeSubSpacing_OBSOLETE,
"RangeSubSpacing",
std::numeric_limits<double>::infinity(),
"Spacing [m]",
"",
"",
"" );
CAF_PDM_InitField( &m_rangeSubSpacing_OBSOLETE, "RangeSubSpacing", std::numeric_limits<double>::infinity(), "Spacing [m]" );
m_rangeSubSpacing_OBSOLETE.xmlCapability()->setIOWritable( false );
CAF_PDM_InitField( &m_rangeSubCount_OBSOLETE, "RangeSubCount", -1, "Number of Subs" );

2
ApplicationLibCode/ProjectDataModel/Completions/RimFishbonesCollection.cpp
View File

@ -40,7 +40,7 @@ CAF_PDM_SOURCE_INIT( RimFishbonesCollection, "FishbonesCollection" );
//--------------------------------------------------------------------------------------------------
RimFishbonesCollection::RimFishbonesCollection()
{
CAF_PDM_InitObject( "Fishbones", ":/FishBones16x16.png", "", "" );
CAF_PDM_InitObject( "Fishbones", ":/FishBones16x16.png" );
nameField()->uiCapability()->setUiHidden( true );
this->setName( "Fishbones" );

21
ApplicationLibCode/ProjectDataModel/Completions/RimFracture.cpp
View File

@ -102,13 +102,7 @@ RimFracture::RimFracture()
m_editFractureTemplate.uiCapability()->setUiEditorTypeName( caf::PdmUiToolButtonEditor::uiEditorTypeName() );
m_editFractureTemplate.uiCapability()->setUiLabelPosition( caf::PdmUiItemInfo::HIDDEN );
CAF_PDM_InitField( &m_createEllipseFractureTemplate,
"CreateEllipseTemplate",
false,
"No Fracture Templates Found.",
"",
"",
"" );
CAF_PDM_InitField( &m_createEllipseFractureTemplate, "CreateEllipseTemplate", false, "No Fracture Templates Found." );
m_createEllipseFractureTemplate.uiCapability()->setUiEditorTypeName( caf::PdmUiPushButtonEditor::uiEditorTypeName() );
m_createEllipseFractureTemplate.uiCapability()->setUiLabelPosition( caf::PdmUiItemInfo::TOP );
@ -119,10 +113,7 @@ RimFracture::RimFracture()
CAF_PDM_InitField( &m_autoUpdateWellPathDepthAtFractureFromTemplate,
"AutoUpdateWellPathDepthAtFractureFromTemplate",
true,
"Auto-Update From Template",
"",
"",
"" );
"Auto-Update From Template" );
CAF_PDM_InitField( &m_wellPathDepthAtFracture, "WellPathDepthAtFracture", 0.0, "Well/Fracture Intersection Depth" );
m_wellPathDepthAtFracture.uiCapability()->setUiEditorTypeName( caf::PdmUiDoubleSliderEditor::uiEditorTypeName() );
@ -150,10 +141,7 @@ RimFracture::RimFracture()
CAF_PDM_InitField( &m_fractureUnit,
"FractureUnit",
caf::AppEnum<RiaDefines::EclipseUnitSystem>( RiaDefines::EclipseUnitSystem::UNITS_METRIC ),
"Fracture Unit System",
"",
"",
"" );
"Fracture Unit System" );
m_fractureUnit.uiCapability()->setUiReadOnly( true );
CAF_PDM_InitField( &m_stimPlanTimeIndexToPlot, "TimeIndexToPlot", 0, "StimPlan Time Step" );
@ -173,9 +161,6 @@ RimFracture::RimFracture()
CAF_PDM_InitField( &m_wellFractureAzimuthAngleWarning,
"WellFractureAzimithAngleWarning",
QString( "Difference is below 10 degrees. Consider longitudinal fracture" ),
"",
"",
"",
"" );
m_wellFractureAzimuthAngleWarning.uiCapability()->setUiReadOnly( true );
m_wellFractureAzimuthAngleWarning.xmlCapability()->disableIO();

25
ApplicationLibCode/ProjectDataModel/Completions/RimFractureTemplate.cpp
View File

@ -110,7 +110,7 @@ CAF_PDM_XML_ABSTRACT_SOURCE_INIT( RimFractureTemplate, "FractureTemplate", "RimF
RimFractureTemplate::RimFractureTemplate()
: wellPathDepthAtFractureChanged( this )
{
CAF_PDM_InitScriptableObject( "Fracture Template", ":/FractureTemplate16x16.png", "", "" );
CAF_PDM_InitScriptableObject( "Fracture Template", ":/FractureTemplate16x16.png" );
CAF_PDM_InitField( &m_id, "Id", -1, "ID" );
m_id.uiCapability()->setUiReadOnly( true );
@ -125,19 +125,13 @@ RimFractureTemplate::RimFractureTemplate()
CAF_PDM_InitField( &m_fractureTemplateUnit,
"UnitSystem",
caf::AppEnum<RiaDefines::EclipseUnitSystem>( RiaDefines::EclipseUnitSystem::UNITS_UNKNOWN ),
"Units System",
"",
"",
"" );
"Units System" );
m_fractureTemplateUnit.uiCapability()->setUiReadOnly( true );
CAF_PDM_InitScriptableField( &m_orientationType,
"Orientation",
caf::AppEnum<FracOrientationEnum>( TRANSVERSE_WELL_PATH ),
"Fracture Orientation",
"",
"",
"" );
"Fracture Orientation" );
CAF_PDM_InitScriptableField( &m_azimuthAngle, "AzimuthAngle", 0.0f, "Azimuth Angle" );
@ -152,10 +146,7 @@ RimFractureTemplate::RimFractureTemplate()
CAF_PDM_InitField( &m_conductivityType,
"ConductivityType",
caf::AppEnum<FracConductivityEnum>( FINITE_CONDUCTIVITY ),
"Conductivity in Fracture",
"",
"",
"" );
"Conductivity in Fracture" );
CAF_PDM_InitField( &m_wellPathDepthAtFracture, "WellPathDepthAtFracture", 0.0, "Well/Fracture Intersection Depth" );
m_wellPathDepthAtFracture.uiCapability()->setUiEditorTypeName( caf::PdmUiDoubleSliderEditor::uiEditorTypeName() );
@ -181,13 +172,7 @@ RimFractureTemplate::RimFractureTemplate()
CAF_PDM_InitFieldNoDefault( &m_permeabilityType, "PermeabilityType", "Type" );
CAF_PDM_InitField( &m_relativePermeability, "RelativePermeability", 1.0, "Relative Permeability" );
CAF_PDM_InitField( &m_userDefinedEffectivePermeability,
"EffectivePermeability",
0.0,
"Effective Permeability (Ke) [mD]",
"",
"",
"" );
CAF_PDM_InitField( &m_userDefinedEffectivePermeability, "EffectivePermeability", 0.0, "Effective Permeability (Ke) [mD]" );
CAF_PDM_InitField( &m_relativeGasDensity,
"RelativeGasDensity",

7
ApplicationLibCode/ProjectDataModel/Completions/RimFractureTemplateCollection.cpp
View File

@ -52,15 +52,12 @@ CAF_PDM_SOURCE_INIT( RimFractureTemplateCollection, "FractureTemplateCollection"
//--------------------------------------------------------------------------------------------------
RimFractureTemplateCollection::RimFractureTemplateCollection()
{
CAF_PDM_InitScriptableObject( "Fracture Templates", ":/FractureTemplates16x16.png", "", "" );
CAF_PDM_InitScriptableObject( "Fracture Templates", ":/FractureTemplates16x16.png" );
CAF_PDM_InitField( &m_defaultUnitsForFracTemplates,
"DefaultUnitForTemplates",
caf::AppEnum<RiaDefines::EclipseUnitSystem>( RiaDefines::EclipseUnitSystem::UNITS_METRIC ),
"Default unit system for fracture templates",
"",
"",
"" );
"Default unit system for fracture templates" );
CAF_PDM_InitFieldNoDefault( &m_fractureDefinitions, "FractureDefinitions", "" );
m_fractureDefinitions.uiCapability()->setUiTreeHidden( true );

18
ApplicationLibCode/ProjectDataModel/Completions/RimMswCompletionParameters.cpp
View File

@ -63,26 +63,14 @@ CAF_PDM_SOURCE_INIT( RimMswCompletionParameters, "RimMswCompletionParameters" );
//--------------------------------------------------------------------------------------------------
RimMswCompletionParameters::RimMswCompletionParameters()
{
CAF_PDM_InitObject( "MSW Completion Parameters", ":/CompletionsSymbol16x16.png", "", "" );
CAF_PDM_InitObject( "MSW Completion Parameters", ":/CompletionsSymbol16x16.png" );
CAF_PDM_InitFieldNoDefault( &m_refMDType, "RefMDType", "Reference MD" );
CAF_PDM_InitField( &m_refMD, "RefMD", 0.0, "" );
CAF_PDM_InitField( &m_customValuesForLateral, "CustomValuesForLateral", false, "Custom Values for Lateral" );
CAF_PDM_InitField( &m_linerDiameter,
"LinerDiameter",
std::numeric_limits<double>::infinity(),
"Liner Inner Diameter",
"",
"",
"" );
CAF_PDM_InitField( &m_roughnessFactor,
"RoughnessFactor",
std::numeric_limits<double>::infinity(),
"Roughness Factor",
"",
"",
"" );
CAF_PDM_InitField( &m_linerDiameter, "LinerDiameter", std::numeric_limits<double>::infinity(), "Liner Inner Diameter" );
CAF_PDM_InitField( &m_roughnessFactor, "RoughnessFactor", std::numeric_limits<double>::infinity(), "Roughness Factor" );
CAF_PDM_InitFieldNoDefault( &m_pressureDrop, "PressureDrop", "Pressure Drop" );
CAF_PDM_InitFieldNoDefault( &m_lengthAndDepth, "LengthAndDepth", "Length and Depth" );

10
ApplicationLibCode/ProjectDataModel/Completions/RimMultipleValveLocations.cpp
View File

@ -51,15 +51,9 @@ void AppEnum<RimMultipleValveLocations::LocationType>::setUp()
//--------------------------------------------------------------------------------------------------
RimMultipleValveLocations::RimMultipleValveLocations()
{
CAF_PDM_InitObject( "RimMultipleValveLocations", ":/FishBoneGroup16x16.png", "", "" );
CAF_PDM_InitObject( "RimMultipleValveLocations", ":/FishBoneGroup16x16.png" );
CAF_PDM_InitField( &m_locationType,
"LocationMode",
caf::AppEnum<LocationType>( VALVE_COUNT ),
"Location Defined By",
"",
"",
"" );
CAF_PDM_InitField( &m_locationType, "LocationMode", caf::AppEnum<LocationType>( VALVE_COUNT ), "Location Defined By" );
CAF_PDM_InitField( &m_rangeStart, "RangeStart", 100.0, "Start MD [m]" );
m_rangeStart.uiCapability()->setUiEditorTypeName( caf::PdmUiDoubleValueEditor::uiEditorTypeName() );

20
ApplicationLibCode/ProjectDataModel/Completions/RimNonDarcyPerforationParameters.cpp
View File

@ -43,7 +43,7 @@ CAF_PDM_SOURCE_INIT( RimNonDarcyPerforationParameters, "RimNonDarcyPerforationPa
//--------------------------------------------------------------------------------------------------
RimNonDarcyPerforationParameters::RimNonDarcyPerforationParameters()
{
CAF_PDM_InitObject( "NonDarcyPerforationParameters", ":/CompletionsSymbol16x16.png", "", "" );
CAF_PDM_InitObject( "NonDarcyPerforationParameters", ":/CompletionsSymbol16x16.png" );
CAF_PDM_InitFieldNoDefault( &m_nonDarcyFlowType, "NonDarcyFlowType", "Non-Darcy Flow" );
@ -52,10 +52,7 @@ RimNonDarcyPerforationParameters::RimNonDarcyPerforationParameters()
CAF_PDM_InitField( &m_gridPermeabilityScalingFactor,
"GridPermeabilityScalingFactor",
1.0,
"<html>Grid Permeability Scaling Factor (K<sub>r</sub>) [0..1]</html>",
"",
"",
"" );
"<html>Grid Permeability Scaling Factor (K<sub>r</sub>) [0..1]</html>" );
CAF_PDM_InitField( &m_wellRadius, "WellRadius", 0.108, "<html>Well Radius (r<sub>w</sub>)</html> [m]" );
@ -78,17 +75,8 @@ RimNonDarcyPerforationParameters::RimNonDarcyPerforationParameters()
CAF_PDM_InitField( &m_inertialCoefficientBeta0,
"InertialCoefficientBeta0",
883.90,
"<html>Inertial Coefficient (&beta;<sub>0</sub>)</html> [Forch. unit]",
"",
"",
"" );
CAF_PDM_InitField( &m_permeabilityScalingFactor,
"PermeabilityScalingFactor",
-1.1045,
"Permeability Scaling Factor (B)",
"",
"",
"" );
"<html>Inertial Coefficient (&beta;<sub>0</sub>)</html> [Forch. unit]" );
CAF_PDM_InitField( &m_permeabilityScalingFactor, "PermeabilityScalingFactor", -1.1045, "Permeability Scaling Factor (B)" );
CAF_PDM_InitField( &m_porosityScalingFactor, "PorosityScalingFactor", 0.0, "Porosity Scaling Factor (C)" );
}

2
ApplicationLibCode/ProjectDataModel/Completions/RimPerforationCollection.cpp
View File

@ -40,7 +40,7 @@ CAF_PDM_SOURCE_INIT( RimPerforationCollection, "PerforationCollection" );
//--------------------------------------------------------------------------------------------------
RimPerforationCollection::RimPerforationCollection()
{
CAF_PDM_InitObject( "Perforations", ":/PerforationIntervals16x16.png", "", "" );
CAF_PDM_InitObject( "Perforations", ":/PerforationIntervals16x16.png" );
nameField()->uiCapability()->setUiHidden( true );
this->setName( "Perforations" );

2
ApplicationLibCode/ProjectDataModel/Completions/RimPerforationInterval.cpp
View File

@ -41,7 +41,7 @@ CAF_PDM_SOURCE_INIT( RimPerforationInterval, "Perforation" );
//--------------------------------------------------------------------------------------------------
RimPerforationInterval::RimPerforationInterval()
{
CAF_PDM_InitObject( "Perforation", ":/PerforationInterval16x16.png", "", "" );
CAF_PDM_InitObject( "Perforation", ":/PerforationInterval16x16.png" );
CAF_PDM_InitField( &m_startMD, "StartMeasuredDepth", 0.0, "Start MD" );
CAF_PDM_InitField( &m_endMD, "EndMeasuredDepth", 0.0, "End MD" );

2
ApplicationLibCode/ProjectDataModel/Completions/RimSimWellFracture.cpp
View File

@ -40,7 +40,7 @@ CAF_PDM_SOURCE_INIT( RimSimWellFracture, "SimWellFracture" );
//--------------------------------------------------------------------------------------------------
RimSimWellFracture::RimSimWellFracture( void )
{
CAF_PDM_InitObject( "SimWellFracture", ":/FractureSymbol16x16.png", "", "" );
CAF_PDM_InitObject( "SimWellFracture", ":/FractureSymbol16x16.png" );
CAF_PDM_InitField( &m_location, "MeasuredDepth", 0.0f, "Pseudo Length Location" );
m_location.uiCapability()->setUiEditorTypeName( caf::PdmUiDoubleSliderEditor::uiEditorTypeName() );

2
ApplicationLibCode/ProjectDataModel/Completions/RimSimWellFractureCollection.cpp
View File

@ -28,7 +28,7 @@ CAF_PDM_SOURCE_INIT( RimSimWellFractureCollection, "SimWellFractureCollection" )
//--------------------------------------------------------------------------------------------------
RimSimWellFractureCollection::RimSimWellFractureCollection( void )
{
CAF_PDM_InitObject( "Fractures", ":/FractureLayout16x16.png", "", "" );
CAF_PDM_InitObject( "Fractures", ":/FractureLayout16x16.png" );
CAF_PDM_InitFieldNoDefault( &simwellFractures, "Fractures", "" );
simwellFractures.uiCapability()->setUiTreeHidden( true );

12
ApplicationLibCode/ProjectDataModel/Completions/RimStimPlanFractureTemplate.cpp
View File

@ -72,7 +72,7 @@ CAF_PDM_SOURCE_INIT( RimStimPlanFractureTemplate, "StimPlanFractureTemplate", "R
//--------------------------------------------------------------------------------------------------
RimStimPlanFractureTemplate::RimStimPlanFractureTemplate()
{
CAF_PDM_InitScriptableObject( "Fracture Template", ":/FractureTemplate16x16.png", "", "" );
CAF_PDM_InitScriptableObject( "Fracture Template", ":/FractureTemplate16x16.png" );
CAF_PDM_InitFieldNoDefault( &m_stimPlanFileName, "StimPlanFileName", "File Name" );
m_stimPlanFileName.uiCapability()->setUiEditorTypeName( caf::PdmUiFilePathEditor::uiEditorTypeName() );
@ -80,10 +80,7 @@ RimStimPlanFractureTemplate::RimStimPlanFractureTemplate()
CAF_PDM_InitField( &m_userDefinedWellPathDepthAtFracture,
"UserDefinedWellPathDepthAtFracture",
false,
"User-Defined Well/Fracture Intersection Depth",
"",
"",
"" );
"User-Defined Well/Fracture Intersection Depth" );
CAF_PDM_InitField( &m_borderPolygonResultName, "BorderPolygonResultName", QString( "" ), "Parameter" );
m_borderPolygonResultName.uiCapability()->setUiHidden( true );
@ -92,10 +89,7 @@ RimStimPlanFractureTemplate::RimStimPlanFractureTemplate()
CAF_PDM_InitField( &m_conductivityResultNameOnFile,
"ConductivityResultName",
QString( "" ),
"Active Conductivity Result Name",
"",
"",
"" );
"Active Conductivity Result Name" );
CAF_PDM_InitFieldNoDefault( &m_propertiesTable, "PropertiesTable", "Properties Table" );
m_propertiesTable.uiCapability()->setUiEditorTypeName( caf::PdmUiTextEditor::uiEditorTypeName() );

7
ApplicationLibCode/ProjectDataModel/Completions/RimValveTemplate.cpp
View File

@ -30,15 +30,12 @@ CAF_PDM_SOURCE_INIT( RimValveTemplate, "ValveTemplate" );
//--------------------------------------------------------------------------------------------------
RimValveTemplate::RimValveTemplate()
{
CAF_PDM_InitObject( "Valve Template", ":/ICDValve16x16.png", "", "" );
CAF_PDM_InitObject( "Valve Template", ":/ICDValve16x16.png" );
CAF_PDM_InitField( &m_valveTemplateUnit,
"UnitSystem",
caf::AppEnum<RiaDefines::EclipseUnitSystem>( RiaDefines::EclipseUnitSystem::UNITS_UNKNOWN ),
"Units System",
"",
"",
"" );
"Units System" );
m_valveTemplateUnit.uiCapability()->setUiReadOnly( true );
CAF_PDM_InitFieldNoDefault( &m_type, "CompletionType", "Type" );

2
ApplicationLibCode/ProjectDataModel/Completions/RimValveTemplateCollection.cpp
View File

@ -28,7 +28,7 @@ CAF_PDM_SOURCE_INIT( RimValveTemplateCollection, "ValveTemplateCollection" );
//--------------------------------------------------------------------------------------------------
RimValveTemplateCollection::RimValveTemplateCollection()
{
CAF_PDM_InitObject( "Valve Templates", ":/ICDValve16x16.png", "", "" );
CAF_PDM_InitObject( "Valve Templates", ":/ICDValve16x16.png" );
CAF_PDM_InitFieldNoDefault( &m_valveDefinitions, "ValveDefinitions", "" );
CAF_PDM_InitFieldNoDefault( &m_defaultUnitsForValveTemplates, "ValveUnits", "Default unit system for valve templates" );
m_defaultUnitsForValveTemplates = RiaDefines::EclipseUnitSystem::UNITS_METRIC;

50
ApplicationLibCode/ProjectDataModel/Completions/RimWellPathAicdParameters.cpp
View File

@ -56,73 +56,43 @@ RimWellPathAicdParameters::RimWellPathAicdParameters()
CAF_PDM_InitField( &m_aicdParameterFields[AICD_CRITICAL_WATER_IN_LIQUID_FRAC],
"CriticalWaterLiquidFractionEmul",
QString( "1*" ),
"Critical Water in Liquid Fraction for emulsions",
"",
"",
"" );
"Critical Water in Liquid Fraction for emulsions" );
CAF_PDM_InitField( &m_aicdParameterFields[AICD_EMULSION_VISC_TRANS_REGION],
"ViscosityTransitionRegionEmul",
QString( "1*" ),
"Emulsion Viscosity Transition Region",
"",
"",
"" );
"Emulsion Viscosity Transition Region" );
CAF_PDM_InitField( &m_aicdParameterFields[AICD_MAX_RATIO_EMULSION_VISC],
"MaxRatioOfEmulsionVisc",
QString( "1*" ),
"Max Ratio of Emulsion to Continuous Viscosity",
"",
"",
"" );
"Max Ratio of Emulsion to Continuous Viscosity" );
CAF_PDM_InitField( &m_aicdParameterFields[AICD_MAX_FLOW_RATE],
"MaxFlowRate",
QString( "1*" ),
"Max Flow Rate for AICD Device (m^3 / day)",
"",
"",
"" );
"Max Flow Rate for AICD Device (m^3 / day)" );
CAF_PDM_InitField( &m_aicdParameterFields[AICD_EXP_OIL_FRAC_DENSITY],
"ExponentOilDensity",
QString( "1*" ),
"Density Exponent of Oil Fraction",
"",
"",
"" );
"Density Exponent of Oil Fraction" );
CAF_PDM_InitField( &m_aicdParameterFields[AICD_EXP_WATER_FRAC_DENSITY],
"ExponentWaterDensity",
QString( "1*" ),
"Density Exponent of Water Fraction",
"",
"",
"" );
"Density Exponent of Water Fraction" );
CAF_PDM_InitField( &m_aicdParameterFields[AICD_EXP_GAS_FRAC_DENSITY],
"ExponentGasDensity",
QString( "1*" ),
"Density Exponent of Gas Fraction",
"",
"",
"" );
"Density Exponent of Gas Fraction" );
CAF_PDM_InitField( &m_aicdParameterFields[AICD_EXP_OIL_FRAC_VISCOSITY],
"ExponentOilViscosity",
QString( "1*" ),
"Viscosity Exponent of Oil Fraction",
"",
"",
"" );
"Viscosity Exponent of Oil Fraction" );
CAF_PDM_InitField( &m_aicdParameterFields[AICD_EXP_WATER_FRAC_VISCOSITY],
"ExponentWaterViscosity",
QString( "1*" ),
"Viscosity Exponent of Water Fraction",
"",
"",
"" );
"Viscosity Exponent of Water Fraction" );
CAF_PDM_InitField( &m_aicdParameterFields[AICD_EXP_GAS_FRAC_VISCOSITY],
"ExponentGasViscosity",
QString( "1*" ),
"Viscosity Exponent of Gas Fraction",
"",
"",
"" );
"Viscosity Exponent of Gas Fraction" );
std::vector<caf::PdmFieldHandle*> allFields;
this->fields( allFields );

2
ApplicationLibCode/ProjectDataModel/Completions/RimWellPathCompletionSettings.cpp
View File

@ -77,7 +77,7 @@ CAF_PDM_SOURCE_INIT( RimWellPathCompletionSettings, "WellPathCompletionSettings"
//--------------------------------------------------------------------------------------------------
RimWellPathCompletionSettings::RimWellPathCompletionSettings()
{
CAF_PDM_InitObject( "Completion Settings", ":/CompletionsSymbol16x16.png", "", "" );
CAF_PDM_InitObject( "Completion Settings", ":/CompletionsSymbol16x16.png" );
CAF_PDM_InitField( &m_wellNameForExport, "WellNameForExport", QString(), "Well Name" );
m_wellNameForExport.uiCapability()->setUiEditorTypeName( caf::PdmUiLineEditor::uiEditorTypeName() );

10
ApplicationLibCode/ProjectDataModel/Completions/RimWellPathCompletions.cpp
View File

@ -49,7 +49,7 @@ CAF_PDM_SOURCE_INIT( RimWellPathCompletions, "WellPathCompletions" );
//--------------------------------------------------------------------------------------------------
RimWellPathCompletions::RimWellPathCompletions()
{
CAF_PDM_InitObject( "Completions", ":/CompletionsSymbol16x16.png", "", "" );
CAF_PDM_InitObject( "Completions", ":/CompletionsSymbol16x16.png" );
CAF_PDM_InitFieldNoDefault( &m_perforationCollection, "Perforations", "Perforations" );
m_perforationCollection = new RimPerforationCollection;
@ -75,13 +75,7 @@ RimWellPathCompletions::RimWellPathCompletions()
m_referenceDepth_OBSOLETE.xmlCapability()->setIOWritable( false );
CAF_PDM_InitFieldNoDefault( &m_preferredFluidPhase_OBSOLETE, "WellTypeForExport", "Preferred Fluid Phase" );
m_preferredFluidPhase_OBSOLETE.xmlCapability()->setIOWritable( false );
CAF_PDM_InitField( &m_drainageRadiusForPI_OBSOLETE,
"DrainageRadiusForPI",
QString( "0.0" ),
"Drainage Radius for PI",
"",
"",
"" );
CAF_PDM_InitField( &m_drainageRadiusForPI_OBSOLETE, "DrainageRadiusForPI", QString( "0.0" ), "Drainage Radius for PI" );
m_drainageRadiusForPI_OBSOLETE.xmlCapability()->setIOWritable( false );
CAF_PDM_InitFieldNoDefault( &m_gasInflowEquation_OBSOLETE, "GasInflowEq", "Gas Inflow Equation" );
m_gasInflowEquation_OBSOLETE.xmlCapability()->setIOWritable( false );

2
ApplicationLibCode/ProjectDataModel/Completions/RimWellPathFracture.cpp
View File

@ -35,7 +35,7 @@ CAF_PDM_SOURCE_INIT( RimWellPathFracture, "WellPathFracture" );
//--------------------------------------------------------------------------------------------------
RimWellPathFracture::RimWellPathFracture( void )
{
CAF_PDM_InitObject( "Fracture", ":/FractureSymbol16x16.png", "", "" );
CAF_PDM_InitObject( "Fracture", ":/FractureSymbol16x16.png" );
CAF_PDM_InitField( &m_measuredDepth, "MeasuredDepth", 0.0f, "Measured Depth Location" );
m_measuredDepth.uiCapability()->setUiEditorTypeName( caf::PdmUiDoubleSliderEditor::uiEditorTypeName() );

2
ApplicationLibCode/ProjectDataModel/Completions/RimWellPathFractureCollection.cpp
View File

@ -30,7 +30,7 @@ CAF_PDM_SOURCE_INIT( RimWellPathFractureCollection, "WellPathFractureCollection"
//--------------------------------------------------------------------------------------------------
RimWellPathFractureCollection::RimWellPathFractureCollection( void )
{
CAF_PDM_InitObject( "Fractures", ":/FractureLayout16x16.png", "", "" );
CAF_PDM_InitObject( "Fractures", ":/FractureLayout16x16.png" );
CAF_PDM_InitFieldNoDefault( &m_fractures, "Fractures", "" );
m_fractures.uiCapability()->setUiTreeHidden( true );

2
ApplicationLibCode/ProjectDataModel/Completions/RimWellPathValve.cpp
View File

@ -44,7 +44,7 @@ CAF_PDM_SOURCE_INIT( RimWellPathValve, "WellPathValve" );
//--------------------------------------------------------------------------------------------------
RimWellPathValve::RimWellPathValve()
{
CAF_PDM_InitObject( "WellPathValve", ":/ICDValve16x16.png", "", "" );
CAF_PDM_InitObject( "WellPathValve", ":/ICDValve16x16.png" );
CAF_PDM_InitFieldNoDefault( &m_valveTemplate, "ValveTemplate", "Valve Template" );
CAF_PDM_InitField( &m_measuredDepth, "StartMeasuredDepth", 0.0, "Start MD" );

2
ApplicationLibCode/ProjectDataModel/CorrelationPlots/RimAbstractCorrelationPlot.cpp
View File

@ -50,7 +50,7 @@ CAF_PDM_ABSTRACT_SOURCE_INIT( RimAbstractCorrelationPlot, "AbstractCorrelationPl
RimAbstractCorrelationPlot::RimAbstractCorrelationPlot()
: m_selectMultipleVectors( false )
{
CAF_PDM_InitObject( "Abstract Correlation Plot", ":/CorrelationPlot16x16.png", "", "" );
CAF_PDM_InitObject( "Abstract Correlation Plot", ":/CorrelationPlot16x16.png" );
this->setDeletable( true );
CAF_PDM_InitFieldNoDefault( &m_selectedVarsUiField, "SelectedVariableDisplayVar", "Vector" );

7
ApplicationLibCode/ProjectDataModel/CorrelationPlots/RimCorrelationMatrixPlot.cpp
View File

@ -153,7 +153,7 @@ RimCorrelationMatrixPlot::RimCorrelationMatrixPlot()
: RimAbstractCorrelationPlot()
, matrixCellSelected( this )
{
CAF_PDM_InitObject( "Correlation Plot", ":/CorrelationMatrixPlot16x16.png", "", "" );
CAF_PDM_InitObject( "Correlation Plot", ":/CorrelationMatrixPlot16x16.png" );
CAF_PDM_InitField( &m_showAbsoluteValues, "CorrelationAbsValues", false, "Show Absolute Values" );
CAF_PDM_InitFieldNoDefault( &m_sortByValues, "CorrelationSorting", "Sort Matrix by Values" );
@ -161,10 +161,7 @@ RimCorrelationMatrixPlot::RimCorrelationMatrixPlot()
CAF_PDM_InitField( &m_excludeParametersWithoutVariation,
"ExcludeParamsWithoutVariation",
true,
"Exclude Parameters Without Variation",
"",
"",
"" );
"Exclude Parameters Without Variation" );
CAF_PDM_InitField( &m_showOnlyTopNCorrelations, "ShowOnlyTopNCorrelations", true, "Show Only Top Correlations" );
CAF_PDM_InitField( &m_topNFilterCount, "TopNFilterCount", 20, "Number rows/columns" );
CAF_PDM_InitFieldNoDefault( &m_legendConfig, "LegendConfig", "" );

7
ApplicationLibCode/ProjectDataModel/CorrelationPlots/RimCorrelationPlot.cpp
View File

@ -55,17 +55,14 @@ RimCorrelationPlot::RimCorrelationPlot()
: RimAbstractCorrelationPlot()
, tornadoItemSelected( this )
{
CAF_PDM_InitObject( "Correlation Tornado Plot", ":/CorrelationTornadoPlot16x16.png", "", "" );
CAF_PDM_InitObject( "Correlation Tornado Plot", ":/CorrelationTornadoPlot16x16.png" );
CAF_PDM_InitField( &m_showAbsoluteValues, "CorrelationAbsValues", false, "Show Absolute Values" );
CAF_PDM_InitField( &m_sortByAbsoluteValues, "CorrelationAbsSorting", true, "Sort by Absolute Values" );
CAF_PDM_InitField( &m_excludeParametersWithoutVariation,
"ExcludeParamsWithoutVariation",
true,
"Exclude Parameters Without Variation",
"",
"",
"" );
"Exclude Parameters Without Variation" );
CAF_PDM_InitField( &m_showOnlyTopNCorrelations, "ShowOnlyTopNCorrelations", true, "Show Only Top Correlations" );
CAF_PDM_InitField( &m_topNFilterCount, "TopNFilterCount", 20, "Number rows/columns" );

2
ApplicationLibCode/ProjectDataModel/CorrelationPlots/RimCorrelationPlotCollection.cpp
View File

@ -34,7 +34,7 @@ CAF_PDM_SOURCE_INIT( RimCorrelationPlotCollection, "CorrelationPlotCollection" )
//--------------------------------------------------------------------------------------------------
RimCorrelationPlotCollection::RimCorrelationPlotCollection()
{
CAF_PDM_InitObject( "Ensemble Correlation Plots", ":/CorrelationPlots16x16.png", "", "" );
CAF_PDM_InitObject( "Ensemble Correlation Plots", ":/CorrelationPlots16x16.png" );
CAF_PDM_InitFieldNoDefault( &m_correlationPlots, "CorrelationPlots", "Correlation Plots" );
CAF_PDM_InitFieldNoDefault( &m_correlationReports, "CorrelationReports", "Correlation Reports" );

2
ApplicationLibCode/ProjectDataModel/CorrelationPlots/RimCorrelationReportPlot.cpp
View File

@ -51,7 +51,7 @@ CAF_PDM_SOURCE_INIT( RimCorrelationReportPlot, "CorrelationReportPlot" );
//--------------------------------------------------------------------------------------------------
RimCorrelationReportPlot::RimCorrelationReportPlot()
{
CAF_PDM_InitObject( "Correlation Report Plot", ":/CorrelationReportPlot16x16.png", "", "" );
CAF_PDM_InitObject( "Correlation Report Plot", ":/CorrelationReportPlot16x16.png" );
this->setDeletable( true );
CAF_PDM_InitFieldNoDefault( &m_plotWindowTitle, "PlotWindowTitle", "Title" );

2
ApplicationLibCode/ProjectDataModel/CorrelationPlots/RimParameterResultCrossPlot.cpp
View File

@ -66,7 +66,7 @@ CAF_PDM_SOURCE_INIT( RimParameterResultCrossPlot, "ParameterResultCrossPlot" );
RimParameterResultCrossPlot::RimParameterResultCrossPlot()
: RimAbstractCorrelationPlot()
{
CAF_PDM_InitObject( "ParameterResultCross Plot", ":/CorrelationCrossPlot16x16.png", "", "" );
CAF_PDM_InitObject( "ParameterResultCross Plot", ":/CorrelationCrossPlot16x16.png" );
CAF_PDM_InitField( &m_ensembleParameter, "EnsembleParameter", QString( "" ), "Ensemble Parameter" );
m_ensembleParameter.uiCapability()->setUiEditorTypeName( caf::PdmUiComboBoxEditor::uiEditorTypeName() );

2
ApplicationLibCode/ProjectDataModel/Faults/RimFaultInView.cpp
View File

@ -31,7 +31,7 @@ CAF_PDM_SOURCE_INIT( RimFaultInView, "Fault" );
//--------------------------------------------------------------------------------------------------
RimFaultInView::RimFaultInView()
{
CAF_PDM_InitObject( "RimFault", ":/draw_style_faults_24x24.png", "", "" );
CAF_PDM_InitObject( "RimFault", ":/draw_style_faults_24x24.png" );
CAF_PDM_InitFieldNoDefault( &name, "FaultName", "Name" );
name.uiCapability()->setUiHidden( true );

2
ApplicationLibCode/ProjectDataModel/Faults/RimFaultInViewCollection.cpp
View File

@ -61,7 +61,7 @@ CAF_PDM_SOURCE_INIT( RimFaultInViewCollection, "Faults" );
//--------------------------------------------------------------------------------------------------
RimFaultInViewCollection::RimFaultInViewCollection()
{
CAF_PDM_InitObject( "Faults", ":/draw_style_faults_24x24.png", "", "" );
CAF_PDM_InitObject( "Faults", ":/draw_style_faults_24x24.png" );
CAF_PDM_InitField( &showFaultCollection, "Active", true, "Active" );
showFaultCollection.uiCapability()->setUiHidden( true );

2
ApplicationLibCode/ProjectDataModel/Faults/RimFaultRAPostprocSettings.cpp
View File

@ -30,7 +30,7 @@
//--------------------------------------------------------------------------------------------------
RimFaultRAPostprocSettings::RimFaultRAPostprocSettings()
{
CAF_PDM_InitObject( "Reactivation Assessment Postproc Settings", ":/fault_react_24x24.png", "", "" );
CAF_PDM_InitObject( "Reactivation Assessment Postproc Settings", ":/fault_react_24x24.png" );
CAF_PDM_InitField( &m_baseDir, "BaseDir", QString( "" ), "Working Directory" );
CAF_PDM_InitField( &m_startTimestepEclipse, "StartTimeStepEclipse", 0, "Start Time Step" );

2
ApplicationLibCode/ProjectDataModel/Faults/RimFaultRAPreprocSettings.cpp
View File

@ -40,7 +40,7 @@ CAF_PDM_SOURCE_INIT( RimFaultRAPreprocSettings, "RimFaultRAPreprocSettings" );
//--------------------------------------------------------------------------------------------------
RimFaultRAPreprocSettings::RimFaultRAPreprocSettings()
{
CAF_PDM_InitObject( "Fault RA Preproc Settings", ":/fault_react_24x24.png", "", "" );
CAF_PDM_InitObject( "Fault RA Preproc Settings", ":/fault_react_24x24.png" );
CAF_PDM_InitField( &m_startTimestepEclipse, "StartTimeStepEclipse", 0, "Start Time Step" );
m_startTimestepEclipse.uiCapability()->setUiEditorTypeName( caf::PdmUiComboBoxEditor::uiEditorTypeName() );

11
ApplicationLibCode/ProjectDataModel/Faults/RimFaultRASettings.cpp
View File

@ -53,7 +53,7 @@ CAF_PDM_SOURCE_INIT( RimFaultRASettings, "RimFaultRASettings" );
//--------------------------------------------------------------------------------------------------
RimFaultRASettings::RimFaultRASettings()
{
CAF_PDM_InitObject( "Reactivation Assessment Settings", ":/fault_react_24x24.png", "", "" );
CAF_PDM_InitObject( "Reactivation Assessment Settings", ":/fault_react_24x24.png" );
CAF_PDM_InitFieldNoDefault( &m_eclipseCase, "EclipseCase", "Eclipse Case" );
m_eclipseCase.uiCapability()->setUiReadOnly( true );
@ -83,13 +83,8 @@ RimFaultRASettings::RimFaultRASettings()
m_endTimestepGeoMech.uiCapability()->setUiEditorTypeName( caf::PdmUiComboBoxEditor::uiEditorTypeName() );
m_endTimestepGeoMech.uiCapability()->setUiReadOnly( true );
CAF_PDM_InitFieldNoDefault( &m_basicParameters, "BasicParameters", "Basic Processing Parameters", ":/Bullet.png", "", "" );
CAF_PDM_InitFieldNoDefault( &m_advancedParameters,
"AdvancedParameters",
"Advanced Processing Parameters",
":/Bullet.png",
"",
"" );
CAF_PDM_InitFieldNoDefault( &m_basicParameters, "BasicParameters", "Basic Processing Parameters", ":/Bullet.png" );
CAF_PDM_InitFieldNoDefault( &m_advancedParameters, "AdvancedParameters", "Advanced Processing Parameters", ":/Bullet.png" );
CAF_PDM_InitFieldNoDefault( &m_basicParametersRI, "BasicParametersRI", "Basic ResInsight Parameters" );
CAF_PDM_InitFieldNoDefault( &m_advancedParametersRI, "AdvancedParametersRI", "Advanced ResInsight Parameters" );

2
ApplicationLibCode/ProjectDataModel/Flow/RimFlowCharacteristicsPlot.cpp
View File

@ -68,7 +68,7 @@ CAF_PDM_SOURCE_INIT( RimFlowCharacteristicsPlot, "FlowCharacteristicsPlot" );
//--------------------------------------------------------------------------------------------------
RimFlowCharacteristicsPlot::RimFlowCharacteristicsPlot()
{
CAF_PDM_InitObject( "Flow Characteristics", ":/FlowCharPlot16x16.png", "", "" );
CAF_PDM_InitObject( "Flow Characteristics", ":/FlowCharPlot16x16.png" );
CAF_PDM_InitFieldNoDefault( &m_case, "FlowCase", "Case" );
CAF_PDM_InitFieldNoDefault( &m_flowDiagSolution, "FlowDiagSolution", "Flow Diag Solution" );

2
ApplicationLibCode/ProjectDataModel/Flow/RimFlowPlotCollection.cpp
View File

@ -33,7 +33,7 @@ CAF_PDM_SOURCE_INIT( RimFlowPlotCollection, "FlowPlotCollection" );
//--------------------------------------------------------------------------------------------------
RimFlowPlotCollection::RimFlowPlotCollection()
{
CAF_PDM_InitObject( "Flow Diagnostics Plots", ":/WellAllocPlots16x16.png", "", "" );
CAF_PDM_InitObject( "Flow Diagnostics Plots", ":/WellAllocPlots16x16.png" );
CAF_PDM_InitFieldNoDefault( &m_flowCharacteristicsPlot, "FlowCharacteristicsPlot", "" );
m_flowCharacteristicsPlot.uiCapability()->setUiTreeHidden( true );

2
ApplicationLibCode/ProjectDataModel/Flow/RimTofAccumulatedPhaseFractionsPlot.cpp
View File

@ -44,7 +44,7 @@ CAF_PDM_SOURCE_INIT( RimTofAccumulatedPhaseFractionsPlot, "TofAccumulatedPhaseFr
//--------------------------------------------------------------------------------------------------
RimTofAccumulatedPhaseFractionsPlot::RimTofAccumulatedPhaseFractionsPlot()
{
CAF_PDM_InitObject( "Cumulative Saturation by Time of Flight", ":/TOFAccSatPlot16x16.png", "", "" );
CAF_PDM_InitObject( "Cumulative Saturation by Time of Flight", ":/TOFAccSatPlot16x16.png" );
CAF_PDM_InitField( &m_userName, "PlotDescription", QString( "Cumulative Saturation by Time of Flight" ), "Name" );
m_userName.uiCapability()->setUiHidden( true );

2
ApplicationLibCode/ProjectDataModel/Flow/RimTotalWellAllocationPlot.cpp
View File

@ -42,7 +42,7 @@ CAF_PDM_SOURCE_INIT( RimTotalWellAllocationPlot, "TotalWellAllocationPlot" );
//--------------------------------------------------------------------------------------------------
RimTotalWellAllocationPlot::RimTotalWellAllocationPlot()
{
CAF_PDM_InitObject( "Total Allocation", ":/WellAllocPie16x16.png", "", "" );
CAF_PDM_InitObject( "Total Allocation", ":/WellAllocPie16x16.png" );
CAF_PDM_InitField( &m_userName, "PlotDescription", QString( "Total Allocation" ), "Name" );
m_userName.uiCapability()->setUiReadOnly( true );

2
ApplicationLibCode/ProjectDataModel/Flow/RimWellAllocationPlot.cpp
View File

@ -74,7 +74,7 @@ void AppEnum<RimWellAllocationPlot::FlowType>::setUp()
//--------------------------------------------------------------------------------------------------
RimWellAllocationPlot::RimWellAllocationPlot()
{
CAF_PDM_InitObject( "Well Allocation Plot", ":/WellAllocPlot16x16.png", "", "" );
CAF_PDM_InitObject( "Well Allocation Plot", ":/WellAllocPlot16x16.png" );
CAF_PDM_InitField( &m_userName, "PlotDescription", QString( "Flow Diagnostics Plot" ), "Name" );
m_userName.uiCapability()->setUiReadOnly( true );

2
ApplicationLibCode/ProjectDataModel/Flow/RimWellAllocationPlotLegend.cpp
View File

@ -26,7 +26,7 @@ CAF_PDM_SOURCE_INIT( RimWellAllocationPlotLegend, "WellAllocationPlotLegend" );
//--------------------------------------------------------------------------------------------------
RimWellAllocationPlotLegend::RimWellAllocationPlotLegend()
{
CAF_PDM_InitObject( "Legend", ":/WellAllocLegend16x16.png", "", "" );
CAF_PDM_InitObject( "Legend", ":/WellAllocLegend16x16.png" );
CAF_PDM_InitField( &m_showLegend, "ShowPlotLegend", true, "Show Plot Legend" );
}

5
ApplicationLibCode/ProjectDataModel/Flow/RimWellDistributionPlot.cpp
View File

@ -69,10 +69,7 @@ RimWellDistributionPlot::RimWellDistributionPlot( RiaDefines::PhaseType phase )
CAF_PDM_InitField( &m_smallContributionsRelativeThreshold,
"SmallContributionsRelativeThreshold",
0.005,
"Relative Threshold [0, 1]",
"",
"",
"" );
"Relative Threshold [0, 1]" );
CAF_PDM_InitField( &m_maximumTof, "MaximumTOF", 20.0, "Maximum Time of Flight [0, 200]" );

15
ApplicationLibCode/ProjectDataModel/Flow/RimWellDistributionPlotCollection.cpp
View File

@ -59,7 +59,7 @@ RimWellDistributionPlotCollection::RimWellDistributionPlotCollection()
{
// cvf::Trace::show("RimWellDistributionPlotCollection::RimWellDistributionPlotCollection()");
CAF_PDM_InitObject( "Cumulative Phase Distribution Plot", ":/CumulativePhaseDist16x16.png", "", "" );
CAF_PDM_InitObject( "Cumulative Phase Distribution Plot", ":/CumulativePhaseDist16x16.png" );
CAF_PDM_InitFieldNoDefault( &m_case, "Case", "Case" );
CAF_PDM_InitField( &m_timeStepIndex, "TimeStepIndex", -1, "Time Step" );
@ -68,10 +68,7 @@ RimWellDistributionPlotCollection::RimWellDistributionPlotCollection()
CAF_PDM_InitField( &m_smallContributionsRelativeThreshold,
"SmallContributionsRelativeThreshold",
0.005,
"Relative Threshold [0, 1]",
"",
"",
"" );
"Relative Threshold [0, 1]" );
CAF_PDM_InitField( &m_maximumTof, "MaximumTOF", 20.0, "Maximum Time of Flight [0, 200]" );
@ -83,13 +80,7 @@ RimWellDistributionPlotCollection::RimWellDistributionPlotCollection()
CAF_PDM_InitField( &m_showGas, "ShowGas", true, "Show Gas" );
CAF_PDM_InitField( &m_showWater, "ShowWater", true, "Show Water" );
CAF_PDM_InitField( &m_plotWindowTitle,
"PlotDescription",
QString( "Cumulative Phase Distribution Plots" ),
"Name",
"",
"",
"" );
CAF_PDM_InitField( &m_plotWindowTitle, "PlotDescription", QString( "Cumulative Phase Distribution Plots" ), "Name" );
m_showWindow = false;

2
ApplicationLibCode/ProjectDataModel/Flow/RimWellPltPlot.cpp
View File

@ -98,7 +98,7 @@ const char RimWellPltPlot::PLOT_NAME_QFORMAT_STRING[] = "PLT: %1";
RimWellPltPlot::RimWellPltPlot()
: RimWellLogPlot()
{
CAF_PDM_InitObject( "Well Allocation Plot", ":/WellFlowPlot16x16.png", "", "" );
CAF_PDM_InitObject( "Well Allocation Plot", ":/WellFlowPlot16x16.png" );
CAF_PDM_InitFieldNoDefault( &m_wellLogPlot_OBSOLETE, "WellLog", "WellLog" );
m_wellLogPlot_OBSOLETE.uiCapability()->setUiTreeHidden( true );

2
ApplicationLibCode/ProjectDataModel/Flow/RimWellRftEnsembleCurveSet.cpp
View File

@ -38,7 +38,7 @@ CAF_PDM_SOURCE_INIT( RimWellRftEnsembleCurveSet, "WellRftEnsembleCurveSet" );
//--------------------------------------------------------------------------------------------------
RimWellRftEnsembleCurveSet::RimWellRftEnsembleCurveSet()
{
CAF_PDM_InitObject( "Ensemble Curve Set", ":/EnsembleCurveSet16x16.png", "", "" );
CAF_PDM_InitObject( "Ensemble Curve Set", ":/EnsembleCurveSet16x16.png" );
CAF_PDM_InitFieldNoDefault( &m_ensemble, "Ensemble", "Ensemble" );
m_ensemble.uiCapability()->setUiTreeChildrenHidden( true );
m_ensemble.uiCapability()->setAutoAddingOptionFromValue( false );

2
ApplicationLibCode/ProjectDataModel/Flow/RimWellRftPlot.cpp
View File

@ -82,7 +82,7 @@ const char RimWellRftPlot::PLOT_NAME_QFORMAT_STRING[] = "RFT: %1";
RimWellRftPlot::RimWellRftPlot()
: RimWellLogPlot()
{
CAF_PDM_InitObject( "RFT Plot", ":/RFTPlot16x16.png", "", "" );
CAF_PDM_InitObject( "RFT Plot", ":/RFTPlot16x16.png" );
CAF_PDM_InitField( &m_showStatisticsCurves, "ShowStatisticsCurves", true, "Show Statistics Curves" );
CAF_PDM_InitField( &m_showEnsembleCurves, "ShowEnsembleCurves", true, "Show Ensemble Curves" );

13
ApplicationLibCode/ProjectDataModel/GeoMech/RimGeoMechCase.cpp
View File

@ -153,17 +153,8 @@ RimGeoMechCase::RimGeoMechCase( void )
CAF_PDM_InitField( &m_initialPermeabilityType,
"InitialPermeabilityType",
defaultInitialPermeabilityType,
"Initial Permeability",
"",
"",
"" );
CAF_PDM_InitField( &m_initialPermeabilityFixed,
"InitialPermeabilityFixed",
1.0,
"Fixed Initial Permeability [mD]",
"",
"",
"" );
"Initial Permeability" );
CAF_PDM_InitField( &m_initialPermeabilityFixed, "InitialPermeabilityFixed", 1.0, "Fixed Initial Permeability [mD]" );
m_initialPermeabilityFixed.uiCapability()->setUiEditorTypeName( caf::PdmUiDoubleValueEditor::uiEditorTypeName() );
CAF_PDM_InitField( &m_initialPermeabilityResultAddress, "InitialPermeabilityAddress", QString( "" ), "Value" );

7
ApplicationLibCode/ProjectDataModel/GeoMech/RimGeoMechContourMapProjection.cpp
View File

@ -59,16 +59,13 @@ CAF_PDM_SOURCE_INIT( RimGeoMechContourMapProjection, "RimGeoMechContourMapProjec
RimGeoMechContourMapProjection::RimGeoMechContourMapProjection()
: m_kLayers( 0u )
{
CAF_PDM_InitObject( "RimContourMapProjection", ":/2DMapProjection16x16.png", "", "" );
CAF_PDM_InitObject( "RimContourMapProjection", ":/2DMapProjection16x16.png" );
CAF_PDM_InitField( &m_limitToPorePressureRegions, "LimitToPorRegion", true, "Limit to Pore Pressure regions" );
CAF_PDM_InitField( &m_applyPPRegionLimitVertically, "VerticalLimit", false, "Apply Limit Vertically" );
CAF_PDM_InitField( &m_paddingAroundPorePressureRegion,
"PaddingAroundPorRegion",
0.0,
"Horizontal Padding around PP regions",
"",
"",
"" );
"Horizontal Padding around PP regions" );
m_paddingAroundPorePressureRegion.uiCapability()->setUiEditorTypeName(
caf::PdmUiDoubleSliderEditor::uiEditorTypeName() );
setName( "Map Projection" );

4
ApplicationLibCode/ProjectDataModel/GeoMech/RimGeoMechContourMapViewCollection.cpp
View File

@ -10,9 +10,9 @@ CAF_PDM_SOURCE_INIT( RimGeoMechContourMapViewCollection, "GeoMech2dViewCollectio
//--------------------------------------------------------------------------------------------------
RimGeoMechContourMapViewCollection::RimGeoMechContourMapViewCollection()
{
CAF_PDM_InitObject( "GeoMech Contour Maps", ":/2DMaps16x16.png", "", "" );
CAF_PDM_InitObject( "GeoMech Contour Maps", ":/2DMaps16x16.png" );
CAF_PDM_InitFieldNoDefault( &m_contourMapViews, "GeoMechViews", "Contour Maps", ":/CrossSection16x16.png", "", "" );
CAF_PDM_InitFieldNoDefault( &m_contourMapViews, "GeoMechViews", "Contour Maps", ":/CrossSection16x16.png" );
m_contourMapViews.uiCapability()->setUiTreeHidden( true );
}

2
ApplicationLibCode/ProjectDataModel/GeoMech/RimGeoMechModels.cpp
View File

@ -34,7 +34,7 @@ CAF_PDM_SOURCE_INIT( RimGeoMechModels, "ResInsightGeoMechModels" );
//--------------------------------------------------------------------------------------------------
RimGeoMechModels::RimGeoMechModels( void )
{
CAF_PDM_InitObject( "Geomechanical Models", ":/GeoMechCases48x48.png", "", "" );
CAF_PDM_InitObject( "Geomechanical Models", ":/GeoMechCases48x48.png" );
CAF_PDM_InitFieldNoDefault( &m_cases, "Cases", "" );
m_cases.uiCapability()->setUiTreeHidden( true );

2
ApplicationLibCode/ProjectDataModel/GeoMech/RimGeoMechPart.cpp
View File

@ -30,7 +30,7 @@ CAF_PDM_SOURCE_INIT( RimGeoMechPart, "GeoMechPart" );
//--------------------------------------------------------------------------------------------------
RimGeoMechPart::RimGeoMechPart()
{
CAF_PDM_InitScriptableObject( "GeoMechPart", ":/GeoMechCase24x24.png", "", "" );
CAF_PDM_InitScriptableObject( "GeoMechPart", ":/GeoMechCase24x24.png" );
CAF_PDM_InitScriptableFieldNoDefault( &m_partId, "PartId", "Part Id" );
m_partId.uiCapability()->setUiReadOnly( true );

2
ApplicationLibCode/ProjectDataModel/GeoMech/RimGeoMechPartCollection.cpp
View File

@ -41,7 +41,7 @@ RimGeoMechPartCollection::RimGeoMechPartCollection()
, m_currentScaleFactor( 1.0 )
, m_noDisplacements()
{
CAF_PDM_InitScriptableObject( "Parts", ":/GeoMechCase24x24.png", "", "" );
CAF_PDM_InitScriptableObject( "Parts", ":/GeoMechCase24x24.png" );
CAF_PDM_InitScriptableFieldNoDefault( &m_parts, "Parts", "Parts" );
m_parts.uiCapability()->setUiTreeHidden( true );

Some files were not shown because too many files have changed in this diff Show More