From 2a65636ba374964006ec33d88f243cd92bdac4dd Mon Sep 17 00:00:00 2001 From: Magne Sjaastad Date: Sun, 14 Nov 2021 14:15:12 +0100 Subject: [PATCH] #8250 Use variadic macros and remove obsolete parameters --- .../Application/RiaPreferences.cpp | 72 ++++---- .../Application/RiaPreferencesGeoMech.cpp | 22 +-- .../Application/RiaPreferencesSummary.cpp | 7 +- .../Application/RiaPreferencesSystem.cpp | 16 +- .../Application/Tools/RiaRegressionTest.cpp | 6 +- .../CommandFileInterface/RicfCloneView.cpp | 2 +- .../RicfComputeCaseGroupStatistics.cpp | 4 +- .../RicfCreateGridCaseGroup.cpp | 8 +- .../RicfCreateLgrForCompletions.cpp | 14 +- .../RicfCreateMultipleFractures.cpp | 16 +- .../RicfCreateSaturationPressurePlots.cpp | 2 +- .../RicfCreateStatisticsCase.cpp | 6 +- .../CommandFileInterface/RicfCreateView.cpp | 6 +- ...RicfCreateWellBoreStabilityPlotFeature.cpp | 12 +- .../RicfExportFlowCharacteristics.cpp | 14 +- .../RicfExportLgrForCompletions.cpp | 14 +- .../CommandFileInterface/RicfExportMsw.cpp | 10 +- .../RicfExportMultiCaseSnapshots.cpp | 2 +- .../RicfExportPropertyInViews.cpp | 8 +- .../RicfExportSimWellFractureCompletions.cpp | 8 +- .../RicfExportSnapshots.cpp | 12 +- .../RicfExportVisibleCells.cpp | 10 +- .../RicfExportWellLogPlotData.cpp | 20 +- .../RicfExportWellPathCompletions.cpp | 20 +- .../RicfExportWellPaths.cpp | 4 +- .../RicfImportFormationNames.cpp | 4 +- .../RicfImportWellLogFiles.cpp | 8 +- .../CommandFileInterface/RicfLoadCase.cpp | 8 +- .../CommandFileInterface/RicfOpenProject.cpp | 2 +- .../CommandFileInterface/RicfReplaceCase.cpp | 4 +- .../RicfReplaceSourceCases.cpp | 4 +- .../RicfRunOctaveScript.cpp | 4 +- .../RicfScaleFractureTemplate.cpp | 12 +- .../RicfSetFractureContainment.cpp | 6 +- .../RicfSetMainWindowSize.cpp | 4 +- .../RicfSetPlotWindowSize.cpp | 4 +- .../CommandFileInterface/RicfSetStartDir.cpp | 2 +- .../CommandFileInterface/RicfSetTimeStep.cpp | 6 +- .../RicSaveProjectAsFeature.cpp | 2 +- .../RicSaveProjectFeature.cpp | 2 +- .../RicCaseAndFileExportSettingsUi.cpp | 6 +- .../RicExportCompletionDataSettingsUi.cpp | 37 ++-- .../ExportCommands/RicCellRangeUi.cpp | 18 +- .../ExportCommands/RicExportCarfinUi.cpp | 16 +- .../RicExportEclipseSectorModelUi.cpp | 36 ++-- .../ExportCommands/RicExportLgrUi.cpp | 22 +-- .../RicExportToLasFileResampleUi.cpp | 22 +-- .../ExportCommands/RicExportWellPathsUi.cpp | 6 +- .../RicSaveEclipseInputVisibleCellsUi.cpp | 12 +- .../Commands/FlowCommands/RicSelectViewUI.cpp | 8 +- ...RicCreateMultipleFracturesOptionItemUi.cpp | 8 +- .../RicCreateMultipleFracturesUi.cpp | 10 +- .../RicSaturationPressureUi.cpp | 6 +- .../RicHoloLensCreateSessionUi.cpp | 8 +- .../RicHoloLensExportToFolderUi.cpp | 6 +- .../RicHoloLensServerSettings.cpp | 4 +- .../RicSelectPlotTemplateUi.cpp | 4 +- .../Commands/RicCreateEnsembleSurfaceUi.cpp | 8 +- .../Commands/RicCreateEnsembleWellLogUi.cpp | 12 +- .../Commands/RicDeleteItemExecData.h | 4 +- .../RicExportContourMapToTextFeature.cpp | 10 +- .../Commands/RicExportContourMapToTextUi.cpp | 10 +- .../Commands/RicNewMultiPlotFeature.cpp | 2 +- .../RicStackSelectedCurvesFeature.cpp | 2 +- .../RicUnstackSelectedCurvesFeature.cpp | 2 +- .../SsiHubImportCommands/RimOilFieldEntry.cpp | 12 +- .../RimOilRegionEntry.cpp | 8 +- .../RimWellPathImport.cpp | 18 +- .../SsiHubImportCommands/RimWellsEntry.cpp | 14 +- .../RiuWellImportWizard.cpp | 8 +- .../RiuWellImportWizard.h | 6 +- ...icPasteAsciiDataToSummaryPlotFeatureUi.cpp | 22 +-- .../RicSelectSummaryPlotUI.cpp | 8 +- .../RicSummaryCurveCalculatorUi.cpp | 8 +- .../RicSummaryPlotEditorUi.cpp | 26 +-- .../ViewLink/RicLinkVisibleViewsFeatureUi.cpp | 2 +- .../RicCreateMultipleWellPathLateralsUi.cpp | 6 +- .../WellPathCommands/RicImportWellPaths.cpp | 10 +- .../RicWellPathsUnitSystemSettingsUi.cpp | 4 +- .../FileInterface/RifReaderSettings.cpp | 12 +- .../RimGeoMechGeometrySelectionItem.cpp | 20 +- .../AnalysisPlots/RimAnalysisPlot.cpp | 50 ++--- .../RimAnalysisPlotCollection.cpp | 2 +- .../RimAnalysisPlotDataEntry.cpp | 10 +- .../RimPlotDataFilterCollection.cpp | 4 +- .../AnalysisPlots/RimPlotDataFilterItem.cpp | 26 +-- .../Annotations/RimAnnotationCollection.cpp | 9 +- .../RimAnnotationCollectionBase.cpp | 4 +- .../RimAnnotationGroupCollection.cpp | 4 +- .../RimAnnotationInViewCollection.cpp | 23 +-- .../RimAnnotationLineAppearance.cpp | 14 +- .../RimAnnotationTextAppearance.cpp | 6 +- .../Annotations/RimPolylineTarget.cpp | 4 +- .../Annotations/RimPolylinesAnnotation.cpp | 10 +- .../RimPolylinesAnnotationInView.cpp | 4 +- .../RimPolylinesFromFileAnnotation.cpp | 4 +- .../Annotations/RimReachCircleAnnotation.cpp | 12 +- .../RimReachCircleAnnotationInView.cpp | 4 +- .../Annotations/RimTextAnnotation.cpp | 16 +- .../Annotations/RimTextAnnotationInView.cpp | 4 +- .../RimUserDefinedPolylinesAnnotation.cpp | 6 +- .../CellFilters/RimCellFilter.cpp | 14 +- .../CellFilters/RimCellFilterCollection.cpp | 6 +- .../CellFilters/RimCellRangeFilter.cpp | 12 +- .../CellFilters/RimEclipsePropertyFilter.cpp | 10 +- .../RimEclipsePropertyFilterCollection.cpp | 2 +- .../CellFilters/RimGeoMechPropertyFilter.cpp | 6 +- .../RimGeoMechPropertyFilterCollection.cpp | 2 +- .../CellFilters/RimPolygonFilter.cpp | 30 +-- .../CellFilters/RimPropertyFilter.cpp | 4 +- .../RimPropertyFilterCollection.cpp | 2 +- .../Rim3dWellLogCurveCollection.cpp | 10 +- .../RimCompletionTemplateCollection.cpp | 8 +- .../RimEllipseFractureTemplate.cpp | 8 +- .../RimEnsembleFractureStatistics.cpp | 24 +-- ...imEnsembleFractureStatisticsCollection.cpp | 2 +- .../Completions/RimFishbones.cpp | 37 ++-- .../Completions/RimFishbonesCollection.cpp | 8 +- .../RimFishbonesPipeProperties.cpp | 6 +- .../Completions/RimFracture.cpp | 35 ++-- .../Completions/RimFractureContainment.cpp | 4 +- .../Completions/RimFractureExportSettings.cpp | 6 +- .../Completions/RimFractureTemplate.cpp | 58 +++--- .../RimFractureTemplateCollection.cpp | 4 +- .../RimMswCompletionParameters.cpp | 14 +- .../Completions/RimMultipleValveLocations.cpp | 10 +- .../RimNonDarcyPerforationParameters.cpp | 8 +- .../Completions/RimPerforationCollection.cpp | 4 +- .../Completions/RimPerforationInterval.cpp | 20 +- .../Completions/RimSimWellFracture.cpp | 6 +- .../RimSimWellFractureCollection.cpp | 2 +- .../RimStimPlanFractureTemplate.cpp | 10 +- .../Completions/RimValveTemplate.cpp | 10 +- .../RimValveTemplateCollection.cpp | 9 +- .../Completions/RimWellPathAicdParameters.cpp | 26 +-- .../RimWellPathCompletionSettings.cpp | 24 +-- .../Completions/RimWellPathCompletions.cpp | 28 +-- .../Completions/RimWellPathFracture.cpp | 2 +- .../RimWellPathFractureCollection.cpp | 2 +- .../Completions/RimWellPathValve.cpp | 10 +- .../RimAbstractCorrelationPlot.cpp | 26 +-- .../RimCorrelationMatrixPlot.cpp | 14 +- .../CorrelationPlots/RimCorrelationPlot.cpp | 10 +- .../RimCorrelationPlotCollection.cpp | 4 +- .../RimCorrelationReportPlot.cpp | 16 +- .../RimParameterResultCrossPlot.cpp | 2 +- .../Faults/RimFaultInView.cpp | 6 +- .../Faults/RimFaultInViewCollection.cpp | 20 +- .../Faults/RimFaultRAPostprocSettings.cpp | 14 +- .../Faults/RimFaultRAPreprocSettings.cpp | 20 +- .../Faults/RimFaultRASettings.cpp | 22 +-- .../Flow/RimDataSourceForRftPlt.cpp | 10 +- .../Flow/RimFlowCharacteristicsPlot.cpp | 28 +-- .../Flow/RimFlowDiagSolution.cpp | 4 +- .../Flow/RimFlowPlotCollection.cpp | 15 +- .../RimTofAccumulatedPhaseFractionsPlot.cpp | 6 +- .../Flow/RimTotalWellAllocationPlot.cpp | 4 +- .../Flow/RimWellAllocationPlot.cpp | 29 ++- .../Flow/RimWellAllocationPlotLegend.cpp | 2 +- .../Flow/RimWellDistributionPlot.cpp | 14 +- .../RimWellDistributionPlotCollection.cpp | 18 +- .../Flow/RimWellFlowRateCurve.cpp | 2 +- .../ProjectDataModel/Flow/RimWellPltPlot.cpp | 16 +- .../Flow/RimWellRftEnsembleCurveSet.cpp | 10 +- .../ProjectDataModel/Flow/RimWellRftPlot.cpp | 20 +- .../GeoMech/RimGeoMechCase.cpp | 36 ++-- .../GeoMech/RimGeoMechCellColors.cpp | 2 +- .../RimGeoMechContourMapProjection.cpp | 4 +- .../GeoMech/RimGeoMechContourMapView.cpp | 6 +- .../GeoMech/RimGeoMechModels.cpp | 2 +- .../GeoMech/RimGeoMechPart.cpp | 2 +- .../GeoMech/RimGeoMechPartCollection.cpp | 2 +- .../GeoMech/RimGeoMechResultDefinition.cpp | 16 +- .../GeoMech/RimGeoMechView.cpp | 10 +- .../CellFilters/RimPlotCellFilter.cpp | 2 +- .../RimPlotCellFilterCollection.cpp | 4 +- .../CellFilters/RimPlotCellPropertyFilter.cpp | 8 +- .../GridCrossPlots/RimGridCrossPlot.cpp | 14 +- .../RimGridCrossPlotCollection.cpp | 2 +- .../RimGridCrossPlotDataSet.cpp | 34 ++-- .../RimSaturationPressurePlotCollection.cpp | 2 +- .../Intersections/RimBoxIntersection.cpp | 20 +- .../RimExtrudedCurveIntersection.cpp | 42 ++--- .../Intersections/RimIntersection.cpp | 8 +- .../RimIntersectionCollection.cpp | 6 +- .../RimIntersectionResultDefinition.cpp | 16 +- ...ntersectionResultsDefinitionCollection.cpp | 4 +- .../Parameters/RimDoubleParameter.cpp | 2 +- .../Parameters/RimGenericParameter.cpp | 10 +- .../Parameters/RimIntegerParameter.cpp | 2 +- .../Parameters/RimParameterGroup.cpp | 12 +- .../Parameters/RimStringParameter.cpp | 2 +- .../PlotTemplates/RimPlotTemplateFileItem.cpp | 2 +- .../RimPlotTemplateFolderItem.cpp | 6 +- .../ProcessControl/RimProcess.cpp | 6 +- .../Rim2dIntersectionView.cpp | 10 +- .../Rim3dOverlayInfoConfig.cpp | 18 +- .../ProjectDataModel/Rim3dView.cpp | 28 +-- .../RimAdvancedSnapshotExportDefinition.cpp | 20 +- .../RimBinaryExportSettings.cpp | 8 +- .../ProjectDataModel/RimCalcScript.cpp | 2 +- .../ProjectDataModel/RimCase.cpp | 12 +- .../ProjectDataModel/RimCaseCollection.cpp | 4 +- .../ProjectDataModel/RimCellEdgeColors.cpp | 12 +- .../RimCheckableNamedObject.cpp | 4 +- .../ProjectDataModel/RimCheckableObject.cpp | 2 +- .../ProjectDataModel/RimColorLegend.cpp | 4 +- .../ProjectDataModel/RimColorLegendItem.cpp | 10 +- .../ProjectDataModel/RimCommandObject.cpp | 16 +- .../RimContourMapProjection.cpp | 10 +- .../RimCustomObjectiveFunction.cpp | 8 +- .../RimCustomObjectiveFunctionCollection.cpp | 2 +- .../RimCustomObjectiveFunctionWeight.cpp | 17 +- .../ProjectDataModel/RimDepthTrackPlot.cpp | 28 +-- .../ProjectDataModel/RimDialogData.cpp | 25 ++- .../ProjectDataModel/RimEclipseCase.cpp | 14 +- .../RimEclipseCaseCollection.cpp | 4 +- .../ProjectDataModel/RimEclipseCellColors.cpp | 8 +- .../RimEclipseContourMapProjection.cpp | 4 +- .../RimEclipseContourMapView.cpp | 6 +- .../RimEclipseFaultColors.cpp | 2 +- .../RimEclipseGeometrySelectionItem.cpp | 15 +- .../ProjectDataModel/RimEclipseInputCase.cpp | 2 +- .../RimEclipseInputProperty.cpp | 8 +- .../RimEclipseInputPropertyCollection.cpp | 2 +- .../ProjectDataModel/RimEclipseResultCase.cpp | 6 +- .../RimEclipseResultDefinition.cpp | 38 ++-- .../RimEclipseStatisticsCase.cpp | 26 +-- .../RimEclipseStatisticsCaseCollection.cpp | 4 +- .../ProjectDataModel/RimEclipseView.cpp | 20 +- .../RimElementVectorResult.cpp | 33 ++-- .../RimEnsembleFractureStatisticsPlot.cpp | 9 +- ...sembleFractureStatisticsPlotCollection.cpp | 2 +- .../RimEquilibriumAxisAnnotation.cpp | 6 +- .../RimExportInputPropertySettings.cpp | 6 +- .../ProjectDataModel/RimFormationNames.cpp | 2 +- .../RimFormationNamesCollection.cpp | 2 +- .../ProjectDataModel/RimGridCollection.cpp | 18 +- .../RimGridStatisticsPlot.cpp | 8 +- .../RimGridStatisticsPlotCollection.cpp | 2 +- .../RimGridTimeHistoryCurve.cpp | 8 +- .../ProjectDataModel/RimGridView.cpp | 28 +-- .../RimIdenticalGridCaseGroup.cpp | 11 +- .../RimMainPlotCollection.cpp | 42 ++--- .../RimMdiWindowController.cpp | 12 +- .../ProjectDataModel/RimMockModelSettings.cpp | 14 +- .../RimMudWeightWindowParameters.cpp | 50 ++--- .../ProjectDataModel/RimMultiPlot.cpp | 18 +- .../RimMultiPlotCollection.cpp | 2 +- .../ProjectDataModel/RimMultipleLocations.cpp | 10 +- .../ProjectDataModel/RimNameConfig.cpp | 6 +- .../ProjectDataModel/RimNamedObject.cpp | 4 +- .../RimObservedDataCollection.cpp | 4 +- .../RimObservedFmuRftData.cpp | 4 +- .../ProjectDataModel/RimOilField.cpp | 19 +- .../ProjectDataModel/RimPlot.cpp | 4 +- .../RimPlotAxisAnnotation.cpp | 10 +- .../ProjectDataModel/RimPlotCurve.cpp | 36 ++-- .../RimPlotCurveAppearance.cpp | 24 +-- .../ProjectDataModel/RimPlotWindow.cpp | 12 +- .../ProjectDataModel/RimPltPlotCollection.cpp | 2 +- .../ProjectDataModel/RimProject.cpp | 42 ++--- .../RimRegularLegendConfig.cpp | 14 +- .../RimReservoirCellResultsStorage.cpp | 16 +- .../ProjectDataModel/RimRftPlotCollection.cpp | 2 +- .../ProjectDataModel/RimScriptCollection.cpp | 8 +- .../ProjectDataModel/RimSimWellInView.cpp | 28 +-- .../RimSimWellInViewCollection.cpp | 54 +++--- .../RimStackablePlotCurve.cpp | 4 +- .../ProjectDataModel/RimStatisticsPlot.cpp | 12 +- .../ProjectDataModel/RimStimPlanColors.cpp | 10 +- .../RimStimPlanLegendConfig.cpp | 4 +- .../RimSummaryCalculation.cpp | 14 +- .../RimSummaryCalculationCollection.cpp | 4 +- .../RimSummaryCalculationVariable.cpp | 10 +- .../RimSurfaceIntersectionBand.cpp | 10 +- .../RimSurfaceIntersectionCollection.cpp | 6 +- .../RimSurfaceIntersectionCurve.cpp | 6 +- .../ProjectDataModel/RimTensorResults.cpp | 22 +-- .../RimTernaryLegendConfig.cpp | 10 +- .../ProjectDataModel/RimTimeStepFilter.cpp | 20 +- .../ProjectDataModel/RimVfpPlot.cpp | 30 +-- .../ProjectDataModel/RimVfpPlotCollection.cpp | 2 +- .../RimViewLinkerCollection.cpp | 4 +- .../ProjectDataModel/RimViewNameConfig.cpp | 10 +- .../ProjectDataModel/RimViewWindow.cpp | 6 +- .../RimVirtualPerforationResults.cpp | 8 +- .../ProjectDataModel/RimWbsParameters.cpp | 16 +- .../StimPlanModel/RimElasticProperties.cpp | 10 +- .../RimElasticPropertyScaling.cpp | 10 +- .../RimElasticPropertyScalingCollection.cpp | 2 +- .../RimFaciesInitialPressureConfig.cpp | 8 +- .../StimPlanModel/RimFaciesProperties.cpp | 10 +- .../StimPlanModel/RimNonNetLayers.cpp | 8 +- .../StimPlanModel/RimPressureTable.cpp | 6 +- .../StimPlanModel/RimPressureTableItem.cpp | 8 +- .../StimPlanModel/RimStimPlanModel.cpp | 60 +++--- .../RimStimPlanModelCollection.cpp | 4 +- .../StimPlanModel/RimStimPlanModelCurve.cpp | 6 +- .../StimPlanModel/RimStimPlanModelPlot.cpp | 8 +- .../RimStimPlanModelPlotCollection.cpp | 2 +- .../RimStimPlanModelTemplate.cpp | 44 ++--- .../RimStimPlanModelTemplateCollection.cpp | 2 +- .../Streamlines/RimStreamline.cpp | 2 +- .../RimStreamlineInViewCollection.cpp | 34 ++-- .../Summary/RimAsciiDataCurve.cpp | 8 +- .../Summary/RimCsvUserData.cpp | 2 +- .../RimDerivedEnsembleCaseCollection.cpp | 16 +- .../Summary/RimDerivedSummaryCase.cpp | 12 +- .../Summary/RimEnsembleCurveFilter.cpp | 29 ++- .../RimEnsembleCurveFilterCollection.cpp | 6 +- .../Summary/RimEnsembleCurveSet.cpp | 74 ++++---- .../Summary/RimEnsembleCurveSetCollection.cpp | 6 +- .../Summary/RimEnsembleStatistics.cpp | 22 +-- .../Summary/RimFileSummaryCase.cpp | 2 +- .../Summary/RimGridSummaryCase.cpp | 8 +- .../Summary/RimObjectiveFunction.cpp | 8 +- .../Summary/RimObservedSummaryData.cpp | 6 +- .../Summary/RimSummaryAddress.cpp | 28 +-- .../Summary/RimSummaryCase.cpp | 10 +- .../Summary/RimSummaryCaseCollection.cpp | 10 +- .../Summary/RimSummaryCaseMainCollection.cpp | 4 +- .../Summary/RimSummaryCrossPlotCollection.cpp | 2 +- .../Summary/RimSummaryCurve.cpp | 30 +-- .../Summary/RimSummaryCurveCollection.cpp | 12 +- .../Summary/RimSummaryCurveFilter.cpp | 30 +-- .../Summary/RimSummaryFilter.cpp | 22 +-- .../Summary/RimSummaryPlot.cpp | 29 ++- .../Summary/RimSummaryPlotCollection.cpp | 2 +- ...RimSummaryPlotFilterTextCurveSetEditor.cpp | 6 +- .../Summary/RimSummaryPlotSourceStepping.cpp | 24 +-- .../Summary/RimSummaryTimeAxisProperties.cpp | 44 ++--- .../Surfaces/RimEnsembleStatisticsSurface.cpp | 2 +- .../Surfaces/RimEnsembleSurface.cpp | 2 +- .../Surfaces/RimFileSurface.cpp | 2 +- .../Surfaces/RimGridCaseSurface.cpp | 6 +- .../ProjectDataModel/Surfaces/RimSurface.cpp | 8 +- .../Surfaces/RimSurfaceCollection.cpp | 6 +- .../Surfaces/RimSurfaceInView.cpp | 6 +- .../Surfaces/RimSurfaceInViewCollection.cpp | 13 +- .../Surfaces/RimSurfaceResultDefinition.cpp | 6 +- .../WellLog/Rim3dWellLogCurve.cpp | 6 +- .../WellLog/Rim3dWellLogExtractionCurve.cpp | 10 +- .../WellLog/Rim3dWellLogFileCurve.cpp | 6 +- .../WellLog/Rim3dWellLogRftCurve.cpp | 10 +- .../WellLog/RimEnsembleWellLogCurveSet.cpp | 26 +-- .../RimEnsembleWellLogStatisticsCurve.cpp | 6 +- .../WellLog/RimEnsembleWellLogs.cpp | 4 +- .../WellLog/RimEnsembleWellLogsCollection.cpp | 2 +- .../RimWellLogCurveCommonDataSource.cpp | 18 +- .../WellLog/RimWellLogExtractionCurve.cpp | 26 +-- .../RimWellLogExtractionCurveNameConfig.cpp | 12 +- .../WellLog/RimWellLogFile.cpp | 12 +- .../WellLog/RimWellLogFileChannel.cpp | 6 +- .../WellLog/RimWellLogFileCurve.cpp | 6 +- .../WellLog/RimWellLogFileCurveNameConfig.cpp | 2 +- .../WellLog/RimWellLogPlotCollection.cpp | 2 +- .../WellLog/RimWellLogPlotNameConfig.cpp | 12 +- .../WellLog/RimWellLogRftCurve.cpp | 16 +- .../WellLog/RimWellLogRftCurveNameConfig.cpp | 2 +- .../WellLog/RimWellLogTrack.cpp | 92 +++++----- .../WellLog/RimWellLogWbsCurve.cpp | 4 +- .../WellMeasurement/RimWellMeasurement.cpp | 16 +- .../RimWellMeasurementCollection.cpp | 4 +- .../RimWellMeasurementCurve.cpp | 4 +- .../RimWellMeasurementFilePath.cpp | 4 +- .../RimWellMeasurementInView.cpp | 18 +- .../RimWellMeasurementInViewCollection.cpp | 2 +- .../WellPath/RimFileWellPath.cpp | 18 +- .../WellPath/RimWellIASettings.cpp | 16 +- .../WellPath/RimWellIASettingsCollection.cpp | 2 +- .../ProjectDataModel/WellPath/RimWellPath.cpp | 38 ++-- .../WellPath/RimWellPathAttribute.cpp | 10 +- .../RimWellPathAttributeCollection.cpp | 2 +- .../WellPath/RimWellPathCollection.cpp | 20 +- .../WellPath/RimWellPathGeometryDef.cpp | 24 +-- .../WellPath/RimWellPathGroup.cpp | 6 +- .../WellPath/RimWellPathTarget.cpp | 18 +- .../WellPath/RimWellPathTieIn.cpp | 10 +- .../ProjectDataModel/cafTreeNode.cpp | 8 +- .../CommandRouter/RimcExtractSurfaces.cpp | 12 +- .../RimcDataContainerDouble.cpp | 4 +- .../RimcDataContainerString.cpp | 4 +- .../RimcDataContainerTime.cpp | 4 +- .../ProjectDataModelCommands/RimcProject.cpp | 6 +- .../RimcStimPlanModelCollection.cpp | 2 +- .../RimcSummaryCase.cpp | 6 +- .../RimcSummaryResampleData.cpp | 6 +- .../RimcSurfaceCollection.cpp | 4 +- .../ProjectDataModelCommands/RimcWellPath.cpp | 2 +- .../UnitTests/RifcCommandCore-Test.cpp | 16 +- .../RiuSummaryVectorSelectionUi.cpp | 171 ++++-------------- 392 files changed, 2275 insertions(+), 2533 deletions(-) diff --git a/ApplicationLibCode/Application/RiaPreferences.cpp b/ApplicationLibCode/Application/RiaPreferences.cpp index 080a441376..bf786e23ac 100644 --- a/ApplicationLibCode/Application/RiaPreferences.cpp +++ b/ApplicationLibCode/Application/RiaPreferences.cpp @@ -93,9 +93,9 @@ RiaPreferences::RiaPreferences() "", "Remote Procedure Call Scripting Engine", "" ); - CAF_PDM_InitField( &defaultGrpcPortNumber, "defaultGrpcPort", 50051, "Default Python Script Server Port", "", "", "" ); + CAF_PDM_InitField( &defaultGrpcPortNumber, "defaultGrpcPort", 50051, "Default Python Script Server Port" ); - CAF_PDM_InitFieldNoDefault( &scriptDirectories, "scriptDirectory", "Shared Script Folder(s)", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &scriptDirectories, "scriptDirectory", "Shared Script Folder(s)" ); scriptDirectories.uiCapability()->setUiEditorTypeName( caf::PdmUiFilePathEditor::uiEditorTypeName() ); // TODO: This only currently works for installed ResInsight. @@ -112,10 +112,10 @@ RiaPreferences::RiaPreferences() } #endif - CAF_PDM_InitField( &scriptEditorExecutable, "scriptEditorExecutable", defaultTextEditor, "Script Editor", "", "", "" ); + CAF_PDM_InitField( &scriptEditorExecutable, "scriptEditorExecutable", defaultTextEditor, "Script Editor" ); scriptEditorExecutable.uiCapability()->setUiEditorTypeName( caf::PdmUiFilePathEditor::uiEditorTypeName() ); - CAF_PDM_InitField( &m_octaveExecutable, "octaveExecutable", QString( "octave" ), "Octave Executable Location", "", "", "" ); + CAF_PDM_InitField( &m_octaveExecutable, "octaveExecutable", QString( "octave" ), "Octave Executable Location" ); m_octaveExecutable.uiCapability()->setUiEditorTypeName( caf::PdmUiFilePathEditor::uiEditorTypeName() ); m_octaveExecutable.uiCapability()->setUiLabelPosition( caf::PdmUiItemInfo::TOP ); @@ -128,15 +128,15 @@ RiaPreferences::RiaPreferences() "" ); caf::PdmUiNativeCheckBoxEditor::configureFieldForEditor( &octaveShowHeaderInfoWhenExecutingScripts ); - CAF_PDM_InitField( &m_pythonExecutable, "pythonExecutable", QString( "python" ), "Python Executable Location", "", "", "" ); + CAF_PDM_InitField( &m_pythonExecutable, "pythonExecutable", QString( "python" ), "Python Executable Location" ); m_pythonExecutable.uiCapability()->setUiEditorTypeName( caf::PdmUiFilePathEditor::uiEditorTypeName() ); m_pythonExecutable.uiCapability()->setUiLabelPosition( caf::PdmUiItemInfo::TOP ); - CAF_PDM_InitField( &showPythonDebugInfo, "pythonDebugInfo", false, "Show Python Debug Info", "", "", "" ); + CAF_PDM_InitField( &showPythonDebugInfo, "pythonDebugInfo", false, "Show Python Debug Info" ); - CAF_PDM_InitField( &ssihubAddress, "ssihubAddress", QString( "http://" ), "SSIHUB Address", "", "", "" ); + CAF_PDM_InitField( &ssihubAddress, "ssihubAddress", QString( "http://" ), "SSIHUB Address" ); ssihubAddress.uiCapability()->setUiLabelPosition( caf::PdmUiItemInfo::TOP ); - CAF_PDM_InitFieldNoDefault( &m_defaultMeshModeType, "defaultMeshModeType", "Show Grid Lines", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_defaultMeshModeType, "defaultMeshModeType", "Show Grid Lines" ); CAF_PDM_InitField( &defaultGridLineColors, "defaultGridLineColors", RiaColorTables::defaultGridLineColor(), @@ -167,26 +167,26 @@ RiaPreferences::RiaPreferences() "The viewer background color for new views", "" ); - CAF_PDM_InitField( &m_defaultScaleFactorZ, "defaultScaleFactorZ", 5, "Default Z Scale Factor", "", "", "" ); + CAF_PDM_InitField( &m_defaultScaleFactorZ, "defaultScaleFactorZ", 5, "Default Z Scale Factor" ); - CAF_PDM_InitFieldNoDefault( &defaultSceneFontSize, "defaultSceneFontSizePt", "Viewer Font Size", "", "", "" ); - CAF_PDM_InitFieldNoDefault( &defaultAnnotationFontSize, "defaultAnnotationFontSizePt", "Annotation Font Size", "", "", "" ); - CAF_PDM_InitFieldNoDefault( &defaultWellLabelFontSize, "defaultWellLabelFontSizePt", "Well Label Font Size", "", "", "" ); - CAF_PDM_InitFieldNoDefault( &defaultPlotFontSize, "defaultPlotFontSizePt", "Plot Font Size", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &defaultSceneFontSize, "defaultSceneFontSizePt", "Viewer Font Size" ); + CAF_PDM_InitFieldNoDefault( &defaultAnnotationFontSize, "defaultAnnotationFontSizePt", "Annotation Font Size" ); + CAF_PDM_InitFieldNoDefault( &defaultWellLabelFontSize, "defaultWellLabelFontSizePt", "Well Label Font Size" ); + CAF_PDM_InitFieldNoDefault( &defaultPlotFontSize, "defaultPlotFontSizePt", "Plot Font Size" ); - CAF_PDM_InitField( &m_showLegendBackground, "showLegendBackground", true, "Show Box around Legends", "", "", "" ); + CAF_PDM_InitField( &m_showLegendBackground, "showLegendBackground", true, "Show Box around Legends" ); caf::PdmUiNativeCheckBoxEditor::configureFieldForEditor( &m_showLegendBackground ); - CAF_PDM_InitField( &m_enableFaultsByDefault, "enableFaultsByDefault", true, "Enable Faults By Default", "", "", "" ); + CAF_PDM_InitField( &m_enableFaultsByDefault, "enableFaultsByDefault", true, "Enable Faults By Default" ); caf::PdmUiNativeCheckBoxEditor::configureFieldForEditor( &m_enableFaultsByDefault ); - CAF_PDM_InitField( &m_showInfoBox, "showInfoBox", true, "Show Info Box in New Projects", "", "", "" ); + CAF_PDM_InitField( &m_showInfoBox, "showInfoBox", true, "Show Info Box in New Projects" ); caf::PdmUiNativeCheckBoxEditor::configureFieldForEditor( &m_showInfoBox ); - CAF_PDM_InitField( &m_showGridBox, "showGridBox", true, "Show Grid Box in New Projects", "", "", "" ); + CAF_PDM_InitField( &m_showGridBox, "showGridBox", true, "Show Grid Box in New Projects" ); caf::PdmUiNativeCheckBoxEditor::configureFieldForEditor( &m_showGridBox ); - CAF_PDM_InitFieldNoDefault( &lastUsedProjectFileName, "lastUsedProjectFileName", "Last Used Project File", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &lastUsedProjectFileName, "lastUsedProjectFileName", "Last Used Project File" ); lastUsedProjectFileName.uiCapability()->setUiHidden( true ); CAF_PDM_InitField( &autocomputeDepthRelatedProperties, @@ -198,7 +198,7 @@ RiaPreferences::RiaPreferences() "" ); caf::PdmUiNativeCheckBoxEditor::configureFieldForEditor( &autocomputeDepthRelatedProperties ); - CAF_PDM_InitField( &loadAndShowSoil, "loadAndShowSoil", true, "Load and Show SOIL", "", "", "" ); + CAF_PDM_InitField( &loadAndShowSoil, "loadAndShowSoil", true, "Load and Show SOIL" ); caf::PdmUiNativeCheckBoxEditor::configureFieldForEditor( &loadAndShowSoil ); CAF_PDM_InitField( &holoLensDisableCertificateVerification, @@ -218,20 +218,20 @@ RiaPreferences::RiaPreferences() "", "" ); - CAF_PDM_InitFieldNoDefault( &m_readerSettings, "readerSettings", "Reader Settings", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_readerSettings, "readerSettings", "Reader Settings" ); m_readerSettings = new RifReaderSettings; - CAF_PDM_InitFieldNoDefault( &m_dateFormat, "dateFormat", "Date Format", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_dateFormat, "dateFormat", "Date Format" ); m_dateFormat.uiCapability()->setUiEditorTypeName( caf::PdmUiComboBoxEditor::uiEditorTypeName() ); m_dateFormat = RiaQDateTimeTools::supportedDateFormats().front(); - CAF_PDM_InitFieldNoDefault( &m_timeFormat, "timeFormat", "Time Format", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_timeFormat, "timeFormat", "Time Format" ); m_timeFormat.uiCapability()->setUiEditorTypeName( caf::PdmUiComboBoxEditor::uiEditorTypeName() ); m_timeFormat = RiaQDateTimeTools::supportedTimeFormats().front(); - CAF_PDM_InitField( &m_useUndoRedo, "useUndoRedo", true, "Enable Undo/Redo for Property Editor changes", "", "", "" ); + CAF_PDM_InitField( &m_useUndoRedo, "useUndoRedo", true, "Enable Undo/Redo for Property Editor changes" ); caf::PdmUiNativeCheckBoxEditor::configureFieldForEditor( &m_useUndoRedo ); - CAF_PDM_InitFieldNoDefault( &m_plotTemplateFolders, "plotTemplateFolders", "Plot Template Folder(s)", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_plotTemplateFolders, "plotTemplateFolders", "Plot Template Folder(s)" ); m_plotTemplateFolders.uiCapability()->setUiEditorTypeName( caf::PdmUiFilePathEditor::uiEditorTypeName() ); CAF_PDM_InitField( &m_searchPlotTemplateFoldersRecursively, "SearchPlotTemplateFoldersRecursively", @@ -242,16 +242,16 @@ RiaPreferences::RiaPreferences() "" ); caf::PdmUiNativeCheckBoxEditor::configureFieldForEditor( &m_searchPlotTemplateFoldersRecursively ); - CAF_PDM_InitFieldNoDefault( &m_defaultPlotTemplate, "defaultPlotTemplate", "Default Plot Template", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_defaultPlotTemplate, "defaultPlotTemplate", "Default Plot Template" ); - CAF_PDM_InitFieldNoDefault( &m_pageSize, "pageSize", "Page Size", "", "", "" ); - CAF_PDM_InitFieldNoDefault( &m_pageOrientation, "pageOrientation", "Page Orientation", "", "", "" ); - CAF_PDM_InitField( &m_pageLeftMargin, "pageLeftMargin", defaultMarginSize( m_pageSize() ), "Left Margin", "", "", "" ); - CAF_PDM_InitField( &m_pageTopMargin, "pageTopMargin", defaultMarginSize( m_pageSize() ), "Top Margin", "", "", "" ); - CAF_PDM_InitField( &m_pageRightMargin, "pageRightMargin", defaultMarginSize( m_pageSize() ), "Right Margin", "", "", "" ); - CAF_PDM_InitField( &m_pageBottomMargin, "pageBottomMargin", defaultMarginSize( m_pageSize() ), "Bottom Margin", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_pageSize, "pageSize", "Page Size" ); + CAF_PDM_InitFieldNoDefault( &m_pageOrientation, "pageOrientation", "Page Orientation" ); + CAF_PDM_InitField( &m_pageLeftMargin, "pageLeftMargin", defaultMarginSize( m_pageSize() ), "Left Margin" ); + CAF_PDM_InitField( &m_pageTopMargin, "pageTopMargin", defaultMarginSize( m_pageSize() ), "Top Margin" ); + CAF_PDM_InitField( &m_pageRightMargin, "pageRightMargin", defaultMarginSize( m_pageSize() ), "Right Margin" ); + CAF_PDM_InitField( &m_pageBottomMargin, "pageBottomMargin", defaultMarginSize( m_pageSize() ), "Bottom Margin" ); - CAF_PDM_InitField( &m_openExportedPdfInViewer, "openExportedPdfInViewer", false, "Open Exported PDF in Viewer", "", "", "" ); + CAF_PDM_InitField( &m_openExportedPdfInViewer, "openExportedPdfInViewer", false, "Open Exported PDF in Viewer" ); caf::PdmUiNativeCheckBoxEditor::configureFieldForEditor( &m_openExportedPdfInViewer ); CAF_PDM_InitField( &m_surfaceImportResamplingDistance, @@ -272,15 +272,15 @@ RiaPreferences::RiaPreferences() "" ); m_multiLateralWellPattern.uiCapability()->setUiEditorTypeName( caf::PdmUiLineEditor::uiEditorTypeName() ); - CAF_PDM_InitFieldNoDefault( &m_guiTheme, "guiTheme", "GUI theme", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_guiTheme, "guiTheme", "GUI theme" ); - CAF_PDM_InitFieldNoDefault( &m_summaryPreferences, "summaryPreferences", "summaryPreferences", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_summaryPreferences, "summaryPreferences", "summaryPreferences" ); m_summaryPreferences = new RiaPreferencesSummary; - CAF_PDM_InitFieldNoDefault( &m_geoMechPreferences, "geoMechPreferences", "geoMechPreferences", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_geoMechPreferences, "geoMechPreferences", "geoMechPreferences" ); m_geoMechPreferences = new RiaPreferencesGeoMech; - CAF_PDM_InitFieldNoDefault( &m_systemPreferences, "systemPreferences", "systemPreferences", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_systemPreferences, "systemPreferences", "systemPreferences" ); m_systemPreferences = new RiaPreferencesSystem; } diff --git a/ApplicationLibCode/Application/RiaPreferencesGeoMech.cpp b/ApplicationLibCode/Application/RiaPreferencesGeoMech.cpp index cb356bc591..f890f836ed 100644 --- a/ApplicationLibCode/Application/RiaPreferencesGeoMech.cpp +++ b/ApplicationLibCode/Application/RiaPreferencesGeoMech.cpp @@ -34,41 +34,33 @@ CAF_PDM_SOURCE_INIT( RiaPreferencesGeoMech, "RiaPreferencesGeoMech" ); //-------------------------------------------------------------------------------------------------- RiaPreferencesGeoMech::RiaPreferencesGeoMech() { - CAF_PDM_InitFieldNoDefault( &m_geomechFRAPreprocCommand, "geomechFRAPreprocCommand", "Pre-Processing Command", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_geomechFRAPreprocCommand, "geomechFRAPreprocCommand", "Pre-Processing Command" ); m_geomechFRAPreprocCommand.uiCapability()->setUiEditorTypeName( caf::PdmUiFilePathEditor::uiEditorTypeName() ); m_geomechFRAPreprocCommand.uiCapability()->setUiLabelPosition( caf::PdmUiItemInfo::TOP ); - CAF_PDM_InitFieldNoDefault( &m_geomechFRAPostprocCommand, "geomechFRAPostprocCommand", "Post-Processing Command", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_geomechFRAPostprocCommand, "geomechFRAPostprocCommand", "Post-Processing Command" ); m_geomechFRAPostprocCommand.uiCapability()->setUiEditorTypeName( caf::PdmUiFilePathEditor::uiEditorTypeName() ); m_geomechFRAPostprocCommand.uiCapability()->setUiLabelPosition( caf::PdmUiItemInfo::TOP ); - CAF_PDM_InitFieldNoDefault( &m_geomechFRAMacrisCommand, "geomechFRAMacrisCommand", "Main Macris Command", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_geomechFRAMacrisCommand, "geomechFRAMacrisCommand", "Main Macris Command" ); m_geomechFRAMacrisCommand.uiCapability()->setUiEditorTypeName( caf::PdmUiFilePathEditor::uiEditorTypeName() ); m_geomechFRAMacrisCommand.uiCapability()->setUiLabelPosition( caf::PdmUiItemInfo::TOP ); - CAF_PDM_InitFieldNoDefault( &m_geomechFRADefaultBasicXML, - "geomechFRADefaultXML", - "Basic Processing Parameter XML File", - "", - "", - "" ); + CAF_PDM_InitFieldNoDefault( &m_geomechFRADefaultBasicXML, "geomechFRADefaultXML", "Basic Processing Parameter XML File" ); m_geomechFRADefaultBasicXML.uiCapability()->setUiEditorTypeName( caf::PdmUiFilePathEditor::uiEditorTypeName() ); m_geomechFRADefaultBasicXML.uiCapability()->setUiLabelPosition( caf::PdmUiItemInfo::TOP ); CAF_PDM_InitFieldNoDefault( &m_geomechFRADefaultAdvXML, "geomechFRADefaultAdvXML", - "Advanced Processing Parameter XML File", - "", - "", - "" ); + "Advanced Processing Parameter XML File" ); m_geomechFRADefaultAdvXML.uiCapability()->setUiEditorTypeName( caf::PdmUiFilePathEditor::uiEditorTypeName() ); m_geomechFRADefaultAdvXML.uiCapability()->setUiLabelPosition( caf::PdmUiItemInfo::TOP ); - CAF_PDM_InitFieldNoDefault( &m_geomechWIADefaultXML, "geomechWIADefaultXML", "Default Parameter XML File", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_geomechWIADefaultXML, "geomechWIADefaultXML", "Default Parameter XML File" ); m_geomechWIADefaultXML.uiCapability()->setUiEditorTypeName( caf::PdmUiFilePathEditor::uiEditorTypeName() ); m_geomechWIADefaultXML.uiCapability()->setUiLabelPosition( caf::PdmUiItemInfo::TOP ); - CAF_PDM_InitFieldNoDefault( &m_geomechWIACommand, "geomechWIACommand", "Command to run", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_geomechWIACommand, "geomechWIACommand", "Command to run" ); m_geomechWIACommand.uiCapability()->setUiEditorTypeName( caf::PdmUiFilePathEditor::uiEditorTypeName() ); m_geomechWIACommand.uiCapability()->setUiLabelPosition( caf::PdmUiItemInfo::TOP ); diff --git a/ApplicationLibCode/Application/RiaPreferencesSummary.cpp b/ApplicationLibCode/Application/RiaPreferencesSummary.cpp index c57f0b1029..5e08e1b7b8 100644 --- a/ApplicationLibCode/Application/RiaPreferencesSummary.cpp +++ b/ApplicationLibCode/Application/RiaPreferencesSummary.cpp @@ -66,10 +66,7 @@ RiaPreferencesSummary::RiaPreferencesSummary() { CAF_PDM_InitFieldNoDefault( &m_summaryRestartFilesShowImportDialog, "summaryRestartFilesShowImportDialog", - "Show Import Dialog", - "", - "", - "" ); + "Show Import Dialog" ); caf::PdmUiNativeCheckBoxEditor::configureFieldForEditor( &m_summaryRestartFilesShowImportDialog ); @@ -154,7 +151,7 @@ RiaPreferencesSummary::RiaPreferencesSummary() "", "" ); - CAF_PDM_InitFieldNoDefault( &m_summaryReader, "summaryReaderType", "File Format", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_summaryReader, "summaryReaderType", "File Format" ); CAF_PDM_InitField( &m_showSummaryTimeAsLongString, "showSummaryTimeAsLongString", diff --git a/ApplicationLibCode/Application/RiaPreferencesSystem.cpp b/ApplicationLibCode/Application/RiaPreferencesSystem.cpp index 33d2e09749..e3c9944e07 100644 --- a/ApplicationLibCode/Application/RiaPreferencesSystem.cpp +++ b/ApplicationLibCode/Application/RiaPreferencesSystem.cpp @@ -46,11 +46,11 @@ CAF_PDM_SOURCE_INIT( RiaPreferencesSystem, "RiaPreferencesSystem" ); //-------------------------------------------------------------------------------------------------- RiaPreferencesSystem::RiaPreferencesSystem() { - CAF_PDM_InitField( &m_useShaders, "useShaders", true, "Use Shaders", "", "", "" ); + CAF_PDM_InitField( &m_useShaders, "useShaders", true, "Use Shaders" ); caf::PdmUiNativeCheckBoxEditor::configureFieldForEditor( &m_useShaders ); - CAF_PDM_InitField( &m_showHud, "showHud", false, "Show 3D Information", "", "", "" ); + CAF_PDM_InitField( &m_showHud, "showHud", false, "Show 3D Information" ); caf::PdmUiNativeCheckBoxEditor::configureFieldForEditor( &m_showHud ); - CAF_PDM_InitField( &m_appendClassNameToUiText, "appendClassNameToUiText", false, "Show Class Names", "", "", "" ); + CAF_PDM_InitField( &m_appendClassNameToUiText, "appendClassNameToUiText", false, "Show Class Names" ); caf::PdmUiNativeCheckBoxEditor::configureFieldForEditor( &m_appendClassNameToUiText ); CAF_PDM_InitField( &m_appendFieldKeywordToToolTipText, @@ -62,10 +62,10 @@ RiaPreferencesSystem::RiaPreferencesSystem() "" ); caf::PdmUiNativeCheckBoxEditor::configureFieldForEditor( &m_appendFieldKeywordToToolTipText ); - CAF_PDM_InitField( &m_showViewIdInProjectTree, "showViewIdInTree", false, "Show View Id in Project Tree", "", "", "" ); + CAF_PDM_InitField( &m_showViewIdInProjectTree, "showViewIdInTree", false, "Show View Id in Project Tree" ); caf::PdmUiNativeCheckBoxEditor::configureFieldForEditor( &m_showViewIdInProjectTree ); - CAF_PDM_InitField( &m_showTestToolbar, "showTestToolbar", false, "Enable Test Toolbar", "", "", "" ); + CAF_PDM_InitField( &m_showTestToolbar, "showTestToolbar", false, "Enable Test Toolbar" ); caf::PdmUiNativeCheckBoxEditor::configureFieldForEditor( &m_showTestToolbar ); CAF_PDM_InitField( &m_includeFractureDebugInfoFile, @@ -77,7 +77,7 @@ RiaPreferencesSystem::RiaPreferencesSystem() "" ); caf::PdmUiNativeCheckBoxEditor::configureFieldForEditor( &m_includeFractureDebugInfoFile ); - CAF_PDM_InitFieldNoDefault( &m_holoLensExportFolder, "holoLensExportFolder", "HoloLens Export Folder", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_holoLensExportFolder, "holoLensExportFolder", "HoloLens Export Folder" ); m_holoLensExportFolder.uiCapability()->setUiLabelPosition( caf::PdmUiItemInfo::TOP ); m_holoLensExportFolder.uiCapability()->setUiEditorTypeName( caf::PdmUiFilePathEditor::uiEditorTypeName() ); @@ -90,10 +90,10 @@ RiaPreferencesSystem::RiaPreferencesSystem() "" ); caf::PdmUiNativeCheckBoxEditor::configureFieldForEditor( &m_showProjectChangedDialog ); - CAF_PDM_InitField( &m_showProgressBar, "showProgressBar", true, "Show Progress Bar", "", "", "" ); + CAF_PDM_InitField( &m_showProgressBar, "showProgressBar", true, "Show Progress Bar" ); caf::PdmUiNativeCheckBoxEditor::configureFieldForEditor( &m_showProgressBar ); - CAF_PDM_InitField( &m_gtestFilter, "gtestFilter", QString(), "Unit Test Filter (gtest)", "", "", "" ); + CAF_PDM_InitField( &m_gtestFilter, "gtestFilter", QString(), "Unit Test Filter (gtest)" ); CAF_PDM_InitField( &m_eclipseReaderMode, "eclipseReaderMode", diff --git a/ApplicationLibCode/Application/Tools/RiaRegressionTest.cpp b/ApplicationLibCode/Application/Tools/RiaRegressionTest.cpp index 1f588577b3..035cd37926 100644 --- a/ApplicationLibCode/Application/Tools/RiaRegressionTest.cpp +++ b/ApplicationLibCode/Application/Tools/RiaRegressionTest.cpp @@ -53,10 +53,10 @@ RiaRegressionTest::RiaRegressionTest( void ) "" ); folderContainingGitTool.uiCapability()->setUiEditorTypeName( caf::PdmUiFilePathEditor::uiEditorTypeName() ); - CAF_PDM_InitFieldNoDefault( ®ressionTestFolder, "regressionTestFolder", "Regression Test Folder", "", "", "" ); + CAF_PDM_InitFieldNoDefault( ®ressionTestFolder, "regressionTestFolder", "Regression Test Folder" ); regressionTestFolder.uiCapability()->setUiEditorTypeName( caf::PdmUiFilePathEditor::uiEditorTypeName() ); - CAF_PDM_InitField( &showInteractiveDiffImages, "showInteractiveDiffImages", false, "Interactive Diff Images", "", "", "" ); + CAF_PDM_InitField( &showInteractiveDiffImages, "showInteractiveDiffImages", false, "Interactive Diff Images" ); CAF_PDM_InitField( &useOpenMPForGeometryCreation, "useOpenMPForGeometryCreation", true, @@ -65,7 +65,7 @@ RiaRegressionTest::RiaRegressionTest( void ) "", "" ); - CAF_PDM_InitField( &openReportInBrowser, "openReportInBrowser", false, "Open Generated Report in Browser", "", "", "" ); + CAF_PDM_InitField( &openReportInBrowser, "openReportInBrowser", false, "Open Generated Report in Browser" ); CAF_PDM_InitFieldNoDefault( &testFilter, "testFilter", diff --git a/ApplicationLibCode/CommandFileInterface/RicfCloneView.cpp b/ApplicationLibCode/CommandFileInterface/RicfCloneView.cpp index 71b4fe68b0..a489e495b7 100644 --- a/ApplicationLibCode/CommandFileInterface/RicfCloneView.cpp +++ b/ApplicationLibCode/CommandFileInterface/RicfCloneView.cpp @@ -25,7 +25,7 @@ CAF_PDM_SOURCE_INIT( RicfCloneView, "cloneView" ); //-------------------------------------------------------------------------------------------------- RicfCloneView::RicfCloneView() { - CAF_PDM_InitScriptableField( &m_viewId, "viewId", -1, "View Id", "", "", "" ); + CAF_PDM_InitScriptableField( &m_viewId, "viewId", -1, "View Id" ); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/CommandFileInterface/RicfComputeCaseGroupStatistics.cpp b/ApplicationLibCode/CommandFileInterface/RicfComputeCaseGroupStatistics.cpp index 39679c5387..87d317dd98 100644 --- a/ApplicationLibCode/CommandFileInterface/RicfComputeCaseGroupStatistics.cpp +++ b/ApplicationLibCode/CommandFileInterface/RicfComputeCaseGroupStatistics.cpp @@ -38,8 +38,8 @@ CAF_PDM_SOURCE_INIT( RicfComputeCaseGroupStatistics, "computeCaseGroupStatistics //-------------------------------------------------------------------------------------------------- RicfComputeCaseGroupStatistics::RicfComputeCaseGroupStatistics() { - CAF_PDM_InitScriptableField( &m_groupId, "caseGroupId", -1, "Case Group ID", "", "", "" ); - CAF_PDM_InitScriptableField( &m_caseIds, "caseIds", std::vector(), "Case IDs", "", "", "" ); + CAF_PDM_InitScriptableField( &m_groupId, "caseGroupId", -1, "Case Group ID" ); + CAF_PDM_InitScriptableField( &m_caseIds, "caseIds", std::vector(), "Case IDs" ); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/CommandFileInterface/RicfCreateGridCaseGroup.cpp b/ApplicationLibCode/CommandFileInterface/RicfCreateGridCaseGroup.cpp index 3e8c21bcd0..8782270d1a 100644 --- a/ApplicationLibCode/CommandFileInterface/RicfCreateGridCaseGroup.cpp +++ b/ApplicationLibCode/CommandFileInterface/RicfCreateGridCaseGroup.cpp @@ -37,9 +37,9 @@ CAF_PDM_SOURCE_INIT( RicfCreateGridCaseGroupResult, "createGridCaseGroupResult" RicfCreateGridCaseGroupResult::RicfCreateGridCaseGroupResult( int caseGroupId /*= -1*/, const QString& caseGroupName /*= ""*/ ) { - CAF_PDM_InitObject( "case_group_result", "", "", "" ); - CAF_PDM_InitField( &this->caseGroupId, "groupId", caseGroupId, "", "", "", "" ); - CAF_PDM_InitField( &this->caseGroupName, "groupName", caseGroupName, "", "", "", "" ); + CAF_PDM_InitObject( "case_group_result" ); + CAF_PDM_InitField( &this->caseGroupId, "groupId", caseGroupId, "" ); + CAF_PDM_InitField( &this->caseGroupName, "groupName", caseGroupName, "" ); } CAF_PDM_SOURCE_INIT( RicfCreateGridCaseGroup, "createGridCaseGroup" ); @@ -49,7 +49,7 @@ CAF_PDM_SOURCE_INIT( RicfCreateGridCaseGroup, "createGridCaseGroup" ); //-------------------------------------------------------------------------------------------------- RicfCreateGridCaseGroup::RicfCreateGridCaseGroup() { - CAF_PDM_InitScriptableFieldNoDefault( &m_casePaths, "casePaths", "List of Paths to Case Files", "", "", "" ); + CAF_PDM_InitScriptableFieldNoDefault( &m_casePaths, "casePaths", "List of Paths to Case Files" ); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/CommandFileInterface/RicfCreateLgrForCompletions.cpp b/ApplicationLibCode/CommandFileInterface/RicfCreateLgrForCompletions.cpp index d55ab95501..fcceaf00c4 100644 --- a/ApplicationLibCode/CommandFileInterface/RicfCreateLgrForCompletions.cpp +++ b/ApplicationLibCode/CommandFileInterface/RicfCreateLgrForCompletions.cpp @@ -48,13 +48,13 @@ CAF_PDM_SOURCE_INIT( RicfCreateLgrForCompletions, "createLgrForCompletions" ); //-------------------------------------------------------------------------------------------------- RicfCreateLgrForCompletions::RicfCreateLgrForCompletions() { - CAF_PDM_InitScriptableField( &m_caseId, "caseId", -1, "Case ID", "", "", "" ); - CAF_PDM_InitScriptableField( &m_timeStep, "timeStep", 0, "Time Step Index", "", "", "" ); - CAF_PDM_InitScriptableField( &m_wellPathNames, "wellPathNames", std::vector(), "Well Path Names", "", "", "" ); - CAF_PDM_InitScriptableField( &m_refinementI, "refinementI", -1, "RefinementI", "", "", "" ); - CAF_PDM_InitScriptableField( &m_refinementJ, "refinementJ", -1, "RefinementJ", "", "", "" ); - CAF_PDM_InitScriptableField( &m_refinementK, "refinementK", -1, "RefinementK", "", "", "" ); - CAF_PDM_InitScriptableField( &m_splitType, "splitType", Lgr::SplitTypeEnum(), "SplitType", "", "", "" ); + CAF_PDM_InitScriptableField( &m_caseId, "caseId", -1, "Case ID" ); + CAF_PDM_InitScriptableField( &m_timeStep, "timeStep", 0, "Time Step Index" ); + CAF_PDM_InitScriptableField( &m_wellPathNames, "wellPathNames", std::vector(), "Well Path Names" ); + CAF_PDM_InitScriptableField( &m_refinementI, "refinementI", -1, "RefinementI" ); + CAF_PDM_InitScriptableField( &m_refinementJ, "refinementJ", -1, "RefinementJ" ); + CAF_PDM_InitScriptableField( &m_refinementK, "refinementK", -1, "RefinementK" ); + CAF_PDM_InitScriptableField( &m_splitType, "splitType", Lgr::SplitTypeEnum(), "SplitType" ); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/CommandFileInterface/RicfCreateMultipleFractures.cpp b/ApplicationLibCode/CommandFileInterface/RicfCreateMultipleFractures.cpp index 45393babd7..0408c7c57a 100644 --- a/ApplicationLibCode/CommandFileInterface/RicfCreateMultipleFractures.cpp +++ b/ApplicationLibCode/CommandFileInterface/RicfCreateMultipleFractures.cpp @@ -58,14 +58,14 @@ void AppEnum::setUp() //-------------------------------------------------------------------------------------------------- RicfCreateMultipleFractures::RicfCreateMultipleFractures() { - CAF_PDM_InitScriptableField( &m_caseId, "caseId", -1, "Case ID", "", "", "" ); - CAF_PDM_InitScriptableField( &m_wellPathNames, "wellPathNames", std::vector(), "Well Path Names", "", "", "" ); - CAF_PDM_InitScriptableField( &m_minDistFromWellTd, "minDistFromWellTd", 100.0, "Min Distance From Well TD", "", "", "" ); - CAF_PDM_InitScriptableField( &m_maxFracturesPerWell, "maxFracturesPerWell", 100, "Max Fractures per Well", "", "", "" ); - CAF_PDM_InitScriptableField( &m_templateId, "templateId", -1, "Template ID", "", "", "" ); - CAF_PDM_InitScriptableField( &m_topLayer, "topLayer", -1, "Top Layer", "", "", "" ); - CAF_PDM_InitScriptableField( &m_baseLayer, "baseLayer", -1, "Base Layer", "", "", "" ); - CAF_PDM_InitScriptableField( &m_spacing, "spacing", 300.0, "Spacing", "", "", "" ); + CAF_PDM_InitScriptableField( &m_caseId, "caseId", -1, "Case ID" ); + CAF_PDM_InitScriptableField( &m_wellPathNames, "wellPathNames", std::vector(), "Well Path Names" ); + CAF_PDM_InitScriptableField( &m_minDistFromWellTd, "minDistFromWellTd", 100.0, "Min Distance From Well TD" ); + CAF_PDM_InitScriptableField( &m_maxFracturesPerWell, "maxFracturesPerWell", 100, "Max Fractures per Well" ); + CAF_PDM_InitScriptableField( &m_templateId, "templateId", -1, "Template ID" ); + CAF_PDM_InitScriptableField( &m_topLayer, "topLayer", -1, "Top Layer" ); + CAF_PDM_InitScriptableField( &m_baseLayer, "baseLayer", -1, "Base Layer" ); + CAF_PDM_InitScriptableField( &m_spacing, "spacing", 300.0, "Spacing" ); CAF_PDM_InitScriptableField( &m_action, "action", caf::AppEnum( MultipleFractures::Action::APPEND_FRACTURES ), diff --git a/ApplicationLibCode/CommandFileInterface/RicfCreateSaturationPressurePlots.cpp b/ApplicationLibCode/CommandFileInterface/RicfCreateSaturationPressurePlots.cpp index 1d000c51de..84db70096d 100644 --- a/ApplicationLibCode/CommandFileInterface/RicfCreateSaturationPressurePlots.cpp +++ b/ApplicationLibCode/CommandFileInterface/RicfCreateSaturationPressurePlots.cpp @@ -38,7 +38,7 @@ CAF_PDM_SOURCE_INIT( RicfCreateSaturationPressurePlots, "createSaturationPressur //-------------------------------------------------------------------------------------------------- RicfCreateSaturationPressurePlots::RicfCreateSaturationPressurePlots() { - CAF_PDM_InitScriptableField( &m_caseIds, "caseIds", std::vector(), "Case IDs", "", "", "" ); + CAF_PDM_InitScriptableField( &m_caseIds, "caseIds", std::vector(), "Case IDs" ); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/CommandFileInterface/RicfCreateStatisticsCase.cpp b/ApplicationLibCode/CommandFileInterface/RicfCreateStatisticsCase.cpp index 750fb6ef6c..77ed10669f 100644 --- a/ApplicationLibCode/CommandFileInterface/RicfCreateStatisticsCase.cpp +++ b/ApplicationLibCode/CommandFileInterface/RicfCreateStatisticsCase.cpp @@ -38,8 +38,8 @@ CAF_PDM_SOURCE_INIT( RicfCreateStatisticsCaseResult, "createStatisticsCaseResult //-------------------------------------------------------------------------------------------------- RicfCreateStatisticsCaseResult::RicfCreateStatisticsCaseResult( int caseId /*= -1*/ ) { - CAF_PDM_InitObject( "statistics_case_result", "", "", "" ); - CAF_PDM_InitField( &this->caseId, "caseId", caseId, "", "", "", "" ); + CAF_PDM_InitObject( "statistics_case_result" ); + CAF_PDM_InitField( &this->caseId, "caseId", caseId, "" ); } CAF_PDM_SOURCE_INIT( RicfCreateStatisticsCase, "createStatisticsCase" ); @@ -49,7 +49,7 @@ CAF_PDM_SOURCE_INIT( RicfCreateStatisticsCase, "createStatisticsCase" ); //-------------------------------------------------------------------------------------------------- RicfCreateStatisticsCase::RicfCreateStatisticsCase() { - CAF_PDM_InitScriptableField( &m_caseGroupId, "caseGroupId", -1, "Case Group Id", "", "", "" ); + CAF_PDM_InitScriptableField( &m_caseGroupId, "caseGroupId", -1, "Case Group Id" ); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/CommandFileInterface/RicfCreateView.cpp b/ApplicationLibCode/CommandFileInterface/RicfCreateView.cpp index af3e6f1796..1a518ef432 100644 --- a/ApplicationLibCode/CommandFileInterface/RicfCreateView.cpp +++ b/ApplicationLibCode/CommandFileInterface/RicfCreateView.cpp @@ -23,8 +23,8 @@ CAF_PDM_SOURCE_INIT( RicfCreateViewResult, "createViewResult" ); //-------------------------------------------------------------------------------------------------- RicfCreateViewResult::RicfCreateViewResult( int viewId /*= -1*/ ) { - CAF_PDM_InitObject( "view_result", "", "", "" ); - CAF_PDM_InitField( &this->viewId, "viewId", viewId, "", "", "", "" ); + CAF_PDM_InitObject( "view_result" ); + CAF_PDM_InitField( &this->viewId, "viewId", viewId, "" ); } CAF_PDM_SOURCE_INIT( RicfCreateView, "createView" ); @@ -34,7 +34,7 @@ CAF_PDM_SOURCE_INIT( RicfCreateView, "createView" ); //-------------------------------------------------------------------------------------------------- RicfCreateView::RicfCreateView() { - CAF_PDM_InitScriptableField( &m_caseId, "caseId", -1, "Case Id", "", "", "" ); + CAF_PDM_InitScriptableField( &m_caseId, "caseId", -1, "Case Id" ); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/CommandFileInterface/RicfCreateWellBoreStabilityPlotFeature.cpp b/ApplicationLibCode/CommandFileInterface/RicfCreateWellBoreStabilityPlotFeature.cpp index 758b9762b9..386d02286c 100644 --- a/ApplicationLibCode/CommandFileInterface/RicfCreateWellBoreStabilityPlotFeature.cpp +++ b/ApplicationLibCode/CommandFileInterface/RicfCreateWellBoreStabilityPlotFeature.cpp @@ -39,8 +39,8 @@ CAF_PDM_SOURCE_INIT( RicfCreateWbsPlotResult, "createWbsPlotResult" ); //-------------------------------------------------------------------------------------------------- RicfCreateWbsPlotResult::RicfCreateWbsPlotResult( int viewId /*= -1*/ ) { - CAF_PDM_InitObject( "wbs_result", "", "", "" ); - CAF_PDM_InitField( &this->viewId, "viewId", viewId, "", "", "", "" ); + CAF_PDM_InitObject( "wbs_result" ); + CAF_PDM_InitField( &this->viewId, "viewId", viewId, "" ); } CAF_PDM_SOURCE_INIT( RicfCreateWellBoreStabilityPlotFeature, "createWellBoreStabilityPlot" ); @@ -50,11 +50,11 @@ CAF_PDM_SOURCE_INIT( RicfCreateWellBoreStabilityPlotFeature, "createWellBoreStab //-------------------------------------------------------------------------------------------------- RicfCreateWellBoreStabilityPlotFeature::RicfCreateWellBoreStabilityPlotFeature() { - CAF_PDM_InitScriptableField( &m_caseId, "caseId", -1, "GeoMech Case Id", "", "", "" ); - CAF_PDM_InitScriptableField( &m_wellPath, "wellPath", QString( "" ), "Well Path", "", "", "" ); - CAF_PDM_InitScriptableField( &m_timeStep, "timeStep", -1, "Time Step", "", "", "" ); + CAF_PDM_InitScriptableField( &m_caseId, "caseId", -1, "GeoMech Case Id" ); + CAF_PDM_InitScriptableField( &m_wellPath, "wellPath", QString( "" ), "Well Path" ); + CAF_PDM_InitScriptableField( &m_timeStep, "timeStep", -1, "Time Step" ); - CAF_PDM_InitFieldNoDefault( &m_wbsParameters, "wbsParameters", "WbsParameters", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_wbsParameters, "wbsParameters", "WbsParameters" ); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/CommandFileInterface/RicfExportFlowCharacteristics.cpp b/ApplicationLibCode/CommandFileInterface/RicfExportFlowCharacteristics.cpp index bdddec4424..954c246ff1 100644 --- a/ApplicationLibCode/CommandFileInterface/RicfExportFlowCharacteristics.cpp +++ b/ApplicationLibCode/CommandFileInterface/RicfExportFlowCharacteristics.cpp @@ -42,13 +42,13 @@ CAF_PDM_SOURCE_INIT( RicfExportFlowCharacteristics, "exportFlowCharacteristics" //-------------------------------------------------------------------------------------------------- RicfExportFlowCharacteristics::RicfExportFlowCharacteristics() { - CAF_PDM_InitScriptableField( &m_caseId, "caseId", -1, "Case ID", "", "", "" ); - CAF_PDM_InitScriptableField( &m_selectedTimeSteps, "timeSteps", std::vector(), "Selected Time Steps", "", "", "" ); - CAF_PDM_InitScriptableField( &m_injectors, "injectors", std::vector(), "Injectors", "", "", "" ); - CAF_PDM_InitScriptableField( &m_producers, "producers", std::vector(), "Producers", "", "", "" ); - CAF_PDM_InitScriptableField( &m_fileName, "fileName", QString(), "Export File Name", "", "", "" ); - CAF_PDM_InitScriptableField( &m_minCommunication, "minimumCommunication", 0.0, "Minimum Communication", "", "", "" ); - CAF_PDM_InitScriptableField( &m_maxPvFraction, "aquiferCellThreshold", 0.1, "Aquifer Cell Threshold", "", "", "" ); + CAF_PDM_InitScriptableField( &m_caseId, "caseId", -1, "Case ID" ); + CAF_PDM_InitScriptableField( &m_selectedTimeSteps, "timeSteps", std::vector(), "Selected Time Steps" ); + CAF_PDM_InitScriptableField( &m_injectors, "injectors", std::vector(), "Injectors" ); + CAF_PDM_InitScriptableField( &m_producers, "producers", std::vector(), "Producers" ); + CAF_PDM_InitScriptableField( &m_fileName, "fileName", QString(), "Export File Name" ); + CAF_PDM_InitScriptableField( &m_minCommunication, "minimumCommunication", 0.0, "Minimum Communication" ); + CAF_PDM_InitScriptableField( &m_maxPvFraction, "aquiferCellThreshold", 0.1, "Aquifer Cell Threshold" ); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/CommandFileInterface/RicfExportLgrForCompletions.cpp b/ApplicationLibCode/CommandFileInterface/RicfExportLgrForCompletions.cpp index 1e746d2c37..36edfc00cf 100644 --- a/ApplicationLibCode/CommandFileInterface/RicfExportLgrForCompletions.cpp +++ b/ApplicationLibCode/CommandFileInterface/RicfExportLgrForCompletions.cpp @@ -47,13 +47,13 @@ CAF_PDM_SOURCE_INIT( RicfExportLgrForCompletions, "exportLgrForCompletions" ); //-------------------------------------------------------------------------------------------------- RicfExportLgrForCompletions::RicfExportLgrForCompletions() { - CAF_PDM_InitScriptableField( &m_caseId, "caseId", -1, "Case ID", "", "", "" ); - CAF_PDM_InitScriptableField( &m_timeStep, "timeStep", -1, "Time Step Index", "", "", "" ); - CAF_PDM_InitScriptableField( &m_wellPathNames, "wellPathNames", std::vector(), "Well Path Names", "", "", "" ); - CAF_PDM_InitScriptableField( &m_refinementI, "refinementI", -1, "RefinementI", "", "", "" ); - CAF_PDM_InitScriptableField( &m_refinementJ, "refinementJ", -1, "RefinementJ", "", "", "" ); - CAF_PDM_InitScriptableField( &m_refinementK, "refinementK", -1, "RefinementK", "", "", "" ); - CAF_PDM_InitScriptableField( &m_splitType, "splitType", Lgr::SplitTypeEnum(), "SplitType", "", "", "" ); + CAF_PDM_InitScriptableField( &m_caseId, "caseId", -1, "Case ID" ); + CAF_PDM_InitScriptableField( &m_timeStep, "timeStep", -1, "Time Step Index" ); + CAF_PDM_InitScriptableField( &m_wellPathNames, "wellPathNames", std::vector(), "Well Path Names" ); + CAF_PDM_InitScriptableField( &m_refinementI, "refinementI", -1, "RefinementI" ); + CAF_PDM_InitScriptableField( &m_refinementJ, "refinementJ", -1, "RefinementJ" ); + CAF_PDM_InitScriptableField( &m_refinementK, "refinementK", -1, "RefinementK" ); + CAF_PDM_InitScriptableField( &m_splitType, "splitType", Lgr::SplitTypeEnum(), "SplitType" ); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/CommandFileInterface/RicfExportMsw.cpp b/ApplicationLibCode/CommandFileInterface/RicfExportMsw.cpp index 8b430a84e6..973fb1a09e 100644 --- a/ApplicationLibCode/CommandFileInterface/RicfExportMsw.cpp +++ b/ApplicationLibCode/CommandFileInterface/RicfExportMsw.cpp @@ -45,11 +45,11 @@ CAF_PDM_SOURCE_INIT( RicfExportMsw, "exportMsw" ); //-------------------------------------------------------------------------------------------------- RicfExportMsw::RicfExportMsw() { - CAF_PDM_InitScriptableField( &m_caseId, "caseId", -1, "Case ID", "", "", "" ); - CAF_PDM_InitScriptableField( &m_wellPathName, "wellPath", QString(), "Well Path Name", "", "", "" ); - 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_caseId, "caseId", -1, "Case ID" ); + CAF_PDM_InitScriptableField( &m_wellPathName, "wellPath", QString(), "Well Path Name" ); + 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(), diff --git a/ApplicationLibCode/CommandFileInterface/RicfExportMultiCaseSnapshots.cpp b/ApplicationLibCode/CommandFileInterface/RicfExportMultiCaseSnapshots.cpp index febd909ccb..ccac71abfb 100644 --- a/ApplicationLibCode/CommandFileInterface/RicfExportMultiCaseSnapshots.cpp +++ b/ApplicationLibCode/CommandFileInterface/RicfExportMultiCaseSnapshots.cpp @@ -33,7 +33,7 @@ CAF_PDM_SOURCE_INIT( RicfExportMultiCaseSnapshots, "exportMultiCaseSnapshots" ); //-------------------------------------------------------------------------------------------------- RicfExportMultiCaseSnapshots::RicfExportMultiCaseSnapshots() { - CAF_PDM_InitScriptableField( &m_gridListFile, "gridListFile", QString(), "Grid List File", "", "", "" ); + CAF_PDM_InitScriptableField( &m_gridListFile, "gridListFile", QString(), "Grid List File" ); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/CommandFileInterface/RicfExportPropertyInViews.cpp b/ApplicationLibCode/CommandFileInterface/RicfExportPropertyInViews.cpp index 4f02237214..eb62f8ae06 100644 --- a/ApplicationLibCode/CommandFileInterface/RicfExportPropertyInViews.cpp +++ b/ApplicationLibCode/CommandFileInterface/RicfExportPropertyInViews.cpp @@ -47,10 +47,10 @@ CAF_PDM_SOURCE_INIT( RicfExportPropertyInViews, "exportPropertyInViews" ); //-------------------------------------------------------------------------------------------------- RicfExportPropertyInViews::RicfExportPropertyInViews() { - CAF_PDM_InitScriptableField( &m_caseId, "caseId", -1, "Case ID", "", "", "" ); - CAF_PDM_InitScriptableField( &m_viewIds, "viewIds", std::vector(), "View IDs", "", "", "" ); - CAF_PDM_InitScriptableField( &m_viewNames, "viewNames", std::vector(), "View Names", "", "", "" ); - CAF_PDM_InitScriptableField( &m_undefinedValue, "undefinedValue", 0.0, "Undefined Value", "", "", "" ); + CAF_PDM_InitScriptableField( &m_caseId, "caseId", -1, "Case ID" ); + CAF_PDM_InitScriptableField( &m_viewIds, "viewIds", std::vector(), "View IDs" ); + CAF_PDM_InitScriptableField( &m_viewNames, "viewNames", std::vector(), "View Names" ); + CAF_PDM_InitScriptableField( &m_undefinedValue, "undefinedValue", 0.0, "Undefined Value" ); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/CommandFileInterface/RicfExportSimWellFractureCompletions.cpp b/ApplicationLibCode/CommandFileInterface/RicfExportSimWellFractureCompletions.cpp index 5ed162c483..471d41d739 100644 --- a/ApplicationLibCode/CommandFileInterface/RicfExportSimWellFractureCompletions.cpp +++ b/ApplicationLibCode/CommandFileInterface/RicfExportSimWellFractureCompletions.cpp @@ -46,10 +46,10 @@ CAF_PDM_SOURCE_INIT( RicfExportSimWellFractureCompletions, "exportSimWellFractur //-------------------------------------------------------------------------------------------------- RicfExportSimWellFractureCompletions::RicfExportSimWellFractureCompletions() { - CAF_PDM_InitScriptableField( &m_caseId, "caseId", -1, "Case ID", "", "", "" ); - 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_caseId, "caseId", -1, "Case ID" ); + 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(), diff --git a/ApplicationLibCode/CommandFileInterface/RicfExportSnapshots.cpp b/ApplicationLibCode/CommandFileInterface/RicfExportSnapshots.cpp index a5b7248243..137dab6268 100644 --- a/ApplicationLibCode/CommandFileInterface/RicfExportSnapshots.cpp +++ b/ApplicationLibCode/CommandFileInterface/RicfExportSnapshots.cpp @@ -60,12 +60,12 @@ void RicfExportSnapshots::SnapshotsTypeEnum::setUp() //-------------------------------------------------------------------------------------------------- RicfExportSnapshots::RicfExportSnapshots() { - CAF_PDM_InitScriptableField( &m_type, "type", RicfExportSnapshots::SnapshotsTypeEnum(), "Type", "", "", "" ); - CAF_PDM_InitScriptableField( &m_prefix, "prefix", QString(), "Prefix", "", "", "" ); - CAF_PDM_InitScriptableField( &m_caseId, "caseId", -1, "Case Id", "", "", "" ); - CAF_PDM_InitScriptableField( &m_viewId, "viewId", -1, "View Id", "", "", "" ); - CAF_PDM_InitScriptableField( &m_exportFolder, "exportFolder", QString(), "Export Folder", "", "", "" ); - CAF_PDM_InitScriptableFieldNoDefault( &m_plotOutputFormat, "plotOutputFormat", "Output Format", "", "", "" ); + CAF_PDM_InitScriptableField( &m_type, "type", RicfExportSnapshots::SnapshotsTypeEnum(), "Type" ); + CAF_PDM_InitScriptableField( &m_prefix, "prefix", QString(), "Prefix" ); + CAF_PDM_InitScriptableField( &m_caseId, "caseId", -1, "Case Id" ); + CAF_PDM_InitScriptableField( &m_viewId, "viewId", -1, "View Id" ); + CAF_PDM_InitScriptableField( &m_exportFolder, "exportFolder", QString(), "Export Folder" ); + CAF_PDM_InitScriptableFieldNoDefault( &m_plotOutputFormat, "plotOutputFormat", "Output Format" ); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/CommandFileInterface/RicfExportVisibleCells.cpp b/ApplicationLibCode/CommandFileInterface/RicfExportVisibleCells.cpp index 3d7b8f66e4..7855392475 100644 --- a/ApplicationLibCode/CommandFileInterface/RicfExportVisibleCells.cpp +++ b/ApplicationLibCode/CommandFileInterface/RicfExportVisibleCells.cpp @@ -63,9 +63,9 @@ void AppEnum::setUp() //-------------------------------------------------------------------------------------------------- RicfExportVisibleCells::RicfExportVisibleCells() { - CAF_PDM_InitScriptableField( &m_caseId, "caseId", -1, "Case ID", "", "", "" ); - CAF_PDM_InitScriptableField( &m_viewId, "viewId", -1, "View ID", "", "", "" ); - CAF_PDM_InitScriptableField( &m_viewName, "viewName", QString(), "View Name", "", "", "" ); + CAF_PDM_InitScriptableField( &m_caseId, "caseId", -1, "Case ID" ); + CAF_PDM_InitScriptableField( &m_viewId, "viewId", -1, "View ID" ); + CAF_PDM_InitScriptableField( &m_viewName, "viewName", QString(), "View Name" ); CAF_PDM_InitScriptableField( &m_exportKeyword, "exportKeyword", caf::AppEnum(), @@ -80,8 +80,8 @@ RicfExportVisibleCells::RicfExportVisibleCells() "", "", "" ); - CAF_PDM_InitScriptableField( &m_hiddenActiveCellsValue, "hiddenActiveCellsValue", 0, "Hidden Active Cells Value", "", "", "" ); - CAF_PDM_InitScriptableField( &m_inactiveCellsValue, "inactiveCellsValue", 0, "Inactive Cells Value", "", "", "" ); + CAF_PDM_InitScriptableField( &m_hiddenActiveCellsValue, "hiddenActiveCellsValue", 0, "Hidden Active Cells Value" ); + CAF_PDM_InitScriptableField( &m_inactiveCellsValue, "inactiveCellsValue", 0, "Inactive Cells Value" ); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/CommandFileInterface/RicfExportWellLogPlotData.cpp b/ApplicationLibCode/CommandFileInterface/RicfExportWellLogPlotData.cpp index f6e0c2884e..1f070064b4 100644 --- a/ApplicationLibCode/CommandFileInterface/RicfExportWellLogPlotData.cpp +++ b/ApplicationLibCode/CommandFileInterface/RicfExportWellLogPlotData.cpp @@ -49,8 +49,8 @@ CAF_PDM_SOURCE_INIT( RicfExportWellLogPlotDataResult, "exportWellLogPlotDataResu //-------------------------------------------------------------------------------------------------- RicfExportWellLogPlotDataResult::RicfExportWellLogPlotDataResult() { - CAF_PDM_InitObject( "export_well_data_result", "", "", "" ); - CAF_PDM_InitFieldNoDefault( &this->exportedFiles, "exportedFiles", "", "", "", "" ); + CAF_PDM_InitObject( "export_well_data_result" ); + CAF_PDM_InitFieldNoDefault( &this->exportedFiles, "exportedFiles", "" ); } CAF_PDM_SOURCE_INIT( RicfExportWellLogPlotData, "exportWellLogPlotData" ); @@ -60,14 +60,14 @@ CAF_PDM_SOURCE_INIT( RicfExportWellLogPlotData, "exportWellLogPlotData" ); //-------------------------------------------------------------------------------------------------- RicfExportWellLogPlotData::RicfExportWellLogPlotData() { - CAF_PDM_InitScriptableFieldNoDefault( &m_format, "exportFormat", "", "", "", "" ); - CAF_PDM_InitScriptableField( &m_viewId, "viewId", -1, "", "", "", "" ); - CAF_PDM_InitScriptableField( &m_folder, "exportFolder", QString(), "", "", "", "" ); - CAF_PDM_InitScriptableField( &m_filePrefix, "filePrefix", QString(), "", "", "", "" ); - CAF_PDM_InitScriptableField( &m_exportTvdRkb, "exportTvdRkb", false, "", "", "", "" ); - CAF_PDM_InitScriptableField( &m_capitalizeFileNames, "capitalizeFileNames", false, "", "", "", "" ); - CAF_PDM_InitScriptableField( &m_resampleInterval, "resampleInterval", 0.0, "", "", "", "" ); - CAF_PDM_InitScriptableField( &m_convertCurveUnits, "convertCurveUnits", false, "", "", "", "" ); + CAF_PDM_InitScriptableFieldNoDefault( &m_format, "exportFormat", "" ); + CAF_PDM_InitScriptableField( &m_viewId, "viewId", -1, "" ); + CAF_PDM_InitScriptableField( &m_folder, "exportFolder", QString(), "" ); + CAF_PDM_InitScriptableField( &m_filePrefix, "filePrefix", QString(), "" ); + CAF_PDM_InitScriptableField( &m_exportTvdRkb, "exportTvdRkb", false, "" ); + CAF_PDM_InitScriptableField( &m_capitalizeFileNames, "capitalizeFileNames", false, "" ); + CAF_PDM_InitScriptableField( &m_resampleInterval, "resampleInterval", 0.0, "" ); + CAF_PDM_InitScriptableField( &m_convertCurveUnits, "convertCurveUnits", false, "" ); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/CommandFileInterface/RicfExportWellPathCompletions.cpp b/ApplicationLibCode/CommandFileInterface/RicfExportWellPathCompletions.cpp index 9ab16a08f4..f0f10d25f6 100644 --- a/ApplicationLibCode/CommandFileInterface/RicfExportWellPathCompletions.cpp +++ b/ApplicationLibCode/CommandFileInterface/RicfExportWellPathCompletions.cpp @@ -43,9 +43,9 @@ CAF_PDM_SOURCE_INIT( RicfExportWellPathCompletions, "exportWellPathCompletions" //-------------------------------------------------------------------------------------------------- RicfExportWellPathCompletions::RicfExportWellPathCompletions() { - CAF_PDM_InitScriptableField( &m_caseId, "caseId", -1, "Case ID", "", "", "" ); - CAF_PDM_InitScriptableField( &m_timeStep, "timeStep", -1, "Time Step Index", "", "", "" ); - CAF_PDM_InitScriptableField( &m_wellPathNames, "wellPathNames", std::vector(), "Well Path Names", "", "", "" ); + CAF_PDM_InitScriptableField( &m_caseId, "caseId", -1, "Case ID" ); + CAF_PDM_InitScriptableField( &m_timeStep, "timeStep", -1, "Time Step Index" ); + CAF_PDM_InitScriptableField( &m_wellPathNames, "wellPathNames", std::vector(), "Well Path Names" ); CAF_PDM_InitScriptableField( &m_fileSplit, "fileSplit", @@ -69,11 +69,11 @@ RicfExportWellPathCompletions::RicfExportWellPathCompletions() "", "" ); - CAF_PDM_InitScriptableField( &m_includeMsw, "includeMsw", true, "Export Multi Segment Well Model", "", "", "" ); - CAF_PDM_InitScriptableField( &m_useLateralNTG, "useNtgHorizontally", false, "Use NTG Horizontally", "", "", "" ); - 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_includeMsw, "includeMsw", true, "Export Multi Segment Well Model" ); + CAF_PDM_InitScriptableField( &m_useLateralNTG, "useNtgHorizontally", false, "Use NTG Horizontally" ); + 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_excludeMainBoreForFishbones, "excludeMainBoreForFishbones", @@ -119,8 +119,8 @@ RicfExportWellPathCompletions::RicfExportWellPathCompletions() "", "", "" ); - CAF_PDM_InitScriptableField( &m_exportWelspec, "exportWelspec", true, "Export WELSPEC keyword", "", "", "" ); - CAF_PDM_InitScriptableField( &m_customFileName, "customFileName", QString(), "Custom Filename", "", "", "" ); + CAF_PDM_InitScriptableField( &m_exportWelspec, "exportWelspec", true, "Export WELSPEC keyword" ); + CAF_PDM_InitScriptableField( &m_customFileName, "customFileName", QString(), "Custom Filename" ); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/CommandFileInterface/RicfExportWellPaths.cpp b/ApplicationLibCode/CommandFileInterface/RicfExportWellPaths.cpp index 34feb950f0..25ba65d6c3 100644 --- a/ApplicationLibCode/CommandFileInterface/RicfExportWellPaths.cpp +++ b/ApplicationLibCode/CommandFileInterface/RicfExportWellPaths.cpp @@ -45,8 +45,8 @@ CAF_PDM_SOURCE_INIT( RicfExportWellPaths, "exportWellPaths" ); //-------------------------------------------------------------------------------------------------- RicfExportWellPaths::RicfExportWellPaths() { - CAF_PDM_InitScriptableField( &m_wellPathNames, "wellPathNames", std::vector(), "Well Path Names", "", "", "" ); - CAF_PDM_InitScriptableField( &m_mdStepSize, "mdStepSize", 5.0, "MD Step Size", "", "", "" ); + CAF_PDM_InitScriptableField( &m_wellPathNames, "wellPathNames", std::vector(), "Well Path Names" ); + CAF_PDM_InitScriptableField( &m_mdStepSize, "mdStepSize", 5.0, "MD Step Size" ); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/CommandFileInterface/RicfImportFormationNames.cpp b/ApplicationLibCode/CommandFileInterface/RicfImportFormationNames.cpp index 092865cdf2..87f7348faf 100644 --- a/ApplicationLibCode/CommandFileInterface/RicfImportFormationNames.cpp +++ b/ApplicationLibCode/CommandFileInterface/RicfImportFormationNames.cpp @@ -34,8 +34,8 @@ CAF_PDM_SOURCE_INIT( RicfImportFormationNames, "importFormationNames" ); //-------------------------------------------------------------------------------------------------- RicfImportFormationNames::RicfImportFormationNames() { - CAF_PDM_InitScriptableFieldNoDefault( &m_formationFiles, "formationFiles", "", "", "", "" ); - CAF_PDM_InitScriptableField( &m_applyToCaseId, "applyToCaseId", -1, "", "", "", "" ); + CAF_PDM_InitScriptableFieldNoDefault( &m_formationFiles, "formationFiles", "" ); + CAF_PDM_InitScriptableField( &m_applyToCaseId, "applyToCaseId", -1, "" ); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/CommandFileInterface/RicfImportWellLogFiles.cpp b/ApplicationLibCode/CommandFileInterface/RicfImportWellLogFiles.cpp index 6b92cfeff5..3e1ff49519 100644 --- a/ApplicationLibCode/CommandFileInterface/RicfImportWellLogFiles.cpp +++ b/ApplicationLibCode/CommandFileInterface/RicfImportWellLogFiles.cpp @@ -35,8 +35,8 @@ CAF_PDM_SOURCE_INIT( RicfImportWellLogFilesResult, "importWellLogFilesResult" ); //-------------------------------------------------------------------------------------------------- RicfImportWellLogFilesResult::RicfImportWellLogFilesResult() { - CAF_PDM_InitObject( "well_log_files_result", "", "", "" ); - CAF_PDM_InitFieldNoDefault( &wellPathNames, "wellPathNames", "", "", "", "" ); + CAF_PDM_InitObject( "well_log_files_result" ); + CAF_PDM_InitFieldNoDefault( &wellPathNames, "wellPathNames", "" ); } CAF_PDM_SOURCE_INIT( RicfImportWellLogFiles, "importWellLogFiles" ); @@ -46,8 +46,8 @@ CAF_PDM_SOURCE_INIT( RicfImportWellLogFiles, "importWellLogFiles" ); //-------------------------------------------------------------------------------------------------- RicfImportWellLogFiles::RicfImportWellLogFiles() { - CAF_PDM_InitScriptableFieldNoDefault( &m_wellLogFileFolder, "wellLogFolder", "", "", "", "" ); - CAF_PDM_InitScriptableFieldNoDefault( &m_wellLogFilePaths, "wellLogFiles", "", "", "", "" ); + CAF_PDM_InitScriptableFieldNoDefault( &m_wellLogFileFolder, "wellLogFolder", "" ); + CAF_PDM_InitScriptableFieldNoDefault( &m_wellLogFilePaths, "wellLogFiles", "" ); } caf::PdmScriptResponse RicfImportWellLogFiles::execute() diff --git a/ApplicationLibCode/CommandFileInterface/RicfLoadCase.cpp b/ApplicationLibCode/CommandFileInterface/RicfLoadCase.cpp index 6657a13dd2..86838f1c9e 100644 --- a/ApplicationLibCode/CommandFileInterface/RicfLoadCase.cpp +++ b/ApplicationLibCode/CommandFileInterface/RicfLoadCase.cpp @@ -37,8 +37,8 @@ CAF_PDM_SOURCE_INIT( RicfLoadCaseResult, "loadCaseResult" ); //-------------------------------------------------------------------------------------------------- RicfLoadCaseResult::RicfLoadCaseResult( int caseId ) { - CAF_PDM_InitObject( "case_result", "", "", "" ); - CAF_PDM_InitField( &this->caseId, "id", caseId, "", "", "", "" ); + CAF_PDM_InitObject( "case_result" ); + CAF_PDM_InitField( &this->caseId, "id", caseId, "" ); } CAF_PDM_SOURCE_INIT( RicfLoadCase, "loadCase" ); @@ -48,8 +48,8 @@ CAF_PDM_SOURCE_INIT( RicfLoadCase, "loadCase" ); //-------------------------------------------------------------------------------------------------- RicfLoadCase::RicfLoadCase() { - CAF_PDM_InitScriptableField( &m_path, "path", QString(), "Path to Case File", "", "", "" ); - CAF_PDM_InitScriptableField( &m_gridOnly, "gridOnly", false, "Load Grid Data Only", "", "", "" ); + CAF_PDM_InitScriptableField( &m_path, "path", QString(), "Path to Case File" ); + CAF_PDM_InitScriptableField( &m_gridOnly, "gridOnly", false, "Load Grid Data Only" ); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/CommandFileInterface/RicfOpenProject.cpp b/ApplicationLibCode/CommandFileInterface/RicfOpenProject.cpp index 53652df9a5..a8b8446517 100644 --- a/ApplicationLibCode/CommandFileInterface/RicfOpenProject.cpp +++ b/ApplicationLibCode/CommandFileInterface/RicfOpenProject.cpp @@ -35,7 +35,7 @@ CAF_PDM_SOURCE_INIT( RicfOpenProject, "openProject" ); //-------------------------------------------------------------------------------------------------- RicfOpenProject::RicfOpenProject() { - CAF_PDM_InitScriptableField( &m_path, "path", QString(), "Path", "", "", "" ); + CAF_PDM_InitScriptableField( &m_path, "path", QString(), "Path" ); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/CommandFileInterface/RicfReplaceCase.cpp b/ApplicationLibCode/CommandFileInterface/RicfReplaceCase.cpp index 1cd99cc4af..aa525b7ede 100644 --- a/ApplicationLibCode/CommandFileInterface/RicfReplaceCase.cpp +++ b/ApplicationLibCode/CommandFileInterface/RicfReplaceCase.cpp @@ -38,8 +38,8 @@ CAF_PDM_SOURCE_INIT( RicfSingleCaseReplace, "replaceCase" ); //-------------------------------------------------------------------------------------------------- RicfSingleCaseReplace::RicfSingleCaseReplace() { - CAF_PDM_InitScriptableField( &m_caseId, "caseId", -1, "Case ID", "", "", "" ); - CAF_PDM_InitScriptableField( &m_newGridFile, "newGridFile", QString(), "New Grid File", "", "", "" ); + CAF_PDM_InitScriptableField( &m_caseId, "caseId", -1, "Case ID" ); + CAF_PDM_InitScriptableField( &m_newGridFile, "newGridFile", QString(), "New Grid File" ); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/CommandFileInterface/RicfReplaceSourceCases.cpp b/ApplicationLibCode/CommandFileInterface/RicfReplaceSourceCases.cpp index 165b4214c1..8bcc09779a 100644 --- a/ApplicationLibCode/CommandFileInterface/RicfReplaceSourceCases.cpp +++ b/ApplicationLibCode/CommandFileInterface/RicfReplaceSourceCases.cpp @@ -33,8 +33,8 @@ CAF_PDM_SOURCE_INIT( RicfReplaceSourceCases, "replaceSourceCases" ); //-------------------------------------------------------------------------------------------------- RicfReplaceSourceCases::RicfReplaceSourceCases() { - CAF_PDM_InitScriptableField( &m_caseGroupId, "caseGroupId", -1, "Case Group ID", "", "", "" ); - CAF_PDM_InitScriptableField( &m_gridListFile, "gridListFile", QString(), "Grid List File", "", "", "" ); + CAF_PDM_InitScriptableField( &m_caseGroupId, "caseGroupId", -1, "Case Group ID" ); + CAF_PDM_InitScriptableField( &m_gridListFile, "gridListFile", QString(), "Grid List File" ); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/CommandFileInterface/RicfRunOctaveScript.cpp b/ApplicationLibCode/CommandFileInterface/RicfRunOctaveScript.cpp index 8a11e7bde0..09a8c1ac17 100644 --- a/ApplicationLibCode/CommandFileInterface/RicfRunOctaveScript.cpp +++ b/ApplicationLibCode/CommandFileInterface/RicfRunOctaveScript.cpp @@ -37,8 +37,8 @@ CAF_PDM_SOURCE_INIT( RicfRunOctaveScript, "runOctaveScript" ); //-------------------------------------------------------------------------------------------------- RicfRunOctaveScript::RicfRunOctaveScript() { - CAF_PDM_InitScriptableField( &m_path, "path", QString(), "Path", "", "", "" ); - CAF_PDM_InitScriptableField( &m_caseIds, "caseIds", std::vector(), "Case IDs", "", "", "" ); + CAF_PDM_InitScriptableField( &m_path, "path", QString(), "Path" ); + CAF_PDM_InitScriptableField( &m_caseIds, "caseIds", std::vector(), "Case IDs" ); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/CommandFileInterface/RicfScaleFractureTemplate.cpp b/ApplicationLibCode/CommandFileInterface/RicfScaleFractureTemplate.cpp index b1de06eb27..99f733de55 100644 --- a/ApplicationLibCode/CommandFileInterface/RicfScaleFractureTemplate.cpp +++ b/ApplicationLibCode/CommandFileInterface/RicfScaleFractureTemplate.cpp @@ -34,13 +34,13 @@ CAF_PDM_SOURCE_INIT( RicfScaleFractureTemplate, "scaleFractureTemplate" ); //-------------------------------------------------------------------------------------------------- RicfScaleFractureTemplate::RicfScaleFractureTemplate() { - CAF_PDM_InitScriptableField( &m_id, "id", -1, "Id", "", "", "" ); - CAF_PDM_InitScriptableField( &m_halfLengthScaleFactor, "halfLength", 1.0, "HalfLengthScaleFactor", "", "", "" ); - CAF_PDM_InitScriptableField( &m_heightScaleFactor, "height", 1.0, "HeightScaleFactor", "", "", "" ); - CAF_PDM_InitScriptableField( &m_dFactorScaleFactor, "dFactor", 1.0, "DFactorScaleFactor", "", "", "" ); - CAF_PDM_InitScriptableField( &m_conductivityScaleFactor, "conductivity", 1.0, "ConductivityScaleFactor", "", "", "" ); + CAF_PDM_InitScriptableField( &m_id, "id", -1, "Id" ); + CAF_PDM_InitScriptableField( &m_halfLengthScaleFactor, "halfLength", 1.0, "HalfLengthScaleFactor" ); + CAF_PDM_InitScriptableField( &m_heightScaleFactor, "height", 1.0, "HeightScaleFactor" ); + CAF_PDM_InitScriptableField( &m_dFactorScaleFactor, "dFactor", 1.0, "DFactorScaleFactor" ); + CAF_PDM_InitScriptableField( &m_conductivityScaleFactor, "conductivity", 1.0, "ConductivityScaleFactor" ); - CAF_PDM_InitScriptableField( &m_OBSOLETE_widthScaleFactor, "width", 1.0, "WidthScaleFactor", "", "", "" ); + CAF_PDM_InitScriptableField( &m_OBSOLETE_widthScaleFactor, "width", 1.0, "WidthScaleFactor" ); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/CommandFileInterface/RicfSetFractureContainment.cpp b/ApplicationLibCode/CommandFileInterface/RicfSetFractureContainment.cpp index c54f369280..d49633af4f 100644 --- a/ApplicationLibCode/CommandFileInterface/RicfSetFractureContainment.cpp +++ b/ApplicationLibCode/CommandFileInterface/RicfSetFractureContainment.cpp @@ -34,9 +34,9 @@ CAF_PDM_SOURCE_INIT( RicfSetFractureContainment, "setFractureContainment" ); //-------------------------------------------------------------------------------------------------- RicfSetFractureContainment::RicfSetFractureContainment() { - CAF_PDM_InitScriptableField( &m_id, "id", -1, "Id", "", "", "" ); - CAF_PDM_InitScriptableField( &m_topLayer, "topLayer", -1, "TopLayer", "", "", "" ); - CAF_PDM_InitScriptableField( &m_baseLayer, "baseLayer", -1, "BaseLayer", "", "", "" ); + CAF_PDM_InitScriptableField( &m_id, "id", -1, "Id" ); + CAF_PDM_InitScriptableField( &m_topLayer, "topLayer", -1, "TopLayer" ); + CAF_PDM_InitScriptableField( &m_baseLayer, "baseLayer", -1, "BaseLayer" ); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/CommandFileInterface/RicfSetMainWindowSize.cpp b/ApplicationLibCode/CommandFileInterface/RicfSetMainWindowSize.cpp index 6b3f894056..041d1b8190 100644 --- a/ApplicationLibCode/CommandFileInterface/RicfSetMainWindowSize.cpp +++ b/ApplicationLibCode/CommandFileInterface/RicfSetMainWindowSize.cpp @@ -30,8 +30,8 @@ CAF_PDM_SOURCE_INIT( RicfSetMainWindowSize, "setMainWindowSize" ); //-------------------------------------------------------------------------------------------------- RicfSetMainWindowSize::RicfSetMainWindowSize() { - CAF_PDM_InitScriptableField( &m_height, "height", -1, "Height", "", "", "" ); - CAF_PDM_InitScriptableField( &m_width, "width", -1, "Width", "", "", "" ); + CAF_PDM_InitScriptableField( &m_height, "height", -1, "Height" ); + CAF_PDM_InitScriptableField( &m_width, "width", -1, "Width" ); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/CommandFileInterface/RicfSetPlotWindowSize.cpp b/ApplicationLibCode/CommandFileInterface/RicfSetPlotWindowSize.cpp index 0d8550dcf6..cfa4e22fe9 100644 --- a/ApplicationLibCode/CommandFileInterface/RicfSetPlotWindowSize.cpp +++ b/ApplicationLibCode/CommandFileInterface/RicfSetPlotWindowSize.cpp @@ -30,8 +30,8 @@ CAF_PDM_SOURCE_INIT( RicfSetPlotWindowSize, "setPlotWindowSize" ); //-------------------------------------------------------------------------------------------------- RicfSetPlotWindowSize::RicfSetPlotWindowSize() { - CAF_PDM_InitScriptableField( &m_height, "height", -1, "Height", "", "", "" ); - CAF_PDM_InitScriptableField( &m_width, "width", -1, "Width", "", "", "" ); + CAF_PDM_InitScriptableField( &m_height, "height", -1, "Height" ); + CAF_PDM_InitScriptableField( &m_width, "width", -1, "Width" ); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/CommandFileInterface/RicfSetStartDir.cpp b/ApplicationLibCode/CommandFileInterface/RicfSetStartDir.cpp index 7a2e9918ab..f432f99a22 100644 --- a/ApplicationLibCode/CommandFileInterface/RicfSetStartDir.cpp +++ b/ApplicationLibCode/CommandFileInterface/RicfSetStartDir.cpp @@ -32,7 +32,7 @@ CAF_PDM_SOURCE_INIT( RicfSetStartDir, "setStartDir" ); //-------------------------------------------------------------------------------------------------- RicfSetStartDir::RicfSetStartDir() { - CAF_PDM_InitScriptableField( &m_path, "path", QString(), "Path", "", "", "" ); + CAF_PDM_InitScriptableField( &m_path, "path", QString(), "Path" ); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/CommandFileInterface/RicfSetTimeStep.cpp b/ApplicationLibCode/CommandFileInterface/RicfSetTimeStep.cpp index 5ed9fae65f..b1214012a5 100644 --- a/ApplicationLibCode/CommandFileInterface/RicfSetTimeStep.cpp +++ b/ApplicationLibCode/CommandFileInterface/RicfSetTimeStep.cpp @@ -35,9 +35,9 @@ CAF_PDM_SOURCE_INIT( RicfSetTimeStep, "setTimeStep" ); //-------------------------------------------------------------------------------------------------- RicfSetTimeStep::RicfSetTimeStep() { - CAF_PDM_InitScriptableField( &m_caseId, "caseId", -1, "Case ID", "", "", "" ); - CAF_PDM_InitScriptableField( &m_viewId, "viewId", -1, "View ID", "", "", "" ); - CAF_PDM_InitScriptableField( &m_timeStepIndex, "timeStep", -1, "Time Step Index", "", "", "" ); + CAF_PDM_InitScriptableField( &m_caseId, "caseId", -1, "Case ID" ); + CAF_PDM_InitScriptableField( &m_viewId, "viewId", -1, "View ID" ); + CAF_PDM_InitScriptableField( &m_timeStepIndex, "timeStep", -1, "Time Step Index" ); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/Commands/ApplicationCommands/RicSaveProjectAsFeature.cpp b/ApplicationLibCode/Commands/ApplicationCommands/RicSaveProjectAsFeature.cpp index edde3def97..15ba3385d6 100644 --- a/ApplicationLibCode/Commands/ApplicationCommands/RicSaveProjectAsFeature.cpp +++ b/ApplicationLibCode/Commands/ApplicationCommands/RicSaveProjectAsFeature.cpp @@ -34,7 +34,7 @@ RICF_SOURCE_INIT( RicSaveProjectAsFeature, "RicSaveProjectAsFeature", "saveProje //-------------------------------------------------------------------------------------------------- RicSaveProjectAsFeature::RicSaveProjectAsFeature() { - CAF_PDM_InitScriptableFieldNoDefault( &m_filePath, "filePath", "", "", "", "" ); + CAF_PDM_InitScriptableFieldNoDefault( &m_filePath, "filePath", "" ); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/Commands/ApplicationCommands/RicSaveProjectFeature.cpp b/ApplicationLibCode/Commands/ApplicationCommands/RicSaveProjectFeature.cpp index b82395c154..174014233a 100644 --- a/ApplicationLibCode/Commands/ApplicationCommands/RicSaveProjectFeature.cpp +++ b/ApplicationLibCode/Commands/ApplicationCommands/RicSaveProjectFeature.cpp @@ -31,7 +31,7 @@ RICF_SOURCE_INIT( RicSaveProjectFeature, "RicSaveProjectFeature", "saveProject" //-------------------------------------------------------------------------------------------------- RicSaveProjectFeature::RicSaveProjectFeature() { - CAF_PDM_InitFieldNoDefault( &m_filePath, "filePath", "", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_filePath, "filePath", "" ); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/Commands/CompletionExportCommands/RicCaseAndFileExportSettingsUi.cpp b/ApplicationLibCode/Commands/CompletionExportCommands/RicCaseAndFileExportSettingsUi.cpp index 6df38e4ff4..d2a2b1a7e2 100644 --- a/ApplicationLibCode/Commands/CompletionExportCommands/RicCaseAndFileExportSettingsUi.cpp +++ b/ApplicationLibCode/Commands/CompletionExportCommands/RicCaseAndFileExportSettingsUi.cpp @@ -29,12 +29,12 @@ CAF_PDM_SOURCE_INIT( RicCaseAndFileExportSettingsUi, "RicCaseAndFileExportSettin //-------------------------------------------------------------------------------------------------- RicCaseAndFileExportSettingsUi::RicCaseAndFileExportSettingsUi() { - CAF_PDM_InitObject( "RimCaseAndFileExportSettings", "", "", "" ); + CAF_PDM_InitObject( "RimCaseAndFileExportSettings" ); - CAF_PDM_InitFieldNoDefault( &folder, "Folder", "Export Folder", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &folder, "Folder", "Export Folder" ); folder.uiCapability()->setUiEditorTypeName( caf::PdmUiFilePathEditor::uiEditorTypeName() ); - CAF_PDM_InitFieldNoDefault( &caseToApply, "CaseToApply", "Case to Apply", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &caseToApply, "CaseToApply", "Case to Apply" ); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/Commands/CompletionExportCommands/RicExportCompletionDataSettingsUi.cpp b/ApplicationLibCode/Commands/CompletionExportCommands/RicExportCompletionDataSettingsUi.cpp index 3f774af6d6..18123f9021 100644 --- a/ApplicationLibCode/Commands/CompletionExportCommands/RicExportCompletionDataSettingsUi.cpp +++ b/ApplicationLibCode/Commands/CompletionExportCommands/RicExportCompletionDataSettingsUi.cpp @@ -72,26 +72,26 @@ CAF_PDM_SOURCE_INIT( RicExportCompletionDataSettingsUi, "RicExportCompletionData //-------------------------------------------------------------------------------------------------- RicExportCompletionDataSettingsUi::RicExportCompletionDataSettingsUi() { - CAF_PDM_InitObject( "RimExportCompletionDataSettings", "", "", "" ); + CAF_PDM_InitObject( "RimExportCompletionDataSettings" ); - CAF_PDM_InitFieldNoDefault( &fileSplit, "FileSplit", "File Split", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &fileSplit, "FileSplit", "File Split" ); CAF_PDM_InitFieldNoDefault( &compdatExport, "compdatExport", "Export", "", " ", "" ); - CAF_PDM_InitField( &timeStep, "TimeStepIndex", 0, " Time Step", "", "", "" ); + CAF_PDM_InitField( &timeStep, "TimeStepIndex", 0, " Time Step" ); - CAF_PDM_InitField( &includeMsw, "IncludeMSW", true, "Multi Segment Well Model", "", "", "" ); + CAF_PDM_InitField( &includeMsw, "IncludeMSW", true, "Multi Segment Well Model" ); - CAF_PDM_InitField( &useLateralNTG, "UseLateralNTG", false, "Use NTG Horizontally", "", "", "" ); + CAF_PDM_InitField( &useLateralNTG, "UseLateralNTG", false, "Use NTG Horizontally" ); - CAF_PDM_InitField( &includePerforations, "IncludePerforations", true, "Perforations", "", "", "" ); - CAF_PDM_InitField( &includeFishbones, "IncludeFishbones", true, "Fishbones", "", "", "" ); - CAF_PDM_InitField( &includeFractures, "IncludeFractures", true, "Fractures", "", "", "" ); + CAF_PDM_InitField( &includePerforations, "IncludePerforations", true, "Perforations" ); + CAF_PDM_InitField( &includeFishbones, "IncludeFishbones", true, "Fishbones" ); + CAF_PDM_InitField( &includeFractures, "IncludeFractures", true, "Fractures" ); - CAF_PDM_InitField( &performTransScaling, "TransScalingType", false, "Perform Transmissibility Scaling", "", "", "" ); - CAF_PDM_InitField( &transScalingTimeStep, "TransScalingTimeStep", 0, "Current Time Step", "", "", "" ); - CAF_PDM_InitFieldNoDefault( &transScalingWBHPSource, "TransScalingWBHPSource", "WBHP Selection", "", "", "" ); - CAF_PDM_InitField( &transScalingWBHP, "TransScalingWBHP", 200.0, "WBHP Before Production Start", "", "", "" ); + CAF_PDM_InitField( &performTransScaling, "TransScalingType", false, "Perform Transmissibility Scaling" ); + CAF_PDM_InitField( &transScalingTimeStep, "TransScalingTimeStep", 0, "Current Time Step" ); + CAF_PDM_InitFieldNoDefault( &transScalingWBHPSource, "TransScalingWBHPSource", "WBHP Selection" ); + CAF_PDM_InitField( &transScalingWBHP, "TransScalingWBHP", 200.0, "WBHP Before Production Start" ); CAF_PDM_InitField( &excludeMainBoreForFishbones, "ExcludeMainBoreForFishbones", @@ -104,14 +104,11 @@ RicExportCompletionDataSettingsUi::RicExportCompletionDataSettingsUi() CAF_PDM_InitFieldNoDefault( &m_reportCompletionTypesSeparately, "ReportCompletionTypesSeparately", - "Export Completion Types", - "", - "", - "" ); + "Export Completion Types" ); - CAF_PDM_InitField( &m_exportDataSourceAsComment, "ExportDataSourceAsComment", true, "Comments", "", "", "" ); + CAF_PDM_InitField( &m_exportDataSourceAsComment, "ExportDataSourceAsComment", true, "Comments" ); - CAF_PDM_InitField( &m_exportWelspec, "ExportWelspec", true, "WELSPEC keyword", "", "", "" ); + CAF_PDM_InitField( &m_exportWelspec, "ExportWelspec", true, "WELSPEC keyword" ); CAF_PDM_InitField( &m_completionWelspecAfterMainBore, "CompletionWelspecAfterMainBore", true, @@ -120,8 +117,8 @@ RicExportCompletionDataSettingsUi::RicExportCompletionDataSettingsUi() "", "" ); - CAF_PDM_InitField( &m_useCustomFileName, "UseCustomFileName", false, "Use Custom Filename", "", "", "" ); - CAF_PDM_InitField( &m_customFileName, "CustomFileName", {}, "Custom Filename", "", "", "" ); + CAF_PDM_InitField( &m_useCustomFileName, "UseCustomFileName", false, "Use Custom Filename" ); + CAF_PDM_InitField( &m_customFileName, "CustomFileName", {}, "Custom Filename" ); m_displayForSimWell = true; diff --git a/ApplicationLibCode/Commands/ExportCommands/RicCellRangeUi.cpp b/ApplicationLibCode/Commands/ExportCommands/RicCellRangeUi.cpp index d1342672cf..8d2037ea9d 100644 --- a/ApplicationLibCode/Commands/ExportCommands/RicCellRangeUi.cpp +++ b/ApplicationLibCode/Commands/ExportCommands/RicCellRangeUi.cpp @@ -40,20 +40,20 @@ CAF_PDM_SOURCE_INIT( RicCellRangeUi, "RicCellRangeUi" ); //-------------------------------------------------------------------------------------------------- RicCellRangeUi::RicCellRangeUi() { - CAF_PDM_InitObject( "Cell Range", "", "", "" ); + CAF_PDM_InitObject( "Cell Range" ); - CAF_PDM_InitFieldNoDefault( &m_case, "Case", "Case", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_case, "Case", "Case" ); m_case.uiCapability()->setUiHidden( true ); - CAF_PDM_InitField( &m_gridIndex, "GridIndex", 0, "Grid", "", "", "" ); + CAF_PDM_InitField( &m_gridIndex, "GridIndex", 0, "Grid" ); - CAF_PDM_InitField( &m_startIndexI, "StartIndexI", 1, "Start Index I", "", "", "" ); - CAF_PDM_InitField( &m_startIndexJ, "StartIndexJ", 1, "Start Index J", "", "", "" ); - CAF_PDM_InitField( &m_startIndexK, "StartIndexK", 1, "Start Index K", "", "", "" ); + CAF_PDM_InitField( &m_startIndexI, "StartIndexI", 1, "Start Index I" ); + CAF_PDM_InitField( &m_startIndexJ, "StartIndexJ", 1, "Start Index J" ); + CAF_PDM_InitField( &m_startIndexK, "StartIndexK", 1, "Start Index K" ); - CAF_PDM_InitField( &m_cellCountI, "CellCountI", 1, "Cell Count I", "", "", "" ); - CAF_PDM_InitField( &m_cellCountJ, "CellCountJ", 1, "Cell Count J", "", "", "" ); - CAF_PDM_InitField( &m_cellCountK, "CellCountK", 1, "Cell Count K", "", "", "" ); + CAF_PDM_InitField( &m_cellCountI, "CellCountI", 1, "Cell Count I" ); + CAF_PDM_InitField( &m_cellCountJ, "CellCountJ", 1, "Cell Count J" ); + CAF_PDM_InitField( &m_cellCountK, "CellCountK", 1, "Cell Count K" ); m_startIndexI.uiCapability()->setUiEditorTypeName( caf::PdmUiSliderEditor::uiEditorTypeName() ); m_startIndexJ.uiCapability()->setUiEditorTypeName( caf::PdmUiSliderEditor::uiEditorTypeName() ); diff --git a/ApplicationLibCode/Commands/ExportCommands/RicExportCarfinUi.cpp b/ApplicationLibCode/Commands/ExportCommands/RicExportCarfinUi.cpp index 77f65dd1fe..59ba9f82dc 100644 --- a/ApplicationLibCode/Commands/ExportCommands/RicExportCarfinUi.cpp +++ b/ApplicationLibCode/Commands/ExportCommands/RicExportCarfinUi.cpp @@ -33,20 +33,20 @@ CAF_PDM_SOURCE_INIT( RicExportCarfinUi, "RicExportCarfinUi" ); //-------------------------------------------------------------------------------------------------- RicExportCarfinUi::RicExportCarfinUi() { - CAF_PDM_InitObject( "Export CARFIN", "", "", "" ); + CAF_PDM_InitObject( "Export CARFIN" ); - CAF_PDM_InitFieldNoDefault( &m_cellRange, "CellRange", "Cell Range", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_cellRange, "CellRange", "Cell Range" ); m_cellRange = new RicCellRangeUi; - CAF_PDM_InitFieldNoDefault( &m_exportFileName, "ExportFileName", "Export Filename", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_exportFileName, "ExportFileName", "Export Filename" ); m_exportFileName.uiCapability()->setUiEditorTypeName( caf::PdmUiFilePathEditor::uiEditorTypeName() ); - CAF_PDM_InitFieldNoDefault( &m_caseToApply, "CaseToApply", "Source Case", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_caseToApply, "CaseToApply", "Source Case" ); - CAF_PDM_InitField( &m_cellCountI, "CellCountI", 2, "Cell Count I", "", "", "" ); - CAF_PDM_InitField( &m_cellCountJ, "CellCountJ", 2, "Cell Count J", "", "", "" ); - CAF_PDM_InitField( &m_cellCountK, "CellCountK", 2, "Cell Count K", "", "", "" ); - CAF_PDM_InitField( &m_maxWellCount, "MaxWellCount", 8, "Max Well Count", "", "", "" ); + CAF_PDM_InitField( &m_cellCountI, "CellCountI", 2, "Cell Count I" ); + CAF_PDM_InitField( &m_cellCountJ, "CellCountJ", 2, "Cell Count J" ); + CAF_PDM_InitField( &m_cellCountK, "CellCountK", 2, "Cell Count K" ); + CAF_PDM_InitField( &m_maxWellCount, "MaxWellCount", 8, "Max Well Count" ); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/Commands/ExportCommands/RicExportEclipseSectorModelUi.cpp b/ApplicationLibCode/Commands/ExportCommands/RicExportEclipseSectorModelUi.cpp index 96ad9179e3..170c61529e 100644 --- a/ApplicationLibCode/Commands/ExportCommands/RicExportEclipseSectorModelUi.cpp +++ b/ApplicationLibCode/Commands/ExportCommands/RicExportEclipseSectorModelUi.cpp @@ -75,10 +75,10 @@ void RicExportEclipseSectorModelUi::GridBoxSelectionEnum::setUp() //-------------------------------------------------------------------------------------------------- RicExportEclipseSectorModelUi::RicExportEclipseSectorModelUi() { - CAF_PDM_InitObject( "Export Visible Cells as Eclipse Input Grid", "", "", "" ); + CAF_PDM_InitObject( "Export Visible Cells as Eclipse Input Grid" ); CAF_PDM_InitField( &exportGrid, "ExportGrid", true, "Export Grid Data", "", "Includes COORD, ZCORN and ACTNUM", "" ); - CAF_PDM_InitField( &exportGridFilename, "ExportGridFilename", QString(), "Grid File Name", "", "", "" ); + CAF_PDM_InitField( &exportGridFilename, "ExportGridFilename", QString(), "Grid File Name" ); exportGridFilename.uiCapability()->setUiEditorTypeName( caf::PdmUiFilePathEditor::uiEditorTypeName() ); CAF_PDM_InitField( &exportInLocalCoordinates, "ExportInLocalCoords", @@ -87,39 +87,39 @@ RicExportEclipseSectorModelUi::RicExportEclipseSectorModelUi() "", "Remove UTM location on export", "" ); - CAF_PDM_InitField( &makeInvisibleCellsInactive, "InvisibleCellActnum", false, "Make Invisible Cells Inactive", "", "", "" ); + CAF_PDM_InitField( &makeInvisibleCellsInactive, "InvisibleCellActnum", false, "Make Invisible Cells Inactive" ); - CAF_PDM_InitFieldNoDefault( &exportGridBox, "GridBoxSelection", "Cells to Export", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &exportGridBox, "GridBoxSelection", "Cells to Export" ); QString minIJKLabel = "Min I, J, K"; - CAF_PDM_InitField( &minI, "MinI", std::numeric_limits::max(), minIJKLabel, "", "", "" ); - CAF_PDM_InitField( &minJ, "MinJ", std::numeric_limits::max(), "", "", "", "" ); + CAF_PDM_InitField( &minI, "MinI", std::numeric_limits::max(), minIJKLabel ); + CAF_PDM_InitField( &minJ, "MinJ", std::numeric_limits::max(), "" ); minJ.uiCapability()->setUiLabelPosition( caf::PdmUiItemInfo::HIDDEN ); - CAF_PDM_InitField( &minK, "MinK", std::numeric_limits::max(), "", "", "", "" ); + CAF_PDM_InitField( &minK, "MinK", std::numeric_limits::max(), "" ); minK.uiCapability()->setUiLabelPosition( caf::PdmUiItemInfo::HIDDEN ); QString maxIJKLabel = "Max I, J, K"; - CAF_PDM_InitField( &maxI, "MaxI", -std::numeric_limits::max(), maxIJKLabel, "", "", "" ); - CAF_PDM_InitField( &maxJ, "MaxJ", -std::numeric_limits::max(), "", "", "", "" ); + CAF_PDM_InitField( &maxI, "MaxI", -std::numeric_limits::max(), maxIJKLabel ); + CAF_PDM_InitField( &maxJ, "MaxJ", -std::numeric_limits::max(), "" ); maxJ.uiCapability()->setUiLabelPosition( caf::PdmUiItemInfo::HIDDEN ); - CAF_PDM_InitField( &maxK, "MaxK", -std::numeric_limits::max(), "", "", "", "" ); + CAF_PDM_InitField( &maxK, "MaxK", -std::numeric_limits::max(), "" ); maxK.uiCapability()->setUiLabelPosition( caf::PdmUiItemInfo::HIDDEN ); - CAF_PDM_InitFieldNoDefault( &exportFaults, "ExportFaults", "Export Fault Data", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &exportFaults, "ExportFaults", "Export Fault Data" ); exportFaults = EXPORT_TO_SINGLE_SEPARATE_FILE; - CAF_PDM_InitField( &exportFaultsFilename, "ExportFaultsFilename", QString(), "Faults File Name", "", "", "" ); + CAF_PDM_InitField( &exportFaultsFilename, "ExportFaultsFilename", QString(), "Faults File Name" ); exportFaultsFilename.uiCapability()->setUiEditorTypeName( caf::PdmUiFilePathEditor::uiEditorTypeName() ); QString ijkLabel = "Cell Count I, J, K"; - CAF_PDM_InitField( &refinementCountI, "RefinementCountI", 1, ijkLabel, "", "", "" ); - CAF_PDM_InitField( &refinementCountJ, "RefinementCountJ", 1, "", "", "", "" ); - CAF_PDM_InitField( &refinementCountK, "RefinementCountK", 1, "", "", "", "" ); + CAF_PDM_InitField( &refinementCountI, "RefinementCountI", 1, ijkLabel ); + CAF_PDM_InitField( &refinementCountJ, "RefinementCountJ", 1, "" ); + CAF_PDM_InitField( &refinementCountK, "RefinementCountK", 1, "" ); - CAF_PDM_InitFieldNoDefault( &exportParameters, "ExportParams", "Export Parameters", "", "", "" ); - CAF_PDM_InitField( &exportParametersFilename, "ExportParamsFilename", QString(), "File Name", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &exportParameters, "ExportParams", "Export Parameters" ); + CAF_PDM_InitField( &exportParametersFilename, "ExportParamsFilename", QString(), "File Name" ); exportParametersFilename.uiCapability()->setUiEditorTypeName( caf::PdmUiFilePathEditor::uiEditorTypeName() ); - CAF_PDM_InitFieldNoDefault( &selectedKeywords, "ExportMainKeywords", "Keywords to Export", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &selectedKeywords, "ExportMainKeywords", "Keywords to Export" ); exportGridFilename = defaultGridFileName(); exportParametersFilename = defaultResultsFileName(); diff --git a/ApplicationLibCode/Commands/ExportCommands/RicExportLgrUi.cpp b/ApplicationLibCode/Commands/ExportCommands/RicExportLgrUi.cpp index 05541d25ff..3f6e93530f 100644 --- a/ApplicationLibCode/Commands/ExportCommands/RicExportLgrUi.cpp +++ b/ApplicationLibCode/Commands/ExportCommands/RicExportLgrUi.cpp @@ -50,27 +50,27 @@ void Lgr::SplitTypeEnum::setUp() //-------------------------------------------------------------------------------------------------- RicExportLgrUi::RicExportLgrUi() { - CAF_PDM_InitObject( "Export CARFIN", "", "", "" ); + CAF_PDM_InitObject( "Export CARFIN" ); - CAF_PDM_InitFieldNoDefault( &m_exportFolder, "ExportFolder", "Export Folder", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_exportFolder, "ExportFolder", "Export Folder" ); m_exportFolder.uiCapability()->setUiEditorTypeName( caf::PdmUiFilePathEditor::uiEditorTypeName() ); - CAF_PDM_InitFieldNoDefault( &m_caseToApply, "CaseToApply", "Source Case", "", "", "" ); - CAF_PDM_InitFieldNoDefault( &m_timeStep, "TimeStepIndex", "Time Step", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_caseToApply, "CaseToApply", "Source Case" ); + CAF_PDM_InitFieldNoDefault( &m_timeStep, "TimeStepIndex", "Time Step" ); - CAF_PDM_InitField( &m_includePerforations, "IncludePerforations", true, "Perforations", "", "", "" ); - CAF_PDM_InitField( &m_includeFractures, "IncludeFractures", true, "Fractures", "", "", "" ); - CAF_PDM_InitField( &m_includeFishbones, "IncludeFishbones", true, "Fishbones", "", "", "" ); + CAF_PDM_InitField( &m_includePerforations, "IncludePerforations", true, "Perforations" ); + CAF_PDM_InitField( &m_includeFractures, "IncludeFractures", true, "Fractures" ); + CAF_PDM_InitField( &m_includeFishbones, "IncludeFishbones", true, "Fishbones" ); QString ijkLabel = "Cell Count I, J, K"; - CAF_PDM_InitField( &m_cellCountI, "CellCountI", 2, ijkLabel, "", "", "" ); - CAF_PDM_InitField( &m_cellCountJ, "CellCountJ", 2, "", "", "", "" ); - CAF_PDM_InitField( &m_cellCountK, "CellCountK", 2, "", "", "", "" ); + CAF_PDM_InitField( &m_cellCountI, "CellCountI", 2, ijkLabel ); + CAF_PDM_InitField( &m_cellCountJ, "CellCountJ", 2, "" ); + CAF_PDM_InitField( &m_cellCountK, "CellCountK", 2, "" ); m_cellCountJ.uiCapability()->setUiLabelPosition( caf::PdmUiItemInfo::HIDDEN ); m_cellCountK.uiCapability()->setUiLabelPosition( caf::PdmUiItemInfo::HIDDEN ); - CAF_PDM_InitField( &m_splitType, "SplitType", Lgr::SplitTypeEnum(), "Split Type", "", "", "" ); + CAF_PDM_InitField( &m_splitType, "SplitType", Lgr::SplitTypeEnum(), "Split Type" ); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/Commands/ExportCommands/RicExportToLasFileResampleUi.cpp b/ApplicationLibCode/Commands/ExportCommands/RicExportToLasFileResampleUi.cpp index 1490b1a4f6..3ad4e5e23e 100644 --- a/ApplicationLibCode/Commands/ExportCommands/RicExportToLasFileResampleUi.cpp +++ b/ApplicationLibCode/Commands/ExportCommands/RicExportToLasFileResampleUi.cpp @@ -45,9 +45,9 @@ CAF_PDM_SOURCE_INIT( RicExportToLasFileObj, "RicExportToLasFileObj" ); //-------------------------------------------------------------------------------------------------- RicExportToLasFileObj::RicExportToLasFileObj( void ) { - CAF_PDM_InitObject( "RicExportToLasFileObj", "", "", "" ); + CAF_PDM_InitObject( "RicExportToLasFileObj" ); - CAF_PDM_InitField( &tvdrkbOffset, "tvdrkbOffset", QString( "" ), "TVDRKB offset (RKB - MSL) [m]", "", "", "" ); + CAF_PDM_InitField( &tvdrkbOffset, "tvdrkbOffset", QString( "" ), "TVDRKB offset (RKB - MSL) [m]" ); } CAF_PDM_SOURCE_INIT( RicExportToLasFileResampleUi, "RicExportToLasFileResampleUi" ); @@ -58,23 +58,23 @@ CAF_PDM_SOURCE_INIT( RicExportToLasFileResampleUi, "RicExportToLasFileResampleUi RicExportToLasFileResampleUi::RicExportToLasFileResampleUi( void ) : m_enableCurveUnitConversion( false ) { - CAF_PDM_InitObject( "Resample LAS curves for export", "", "", "" ); + CAF_PDM_InitObject( "Resample LAS curves for export" ); - CAF_PDM_InitField( &exportFolder, "ExportFolder", QString(), "Export Folder", "", "", "" ); + CAF_PDM_InitField( &exportFolder, "ExportFolder", QString(), "Export Folder" ); exportFolder.uiCapability()->setUiEditorTypeName( caf::PdmUiFilePathEditor::uiEditorTypeName() ); - CAF_PDM_InitField( &filePrefix, "FilePrefix", QString( "" ), "File Prefix", "", "", "" ); - CAF_PDM_InitField( &capitalizeFileName, "CapitalizeFileName", false, "Capitalize File Name", "", "", "" ); - CAF_PDM_InitFieldNoDefault( &curveUnitConversion, "CurveUnitConversion", "Curve Units", "", "", "" ); + CAF_PDM_InitField( &filePrefix, "FilePrefix", QString( "" ), "File Prefix" ); + CAF_PDM_InitField( &capitalizeFileName, "CapitalizeFileName", false, "Capitalize File Name" ); + CAF_PDM_InitFieldNoDefault( &curveUnitConversion, "CurveUnitConversion", "Curve Units" ); - CAF_PDM_InitField( &activateResample, "ActivateResample", false, "Resample Curve Data", "", "", "" ); + CAF_PDM_InitField( &activateResample, "ActivateResample", false, "Resample Curve Data" ); caf::PdmUiNativeCheckBoxEditor::configureFieldForEditor( &activateResample ); - CAF_PDM_InitField( &resampleInterval, "ResampleInterval", 1.0, "Resample Interval [m]", "", "", "" ); + CAF_PDM_InitField( &resampleInterval, "ResampleInterval", 1.0, "Resample Interval [m]" ); - CAF_PDM_InitField( &exportTvdrkb, "ExportTvdrkb", false, "Export TVDRKB", "", "", "" ); + CAF_PDM_InitField( &exportTvdrkb, "ExportTvdrkb", false, "Export TVDRKB" ); caf::PdmUiNativeCheckBoxEditor::configureFieldForEditor( &exportTvdrkb ); - CAF_PDM_InitFieldNoDefault( &m_tvdrkbOffsets, "tvdrkbOffsets", "", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_tvdrkbOffsets, "tvdrkbOffsets", "" ); updateFieldVisibility(); } diff --git a/ApplicationLibCode/Commands/ExportCommands/RicExportWellPathsUi.cpp b/ApplicationLibCode/Commands/ExportCommands/RicExportWellPathsUi.cpp index ba741a8085..978da4f46c 100644 --- a/ApplicationLibCode/Commands/ExportCommands/RicExportWellPathsUi.cpp +++ b/ApplicationLibCode/Commands/ExportCommands/RicExportWellPathsUi.cpp @@ -34,12 +34,12 @@ CAF_PDM_SOURCE_INIT( RicExportWellPathsUi, "RicExportWellPathsUi" ); //-------------------------------------------------------------------------------------------------- RicExportWellPathsUi::RicExportWellPathsUi() { - CAF_PDM_InitObject( "Resample LAS curves for export", "", "", "" ); + CAF_PDM_InitObject( "Resample LAS curves for export" ); - CAF_PDM_InitField( &m_exportFolder, "ExportFolder", QString(), "Export Folder", "", "", "" ); + CAF_PDM_InitField( &m_exportFolder, "ExportFolder", QString(), "Export Folder" ); m_exportFolder.uiCapability()->setUiEditorTypeName( caf::PdmUiFilePathEditor::uiEditorTypeName() ); - CAF_PDM_InitField( &m_mdStepSize, "MdStepSize", 5.0, "MD Step Size", "", "", "" ); + CAF_PDM_InitField( &m_mdStepSize, "MdStepSize", 5.0, "MD Step Size" ); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/Commands/ExportCommands/RicSaveEclipseInputVisibleCellsUi.cpp b/ApplicationLibCode/Commands/ExportCommands/RicSaveEclipseInputVisibleCellsUi.cpp index ece728d1d8..b557f5d02f 100644 --- a/ApplicationLibCode/Commands/ExportCommands/RicSaveEclipseInputVisibleCellsUi.cpp +++ b/ApplicationLibCode/Commands/ExportCommands/RicSaveEclipseInputVisibleCellsUi.cpp @@ -45,14 +45,14 @@ CAF_PDM_SOURCE_INIT( RicSaveEclipseInputVisibleCellsUi, "RicSaveEclipseInputVisi RicSaveEclipseInputVisibleCellsUi::RicSaveEclipseInputVisibleCellsUi() : exportFilenameManuallyChanged( false ) { - CAF_PDM_InitObject( "Export Visible Cells FLUXNUM/MULTNUM/ACTNUM", "", "", "" ); + CAF_PDM_InitObject( "Export Visible Cells FLUXNUM/MULTNUM/ACTNUM" ); - CAF_PDM_InitField( &exportFilename, "ExportFilename", QString(), "Export Filename", "", "", "" ); + CAF_PDM_InitField( &exportFilename, "ExportFilename", QString(), "Export Filename" ); exportFilename.uiCapability()->setUiEditorTypeName( caf::PdmUiFilePathEditor::uiEditorTypeName() ); - CAF_PDM_InitFieldNoDefault( &exportKeyword, "ExportKeyword", "Export Keyword", "", "", "" ); - CAF_PDM_InitField( &visibleActiveCellsValue, "VisibleActiveCellsValue", 1, "Visible Active Cells Value", "", "", "" ); - CAF_PDM_InitField( &hiddenActiveCellsValue, "HiddenActiveCellsValue", 0, "Hidden Active Cells Value", "", "", "" ); - CAF_PDM_InitField( &inactiveCellsValue, "InactiveCellsValue", 0, "Inactive Cells Value", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &exportKeyword, "ExportKeyword", "Export Keyword" ); + CAF_PDM_InitField( &visibleActiveCellsValue, "VisibleActiveCellsValue", 1, "Visible Active Cells Value" ); + CAF_PDM_InitField( &hiddenActiveCellsValue, "HiddenActiveCellsValue", 0, "Hidden Active Cells Value" ); + CAF_PDM_InitField( &inactiveCellsValue, "InactiveCellsValue", 0, "Inactive Cells Value" ); exportFilename = getDefaultExportPath(); } diff --git a/ApplicationLibCode/Commands/FlowCommands/RicSelectViewUI.cpp b/ApplicationLibCode/Commands/FlowCommands/RicSelectViewUI.cpp index 76b8272145..54b0156cda 100644 --- a/ApplicationLibCode/Commands/FlowCommands/RicSelectViewUI.cpp +++ b/ApplicationLibCode/Commands/FlowCommands/RicSelectViewUI.cpp @@ -28,11 +28,11 @@ CAF_PDM_SOURCE_INIT( RicSelectViewUI, "RicSelectViewUI" ); //-------------------------------------------------------------------------------------------------- RicSelectViewUI::RicSelectViewUI() { - CAF_PDM_InitObject( "RicSelectViewUI", "", "", "" ); + CAF_PDM_InitObject( "RicSelectViewUI" ); - CAF_PDM_InitFieldNoDefault( &m_selectedView, "MasterView", "Select view", "", "", "" ); - CAF_PDM_InitField( &m_createNewView, "CreateNewView", true, "Create New View", "", "", "" ); - CAF_PDM_InitField( &m_newViewName, "NewViewName", QString( "ShowContributingWells" ), "New View Name", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_selectedView, "MasterView", "Select view" ); + CAF_PDM_InitField( &m_createNewView, "CreateNewView", true, "Create New View" ); + CAF_PDM_InitField( &m_newViewName, "NewViewName", QString( "ShowContributingWells" ), "New View Name" ); m_currentView = nullptr; m_currentCase = nullptr; diff --git a/ApplicationLibCode/Commands/FractureCommands/RicCreateMultipleFracturesOptionItemUi.cpp b/ApplicationLibCode/Commands/FractureCommands/RicCreateMultipleFracturesOptionItemUi.cpp index de0187c052..9d70eb697a 100644 --- a/ApplicationLibCode/Commands/FractureCommands/RicCreateMultipleFracturesOptionItemUi.cpp +++ b/ApplicationLibCode/Commands/FractureCommands/RicCreateMultipleFracturesOptionItemUi.cpp @@ -31,10 +31,10 @@ CAF_PDM_SOURCE_INIT( RicCreateMultipleFracturesOptionItemUi, "RiuMultipleFractio //-------------------------------------------------------------------------------------------------- RicCreateMultipleFracturesOptionItemUi::RicCreateMultipleFracturesOptionItemUi() { - CAF_PDM_InitField( &m_topKOneBased, "TopKLayer", 1, "Top K Layer", "", "", "" ); - CAF_PDM_InitField( &m_baseKOneBased, "BaseKLayer", 1, "Base K Layer", "", "", "" ); - CAF_PDM_InitFieldNoDefault( &m_fractureTemplate, "Template", "Template", "", "", "" ); - CAF_PDM_InitField( &m_minSpacing, "MinSpacing", 300.0, "Spacing", "", "", "" ); + CAF_PDM_InitField( &m_topKOneBased, "TopKLayer", 1, "Top K Layer" ); + CAF_PDM_InitField( &m_baseKOneBased, "BaseKLayer", 1, "Base K Layer" ); + CAF_PDM_InitFieldNoDefault( &m_fractureTemplate, "Template", "Template" ); + CAF_PDM_InitField( &m_minSpacing, "MinSpacing", 300.0, "Spacing" ); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/Commands/FractureCommands/RicCreateMultipleFracturesUi.cpp b/ApplicationLibCode/Commands/FractureCommands/RicCreateMultipleFracturesUi.cpp index 54f3ebd7f4..674b56a1d9 100644 --- a/ApplicationLibCode/Commands/FractureCommands/RicCreateMultipleFracturesUi.cpp +++ b/ApplicationLibCode/Commands/FractureCommands/RicCreateMultipleFracturesUi.cpp @@ -85,17 +85,17 @@ const QString RiuCreateMultipleFractionsUi::REPLACE_FRACTURES_BUTTON_TEXT = "Rep //-------------------------------------------------------------------------------------------------- RiuCreateMultipleFractionsUi::RiuCreateMultipleFractionsUi() { - CAF_PDM_InitFieldNoDefault( &m_sourceCase, "SourceCase", "Case", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_sourceCase, "SourceCase", "Case" ); - CAF_PDM_InitField( &m_minDistanceFromWellTd, "MinDistanceFromWellTd", 10.0, "Min Distance From Well TD", "", "", "" ); - CAF_PDM_InitField( &m_maxFracturesPerWell, "MaxFracturesPerWell", 10, "Max Fractures Per Well", "", "", "" ); + CAF_PDM_InitField( &m_minDistanceFromWellTd, "MinDistanceFromWellTd", 10.0, "Min Distance From Well TD" ); + CAF_PDM_InitField( &m_maxFracturesPerWell, "MaxFracturesPerWell", 10, "Max Fractures Per Well" ); - CAF_PDM_InitFieldNoDefault( &m_options, "Options", "Options", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_options, "Options", "Options" ); m_options.uiCapability()->setUiEditorTypeName( caf::PdmUiTableViewEditor::uiEditorTypeName() ); m_options.uiCapability()->setUiLabelPosition( caf::PdmUiItemInfo::TOP ); m_options.uiCapability()->setCustomContextMenuEnabled( true ); - CAF_PDM_InitFieldNoDefault( &m_fractureCreationSummary, "FractureCreationSummary", "Generated Fractures", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_fractureCreationSummary, "FractureCreationSummary", "Generated Fractures" ); m_fractureCreationSummary.registerGetMethod( this, &RiuCreateMultipleFractionsUi::summaryText ); m_fractureCreationSummary.uiCapability()->setUiLabelPosition( caf::PdmUiItemInfo::TOP ); m_fractureCreationSummary.uiCapability()->setUiEditorTypeName( caf::PdmUiTextEditor::uiEditorTypeName() ); diff --git a/ApplicationLibCode/Commands/GridCrossPlotCommands/RicSaturationPressureUi.cpp b/ApplicationLibCode/Commands/GridCrossPlotCommands/RicSaturationPressureUi.cpp index 06859a8fed..944f8748d6 100644 --- a/ApplicationLibCode/Commands/GridCrossPlotCommands/RicSaturationPressureUi.cpp +++ b/ApplicationLibCode/Commands/GridCrossPlotCommands/RicSaturationPressureUi.cpp @@ -29,10 +29,10 @@ CAF_PDM_SOURCE_INIT( RicSaturationPressureUi, "RicSaturationPressureUi" ); //-------------------------------------------------------------------------------------------------- RicSaturationPressureUi::RicSaturationPressureUi() { - CAF_PDM_InitObject( "RicSaturationPressureUi", "", "", "" ); + CAF_PDM_InitObject( "RicSaturationPressureUi" ); - CAF_PDM_InitFieldNoDefault( &m_caseToApply, "CaseToApply", "Case to Apply", "", "", "" ); - CAF_PDM_InitField( &m_timeStep, "TimeStep", 0, "Time Step", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_caseToApply, "CaseToApply", "Case to Apply" ); + CAF_PDM_InitField( &m_timeStep, "TimeStep", 0, "Time Step" ); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/Commands/HoloLensCommands/RicHoloLensCreateSessionUi.cpp b/ApplicationLibCode/Commands/HoloLensCommands/RicHoloLensCreateSessionUi.cpp index b34385e27f..80766ce294 100644 --- a/ApplicationLibCode/Commands/HoloLensCommands/RicHoloLensCreateSessionUi.cpp +++ b/ApplicationLibCode/Commands/HoloLensCommands/RicHoloLensCreateSessionUi.cpp @@ -35,12 +35,12 @@ CAF_PDM_SOURCE_INIT( RicHoloLensCreateSessionUi, "RicHoloLensCreateSessionUi" ); //-------------------------------------------------------------------------------------------------- RicHoloLensCreateSessionUi::RicHoloLensCreateSessionUi() { - CAF_PDM_InitObject( "HoloLens Create Session", "", "", "" ); + CAF_PDM_InitObject( "HoloLens Create Session" ); - CAF_PDM_InitField( &m_sessionName, "SessionName", QString( "DummySessionName" ), "Session Name", "", "", "" ); - CAF_PDM_InitField( &m_sessionPinCode, "SessionPinCode", QString( "1234" ), "Session Pin Code", "", "", "" ); + CAF_PDM_InitField( &m_sessionName, "SessionName", QString( "DummySessionName" ), "Session Name" ); + CAF_PDM_InitField( &m_sessionPinCode, "SessionPinCode", QString( "1234" ), "Session Pin Code" ); - CAF_PDM_InitFieldNoDefault( &m_serverSettings, "ServerSettings", "Server Settings", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_serverSettings, "ServerSettings", "Server Settings" ); m_serverSettings = new RicHoloLensServerSettings; caf::PdmSettings::readFieldsFromApplicationStore( m_serverSettings ); diff --git a/ApplicationLibCode/Commands/HoloLensCommands/RicHoloLensExportToFolderUi.cpp b/ApplicationLibCode/Commands/HoloLensCommands/RicHoloLensExportToFolderUi.cpp index 9092d59360..567cf9a42c 100644 --- a/ApplicationLibCode/Commands/HoloLensCommands/RicHoloLensExportToFolderUi.cpp +++ b/ApplicationLibCode/Commands/HoloLensCommands/RicHoloLensExportToFolderUi.cpp @@ -34,11 +34,11 @@ CAF_PDM_SOURCE_INIT( RicHoloLensExportToFolderUi, "RicHoloLensExportToFolderUi" //-------------------------------------------------------------------------------------------------- RicHoloLensExportToFolderUi::RicHoloLensExportToFolderUi() { - CAF_PDM_InitObject( "Resample LAS curves for export", "", "", "" ); + CAF_PDM_InitObject( "Resample LAS curves for export" ); - CAF_PDM_InitFieldNoDefault( &m_viewForExport, "ViewForExport", "View", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_viewForExport, "ViewForExport", "View" ); - CAF_PDM_InitField( &m_exportFolder, "ExportFolder", QString(), "Export Folder", "", "", "" ); + CAF_PDM_InitField( &m_exportFolder, "ExportFolder", QString(), "Export Folder" ); m_exportFolder.uiCapability()->setUiEditorTypeName( caf::PdmUiFilePathEditor::uiEditorTypeName() ); } diff --git a/ApplicationLibCode/Commands/HoloLensCommands/RicHoloLensServerSettings.cpp b/ApplicationLibCode/Commands/HoloLensCommands/RicHoloLensServerSettings.cpp index 6399e30dbc..275d2464ed 100644 --- a/ApplicationLibCode/Commands/HoloLensCommands/RicHoloLensServerSettings.cpp +++ b/ApplicationLibCode/Commands/HoloLensCommands/RicHoloLensServerSettings.cpp @@ -25,9 +25,9 @@ CAF_PDM_SOURCE_INIT( RicHoloLensServerSettings, "RicHoloLensServerSettings" ); //-------------------------------------------------------------------------------------------------- RicHoloLensServerSettings::RicHoloLensServerSettings() { - CAF_PDM_InitObject( "HoloLens Server Settings", "", "", "" ); + CAF_PDM_InitObject( "HoloLens Server Settings" ); - CAF_PDM_InitField( &m_serverAddress, "ServerAddress", QString(), "Server Address", "", "", "" ); + CAF_PDM_InitField( &m_serverAddress, "ServerAddress", QString(), "Server Address" ); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/Commands/PlotTemplateCommands/RicSelectPlotTemplateUi.cpp b/ApplicationLibCode/Commands/PlotTemplateCommands/RicSelectPlotTemplateUi.cpp index 35a8dd5bbd..d502ad93fb 100644 --- a/ApplicationLibCode/Commands/PlotTemplateCommands/RicSelectPlotTemplateUi.cpp +++ b/ApplicationLibCode/Commands/PlotTemplateCommands/RicSelectPlotTemplateUi.cpp @@ -38,9 +38,9 @@ CAF_PDM_SOURCE_INIT( RicSelectPlotTemplateUi, "RicSelectPlotTemplateUi" ); //-------------------------------------------------------------------------------------------------- RicSelectPlotTemplateUi::RicSelectPlotTemplateUi() { - CAF_PDM_InitObject( "RicSelectPlotTemplateUi", "", "", "" ); + CAF_PDM_InitObject( "RicSelectPlotTemplateUi" ); - CAF_PDM_InitFieldNoDefault( &m_selectedPlotTemplates, "SelectedPlotTemplates", "Plot Templates", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_selectedPlotTemplates, "SelectedPlotTemplates", "Plot Templates" ); m_selectedPlotTemplates.uiCapability()->setUiEditorTypeName( caf::PdmUiTreeSelectionEditor::uiEditorTypeName() ); m_selectedPlotTemplates.uiCapability()->setUiLabelPosition( caf::PdmUiItemInfo::HIDDEN ); } diff --git a/ApplicationLibCode/Commands/RicCreateEnsembleSurfaceUi.cpp b/ApplicationLibCode/Commands/RicCreateEnsembleSurfaceUi.cpp index 198229fbad..b70ee36af0 100644 --- a/ApplicationLibCode/Commands/RicCreateEnsembleSurfaceUi.cpp +++ b/ApplicationLibCode/Commands/RicCreateEnsembleSurfaceUi.cpp @@ -32,9 +32,9 @@ CAF_PDM_SOURCE_INIT( RicCreateEnsembleSurfaceUi, "RicCreateEnsembleSurfaceUi" ); //-------------------------------------------------------------------------------------------------- RicCreateEnsembleSurfaceUi::RicCreateEnsembleSurfaceUi() { - CAF_PDM_InitObject( "Export Multiple Surfaces", "", "", "" ); + CAF_PDM_InitObject( "Export Multiple Surfaces" ); - CAF_PDM_InitFieldNoDefault( &m_layers, "Layers", "Layers", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_layers, "Layers", "Layers" ); CAF_PDM_InitField( &m_autoCreateEnsembleSurfaces, "AutoCreateEnsembleSurfaces", false, @@ -44,8 +44,8 @@ RicCreateEnsembleSurfaceUi::RicCreateEnsembleSurfaceUi() "" ); caf::PdmUiNativeCheckBoxEditor::configureFieldForEditor( &m_autoCreateEnsembleSurfaces ); - CAF_PDM_InitFieldNoDefault( &m_minLayer, "MinLayer", "MinLayer", "", "", "" ); - CAF_PDM_InitFieldNoDefault( &m_maxLayer, "MaxLayer", "MaxLayer", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_minLayer, "MinLayer", "MinLayer" ); + CAF_PDM_InitFieldNoDefault( &m_maxLayer, "MaxLayer", "MaxLayer" ); m_tabNames << "Configuration"; } diff --git a/ApplicationLibCode/Commands/RicCreateEnsembleWellLogUi.cpp b/ApplicationLibCode/Commands/RicCreateEnsembleWellLogUi.cpp index 7a7cc052aa..cda4b4d30a 100644 --- a/ApplicationLibCode/Commands/RicCreateEnsembleWellLogUi.cpp +++ b/ApplicationLibCode/Commands/RicCreateEnsembleWellLogUi.cpp @@ -55,7 +55,7 @@ void caf::AppEnum::setUp() //-------------------------------------------------------------------------------------------------- RicCreateEnsembleWellLogUi::RicCreateEnsembleWellLogUi() { - CAF_PDM_InitObject( "Create Ensemble Well Log", "", "", "" ); + CAF_PDM_InitObject( "Create Ensemble Well Log" ); CAF_PDM_InitField( &m_autoCreateEnsembleWellLogs, "AutoCreateEnsembleWellLogs", @@ -66,11 +66,11 @@ RicCreateEnsembleWellLogUi::RicCreateEnsembleWellLogUi() "" ); caf::PdmUiNativeCheckBoxEditor::configureFieldForEditor( &m_autoCreateEnsembleWellLogs ); - CAF_PDM_InitField( &m_timeStep, "TimeStep", 0, "Time Step", "", "", "" ); - CAF_PDM_InitFieldNoDefault( &m_wellPathSource, "WellPathSource", "Well Path Source", "", "", "" ); - CAF_PDM_InitFieldNoDefault( &m_wellPath, "WellPath", "Well Path", "", "", "" ); - CAF_PDM_InitFieldNoDefault( &m_wellFilePath, "WellFilePath", "Well File Path", "", "", "" ); - CAF_PDM_InitFieldNoDefault( &m_selectedKeywords, "SelectedProperties", "Selected Properties", "", "", "" ); + CAF_PDM_InitField( &m_timeStep, "TimeStep", 0, "Time Step" ); + CAF_PDM_InitFieldNoDefault( &m_wellPathSource, "WellPathSource", "Well Path Source" ); + CAF_PDM_InitFieldNoDefault( &m_wellPath, "WellPath", "Well Path" ); + CAF_PDM_InitFieldNoDefault( &m_wellFilePath, "WellFilePath", "Well File Path" ); + CAF_PDM_InitFieldNoDefault( &m_selectedKeywords, "SelectedProperties", "Selected Properties" ); m_selectedKeywords.uiCapability()->setUiEditorTypeName( caf::PdmUiTreeSelectionEditor::uiEditorTypeName() ); m_tabNames << "Well" diff --git a/ApplicationLibCode/Commands/RicDeleteItemExecData.h b/ApplicationLibCode/Commands/RicDeleteItemExecData.h index 94b26d141c..6acc458f65 100644 --- a/ApplicationLibCode/Commands/RicDeleteItemExecData.h +++ b/ApplicationLibCode/Commands/RicDeleteItemExecData.h @@ -37,8 +37,8 @@ public: "CmdDeleteItemExecData tooltip", "CmdDeleteItemExecData whatsthis" ); - CAF_PDM_InitFieldNoDefault( &m_pathToField, "PathToField", "PathToField", "", "", "" ); - CAF_PDM_InitFieldNoDefault( &m_description, "Description", "Description", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_pathToField, "PathToField", "PathToField" ); + CAF_PDM_InitFieldNoDefault( &m_description, "Description", "Description" ); CAF_PDM_InitField( &m_indexToObject, "indexToObject", -1, diff --git a/ApplicationLibCode/Commands/RicExportContourMapToTextFeature.cpp b/ApplicationLibCode/Commands/RicExportContourMapToTextFeature.cpp index 67c66b1b13..4d54de5417 100644 --- a/ApplicationLibCode/Commands/RicExportContourMapToTextFeature.cpp +++ b/ApplicationLibCode/Commands/RicExportContourMapToTextFeature.cpp @@ -50,11 +50,11 @@ RICF_SOURCE_INIT( RicExportContourMapToTextFeature, "RicExportContourMapToTextFe RicExportContourMapToTextFeature::RicExportContourMapToTextFeature() { - CAF_PDM_InitScriptableFieldNoDefault( &m_exportFileName, "exportFileName", "", "", "", "" ); - CAF_PDM_InitScriptableFieldNoDefault( &m_exportLocalCoordinates, "exportLocalCoordinates", "", "", "", "" ); - CAF_PDM_InitScriptableFieldNoDefault( &m_undefinedValueLabel, "undefinedValueLabel", "", "", "", "" ); - CAF_PDM_InitScriptableFieldNoDefault( &m_excludeUndefinedValues, "excludeUndefinedValues", "", "", "", "" ); - CAF_PDM_InitScriptableField( &m_viewId, "viewId", -1, "View Id", "", "", "" ); + CAF_PDM_InitScriptableFieldNoDefault( &m_exportFileName, "exportFileName", "" ); + CAF_PDM_InitScriptableFieldNoDefault( &m_exportLocalCoordinates, "exportLocalCoordinates", "" ); + CAF_PDM_InitScriptableFieldNoDefault( &m_undefinedValueLabel, "undefinedValueLabel", "" ); + CAF_PDM_InitScriptableFieldNoDefault( &m_excludeUndefinedValues, "excludeUndefinedValues", "" ); + CAF_PDM_InitScriptableField( &m_viewId, "viewId", -1, "View Id" ); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/Commands/RicExportContourMapToTextUi.cpp b/ApplicationLibCode/Commands/RicExportContourMapToTextUi.cpp index 2c7439559b..b9b9d28971 100644 --- a/ApplicationLibCode/Commands/RicExportContourMapToTextUi.cpp +++ b/ApplicationLibCode/Commands/RicExportContourMapToTextUi.cpp @@ -9,14 +9,14 @@ CAF_PDM_SOURCE_INIT( RicExportContourMapToTextUi, "RicExportContourMapToTextUi" //-------------------------------------------------------------------------------------------------- RicExportContourMapToTextUi::RicExportContourMapToTextUi() { - CAF_PDM_InitObject( "Export Contour Map to Text", "", "", "" ); + CAF_PDM_InitObject( "Export Contour Map to Text" ); - CAF_PDM_InitField( &m_exportFileName, "ExportFileName", QString(), "Export File Name", "", "", "" ); + CAF_PDM_InitField( &m_exportFileName, "ExportFileName", QString(), "Export File Name" ); m_exportFileName.uiCapability()->setUiEditorTypeName( caf::PdmUiFilePathEditor::uiEditorTypeName() ); - CAF_PDM_InitField( &m_exportLocalCoordinates, "ExportLocalCoordinates", false, "Export Local Coordinates", "", "", "" ); - CAF_PDM_InitField( &m_undefinedValueLabel, "UndefinedValueLabel", QString( "NaN" ), "Undefined Value Label", "", "", "" ); - CAF_PDM_InitField( &m_excludeUndefinedValues, "ExcludeUndefinedValues", false, "Exclude Undefined Values", "", "", "" ); + CAF_PDM_InitField( &m_exportLocalCoordinates, "ExportLocalCoordinates", false, "Export Local Coordinates" ); + CAF_PDM_InitField( &m_undefinedValueLabel, "UndefinedValueLabel", QString( "NaN" ), "Undefined Value Label" ); + CAF_PDM_InitField( &m_excludeUndefinedValues, "ExcludeUndefinedValues", false, "Exclude Undefined Values" ); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/Commands/RicNewMultiPlotFeature.cpp b/ApplicationLibCode/Commands/RicNewMultiPlotFeature.cpp index 2507bcf216..435223fb45 100644 --- a/ApplicationLibCode/Commands/RicNewMultiPlotFeature.cpp +++ b/ApplicationLibCode/Commands/RicNewMultiPlotFeature.cpp @@ -41,7 +41,7 @@ RICF_SOURCE_INIT( RicNewMultiPlotFeature, "RicNewMultiPlotFeature", "createMulti //-------------------------------------------------------------------------------------------------- RicNewMultiPlotFeature::RicNewMultiPlotFeature() { - CAF_PDM_InitFieldNoDefault( &m_plots, "plots", "Plots", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_plots, "plots", "Plots" ); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/Commands/RicStackSelectedCurvesFeature.cpp b/ApplicationLibCode/Commands/RicStackSelectedCurvesFeature.cpp index e863157054..b5812416c9 100644 --- a/ApplicationLibCode/Commands/RicStackSelectedCurvesFeature.cpp +++ b/ApplicationLibCode/Commands/RicStackSelectedCurvesFeature.cpp @@ -36,7 +36,7 @@ RICF_SOURCE_INIT( RicStackSelectedCurvesFeature, "RicStackSelectedCurvesFeature" //-------------------------------------------------------------------------------------------------- RicStackSelectedCurvesFeature::RicStackSelectedCurvesFeature() { - CAF_PDM_InitScriptableFieldNoDefault( &m_curves, "curves", "", "", "", "" ); + CAF_PDM_InitScriptableFieldNoDefault( &m_curves, "curves", "" ); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/Commands/RicUnstackSelectedCurvesFeature.cpp b/ApplicationLibCode/Commands/RicUnstackSelectedCurvesFeature.cpp index 68b5b8d7ca..b363bf3658 100644 --- a/ApplicationLibCode/Commands/RicUnstackSelectedCurvesFeature.cpp +++ b/ApplicationLibCode/Commands/RicUnstackSelectedCurvesFeature.cpp @@ -36,7 +36,7 @@ RICF_SOURCE_INIT( RicUnstackSelectedCurvesFeature, "RicUnstackSelectedCurvesFeat //-------------------------------------------------------------------------------------------------- RicUnstackSelectedCurvesFeature::RicUnstackSelectedCurvesFeature() { - CAF_PDM_InitScriptableFieldNoDefault( &m_curves, "curves", "", "", "", "" ); + CAF_PDM_InitScriptableFieldNoDefault( &m_curves, "curves", "" ); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/Commands/SsiHubImportCommands/RimOilFieldEntry.cpp b/ApplicationLibCode/Commands/SsiHubImportCommands/RimOilFieldEntry.cpp index cb684c6ac0..c8c261c8b6 100644 --- a/ApplicationLibCode/Commands/SsiHubImportCommands/RimOilFieldEntry.cpp +++ b/ApplicationLibCode/Commands/SsiHubImportCommands/RimOilFieldEntry.cpp @@ -35,15 +35,15 @@ CAF_PDM_SOURCE_INIT( RimOilFieldEntry, "RimOilFieldEntry" ); //-------------------------------------------------------------------------------------------------- RimOilFieldEntry::RimOilFieldEntry() { - CAF_PDM_InitObject( "OilFieldEntry", "", "", "" ); + CAF_PDM_InitObject( "OilFieldEntry" ); - CAF_PDM_InitFieldNoDefault( &name, "OilFieldName", "Oil Field Name", "", "", "" ); - CAF_PDM_InitFieldNoDefault( &edmId, "EdmId", "Edm ID", "", "", "" ); - CAF_PDM_InitField( &selected, "Selected", false, "Selected", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &name, "OilFieldName", "Oil Field Name" ); + CAF_PDM_InitFieldNoDefault( &edmId, "EdmId", "Edm ID" ); + CAF_PDM_InitField( &selected, "Selected", false, "Selected" ); - CAF_PDM_InitFieldNoDefault( &wellsFilePath, "wellsFilePath", "Wells File Path", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &wellsFilePath, "wellsFilePath", "Wells File Path" ); - CAF_PDM_InitFieldNoDefault( &wells, "Wells", "", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &wells, "Wells", "" ); wells.uiCapability()->setUiTreeHidden( true ); wells.uiCapability()->setUiTreeChildrenHidden( true ); } diff --git a/ApplicationLibCode/Commands/SsiHubImportCommands/RimOilRegionEntry.cpp b/ApplicationLibCode/Commands/SsiHubImportCommands/RimOilRegionEntry.cpp index 0e44542c6a..7a81370e84 100644 --- a/ApplicationLibCode/Commands/SsiHubImportCommands/RimOilRegionEntry.cpp +++ b/ApplicationLibCode/Commands/SsiHubImportCommands/RimOilRegionEntry.cpp @@ -26,14 +26,14 @@ CAF_PDM_SOURCE_INIT( RimOilRegionEntry, "RimOilRegionEntry" ); //-------------------------------------------------------------------------------------------------- RimOilRegionEntry::RimOilRegionEntry() { - CAF_PDM_InitObject( "OilRegionEntry", "", "", "" ); + CAF_PDM_InitObject( "OilRegionEntry" ); - CAF_PDM_InitFieldNoDefault( &name, "OilRegionEntry", "OilRegionEntry", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &name, "OilRegionEntry", "OilRegionEntry" ); - CAF_PDM_InitFieldNoDefault( &fields, "Fields", "", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &fields, "Fields", "" ); fields.uiCapability()->setUiTreeHidden( true ); - CAF_PDM_InitField( &selected, "Selected", false, "Selected", "", "", "" ); + CAF_PDM_InitField( &selected, "Selected", false, "Selected" ); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/Commands/SsiHubImportCommands/RimWellPathImport.cpp b/ApplicationLibCode/Commands/SsiHubImportCommands/RimWellPathImport.cpp index bab5838747..06b9541b0a 100644 --- a/ApplicationLibCode/Commands/SsiHubImportCommands/RimWellPathImport.cpp +++ b/ApplicationLibCode/Commands/SsiHubImportCommands/RimWellPathImport.cpp @@ -49,20 +49,20 @@ CAF_PDM_SOURCE_INIT( RimWellPathImport, "RimWellPathImport" ); //-------------------------------------------------------------------------------------------------- RimWellPathImport::RimWellPathImport() { - CAF_PDM_InitObject( "RimWellPathImport", "", "", "" ); + CAF_PDM_InitObject( "RimWellPathImport" ); - CAF_PDM_InitField( &wellTypeSurvey, "WellTypeSurvey", true, "Survey", "", "", "" ); - CAF_PDM_InitField( &wellTypePlans, "WellTypePlans", true, "Plans", "", "", "" ); + CAF_PDM_InitField( &wellTypeSurvey, "WellTypeSurvey", true, "Survey" ); + CAF_PDM_InitField( &wellTypePlans, "WellTypePlans", true, "Plans" ); caf::AppEnum defaultUtmMode = UTM_FILTER_OFF; - CAF_PDM_InitField( &utmFilterMode, "UtmMode", defaultUtmMode, "Utm Filter", "", "", "" ); + CAF_PDM_InitField( &utmFilterMode, "UtmMode", defaultUtmMode, "Utm Filter" ); - CAF_PDM_InitField( &north, "UtmNorth", 0.0, "North", "", "", "" ); - CAF_PDM_InitField( &south, "UtmSouth", 0.0, "South", "", "", "" ); - CAF_PDM_InitField( &east, "UtmEast", 0.0, "East", "", "", "" ); - CAF_PDM_InitField( &west, "UtmWest", 0.0, "West", "", "", "" ); + CAF_PDM_InitField( &north, "UtmNorth", 0.0, "North" ); + CAF_PDM_InitField( &south, "UtmSouth", 0.0, "South" ); + CAF_PDM_InitField( &east, "UtmEast", 0.0, "East" ); + CAF_PDM_InitField( &west, "UtmWest", 0.0, "West" ); - CAF_PDM_InitFieldNoDefault( ®ions, "Regions", "", "", "", "" ); + CAF_PDM_InitFieldNoDefault( ®ions, "Regions", "" ); regions.uiCapability()->setUiTreeHidden( true ); } diff --git a/ApplicationLibCode/Commands/SsiHubImportCommands/RimWellsEntry.cpp b/ApplicationLibCode/Commands/SsiHubImportCommands/RimWellsEntry.cpp index 87eb598479..4da94f883d 100644 --- a/ApplicationLibCode/Commands/SsiHubImportCommands/RimWellsEntry.cpp +++ b/ApplicationLibCode/Commands/SsiHubImportCommands/RimWellsEntry.cpp @@ -39,18 +39,18 @@ CAF_PDM_SOURCE_INIT( RimWellPathEntry, "RimWellPathEntry" ); //-------------------------------------------------------------------------------------------------- RimWellPathEntry::RimWellPathEntry() { - CAF_PDM_InitObject( "WellPathEntry", "", "", "" ); + CAF_PDM_InitObject( "WellPathEntry" ); - CAF_PDM_InitFieldNoDefault( &name, "Name", "Name", "", "", "" ); - CAF_PDM_InitField( &selected, "Selected", false, "Selected", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &name, "Name", "Name" ); + CAF_PDM_InitField( &selected, "Selected", false, "Selected" ); caf::AppEnum wellType = WELL_ALL; - CAF_PDM_InitField( &wellPathType, "WellPathType", wellType, "Well path type", "", "", "" ); + CAF_PDM_InitField( &wellPathType, "WellPathType", wellType, "Well path type" ); - CAF_PDM_InitFieldNoDefault( &surveyType, "surveyType", "surveyType", "", "", "" ); - CAF_PDM_InitFieldNoDefault( &requestUrl, "requestUrl", "requestUrl", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &surveyType, "surveyType", "surveyType" ); + CAF_PDM_InitFieldNoDefault( &requestUrl, "requestUrl", "requestUrl" ); - CAF_PDM_InitFieldNoDefault( &wellPathFilePath, "wellPathFilePath", "wellPathFilePath", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &wellPathFilePath, "wellPathFilePath", "wellPathFilePath" ); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/Commands/SsiHubImportCommands/RiuWellImportWizard.cpp b/ApplicationLibCode/Commands/SsiHubImportCommands/RiuWellImportWizard.cpp index 17cb753607..0f61ccfc01 100644 --- a/ApplicationLibCode/Commands/SsiHubImportCommands/RiuWellImportWizard.cpp +++ b/ApplicationLibCode/Commands/SsiHubImportCommands/RiuWellImportWizard.cpp @@ -1198,9 +1198,9 @@ CAF_PDM_SOURCE_INIT( SummaryPageDownloadEntity, "SummaryPageDownloadEntity" ); //-------------------------------------------------------------------------------------------------- SummaryPageDownloadEntity::SummaryPageDownloadEntity() { - CAF_PDM_InitObject( "SummaryPageDownloadEntity", "", "", "" ); + CAF_PDM_InitObject( "SummaryPageDownloadEntity" ); - CAF_PDM_InitFieldNoDefault( &name, "Name", "", "", "", "" ); - CAF_PDM_InitFieldNoDefault( &requestUrl, "RequestUrl", "", "", "", "" ); - CAF_PDM_InitFieldNoDefault( &responseFilename, "ResponseFilename", "", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &name, "Name", "" ); + CAF_PDM_InitFieldNoDefault( &requestUrl, "RequestUrl", "" ); + CAF_PDM_InitFieldNoDefault( &responseFilename, "ResponseFilename", "" ); } diff --git a/ApplicationLibCode/Commands/SsiHubImportCommands/RiuWellImportWizard.h b/ApplicationLibCode/Commands/SsiHubImportCommands/RiuWellImportWizard.h index 6a5dce6ae5..16c841312f 100644 --- a/ApplicationLibCode/Commands/SsiHubImportCommands/RiuWellImportWizard.h +++ b/ApplicationLibCode/Commands/SsiHubImportCommands/RiuWellImportWizard.h @@ -86,9 +86,9 @@ class ObjectGroupWithHeaders : public caf::PdmObject public: ObjectGroupWithHeaders() { - CAF_PDM_InitFieldNoDefault( &objects, "PdmObjects", "", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &objects, "PdmObjects", "" ); - CAF_PDM_InitField( &m_isChecked, "IsChecked", true, "Active", "", "", "" ); + CAF_PDM_InitField( &m_isChecked, "IsChecked", true, "Active" ); m_isChecked.uiCapability()->setUiHidden( true ); }; @@ -228,7 +228,7 @@ public slots: int wellSelectionPageId(); -#if !defined(QT_NO_OPENSSL) && !defined(CVF_OSX) +#if !defined( QT_NO_OPENSSL ) && !defined( CVF_OSX ) void sslErrors( QNetworkReply*, const QList& errors ); #endif diff --git a/ApplicationLibCode/Commands/SummaryPlotCommands/RicPasteAsciiDataToSummaryPlotFeatureUi.cpp b/ApplicationLibCode/Commands/SummaryPlotCommands/RicPasteAsciiDataToSummaryPlotFeatureUi.cpp index 5b4216f528..7ca773b738 100644 --- a/ApplicationLibCode/Commands/SummaryPlotCommands/RicPasteAsciiDataToSummaryPlotFeatureUi.cpp +++ b/ApplicationLibCode/Commands/SummaryPlotCommands/RicPasteAsciiDataToSummaryPlotFeatureUi.cpp @@ -174,16 +174,16 @@ RicPasteAsciiDataToSummaryPlotFeatureUi::DecimalSeparator mapDecimalSeparator( c RicPasteAsciiDataToSummaryPlotFeatureUi::RicPasteAsciiDataToSummaryPlotFeatureUi() : m_createNewPlot( false ) { - CAF_PDM_InitObject( "RicPasteAsciiDataToSummaryPlotFeatureUi", "", "", "" ); + CAF_PDM_InitObject( "RicPasteAsciiDataToSummaryPlotFeatureUi" ); - CAF_PDM_InitField( &m_plotTitle, "PlotTitle", QString(), "Plot Title", "", "", "" ); - CAF_PDM_InitField( &m_curvePrefix, "CurvePrefix", QString(), "Curve Prefix", "", "", "" ); + CAF_PDM_InitField( &m_plotTitle, "PlotTitle", QString(), "Plot Title" ); + CAF_PDM_InitField( &m_curvePrefix, "CurvePrefix", QString(), "Curve Prefix" ); - CAF_PDM_InitFieldNoDefault( &m_decimalSeparator, "DecimalSeparator", "Decimal Separator", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_decimalSeparator, "DecimalSeparator", "Decimal Separator" ); - CAF_PDM_InitFieldNoDefault( &m_dateFormat, "DateFormat", "Date Format", "", "", "" ); - CAF_PDM_InitFieldNoDefault( &m_timeFormat, "TimeFormat", "Time Format", "", "", "" ); - CAF_PDM_InitField( &m_useCustomDateFormat, "UseCustomDateFormat", false, "Use Custom Date Time Format", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_dateFormat, "DateFormat", "Date Format" ); + CAF_PDM_InitFieldNoDefault( &m_timeFormat, "TimeFormat", "Time Format" ); + CAF_PDM_InitField( &m_useCustomDateFormat, "UseCustomDateFormat", false, "Use Custom Date Time Format" ); CAF_PDM_InitField( &m_customDateTimeFormat, "CustomDateTimeFormat", QString(), @@ -207,13 +207,13 @@ RicPasteAsciiDataToSummaryPlotFeatureUi::RicPasteAsciiDataToSummaryPlotFeatureUi "", "", "" ); - CAF_PDM_InitField( &m_curveSymbolSkipDistance, "SymbolSkipDinstance", 0.0f, "Symbol Skip Distance", "", "", "" ); + CAF_PDM_InitField( &m_curveSymbolSkipDistance, "SymbolSkipDinstance", 0.0f, "Symbol Skip Distance" ); - CAF_PDM_InitFieldNoDefault( &m_cellSeparator, "CellSeparator", "Cell Separator", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_cellSeparator, "CellSeparator", "Cell Separator" ); - CAF_PDM_InitFieldNoDefault( &m_timeSeriesColumnName, "TimeColumnName", "Selected Time Column", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_timeSeriesColumnName, "TimeColumnName", "Selected Time Column" ); - CAF_PDM_InitFieldNoDefault( &m_previewText, "PreviewText", "Preview Text", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_previewText, "PreviewText", "Preview Text" ); m_previewText.uiCapability()->setUiEditorTypeName( caf::PdmUiTextEditor::uiEditorTypeName() ); m_previewText.uiCapability()->setUiLabelPosition( caf::PdmUiItemInfo::HIDDEN ); m_previewText.uiCapability()->setUiReadOnly( true ); diff --git a/ApplicationLibCode/Commands/SummaryPlotCommands/RicSelectSummaryPlotUI.cpp b/ApplicationLibCode/Commands/SummaryPlotCommands/RicSelectSummaryPlotUI.cpp index 5bfa492adf..7b357d924f 100644 --- a/ApplicationLibCode/Commands/SummaryPlotCommands/RicSelectSummaryPlotUI.cpp +++ b/ApplicationLibCode/Commands/SummaryPlotCommands/RicSelectSummaryPlotUI.cpp @@ -34,11 +34,11 @@ CAF_PDM_SOURCE_INIT( RicSelectSummaryPlotUI, "RicSelectSummaryPlotUI" ); //-------------------------------------------------------------------------------------------------- RicSelectSummaryPlotUI::RicSelectSummaryPlotUI() { - CAF_PDM_InitObject( "RicSelectSummaryPlotUI", "", "", "" ); + CAF_PDM_InitObject( "RicSelectSummaryPlotUI" ); - CAF_PDM_InitFieldNoDefault( &m_selectedSummaryPlot, "SelectedSummaryPlot", "Select Plot", "", "", "" ); - CAF_PDM_InitField( &m_createNewPlot, "CreateNewPlot", false, "Create New Plot", "", "", "" ); - CAF_PDM_InitField( &m_newSummaryPlotName, "NewViewName", QString( "Cell Results" ), "New Plot Name", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_selectedSummaryPlot, "SelectedSummaryPlot", "Select Plot" ); + CAF_PDM_InitField( &m_createNewPlot, "CreateNewPlot", false, "Create New Plot" ); + CAF_PDM_InitField( &m_newSummaryPlotName, "NewViewName", QString( "Cell Results" ), "New Plot Name" ); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/Commands/SummaryPlotCommands/RicSummaryCurveCalculatorUi.cpp b/ApplicationLibCode/Commands/SummaryPlotCommands/RicSummaryCurveCalculatorUi.cpp index ce8267064a..b7d0427003 100644 --- a/ApplicationLibCode/Commands/SummaryPlotCommands/RicSummaryCurveCalculatorUi.cpp +++ b/ApplicationLibCode/Commands/SummaryPlotCommands/RicSummaryCurveCalculatorUi.cpp @@ -36,17 +36,17 @@ CAF_PDM_SOURCE_INIT( RicSummaryCurveCalculatorUi, "RicSummaryCurveCalculator" ); //-------------------------------------------------------------------------------------------------- RicSummaryCurveCalculatorUi::RicSummaryCurveCalculatorUi() { - CAF_PDM_InitObject( "RicSummaryCurveCalculator", "", "", "" ); + CAF_PDM_InitObject( "RicSummaryCurveCalculator" ); - CAF_PDM_InitFieldNoDefault( &m_currentCalculation, "CurrentCalculation", "", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_currentCalculation, "CurrentCalculation", "" ); m_currentCalculation.uiCapability()->setUiLabelPosition( caf::PdmUiItemInfo::HIDDEN ); // m_currentCalculation.uiCapability()->setUiEditorTypeName(caf::PdmUiTreeSelectionEditor::uiEditorTypeName()); m_currentCalculation.uiCapability()->setUiEditorTypeName( caf::PdmUiListEditor::uiEditorTypeName() ); - CAF_PDM_InitFieldNoDefault( &m_newCalculation, "NewCalculation", "New Calculation", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_newCalculation, "NewCalculation", "New Calculation" ); RicSummaryCurveCalculatorUi::assignPushButtonEditor( &m_newCalculation ); - CAF_PDM_InitFieldNoDefault( &m_deleteCalculation, "DeleteCalculation", "Delete Calculation", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_deleteCalculation, "DeleteCalculation", "Delete Calculation" ); RicSummaryCurveCalculatorUi::assignPushButtonEditor( &m_deleteCalculation ); m_calcContextMenuMgr = std::unique_ptr( new RiuCalculationsContextMenuManager() ); diff --git a/ApplicationLibCode/Commands/SummaryPlotCommands/RicSummaryPlotEditorUi.cpp b/ApplicationLibCode/Commands/SummaryPlotCommands/RicSummaryPlotEditorUi.cpp index edb01800f5..a570358ab3 100644 --- a/ApplicationLibCode/Commands/SummaryPlotCommands/RicSummaryPlotEditorUi.cpp +++ b/ApplicationLibCode/Commands/SummaryPlotCommands/RicSummaryPlotEditorUi.cpp @@ -84,33 +84,33 @@ std::vector toVector( const std::set& set ); //-------------------------------------------------------------------------------------------------- RicSummaryPlotEditorUi::RicSummaryPlotEditorUi() { - CAF_PDM_InitFieldNoDefault( &m_targetPlot, "TargetPlot", "Target Plot", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_targetPlot, "TargetPlot", "Target Plot" ); - CAF_PDM_InitField( &m_useAutoAppearanceAssignment, "UseAutoAppearanceAssignment", true, "Auto", "", "", "" ); - CAF_PDM_InitField( &m_appearanceApplyButton, "AppearanceApplyButton", false, "", "", "", "" ); - CAF_PDM_InitFieldNoDefault( &m_caseAppearanceType, "CaseAppearanceType", "Case", "", "", "" ); - CAF_PDM_InitFieldNoDefault( &m_variableAppearanceType, "VariableAppearanceType", "Vector", "", "", "" ); - CAF_PDM_InitFieldNoDefault( &m_wellAppearanceType, "WellAppearanceType", "Well", "", "", "" ); - CAF_PDM_InitFieldNoDefault( &m_groupAppearanceType, "GroupAppearanceType", "Group", "", "", "" ); - CAF_PDM_InitFieldNoDefault( &m_regionAppearanceType, "RegionAppearanceType", "Region", "", "", "" ); + CAF_PDM_InitField( &m_useAutoAppearanceAssignment, "UseAutoAppearanceAssignment", true, "Auto" ); + CAF_PDM_InitField( &m_appearanceApplyButton, "AppearanceApplyButton", false, "" ); + CAF_PDM_InitFieldNoDefault( &m_caseAppearanceType, "CaseAppearanceType", "Case" ); + CAF_PDM_InitFieldNoDefault( &m_variableAppearanceType, "VariableAppearanceType", "Vector" ); + CAF_PDM_InitFieldNoDefault( &m_wellAppearanceType, "WellAppearanceType", "Well" ); + CAF_PDM_InitFieldNoDefault( &m_groupAppearanceType, "GroupAppearanceType", "Group" ); + CAF_PDM_InitFieldNoDefault( &m_regionAppearanceType, "RegionAppearanceType", "Region" ); m_previewPlot.reset( new RimSummaryPlot() ); - CAF_PDM_InitFieldNoDefault( &m_useAutoPlotTitleProxy, "UseAutoPlotTitle", "Auto Plot Title", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_useAutoPlotTitleProxy, "UseAutoPlotTitle", "Auto Plot Title" ); m_useAutoPlotTitleProxy.registerGetMethod( this, &RicSummaryPlotEditorUi::proxyPlotAutoTitle ); m_useAutoPlotTitleProxy.registerSetMethod( this, &RicSummaryPlotEditorUi::proxyEnablePlotAutoTitle ); - CAF_PDM_InitFieldNoDefault( &m_applyButtonField, "ApplySelection", "", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_applyButtonField, "ApplySelection", "" ); m_applyButtonField = false; m_applyButtonField.uiCapability()->setUiEditorTypeName( caf::PdmUiPushButtonEditor::uiEditorTypeName() ); m_applyButtonField.uiCapability()->setUiLabelPosition( caf::PdmUiItemInfo::HIDDEN ); - CAF_PDM_InitFieldNoDefault( &m_closeButtonField, "Close", "", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_closeButtonField, "Close", "" ); m_closeButtonField = false; m_closeButtonField.uiCapability()->setUiEditorTypeName( caf::PdmUiPushButtonEditor::uiEditorTypeName() ); m_closeButtonField.uiCapability()->setUiLabelPosition( caf::PdmUiItemInfo::HIDDEN ); - CAF_PDM_InitFieldNoDefault( &m_okButtonField, "OK", "", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_okButtonField, "OK", "" ); m_okButtonField = false; m_okButtonField.uiCapability()->setUiEditorTypeName( caf::PdmUiPushButtonEditor::uiEditorTypeName() ); m_okButtonField.uiCapability()->setUiLabelPosition( caf::PdmUiItemInfo::HIDDEN ); @@ -119,7 +119,7 @@ RicSummaryPlotEditorUi::RicSummaryPlotEditorUi() m_appearanceApplyButton.uiCapability()->setUiEditorTypeName( caf::PdmUiPushButtonEditor::uiEditorTypeName() ); m_appearanceApplyButton.uiCapability()->setUiLabelPosition( caf::PdmUiItemInfo::LEFT ); - CAF_PDM_InitFieldNoDefault( &m_curveNameConfig, "SummaryCurveNameConfig", "SummaryCurveNameConfig", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_curveNameConfig, "SummaryCurveNameConfig", "SummaryCurveNameConfig" ); m_curveNameConfig = new RimSummaryCurveAutoName(); m_curveNameConfig.uiCapability()->setUiTreeHidden( true ); m_curveNameConfig.uiCapability()->setUiTreeChildrenHidden( true ); diff --git a/ApplicationLibCode/Commands/ViewLink/RicLinkVisibleViewsFeatureUi.cpp b/ApplicationLibCode/Commands/ViewLink/RicLinkVisibleViewsFeatureUi.cpp index bc920a771c..b848117de0 100644 --- a/ApplicationLibCode/Commands/ViewLink/RicLinkVisibleViewsFeatureUi.cpp +++ b/ApplicationLibCode/Commands/ViewLink/RicLinkVisibleViewsFeatureUi.cpp @@ -36,7 +36,7 @@ RicLinkVisibleViewsFeatureUi::RicLinkVisibleViewsFeatureUi( void ) { CAF_PDM_InitObject( "Link Visible Views Feature UI", ":/LinkView16x16.png", "", "" ); - CAF_PDM_InitFieldNoDefault( &m_masterView, "MasterView", "Primary View", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_masterView, "MasterView", "Primary View" ); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/Commands/WellPathCommands/RicCreateMultipleWellPathLateralsUi.cpp b/ApplicationLibCode/Commands/WellPathCommands/RicCreateMultipleWellPathLateralsUi.cpp index 3e216b7d0b..42284e5051 100644 --- a/ApplicationLibCode/Commands/WellPathCommands/RicCreateMultipleWellPathLateralsUi.cpp +++ b/ApplicationLibCode/Commands/WellPathCommands/RicCreateMultipleWellPathLateralsUi.cpp @@ -45,12 +45,12 @@ CAF_PDM_SOURCE_INIT( RicCreateMultipleWellPathLateralsUi, "RicCreateMultipleWell //-------------------------------------------------------------------------------------------------- RicCreateMultipleWellPathLateralsUi::RicCreateMultipleWellPathLateralsUi() { - CAF_PDM_InitFieldNoDefault( &m_sourceLateral, "SourceLaterals", "Source Well Path Lateral", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_sourceLateral, "SourceLaterals", "Source Well Path Lateral" ); - CAF_PDM_InitFieldNoDefault( &m_topLevelWellPath, "TopLevelWellPath", "Top Level Well Path", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_topLevelWellPath, "TopLevelWellPath", "Top Level Well Path" ); m_topLevelWellPath.uiCapability()->setUiHidden( true ); - CAF_PDM_InitFieldNoDefault( &m_locations, "Locations", "Locations", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_locations, "Locations", "Locations" ); m_locations = new RimMultipleLocations; } diff --git a/ApplicationLibCode/Commands/WellPathCommands/RicImportWellPaths.cpp b/ApplicationLibCode/Commands/WellPathCommands/RicImportWellPaths.cpp index 1eacb7b706..81db7cc48c 100644 --- a/ApplicationLibCode/Commands/WellPathCommands/RicImportWellPaths.cpp +++ b/ApplicationLibCode/Commands/WellPathCommands/RicImportWellPaths.cpp @@ -48,8 +48,8 @@ class RicImportWellPathsResult : public caf::PdmObject public: RicImportWellPathsResult() { - CAF_PDM_InitObject( "well_path_result", "", "", "" ); - CAF_PDM_InitFieldNoDefault( &wellPathNames, "wellPathNames", "", "", "", "" ); + CAF_PDM_InitObject( "well_path_result" ); + CAF_PDM_InitFieldNoDefault( &wellPathNames, "wellPathNames", "" ); } public: @@ -64,9 +64,9 @@ RICF_SOURCE_INIT( RicImportWellPaths, "RicWellPathsImportFileFeature", "importWe //-------------------------------------------------------------------------------------------------- RicImportWellPaths::RicImportWellPaths() { - CAF_PDM_InitScriptableFieldNoDefault( &m_wellPathFolder, "wellPathFolder", "", "", "", "" ); - CAF_PDM_InitScriptableFieldNoDefault( &m_wellPathFiles, "wellPathFiles", "", "", "", "" ); - CAF_PDM_InitScriptableField( &m_importGrouped, "importGrouped", false, "", "", "", "" ); + CAF_PDM_InitScriptableFieldNoDefault( &m_wellPathFolder, "wellPathFolder", "" ); + CAF_PDM_InitScriptableFieldNoDefault( &m_wellPathFiles, "wellPathFiles", "" ); + CAF_PDM_InitScriptableField( &m_importGrouped, "importGrouped", false, "" ); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/Commands/WellPathCommands/RicWellPathsUnitSystemSettingsUi.cpp b/ApplicationLibCode/Commands/WellPathCommands/RicWellPathsUnitSystemSettingsUi.cpp index 165caff678..56237f6399 100644 --- a/ApplicationLibCode/Commands/WellPathCommands/RicWellPathsUnitSystemSettingsUi.cpp +++ b/ApplicationLibCode/Commands/WellPathCommands/RicWellPathsUnitSystemSettingsUi.cpp @@ -25,9 +25,9 @@ CAF_PDM_SOURCE_INIT( RicWellPathsUnitSystemSettingsUi, "RicWellPathsUnitSystemSe //-------------------------------------------------------------------------------------------------- RicWellPathsUnitSystemSettingsUi::RicWellPathsUnitSystemSettingsUi() { - CAF_PDM_InitObject( "RimWellPathsUnitSystemSettings", "", "", "" ); + CAF_PDM_InitObject( "RimWellPathsUnitSystemSettings" ); - CAF_PDM_InitFieldNoDefault( &unitSystem, "UnitSystem", "Unit System", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &unitSystem, "UnitSystem", "Unit System" ); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/FileInterface/RifReaderSettings.cpp b/ApplicationLibCode/FileInterface/RifReaderSettings.cpp index f105900974..15081d01f2 100644 --- a/ApplicationLibCode/FileInterface/RifReaderSettings.cpp +++ b/ApplicationLibCode/FileInterface/RifReaderSettings.cpp @@ -28,12 +28,12 @@ CAF_PDM_SOURCE_INIT( RifReaderSettings, "RifReaderSettings" ); //-------------------------------------------------------------------------------------------------- RifReaderSettings::RifReaderSettings() { - CAF_PDM_InitObject( "RifReaderSettings", "", "", "" ); + CAF_PDM_InitObject( "RifReaderSettings" ); - CAF_PDM_InitField( &importFaults, "importFaults", true, "Import Faults", "", "", "" ); + CAF_PDM_InitField( &importFaults, "importFaults", true, "Import Faults" ); caf::PdmUiNativeCheckBoxEditor::configureFieldForEditor( &importFaults ); - CAF_PDM_InitField( &importNNCs, "importSimulationNNCs", true, "Import NNCs", "", "", "" ); + CAF_PDM_InitField( &importNNCs, "importSimulationNNCs", true, "Import NNCs" ); caf::PdmUiNativeCheckBoxEditor::configureFieldForEditor( &importNNCs ); CAF_PDM_InitField( &includeInactiveCellsInFaultGeometry, @@ -45,7 +45,7 @@ RifReaderSettings::RifReaderSettings() "" ); caf::PdmUiNativeCheckBoxEditor::configureFieldForEditor( &includeInactiveCellsInFaultGeometry ); - CAF_PDM_InitField( &importAdvancedMswData, "importAdvancedMswData", false, "Import Advanced MSW Data", "", "", "" ); + CAF_PDM_InitField( &importAdvancedMswData, "importAdvancedMswData", false, "Import Advanced MSW Data" ); caf::PdmUiNativeCheckBoxEditor::configureFieldForEditor( &importAdvancedMswData ); CAF_PDM_InitField( &useResultIndexFile, @@ -61,7 +61,7 @@ RifReaderSettings::RifReaderSettings() caf::PdmUiNativeCheckBoxEditor::configureFieldForEditor( &useResultIndexFile ); - CAF_PDM_InitField( &skipWellData, "skipWellData", false, "Skip Import of Simulation Well Data", "", "", "" ); + CAF_PDM_InitField( &skipWellData, "skipWellData", false, "Skip Import of Simulation Well Data" ); caf::PdmUiNativeCheckBoxEditor::configureFieldForEditor( &skipWellData ); CAF_PDM_InitField( &includeFileAbsolutePathPrefix, @@ -73,7 +73,7 @@ RifReaderSettings::RifReaderSettings() "for FAULTS and EQUIL", "" ); - CAF_PDM_InitField( &importSummaryData, "importSummaryData", true, "Import summary data", "", "", "" ); + CAF_PDM_InitField( &importSummaryData, "importSummaryData", true, "Import summary data" ); importSummaryData.uiCapability()->setUiHidden( true ); } diff --git a/ApplicationLibCode/GeoMech/GeoMechDataModel/RimGeoMechGeometrySelectionItem.cpp b/ApplicationLibCode/GeoMech/GeoMechDataModel/RimGeoMechGeometrySelectionItem.cpp index b7923f287d..e51c9d9a32 100644 --- a/ApplicationLibCode/GeoMech/GeoMechDataModel/RimGeoMechGeometrySelectionItem.cpp +++ b/ApplicationLibCode/GeoMech/GeoMechDataModel/RimGeoMechGeometrySelectionItem.cpp @@ -31,18 +31,18 @@ CAF_PDM_SOURCE_INIT( RimGeoMechGeometrySelectionItem, "GeoMechGeometrySelectionI //-------------------------------------------------------------------------------------------------- RimGeoMechGeometrySelectionItem::RimGeoMechGeometrySelectionItem() { - CAF_PDM_InitObject( "GeoMech Topology Item", "", "", "" ); + CAF_PDM_InitObject( "GeoMech Topology Item" ); - CAF_PDM_InitFieldNoDefault( &m_geoMechCase, "GeoMechCase", "Geo Mech Case", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_geoMechCase, "GeoMechCase", "Geo Mech Case" ); - CAF_PDM_InitFieldNoDefault( &m_gridIndex, "m_gridIndex", "GridIndex", "", "", "" ); - CAF_PDM_InitFieldNoDefault( &m_cellIndex, "m_cellIndex", "CellIndex", "", "", "" ); - CAF_PDM_InitFieldNoDefault( &m_elementFace, "m_elementFace", "ElementFace", "", "", "" ); - CAF_PDM_InitFieldNoDefault( &m_hasIntersectionTriangle, "m_hasIntersectionTriangle", "HasIntersectionTriangle", "", "", "" ); - CAF_PDM_InitFieldNoDefault( &m_intersectionTriangle_0, "m_intersectionTriangle_0", "IntersectionTriangle_0", "", "", "" ); - CAF_PDM_InitFieldNoDefault( &m_intersectionTriangle_1, "m_intersectionTriangle_1", "IntersectionTriangle_1", "", "", "" ); - CAF_PDM_InitFieldNoDefault( &m_intersectionTriangle_2, "m_intersectionTriangle_2", "IntersectionTriangle_2", "", "", "" ); - CAF_PDM_InitFieldNoDefault( &m_localIntersectionPoint, "m_localIntersectionPoint", "LocalIntersectionPoint", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_gridIndex, "m_gridIndex", "GridIndex" ); + CAF_PDM_InitFieldNoDefault( &m_cellIndex, "m_cellIndex", "CellIndex" ); + CAF_PDM_InitFieldNoDefault( &m_elementFace, "m_elementFace", "ElementFace" ); + CAF_PDM_InitFieldNoDefault( &m_hasIntersectionTriangle, "m_hasIntersectionTriangle", "HasIntersectionTriangle" ); + CAF_PDM_InitFieldNoDefault( &m_intersectionTriangle_0, "m_intersectionTriangle_0", "IntersectionTriangle_0" ); + CAF_PDM_InitFieldNoDefault( &m_intersectionTriangle_1, "m_intersectionTriangle_1", "IntersectionTriangle_1" ); + CAF_PDM_InitFieldNoDefault( &m_intersectionTriangle_2, "m_intersectionTriangle_2", "IntersectionTriangle_2" ); + CAF_PDM_InitFieldNoDefault( &m_localIntersectionPoint, "m_localIntersectionPoint", "LocalIntersectionPoint" ); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/ProjectDataModel/AnalysisPlots/RimAnalysisPlot.cpp b/ApplicationLibCode/ProjectDataModel/AnalysisPlots/RimAnalysisPlot.cpp index 65048e9f08..437bd584f3 100644 --- a/ApplicationLibCode/ProjectDataModel/AnalysisPlots/RimAnalysisPlot.cpp +++ b/ApplicationLibCode/ProjectDataModel/AnalysisPlots/RimAnalysisPlot.cpp @@ -95,74 +95,74 @@ RimAnalysisPlot::RimAnalysisPlot() // Variable selection - CAF_PDM_InitFieldNoDefault( &m_selectedVarsUiField, "selectedVarsUiField", "Selected Vectors", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_selectedVarsUiField, "selectedVarsUiField", "Selected Vectors" ); m_selectedVarsUiField.xmlCapability()->disableIO(); m_selectedVarsUiField.uiCapability()->setUiLabelPosition( caf::PdmUiItemInfo::HIDDEN ); m_selectedVarsUiField.uiCapability()->setUiReadOnly( true ); - CAF_PDM_InitField( &m_selectVariablesButtonField, "BrowseButton", false, "...", "", "", "" ); + CAF_PDM_InitField( &m_selectVariablesButtonField, "BrowseButton", false, "..." ); caf::PdmUiActionPushButtonEditor::configureEditorForField( &m_selectVariablesButtonField ); - CAF_PDM_InitFieldNoDefault( &m_analysisPlotDataSelection, "AnalysisPlotData", "", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_analysisPlotDataSelection, "AnalysisPlotData", "" ); m_analysisPlotDataSelection.uiCapability()->setUiTreeChildrenHidden( true ); m_analysisPlotDataSelection.uiCapability()->setUiTreeHidden( true ); // Time Step Selection - CAF_PDM_InitFieldNoDefault( &m_timeStepFilter, "TimeStepFilter", "Available Time Steps", "", "", "" ); - CAF_PDM_InitFieldNoDefault( &m_selectedTimeSteps, "TimeSteps", "Select Time Steps", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_timeStepFilter, "TimeStepFilter", "Available Time Steps" ); + CAF_PDM_InitFieldNoDefault( &m_selectedTimeSteps, "TimeSteps", "Select Time Steps" ); m_selectedTimeSteps.uiCapability()->setUiEditorTypeName( caf::PdmUiTreeSelectionEditor::uiEditorTypeName() ); m_selectedTimeSteps.uiCapability()->setUiLabelPosition( caf::PdmUiItemInfo::TOP ); // Options - CAF_PDM_InitFieldNoDefault( &m_referenceCase, "ReferenceCase", "Reference Case", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_referenceCase, "ReferenceCase", "Reference Case" ); - CAF_PDM_InitField( &m_useAutoPlotTitle, "IsUsingAutoName", true, "Auto", "", "", "" ); + CAF_PDM_InitField( &m_useAutoPlotTitle, "IsUsingAutoName", true, "Auto" ); caf::PdmUiNativeCheckBoxEditor::configureFieldForEditor( &m_useAutoPlotTitle ); - CAF_PDM_InitField( &m_description, "PlotDescription", QString( "Analysis Plot" ), "Title", "", "", "" ); + CAF_PDM_InitField( &m_description, "PlotDescription", QString( "Analysis Plot" ), "Title" ); m_description.uiCapability()->setUiLabelPosition( caf::PdmUiItemInfo::HIDDEN ); - CAF_PDM_InitFieldNoDefault( &m_barOrientation, "BarOrientation", "Bar Orientation", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_barOrientation, "BarOrientation", "Bar Orientation" ); // Grouping - CAF_PDM_InitFieldNoDefault( &m_majorGroupType, "MajorGroupType", "Major Grouping", "", "", "" ); - CAF_PDM_InitFieldNoDefault( &m_mediumGroupType, "MediumGroupType", "Medium Grouping", "", "", "" ); - CAF_PDM_InitFieldNoDefault( &m_minorGroupType, "MinorGroupType", "Minor Grouping", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_majorGroupType, "MajorGroupType", "Major Grouping" ); + CAF_PDM_InitFieldNoDefault( &m_mediumGroupType, "MediumGroupType", "Medium Grouping" ); + CAF_PDM_InitFieldNoDefault( &m_minorGroupType, "MinorGroupType", "Minor Grouping" ); - CAF_PDM_InitFieldNoDefault( &m_valueSortOperation, "ValueSortOperation", "Sort by Value", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_valueSortOperation, "ValueSortOperation", "Sort by Value" ); - CAF_PDM_InitFieldNoDefault( &m_sortGroupForColors, "groupForColors", "Coloring Using", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_sortGroupForColors, "groupForColors", "Coloring Using" ); m_sortGroupForColors = RimAnalysisPlot::CASE; m_showPlotLegends = false; - CAF_PDM_InitField( &m_useTopBarsFilter, "UseTopBarsFilter", false, "Show Only Top", "", "", "" ); + CAF_PDM_InitField( &m_useTopBarsFilter, "UseTopBarsFilter", false, "Show Only Top" ); caf::PdmUiNativeCheckBoxEditor::configureFieldForEditor( &m_useTopBarsFilter ); - CAF_PDM_InitField( &m_maxBarCount, "MaxBarCount", 20, "Bar Count", "", "", "" ); + CAF_PDM_InitField( &m_maxBarCount, "MaxBarCount", 20, "Bar Count" ); m_maxBarCount.uiCapability()->setUiLabelPosition( caf::PdmUiItemInfo::HIDDEN ); // Bar text - CAF_PDM_InitField( &m_useBarText, "UseBarText", true, "Activate Bar Labels", "", "", "" ); + CAF_PDM_InitField( &m_useBarText, "UseBarText", true, "Activate Bar Labels" ); caf::PdmUiNativeCheckBoxEditor::configureFieldForEditor( &m_useBarText ); - CAF_PDM_InitField( &m_useCaseInBarText, "UseCaseInBarText", true, "Case Name", "", "", "" ); - CAF_PDM_InitField( &m_useEnsembleInBarText, "UseEnsembleInBarText", false, "Ensemble", "", "", "" ); - CAF_PDM_InitField( &m_useSummaryItemInBarText, "UseSummaryItemInBarText", false, "Summary Item", "", "", "" ); - CAF_PDM_InitField( &m_useTimeStepInBarText, "UseTimeStepInBarText", false, "Time Step", "", "", "" ); - CAF_PDM_InitField( &m_useQuantityInBarText, "UseQuantityInBarText", false, "Quantity", "", "", "" ); + CAF_PDM_InitField( &m_useCaseInBarText, "UseCaseInBarText", true, "Case Name" ); + CAF_PDM_InitField( &m_useEnsembleInBarText, "UseEnsembleInBarText", false, "Ensemble" ); + CAF_PDM_InitField( &m_useSummaryItemInBarText, "UseSummaryItemInBarText", false, "Summary Item" ); + CAF_PDM_InitField( &m_useTimeStepInBarText, "UseTimeStepInBarText", false, "Time Step" ); + CAF_PDM_InitField( &m_useQuantityInBarText, "UseQuantityInBarText", false, "Quantity" ); - CAF_PDM_InitFieldNoDefault( &m_barTextFontSize, "BarTextFontSize", "Font Size", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_barTextFontSize, "BarTextFontSize", "Font Size" ); - CAF_PDM_InitFieldNoDefault( &m_valueAxisProperties, "ValueAxisProperties", "ValueAxisProperties", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_valueAxisProperties, "ValueAxisProperties", "ValueAxisProperties" ); m_valueAxisProperties.uiCapability()->setUiTreeHidden( true ); m_valueAxisProperties = new RimPlotAxisProperties; m_valueAxisProperties->setNameAndAxis( "Value-Axis", QwtPlot::yLeft ); m_valueAxisProperties->enableRangeSettings( false ); - CAF_PDM_InitFieldNoDefault( &m_plotDataFilterCollection, "PlotDataFilterCollection", "PlotDataFilterCollection", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_plotDataFilterCollection, "PlotDataFilterCollection", "PlotDataFilterCollection" ); m_plotDataFilterCollection.uiCapability()->setUiTreeHidden( true ); m_plotDataFilterCollection = new RimPlotDataFilterCollection; diff --git a/ApplicationLibCode/ProjectDataModel/AnalysisPlots/RimAnalysisPlotCollection.cpp b/ApplicationLibCode/ProjectDataModel/AnalysisPlots/RimAnalysisPlotCollection.cpp index 394fe93dec..582da46df4 100644 --- a/ApplicationLibCode/ProjectDataModel/AnalysisPlots/RimAnalysisPlotCollection.cpp +++ b/ApplicationLibCode/ProjectDataModel/AnalysisPlots/RimAnalysisPlotCollection.cpp @@ -34,7 +34,7 @@ RimAnalysisPlotCollection::RimAnalysisPlotCollection() { CAF_PDM_InitObject( "Analysis Plots", ":/AnalysisPlots16x16.png", "", "" ); - CAF_PDM_InitFieldNoDefault( &m_analysisPlots, "AnalysisPlots", "Analysis Plots", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_analysisPlots, "AnalysisPlots", "Analysis Plots" ); m_analysisPlots.uiCapability()->setUiTreeHidden( true ); } diff --git a/ApplicationLibCode/ProjectDataModel/AnalysisPlots/RimAnalysisPlotDataEntry.cpp b/ApplicationLibCode/ProjectDataModel/AnalysisPlots/RimAnalysisPlotDataEntry.cpp index 35e75f1e50..eeb94c7c79 100644 --- a/ApplicationLibCode/ProjectDataModel/AnalysisPlots/RimAnalysisPlotDataEntry.cpp +++ b/ApplicationLibCode/ProjectDataModel/AnalysisPlots/RimAnalysisPlotDataEntry.cpp @@ -33,22 +33,22 @@ CAF_PDM_SOURCE_INIT( RimAnalysisPlotDataEntry, "AnalysisPlotDataEntry" ); //-------------------------------------------------------------------------------------------------- RimAnalysisPlotDataEntry::RimAnalysisPlotDataEntry() { - CAF_PDM_InitObject( "Data Entry", "", "", "" ); + CAF_PDM_InitObject( "Data Entry" ); - CAF_PDM_InitFieldNoDefault( &m_summaryCase, "SummaryCase", "Case", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_summaryCase, "SummaryCase", "Case" ); m_summaryCase.uiCapability()->setUiTreeChildrenHidden( true ); m_summaryCase.uiCapability()->setAutoAddingOptionFromValue( false ); - CAF_PDM_InitFieldNoDefault( &m_ensemble, "Ensemble", "Ensemble", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_ensemble, "Ensemble", "Ensemble" ); m_ensemble.uiCapability()->setUiTreeChildrenHidden( true ); m_ensemble.uiCapability()->setAutoAddingOptionFromValue( false ); - CAF_PDM_InitFieldNoDefault( &m_summaryAddress, "SummaryAddress", "Summary Address", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_summaryAddress, "SummaryAddress", "Summary Address" ); m_summaryAddress.uiCapability()->setUiTreeHidden( true ); m_summaryAddress.uiCapability()->setUiTreeChildrenHidden( true ); m_summaryAddress = new RimSummaryAddress; - CAF_PDM_InitField( &m_isEnsembleCurve, "IsEnsembleCurve", false, "Is Ensemble Curve", "", "", "" ); + CAF_PDM_InitField( &m_isEnsembleCurve, "IsEnsembleCurve", false, "Is Ensemble Curve" ); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/ProjectDataModel/AnalysisPlots/RimPlotDataFilterCollection.cpp b/ApplicationLibCode/ProjectDataModel/AnalysisPlots/RimPlotDataFilterCollection.cpp index 7b7fdedb01..8f3f6568d7 100644 --- a/ApplicationLibCode/ProjectDataModel/AnalysisPlots/RimPlotDataFilterCollection.cpp +++ b/ApplicationLibCode/ProjectDataModel/AnalysisPlots/RimPlotDataFilterCollection.cpp @@ -29,9 +29,9 @@ RimPlotDataFilterCollection::RimPlotDataFilterCollection() { CAF_PDM_InitObject( "Plot Data Filters", ":/AnalysisPlotFilter16x16.png", "", "" ); - CAF_PDM_InitField( &m_isActive, "IsActive", true, "IsActive", "", "", "" ); + CAF_PDM_InitField( &m_isActive, "IsActive", true, "IsActive" ); m_isActive.uiCapability()->setUiHidden( true ); - CAF_PDM_InitFieldNoDefault( &m_filters, "PlotDataFiltersField", "", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_filters, "PlotDataFiltersField", "" ); m_filters.uiCapability()->setUiTreeHidden( true ); } diff --git a/ApplicationLibCode/ProjectDataModel/AnalysisPlots/RimPlotDataFilterItem.cpp b/ApplicationLibCode/ProjectDataModel/AnalysisPlots/RimPlotDataFilterItem.cpp index 2b7d382f7b..676021850a 100644 --- a/ApplicationLibCode/ProjectDataModel/AnalysisPlots/RimPlotDataFilterItem.cpp +++ b/ApplicationLibCode/ProjectDataModel/AnalysisPlots/RimPlotDataFilterItem.cpp @@ -85,37 +85,37 @@ RimPlotDataFilterItem::RimPlotDataFilterItem() { CAF_PDM_InitObject( "Plot Data Filter", ":/AnalysisPlotFilter16x16.png", "", "" ); - CAF_PDM_InitField( &m_isActive, "IsActive", true, "Active", "", "", "" ); + CAF_PDM_InitField( &m_isActive, "IsActive", true, "Active" ); m_isActive.uiCapability()->setUiHidden( true ); - CAF_PDM_InitFieldNoDefault( &m_filterTarget, "FilterTarget", "Use only the", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_filterTarget, "FilterTarget", "Use only the" ); - CAF_PDM_InitFieldNoDefault( &m_filterAddress, "FilterAddressField", "Filter Address", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_filterAddress, "FilterAddressField", "Filter Address" ); m_filterAddress.uiCapability()->setUiTreeHidden( true ); m_filterAddress.uiCapability()->setUiTreeChildrenHidden( true ); m_filterAddress = new RimSummaryAddress(); - CAF_PDM_InitField( &m_filterEnsembleParameter, "QuantityText", QString( "" ), "where", "", "", "" ); + CAF_PDM_InitField( &m_filterEnsembleParameter, "QuantityText", QString( "" ), "where" ); - CAF_PDM_InitFieldNoDefault( &m_filterQuantityUiField, "SelectedVariableDisplayVar", "where", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_filterQuantityUiField, "SelectedVariableDisplayVar", "where" ); m_filterQuantityUiField.xmlCapability()->disableIO(); m_filterQuantityUiField.uiCapability()->setUiEditorTypeName( caf::PdmUiLineEditor::uiEditorTypeName() ); - CAF_PDM_InitField( &m_filterQuantitySelectButton, "SelectAddress", false, "...", "", "", "" ); + CAF_PDM_InitField( &m_filterQuantitySelectButton, "SelectAddress", false, "..." ); caf::PdmUiActionPushButtonEditor::configureEditorForField( &m_filterQuantitySelectButton ); - CAF_PDM_InitFieldNoDefault( &m_filterOperation, "FilterOperation", "is", "", "", "" ); - CAF_PDM_InitField( &m_topBottomN, "MinTopN", 20, "N", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_filterOperation, "FilterOperation", "is" ); + CAF_PDM_InitField( &m_topBottomN, "MinTopN", 20, "N" ); m_topBottomN.uiCapability()->setUiLabelPosition( caf::PdmUiItemInfo::HIDDEN ); - CAF_PDM_InitField( &m_max, "Max", m_upperLimit, "Max", "", "", "" ); + CAF_PDM_InitField( &m_max, "Max", m_upperLimit, "Max" ); m_max.uiCapability()->setUiEditorTypeName( caf::PdmUiDoubleSliderEditor::uiEditorTypeName() ); - CAF_PDM_InitField( &m_min, "Min", m_lowerLimit, "Min", "", "", "" ); + CAF_PDM_InitField( &m_min, "Min", m_lowerLimit, "Min" ); m_min.uiCapability()->setUiEditorTypeName( caf::PdmUiDoubleSliderEditor::uiEditorTypeName() ); - CAF_PDM_InitFieldNoDefault( &m_ensembleParameterValueCategories, "EnsembleParameterValueCategories", "one of", "", "", "" ); - CAF_PDM_InitFieldNoDefault( &m_consideredTimestepsType, "ConsideredTimestepsType", "at the", "", "", "" ); - CAF_PDM_InitFieldNoDefault( &m_explicitlySelectedTimeSteps, "ExplicitlySelectedTimeSteps", "TimeSteps", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_ensembleParameterValueCategories, "EnsembleParameterValueCategories", "one of" ); + CAF_PDM_InitFieldNoDefault( &m_consideredTimestepsType, "ConsideredTimestepsType", "at the" ); + CAF_PDM_InitFieldNoDefault( &m_explicitlySelectedTimeSteps, "ExplicitlySelectedTimeSteps", "TimeSteps" ); m_explicitlySelectedTimeSteps.uiCapability()->setUiEditorTypeName( caf::PdmUiListEditor::uiEditorTypeName() ); m_explicitlySelectedTimeSteps.uiCapability()->setUiLabelPosition( caf::PdmUiItemInfo::HIDDEN ); diff --git a/ApplicationLibCode/ProjectDataModel/Annotations/RimAnnotationCollection.cpp b/ApplicationLibCode/ProjectDataModel/Annotations/RimAnnotationCollection.cpp index c97eb9aaa8..3826f74d31 100644 --- a/ApplicationLibCode/ProjectDataModel/Annotations/RimAnnotationCollection.cpp +++ b/ApplicationLibCode/ProjectDataModel/Annotations/RimAnnotationCollection.cpp @@ -43,14 +43,11 @@ RimAnnotationCollection::RimAnnotationCollection() { CAF_PDM_InitObject( "Annotations", ":/Annotations16x16.png", "", "" ); - CAF_PDM_InitFieldNoDefault( &m_reachCircleAnnotations, "ReachCircleAnnotations", "Reach Circle Annotations", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_reachCircleAnnotations, "ReachCircleAnnotations", "Reach Circle Annotations" ); CAF_PDM_InitFieldNoDefault( &m_userDefinedPolylineAnnotations, "UserDefinedPolylineAnnotations", - "User Defined Polyline Annotations", - "", - "", - "" ); - CAF_PDM_InitFieldNoDefault( &m_polylineFromFileAnnotations, "PolylineFromFileAnnotations", "Polylines From File", "", "", "" ); + "User Defined Polyline Annotations" ); + CAF_PDM_InitFieldNoDefault( &m_polylineFromFileAnnotations, "PolylineFromFileAnnotations", "Polylines From File" ); m_reachCircleAnnotations.uiCapability()->setUiTreeHidden( true ); m_userDefinedPolylineAnnotations.uiCapability()->setUiTreeHidden( true ); diff --git a/ApplicationLibCode/ProjectDataModel/Annotations/RimAnnotationCollectionBase.cpp b/ApplicationLibCode/ProjectDataModel/Annotations/RimAnnotationCollectionBase.cpp index 141f9c30b8..448be09074 100644 --- a/ApplicationLibCode/ProjectDataModel/Annotations/RimAnnotationCollectionBase.cpp +++ b/ApplicationLibCode/ProjectDataModel/Annotations/RimAnnotationCollectionBase.cpp @@ -38,10 +38,10 @@ RimAnnotationCollectionBase::RimAnnotationCollectionBase() { CAF_PDM_InitObject( "Annotations", ":/WellCollection.png", "", "" ); - CAF_PDM_InitField( &m_isActive, "IsActive", true, "Is Active", "", "", "" ); + CAF_PDM_InitField( &m_isActive, "IsActive", true, "Is Active" ); m_isActive.uiCapability()->setUiHidden( true ); - CAF_PDM_InitFieldNoDefault( &m_textAnnotations, "TextAnnotations", "Text Annotations", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_textAnnotations, "TextAnnotations", "Text Annotations" ); m_textAnnotations.uiCapability()->setUiTreeHidden( true ); m_textAnnotations = new RimAnnotationGroupCollection(); diff --git a/ApplicationLibCode/ProjectDataModel/Annotations/RimAnnotationGroupCollection.cpp b/ApplicationLibCode/ProjectDataModel/Annotations/RimAnnotationGroupCollection.cpp index 7b261a9d24..85e8786684 100644 --- a/ApplicationLibCode/ProjectDataModel/Annotations/RimAnnotationGroupCollection.cpp +++ b/ApplicationLibCode/ProjectDataModel/Annotations/RimAnnotationGroupCollection.cpp @@ -46,8 +46,8 @@ RimAnnotationGroupCollection::RimAnnotationGroupCollection() { CAF_PDM_InitObject( "Annotations", ":/WellCollection.png", "", "" ); - CAF_PDM_InitField( &m_isActive, "IsActive", true, "Is Active", "", "", "" ); - CAF_PDM_InitFieldNoDefault( &m_annotations, "Annotations", "Annotations", "", "", "" ); + CAF_PDM_InitField( &m_isActive, "IsActive", true, "Is Active" ); + CAF_PDM_InitFieldNoDefault( &m_annotations, "Annotations", "Annotations" ); m_isActive.uiCapability()->setUiHidden( true ); m_annotations.uiCapability()->setUiTreeHidden( true ); diff --git a/ApplicationLibCode/ProjectDataModel/Annotations/RimAnnotationInViewCollection.cpp b/ApplicationLibCode/ProjectDataModel/Annotations/RimAnnotationInViewCollection.cpp index 47229d8f1e..4e403a60fc 100644 --- a/ApplicationLibCode/ProjectDataModel/Annotations/RimAnnotationInViewCollection.cpp +++ b/ApplicationLibCode/ProjectDataModel/Annotations/RimAnnotationInViewCollection.cpp @@ -80,33 +80,24 @@ RimAnnotationInViewCollection::RimAnnotationInViewCollection() { 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", "", "", "" ); + CAF_PDM_InitField( &m_annotationPlaneDepth, "AnnotationPlaneDepth", 0.0, "Annotation Plane Depth" ); + CAF_PDM_InitField( &m_snapAnnotations, "SnapAnnotations", false, "Snap Annotations to Plane" ); m_annotationPlaneDepth.uiCapability()->setUiEditorTypeName( caf::PdmUiDoubleSliderEditor::uiEditorTypeName() ); m_annotationPlaneDepth.uiCapability()->setUiLabelPosition( caf::PdmUiItemInfo::LabelPosType::TOP ); - CAF_PDM_InitFieldNoDefault( &m_globalTextAnnotations, "TextAnnotationsInView", "Global Text Annotations", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_globalTextAnnotations, "TextAnnotationsInView", "Global Text Annotations" ); CAF_PDM_InitFieldNoDefault( &m_globalReachCircleAnnotations, "ReachCircleAnnotationsInView", - "Global Reach Circle Annotations", - "", - "", - "" ); + "Global Reach Circle Annotations" ); CAF_PDM_InitFieldNoDefault( &m_globalUserDefinedPolylineAnnotations, "UserDefinedPolylinesAnnotationsInView", - "Global User Defined Polylines Annotations", - "", - "", - "" ); + "Global User Defined Polylines Annotations" ); CAF_PDM_InitFieldNoDefault( &m_globalPolylineFromFileAnnotations, "PolylinesFromFileAnnotationsInView", - "Global Polylines From File Annotations", - "", - "", - "" ); + "Global Polylines From File Annotations" ); - CAF_PDM_InitFieldNoDefault( &m_annotationFontSize, "AnnotationFontSize", "Default Font Size", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_annotationFontSize, "AnnotationFontSize", "Default Font Size" ); m_globalTextAnnotations.uiCapability()->setUiTreeHidden( true ); m_globalReachCircleAnnotations.uiCapability()->setUiTreeHidden( true ); diff --git a/ApplicationLibCode/ProjectDataModel/Annotations/RimAnnotationLineAppearance.cpp b/ApplicationLibCode/ProjectDataModel/Annotations/RimAnnotationLineAppearance.cpp index 1f3b55dde6..df44ef31cc 100644 --- a/ApplicationLibCode/ProjectDataModel/Annotations/RimAnnotationLineAppearance.cpp +++ b/ApplicationLibCode/ProjectDataModel/Annotations/RimAnnotationLineAppearance.cpp @@ -65,12 +65,12 @@ RimAnnotationLineAppearance::RimAnnotationLineAppearance() { 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", "", "", "" ); - CAF_PDM_InitField( &m_thickness, "Thickness", 2, "Line Thickness", "", "", "" ); + CAF_PDM_InitField( &m_lineFieldsHidden, "LineFieldsHidden", false, "Line Fields Hidden" ); + CAF_PDM_InitField( &m_color, "Color", cvf::Color3f( cvf::Color3f::BLACK ), "Line Color" ); + CAF_PDM_InitField( &m_thickness, "Thickness", 2, "Line Thickness" ); // Stippling not yet supported. Needs new stuff in VizFwk - CAF_PDM_InitField( &m_style, "Style", LineStyle(), "Style", "", "", "" ); + CAF_PDM_InitField( &m_style, "Style", LineStyle(), "Style" ); m_style.uiCapability()->setUiHidden( true ); m_style.xmlCapability()->disableIO(); @@ -172,9 +172,9 @@ RimPolylineAppearance::RimPolylineAppearance() { 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", "", "", "" ); - CAF_PDM_InitField( &m_sphereRadiusFactor, "SphereRadiusFactor", 0.1, "Sphere Radius Factor", "", "", "" ); + CAF_PDM_InitField( &m_sphereFieldsHidden, "SphereFieldsHidden", false, "Sphere Fields Hidden" ); + CAF_PDM_InitField( &m_sphereColor, "SphereColor", cvf::Color3f( cvf::Color3f::BLACK ), "Sphere Color" ); + CAF_PDM_InitField( &m_sphereRadiusFactor, "SphereRadiusFactor", 0.1, "Sphere Radius Factor" ); m_sphereFieldsHidden.uiCapability()->setUiHidden( true ); } diff --git a/ApplicationLibCode/ProjectDataModel/Annotations/RimAnnotationTextAppearance.cpp b/ApplicationLibCode/ProjectDataModel/Annotations/RimAnnotationTextAppearance.cpp index 3e1fa1514c..5f68d5a5f8 100644 --- a/ApplicationLibCode/ProjectDataModel/Annotations/RimAnnotationTextAppearance.cpp +++ b/ApplicationLibCode/ProjectDataModel/Annotations/RimAnnotationTextAppearance.cpp @@ -35,11 +35,11 @@ RimAnnotationTextAppearance::RimAnnotationTextAppearance() auto prefs = RiaPreferences::current(); auto defaultBackgroundColor = prefs->defaultViewerBackgroundColor(); - CAF_PDM_InitFieldNoDefault( &m_fontSize, "FontSize", "Font Size", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_fontSize, "FontSize", "Font Size" ); m_fontSize = prefs->defaultAnnotationFontSize(); - 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_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 ), diff --git a/ApplicationLibCode/ProjectDataModel/Annotations/RimPolylineTarget.cpp b/ApplicationLibCode/ProjectDataModel/Annotations/RimPolylineTarget.cpp index 435d332b39..113e6b9853 100644 --- a/ApplicationLibCode/ProjectDataModel/Annotations/RimPolylineTarget.cpp +++ b/ApplicationLibCode/ProjectDataModel/Annotations/RimPolylineTarget.cpp @@ -31,8 +31,8 @@ CAF_PDM_SOURCE_INIT( RimPolylineTarget, "PolylineTarget" ); RimPolylineTarget::RimPolylineTarget() : m_isFullUpdateEnabled( true ) { - CAF_PDM_InitField( &m_isEnabled, "IsEnabled", true, "", "", "", "" ); - CAF_PDM_InitFieldNoDefault( &m_targetPointXyd, "TargetPointXyd", "Point", "", "", "" ); + CAF_PDM_InitField( &m_isEnabled, "IsEnabled", true, "" ); + CAF_PDM_InitFieldNoDefault( &m_targetPointXyd, "TargetPointXyd", "Point" ); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/ProjectDataModel/Annotations/RimPolylinesAnnotation.cpp b/ApplicationLibCode/ProjectDataModel/Annotations/RimPolylinesAnnotation.cpp index 5287b7bcf3..37ef0c6e59 100644 --- a/ApplicationLibCode/ProjectDataModel/Annotations/RimPolylinesAnnotation.cpp +++ b/ApplicationLibCode/ProjectDataModel/Annotations/RimPolylinesAnnotation.cpp @@ -37,14 +37,14 @@ RimPolylinesAnnotation::RimPolylinesAnnotation() { CAF_PDM_InitObject( "PolylineAnnotation", ":/WellCollection.png", "", "" ); - CAF_PDM_InitField( &m_isActive, "IsActive", true, "Is Active", "", "", "" ); + CAF_PDM_InitField( &m_isActive, "IsActive", true, "Is Active" ); m_isActive.uiCapability()->setUiHidden( true ); - CAF_PDM_InitField( &m_closePolyline, "ClosePolyline", false, "Close Polyline", "", "", "" ); - CAF_PDM_InitField( &m_showLines, "ShowLines", true, "Show Lines", "", "", "" ); - CAF_PDM_InitField( &m_showSpheres, "ShowSpheres", false, "Show Spheres", "", "", "" ); + CAF_PDM_InitField( &m_closePolyline, "ClosePolyline", false, "Close Polyline" ); + CAF_PDM_InitField( &m_showLines, "ShowLines", true, "Show Lines" ); + CAF_PDM_InitField( &m_showSpheres, "ShowSpheres", false, "Show Spheres" ); - CAF_PDM_InitFieldNoDefault( &m_appearance, "Appearance", "Appearance", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_appearance, "Appearance", "Appearance" ); m_appearance = new RimPolylineAppearance(); m_appearance.uiCapability()->setUiTreeHidden( true ); diff --git a/ApplicationLibCode/ProjectDataModel/Annotations/RimPolylinesAnnotationInView.cpp b/ApplicationLibCode/ProjectDataModel/Annotations/RimPolylinesAnnotationInView.cpp index a2dda86312..0a402a10d4 100644 --- a/ApplicationLibCode/ProjectDataModel/Annotations/RimPolylinesAnnotationInView.cpp +++ b/ApplicationLibCode/ProjectDataModel/Annotations/RimPolylinesAnnotationInView.cpp @@ -33,8 +33,8 @@ RimPolylinesAnnotationInView::RimPolylinesAnnotationInView() { CAF_PDM_InitObject( "PolyLinesAnnotationInView", ":/WellCollection.png", "", "" ); - CAF_PDM_InitField( &m_isActive, "IsActive", true, "Is Active", "", "", "" ); - CAF_PDM_InitFieldNoDefault( &m_sourceAnnotation, "SourceAnnotation", "Source Annotation", "", "", "" ); + CAF_PDM_InitField( &m_isActive, "IsActive", true, "Is Active" ); + CAF_PDM_InitFieldNoDefault( &m_sourceAnnotation, "SourceAnnotation", "Source Annotation" ); m_isActive.uiCapability()->setUiHidden( true ); m_sourceAnnotation.uiCapability()->setUiHidden( true ); diff --git a/ApplicationLibCode/ProjectDataModel/Annotations/RimPolylinesFromFileAnnotation.cpp b/ApplicationLibCode/ProjectDataModel/Annotations/RimPolylinesFromFileAnnotation.cpp index 9c35c70fa7..93adb202b7 100644 --- a/ApplicationLibCode/ProjectDataModel/Annotations/RimPolylinesFromFileAnnotation.cpp +++ b/ApplicationLibCode/ProjectDataModel/Annotations/RimPolylinesFromFileAnnotation.cpp @@ -37,8 +37,8 @@ RimPolylinesFromFileAnnotation::RimPolylinesFromFileAnnotation() { CAF_PDM_InitObject( "PolyLines Annotation", ":/PolylinesFromFile16x16.png", "", "" ); - CAF_PDM_InitFieldNoDefault( &m_polyLinesFileName, "PolyLineFilePath", "File", "", "", "" ); - CAF_PDM_InitField( &m_userDescription, "PolyLineDescription", QString( "" ), "Name", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_polyLinesFileName, "PolyLineFilePath", "File" ); + CAF_PDM_InitField( &m_userDescription, "PolyLineDescription", QString( "" ), "Name" ); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/ProjectDataModel/Annotations/RimReachCircleAnnotation.cpp b/ApplicationLibCode/ProjectDataModel/Annotations/RimReachCircleAnnotation.cpp index eb648d7191..0858df0128 100644 --- a/ApplicationLibCode/ProjectDataModel/Annotations/RimReachCircleAnnotation.cpp +++ b/ApplicationLibCode/ProjectDataModel/Annotations/RimReachCircleAnnotation.cpp @@ -38,19 +38,19 @@ RimReachCircleAnnotation::RimReachCircleAnnotation() { CAF_PDM_InitObject( "CircleAnnotation", ":/ReachCircle16x16.png", "", "" ); - CAF_PDM_InitField( &m_isActive, "IsActive", true, "Is Active", "", "", "" ); + CAF_PDM_InitField( &m_isActive, "IsActive", true, "Is Active" ); m_isActive.uiCapability()->setUiHidden( true ); - CAF_PDM_InitField( &m_centerPointXyd, "CenterPointXyd", Vec3d::ZERO, "Center Point", "", "", "" ); + CAF_PDM_InitField( &m_centerPointXyd, "CenterPointXyd", Vec3d::ZERO, "Center Point" ); m_centerPointXyd.uiCapability()->setUiEditorTypeName( caf::PdmUiPickableLineEditor::uiEditorTypeName() ); - CAF_PDM_InitField( &m_centerPointPickEnabled, "AnchorPointPick", false, "", "", "", "" ); + CAF_PDM_InitField( &m_centerPointPickEnabled, "AnchorPointPick", false, "" ); caf::PdmUiPushButtonEditor::configureEditorForField( &m_centerPointPickEnabled ); m_centerPointPickEnabled.uiCapability()->setUiLabelPosition( caf::PdmUiItemInfo::LabelPosType::HIDDEN ); - CAF_PDM_InitField( &m_radius, "Radius", 100.0, "Radius", "", "", "" ); - CAF_PDM_InitField( &m_name, "Name", QString( "Circle Annotation" ), "Name", "", "", "" ); + CAF_PDM_InitField( &m_radius, "Radius", 100.0, "Radius" ); + CAF_PDM_InitField( &m_name, "Name", QString( "Circle Annotation" ), "Name" ); - CAF_PDM_InitFieldNoDefault( &m_appearance, "Appearance", "Appearance", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_appearance, "Appearance", "Appearance" ); m_appearance = new RimReachCircleLineAppearance(); m_appearance.uiCapability()->setUiTreeHidden( true ); diff --git a/ApplicationLibCode/ProjectDataModel/Annotations/RimReachCircleAnnotationInView.cpp b/ApplicationLibCode/ProjectDataModel/Annotations/RimReachCircleAnnotationInView.cpp index ec8f49c0cd..16c83c6345 100644 --- a/ApplicationLibCode/ProjectDataModel/Annotations/RimReachCircleAnnotationInView.cpp +++ b/ApplicationLibCode/ProjectDataModel/Annotations/RimReachCircleAnnotationInView.cpp @@ -30,8 +30,8 @@ RimReachCircleAnnotationInView::RimReachCircleAnnotationInView() { CAF_PDM_InitObject( "ReachCircleAnnotationInView", ":/ReachCircle16x16.png", "", "" ); - CAF_PDM_InitField( &m_isActive, "IsActive", true, "Is Active", "", "", "" ); - CAF_PDM_InitFieldNoDefault( &m_sourceAnnotation, "SourceAnnotation", "Source Annotation", "", "", "" ); + CAF_PDM_InitField( &m_isActive, "IsActive", true, "Is Active" ); + CAF_PDM_InitFieldNoDefault( &m_sourceAnnotation, "SourceAnnotation", "Source Annotation" ); m_isActive.uiCapability()->setUiHidden( true ); m_sourceAnnotation.uiCapability()->setUiHidden( true ); diff --git a/ApplicationLibCode/ProjectDataModel/Annotations/RimTextAnnotation.cpp b/ApplicationLibCode/ProjectDataModel/Annotations/RimTextAnnotation.cpp index 4912c4b77c..e227e25c2d 100644 --- a/ApplicationLibCode/ProjectDataModel/Annotations/RimTextAnnotation.cpp +++ b/ApplicationLibCode/ProjectDataModel/Annotations/RimTextAnnotation.cpp @@ -47,30 +47,30 @@ RimTextAnnotation::RimTextAnnotation() CAF_PDM_InitObject( "TextAnnotation", ":/TextAnnotation16x16.png", "", "" ); this->setUi3dEditorTypeName( RicTextAnnotation3dEditor::uiEditorTypeName() ); - CAF_PDM_InitField( &m_anchorPointXyd, "AnchorPointXyd", Vec3d::ZERO, "Anchor Point", "", "", "" ); + CAF_PDM_InitField( &m_anchorPointXyd, "AnchorPointXyd", Vec3d::ZERO, "Anchor Point" ); m_anchorPointXyd.uiCapability()->setUiEditorTypeName( caf::PdmUiPickableLineEditor::uiEditorTypeName() ); - CAF_PDM_InitField( &m_anchorPointPickEnabledButtonField, "AnchorPointPick", false, "", "", "", "" ); + CAF_PDM_InitField( &m_anchorPointPickEnabledButtonField, "AnchorPointPick", false, "" ); caf::PdmUiPushButtonEditor::configureEditorForField( &m_anchorPointPickEnabledButtonField ); m_anchorPointPickEnabledButtonField.uiCapability()->setUiLabelPosition( caf::PdmUiItemInfo::LabelPosType::HIDDEN ); - CAF_PDM_InitField( &m_labelPointXyd, "LabelPointXyd", Vec3d::ZERO, "Label Point", "", "", "" ); + CAF_PDM_InitField( &m_labelPointXyd, "LabelPointXyd", Vec3d::ZERO, "Label Point" ); m_labelPointXyd.uiCapability()->setUiEditorTypeName( caf::PdmUiPickableLineEditor::uiEditorTypeName() ); - CAF_PDM_InitField( &m_labelPointPickEnabledButtonField, "LabelPointPick", false, "", "", "", "" ); + CAF_PDM_InitField( &m_labelPointPickEnabledButtonField, "LabelPointPick", false, "" ); caf::PdmUiPushButtonEditor::configureEditorForField( &m_labelPointPickEnabledButtonField ); m_labelPointPickEnabledButtonField.uiCapability()->setUiLabelPosition( caf::PdmUiItemInfo::LabelPosType::HIDDEN ); - CAF_PDM_InitField( &m_text, "Text", QString( "(New text)" ), "Text", "", "", "" ); + CAF_PDM_InitField( &m_text, "Text", QString( "(New text)" ), "Text" ); m_text.uiCapability()->setUiEditorTypeName( caf::PdmUiTextEditor::uiEditorTypeName() ); - CAF_PDM_InitField( &m_isActive, "IsActive", true, "Is Active", "", "", "" ); + CAF_PDM_InitField( &m_isActive, "IsActive", true, "Is Active" ); m_isActive.uiCapability()->setUiHidden( true ); - CAF_PDM_InitFieldNoDefault( &m_textAppearance, "TextAppearance", "Text Appearance", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_textAppearance, "TextAppearance", "Text Appearance" ); m_textAppearance = new RimAnnotationTextAppearance(); m_textAppearance.uiCapability()->setUiTreeHidden( true ); m_textAppearance.uiCapability()->setUiTreeChildrenHidden( true ); - CAF_PDM_InitFieldNoDefault( &m_nameProxy, "NameProxy", "Name Proxy", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_nameProxy, "NameProxy", "Name Proxy" ); m_nameProxy.registerGetMethod( this, &RimTextAnnotation::extractNameFromText ); m_nameProxy.uiCapability()->setUiReadOnly( true ); m_nameProxy.xmlCapability()->disableIO(); diff --git a/ApplicationLibCode/ProjectDataModel/Annotations/RimTextAnnotationInView.cpp b/ApplicationLibCode/ProjectDataModel/Annotations/RimTextAnnotationInView.cpp index 3b8f6a80e8..1a44f5406e 100644 --- a/ApplicationLibCode/ProjectDataModel/Annotations/RimTextAnnotationInView.cpp +++ b/ApplicationLibCode/ProjectDataModel/Annotations/RimTextAnnotationInView.cpp @@ -30,8 +30,8 @@ RimTextAnnotationInView::RimTextAnnotationInView() { CAF_PDM_InitObject( "TextAnnotationInView", ":/TextAnnotation16x16.png", "", "" ); - CAF_PDM_InitField( &m_isActive, "IsActive", true, "Is Active", "", "", "" ); - CAF_PDM_InitFieldNoDefault( &m_sourceAnnotation, "SourceAnnotation", "Source Annotation", "", "", "" ); + CAF_PDM_InitField( &m_isActive, "IsActive", true, "Is Active" ); + CAF_PDM_InitFieldNoDefault( &m_sourceAnnotation, "SourceAnnotation", "Source Annotation" ); m_isActive.uiCapability()->setUiHidden( true ); m_sourceAnnotation.uiCapability()->setUiHidden( true ); diff --git a/ApplicationLibCode/ProjectDataModel/Annotations/RimUserDefinedPolylinesAnnotation.cpp b/ApplicationLibCode/ProjectDataModel/Annotations/RimUserDefinedPolylinesAnnotation.cpp index 4b32332d56..c3e2e63e37 100644 --- a/ApplicationLibCode/ProjectDataModel/Annotations/RimUserDefinedPolylinesAnnotation.cpp +++ b/ApplicationLibCode/ProjectDataModel/Annotations/RimUserDefinedPolylinesAnnotation.cpp @@ -46,13 +46,13 @@ RimUserDefinedPolylinesAnnotation::RimUserDefinedPolylinesAnnotation() { CAF_PDM_InitObject( "PolyLines Annotation", ":/PolylinesFromFile16x16.png", "", "" ); - CAF_PDM_InitField( &m_name, "Name", QString( "User Defined Polyline" ), "Name", "", "", "" ); + CAF_PDM_InitField( &m_name, "Name", QString( "User Defined Polyline" ), "Name" ); - CAF_PDM_InitField( &m_enablePicking, "EnablePicking", false, "", "", "", "" ); + CAF_PDM_InitField( &m_enablePicking, "EnablePicking", false, "" ); caf::PdmUiPushButtonEditor::configureEditorForField( &m_enablePicking ); m_enablePicking.uiCapability()->setUiLabelPosition( caf::PdmUiItemInfo::LabelPosType::HIDDEN ); - CAF_PDM_InitFieldNoDefault( &m_targets, "Targets", "Targets", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_targets, "Targets", "Targets" ); m_targets.uiCapability()->setUiEditorTypeName( caf::PdmUiTableViewEditor::uiEditorTypeName() ); // m_targets.uiCapability()->setUiTreeHidden(true); m_targets.uiCapability()->setUiTreeChildrenHidden( true ); diff --git a/ApplicationLibCode/ProjectDataModel/CellFilters/RimCellFilter.cpp b/ApplicationLibCode/ProjectDataModel/CellFilters/RimCellFilter.cpp index d213bd93a7..6233f1fe2b 100644 --- a/ApplicationLibCode/ProjectDataModel/CellFilters/RimCellFilter.cpp +++ b/ApplicationLibCode/ProjectDataModel/CellFilters/RimCellFilter.cpp @@ -45,18 +45,18 @@ CAF_PDM_XML_ABSTRACT_SOURCE_INIT( RimCellFilter, "CellFilter", "CellFilter" ); / RimCellFilter::RimCellFilter() : filterChanged( this ) { - CAF_PDM_InitObject( "Cell Filter", "", "", "" ); + CAF_PDM_InitObject( "Cell Filter" ); - CAF_PDM_InitField( &m_name, "UserDescription", QString( "New filter" ), "Name", "", "", "" ); - CAF_PDM_InitField( &m_isActive, "Active", true, "Active", "", "", "" ); + CAF_PDM_InitField( &m_name, "UserDescription", QString( "New filter" ), "Name" ); + CAF_PDM_InitField( &m_isActive, "Active", true, "Active" ); m_isActive.uiCapability()->setUiHidden( true ); - CAF_PDM_InitFieldNoDefault( &m_filterMode, "FilterType", "Filter Type", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_filterMode, "FilterType", "Filter Type" ); - CAF_PDM_InitField( &m_gridIndex, "GridIndex", 0, "Grid", "", "", "" ); - CAF_PDM_InitField( &m_propagateToSubGrids, "PropagateToSubGrids", true, "Apply to Subgrids", "", "", "" ); + CAF_PDM_InitField( &m_gridIndex, "GridIndex", 0, "Grid" ); + CAF_PDM_InitField( &m_propagateToSubGrids, "PropagateToSubGrids", true, "Apply to Subgrids" ); - CAF_PDM_InitFieldNoDefault( &m_nameProxy, "NameProxy", "Name Proxy", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_nameProxy, "NameProxy", "Name Proxy" ); m_nameProxy.registerGetMethod( this, &RimCellFilter::fullName ); m_nameProxy.uiCapability()->setUiReadOnly( true ); m_nameProxy.uiCapability()->setUiHidden( true ); diff --git a/ApplicationLibCode/ProjectDataModel/CellFilters/RimCellFilterCollection.cpp b/ApplicationLibCode/ProjectDataModel/CellFilters/RimCellFilterCollection.cpp index bd6f7a7852..de507eec56 100644 --- a/ApplicationLibCode/ProjectDataModel/CellFilters/RimCellFilterCollection.cpp +++ b/ApplicationLibCode/ProjectDataModel/CellFilters/RimCellFilterCollection.cpp @@ -41,15 +41,15 @@ RimCellFilterCollection::RimCellFilterCollection() { CAF_PDM_InitScriptableObject( "Cell Filters", ":/CellFilter.png", "", "" ); - CAF_PDM_InitScriptableField( &m_isActive, "Active", true, "Active", "", "", "" ); + CAF_PDM_InitScriptableField( &m_isActive, "Active", true, "Active" ); m_isActive.uiCapability()->setUiHidden( true ); - CAF_PDM_InitFieldNoDefault( &m_cellFilters, "CellFilters", "Filters", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_cellFilters, "CellFilters", "Filters" ); m_cellFilters.uiCapability()->setUiTreeHidden( true ); caf::PdmFieldReorderCapability::addToField( &m_cellFilters ); // for backwards project file compatibility with old CellRangeFilterCollection - CAF_PDM_InitFieldNoDefault( &m_rangeFilters_OBSOLETE, "RangeFilters", "Range Filters", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_rangeFilters_OBSOLETE, "RangeFilters", "Range Filters" ); m_rangeFilters_OBSOLETE.uiCapability()->setUiTreeHidden( true ); m_rangeFilters_OBSOLETE.xmlCapability()->setIOWritable( false ); } diff --git a/ApplicationLibCode/ProjectDataModel/CellFilters/RimCellRangeFilter.cpp b/ApplicationLibCode/ProjectDataModel/CellFilters/RimCellRangeFilter.cpp index daa3bbecb5..5e3fc5bb4e 100644 --- a/ApplicationLibCode/ProjectDataModel/CellFilters/RimCellRangeFilter.cpp +++ b/ApplicationLibCode/ProjectDataModel/CellFilters/RimCellRangeFilter.cpp @@ -40,22 +40,22 @@ RimCellRangeFilter::RimCellRangeFilter() { CAF_PDM_InitObject( "Cell Range Filter", ":/CellFilter_Range.png", "", "" ); - CAF_PDM_InitField( &startIndexI, "StartIndexI", 1, "Start Index I", "", "", "" ); + CAF_PDM_InitField( &startIndexI, "StartIndexI", 1, "Start Index I" ); startIndexI.uiCapability()->setUiEditorTypeName( caf::PdmUiSliderEditor::uiEditorTypeName() ); - CAF_PDM_InitField( &cellCountI, "CellCountI", 1, "Cell Count I", "", "", "" ); + CAF_PDM_InitField( &cellCountI, "CellCountI", 1, "Cell Count I" ); cellCountI.uiCapability()->setUiEditorTypeName( caf::PdmUiSliderEditor::uiEditorTypeName() ); - CAF_PDM_InitField( &startIndexJ, "StartIndexJ", 1, "Start Index J", "", "", "" ); + CAF_PDM_InitField( &startIndexJ, "StartIndexJ", 1, "Start Index J" ); startIndexJ.uiCapability()->setUiEditorTypeName( caf::PdmUiSliderEditor::uiEditorTypeName() ); - CAF_PDM_InitField( &cellCountJ, "CellCountJ", 1, "Cell Count J", "", "", "" ); + CAF_PDM_InitField( &cellCountJ, "CellCountJ", 1, "Cell Count J" ); cellCountJ.uiCapability()->setUiEditorTypeName( caf::PdmUiSliderEditor::uiEditorTypeName() ); - CAF_PDM_InitField( &startIndexK, "StartIndexK", 1, "Start Index K", "", "", "" ); + CAF_PDM_InitField( &startIndexK, "StartIndexK", 1, "Start Index K" ); startIndexK.uiCapability()->setUiEditorTypeName( caf::PdmUiSliderEditor::uiEditorTypeName() ); - CAF_PDM_InitField( &cellCountK, "CellCountK", 1, "Cell Count K", "", "", "" ); + CAF_PDM_InitField( &cellCountK, "CellCountK", 1, "Cell Count K" ); cellCountK.uiCapability()->setUiEditorTypeName( caf::PdmUiSliderEditor::uiEditorTypeName() ); m_propagateToSubGrids = true; diff --git a/ApplicationLibCode/ProjectDataModel/CellFilters/RimEclipsePropertyFilter.cpp b/ApplicationLibCode/ProjectDataModel/CellFilters/RimEclipsePropertyFilter.cpp index 6cc4919c72..81c72fe6fe 100644 --- a/ApplicationLibCode/ProjectDataModel/CellFilters/RimEclipsePropertyFilter.cpp +++ b/ApplicationLibCode/ProjectDataModel/CellFilters/RimEclipsePropertyFilter.cpp @@ -54,7 +54,7 @@ RimEclipsePropertyFilter::RimEclipsePropertyFilter() { CAF_PDM_InitObject( "Cell Property Filter", ":/CellFilter_Values.png", "", "" ); - CAF_PDM_InitFieldNoDefault( &m_resultDefinition, "ResultDefinition", "Result Definition", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_resultDefinition, "ResultDefinition", "Result Definition" ); m_resultDefinition = new RimEclipseResultDefinition(); m_resultDefinition->enableDeltaResults( true ); @@ -63,17 +63,17 @@ RimEclipsePropertyFilter::RimEclipsePropertyFilter() m_resultDefinition.uiCapability()->setUiTreeHidden( true ); m_resultDefinition.uiCapability()->setUiTreeChildrenHidden( true ); - CAF_PDM_InitField( &m_rangeLabelText, "Dummy_keyword", QString( "Range Type" ), "Range Type", "", "", "" ); + CAF_PDM_InitField( &m_rangeLabelText, "Dummy_keyword", QString( "Range Type" ), "Range Type" ); m_rangeLabelText.xmlCapability()->disableIO(); m_rangeLabelText.uiCapability()->setUiReadOnly( true ); - CAF_PDM_InitField( &m_lowerBound, "LowerBound", 0.0, "Min", "", "", "" ); + CAF_PDM_InitField( &m_lowerBound, "LowerBound", 0.0, "Min" ); m_lowerBound.uiCapability()->setUiEditorTypeName( caf::PdmUiDoubleSliderEditor::uiEditorTypeName() ); - CAF_PDM_InitField( &m_upperBound, "UpperBound", 0.0, "Max", "", "", "" ); + CAF_PDM_InitField( &m_upperBound, "UpperBound", 0.0, "Max" ); m_upperBound.uiCapability()->setUiEditorTypeName( caf::PdmUiDoubleSliderEditor::uiEditorTypeName() ); - CAF_PDM_InitField( &m_useCategorySelection, "CategorySelection", false, "Category Selection", "", "", "" ); + CAF_PDM_InitField( &m_useCategorySelection, "CategorySelection", false, "Category Selection" ); m_upperBound.uiCapability()->setUiEditorTypeName( caf::PdmUiDoubleSliderEditor::uiEditorTypeName() ); // HEADLESS HACK diff --git a/ApplicationLibCode/ProjectDataModel/CellFilters/RimEclipsePropertyFilterCollection.cpp b/ApplicationLibCode/ProjectDataModel/CellFilters/RimEclipsePropertyFilterCollection.cpp index abc71541b2..db2c9f319b 100644 --- a/ApplicationLibCode/ProjectDataModel/CellFilters/RimEclipsePropertyFilterCollection.cpp +++ b/ApplicationLibCode/ProjectDataModel/CellFilters/RimEclipsePropertyFilterCollection.cpp @@ -38,7 +38,7 @@ RimEclipsePropertyFilterCollection::RimEclipsePropertyFilterCollection() { CAF_PDM_InitObject( "Property Filters", ":/CellFilter_Values.png", "", "" ); - CAF_PDM_InitFieldNoDefault( &propertyFilters, "PropertyFilters", "Property Filters", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &propertyFilters, "PropertyFilters", "Property Filters" ); propertyFilters.uiCapability()->setUiTreeHidden( true ); } diff --git a/ApplicationLibCode/ProjectDataModel/CellFilters/RimGeoMechPropertyFilter.cpp b/ApplicationLibCode/ProjectDataModel/CellFilters/RimGeoMechPropertyFilter.cpp index 1158810d24..579fddc105 100644 --- a/ApplicationLibCode/ProjectDataModel/CellFilters/RimGeoMechPropertyFilter.cpp +++ b/ApplicationLibCode/ProjectDataModel/CellFilters/RimGeoMechPropertyFilter.cpp @@ -44,7 +44,7 @@ RimGeoMechPropertyFilter::RimGeoMechPropertyFilter() { CAF_PDM_InitObject( "Property Filter", ":/CellFilter_Values.png", "", "" ); - CAF_PDM_InitFieldNoDefault( &resultDefinition, "ResultDefinition", "Result Definition", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &resultDefinition, "ResultDefinition", "Result Definition" ); resultDefinition = new RimGeoMechResultDefinition(); // Set to hidden to avoid this item to been displayed as a child item @@ -52,10 +52,10 @@ RimGeoMechPropertyFilter::RimGeoMechPropertyFilter() resultDefinition.uiCapability()->setUiTreeHidden( true ); resultDefinition.uiCapability()->setUiTreeChildrenHidden( true ); - CAF_PDM_InitField( &lowerBound, "LowerBound", 0.0, "Min", "", "", "" ); + CAF_PDM_InitField( &lowerBound, "LowerBound", 0.0, "Min" ); lowerBound.uiCapability()->setUiEditorTypeName( caf::PdmUiDoubleSliderEditor::uiEditorTypeName() ); - CAF_PDM_InitField( &upperBound, "UpperBound", 0.0, "Max", "", "", "" ); + CAF_PDM_InitField( &upperBound, "UpperBound", 0.0, "Max" ); upperBound.uiCapability()->setUiEditorTypeName( caf::PdmUiDoubleSliderEditor::uiEditorTypeName() ); updateIconState(); diff --git a/ApplicationLibCode/ProjectDataModel/CellFilters/RimGeoMechPropertyFilterCollection.cpp b/ApplicationLibCode/ProjectDataModel/CellFilters/RimGeoMechPropertyFilterCollection.cpp index a1ae588e36..25a0454096 100644 --- a/ApplicationLibCode/ProjectDataModel/CellFilters/RimGeoMechPropertyFilterCollection.cpp +++ b/ApplicationLibCode/ProjectDataModel/CellFilters/RimGeoMechPropertyFilterCollection.cpp @@ -36,7 +36,7 @@ RimGeoMechPropertyFilterCollection::RimGeoMechPropertyFilterCollection() { CAF_PDM_InitObject( "Property Filters", ":/CellFilter_Values.png", "", "" ); - CAF_PDM_InitFieldNoDefault( &propertyFilters, "PropertyFilters", "Property Filters", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &propertyFilters, "PropertyFilters", "Property Filters" ); propertyFilters.uiCapability()->setUiTreeHidden( true ); } diff --git a/ApplicationLibCode/ProjectDataModel/CellFilters/RimPolygonFilter.cpp b/ApplicationLibCode/ProjectDataModel/CellFilters/RimPolygonFilter.cpp index baf82305aa..ca7b27ce9a 100644 --- a/ApplicationLibCode/ProjectDataModel/CellFilters/RimPolygonFilter.cpp +++ b/ApplicationLibCode/ProjectDataModel/CellFilters/RimPolygonFilter.cpp @@ -122,39 +122,39 @@ RimPolygonFilter::RimPolygonFilter() { CAF_PDM_InitObject( "Polyline Filter", ":/CellFilter_Polygon.png", "", "" ); - CAF_PDM_InitFieldNoDefault( &m_polyFilterMode, "PolygonFilterType", "Vertical Filter", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_polyFilterMode, "PolygonFilterType", "Vertical Filter" ); - CAF_PDM_InitFieldNoDefault( &m_polyIncludeType, "PolyIncludeType", "Cells to include", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_polyIncludeType, "PolyIncludeType", "Cells to include" ); - CAF_PDM_InitField( &m_enablePicking, "EnablePicking", false, "", "", "", "" ); + CAF_PDM_InitField( &m_enablePicking, "EnablePicking", false, "" ); caf::PdmUiPushButtonEditor::configureEditorForField( &m_enablePicking ); m_enablePicking.uiCapability()->setUiLabelPosition( caf::PdmUiItemInfo::LabelPosType::HIDDEN ); - CAF_PDM_InitFieldNoDefault( &m_targets, "Targets", "Targets", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_targets, "Targets", "Targets" ); m_targets.uiCapability()->setUiEditorTypeName( caf::PdmUiTableViewEditor::uiEditorTypeName() ); m_targets.uiCapability()->setUiTreeChildrenHidden( true ); m_targets.uiCapability()->setUiLabelPosition( caf::PdmUiItemInfo::TOP ); m_targets.uiCapability()->setCustomContextMenuEnabled( true ); - CAF_PDM_InitFieldNoDefault( &m_srcCase, "Case", "Case", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_srcCase, "Case", "Case" ); m_srcCase.uiCapability()->setUiHidden( true ); - CAF_PDM_InitField( &m_showLines, "ShowLines", true, "Show Lines", "", "", "" ); - CAF_PDM_InitField( &m_showSpheres, "ShowSpheres", false, "Show Spheres", "", "", "" ); + CAF_PDM_InitField( &m_showLines, "ShowLines", true, "Show Lines" ); + CAF_PDM_InitField( &m_showSpheres, "ShowSpheres", false, "Show Spheres" ); - CAF_PDM_InitField( &m_lineThickness, "LineThickness", 3, "Line Thickness", "", "", "" ); - CAF_PDM_InitField( &m_sphereRadiusFactor, "SphereRadiusFactor", 0.15, "Sphere Radius Factor", "", "", "" ); + CAF_PDM_InitField( &m_lineThickness, "LineThickness", 3, "Line Thickness" ); + CAF_PDM_InitField( &m_sphereRadiusFactor, "SphereRadiusFactor", 0.15, "Sphere Radius Factor" ); - CAF_PDM_InitField( &m_lineColor, "LineColor", cvf::Color3f( cvf::Color3f::WHITE ), "Line Color", "", "", "" ); - CAF_PDM_InitField( &m_sphereColor, "SphereColor", cvf::Color3f( cvf::Color3f::WHITE ), "Sphere Color", "", "", "" ); + CAF_PDM_InitField( &m_lineColor, "LineColor", cvf::Color3f( cvf::Color3f::WHITE ), "Line Color" ); + CAF_PDM_InitField( &m_sphereColor, "SphereColor", cvf::Color3f( cvf::Color3f::WHITE ), "Sphere Color" ); - CAF_PDM_InitField( &m_enableFiltering, "EnableFiltering", false, "Enable Filter", "", "", "" ); + CAF_PDM_InitField( &m_enableFiltering, "EnableFiltering", false, "Enable Filter" ); - CAF_PDM_InitField( &m_enableKFilter, "EnableKFilter", false, "Enable K Range Filter", "", "", "" ); + CAF_PDM_InitField( &m_enableKFilter, "EnableKFilter", false, "Enable K Range Filter" ); CAF_PDM_InitFieldNoDefault( &m_kFilterStr, "KRangeFilter", "K Range Filter", "", "Example: 2,4,10-20,31", "" ); - CAF_PDM_InitField( &m_polygonPlaneDepth, "PolygonPlaneDepth", 0.0, "Polygon Plane Depth", "", "", "" ); - CAF_PDM_InitField( &m_lockPolygonToPlane, "LockPolygon", false, "Lock Polygon to Plane", "", "", "" ); + CAF_PDM_InitField( &m_polygonPlaneDepth, "PolygonPlaneDepth", 0.0, "Polygon Plane Depth" ); + CAF_PDM_InitField( &m_lockPolygonToPlane, "LockPolygon", false, "Lock Polygon to Plane" ); m_polygonPlaneDepth.uiCapability()->setUiEditorTypeName( caf::PdmUiDoubleSliderEditor::uiEditorTypeName() ); m_polygonPlaneDepth.uiCapability()->setUiLabelPosition( caf::PdmUiItemInfo::LabelPosType::TOP ); diff --git a/ApplicationLibCode/ProjectDataModel/CellFilters/RimPropertyFilter.cpp b/ApplicationLibCode/ProjectDataModel/CellFilters/RimPropertyFilter.cpp index 1e1bcfb088..57301f0d93 100644 --- a/ApplicationLibCode/ProjectDataModel/CellFilters/RimPropertyFilter.cpp +++ b/ApplicationLibCode/ProjectDataModel/CellFilters/RimPropertyFilter.cpp @@ -27,9 +27,9 @@ CAF_PDM_SOURCE_INIT( RimPropertyFilter, "PropertyFilter" ); //-------------------------------------------------------------------------------------------------- RimPropertyFilter::RimPropertyFilter() { - CAF_PDM_InitObject( "Property Filter", "", "", "" ); + CAF_PDM_InitObject( "Property Filter" ); - CAF_PDM_InitFieldNoDefault( &m_selectedCategoryValues, "SelectedValues", "Values", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_selectedCategoryValues, "SelectedValues", "Values" ); setDeletable( true ); } diff --git a/ApplicationLibCode/ProjectDataModel/CellFilters/RimPropertyFilterCollection.cpp b/ApplicationLibCode/ProjectDataModel/CellFilters/RimPropertyFilterCollection.cpp index f490c86292..4dd78b44c4 100644 --- a/ApplicationLibCode/ProjectDataModel/CellFilters/RimPropertyFilterCollection.cpp +++ b/ApplicationLibCode/ProjectDataModel/CellFilters/RimPropertyFilterCollection.cpp @@ -30,7 +30,7 @@ CAF_PDM_XML_ABSTRACT_SOURCE_INIT( RimPropertyFilterCollection, "RimPropertyFilte //-------------------------------------------------------------------------------------------------- RimPropertyFilterCollection::RimPropertyFilterCollection() { - CAF_PDM_InitField( &isActive, "Active", true, "Active", "", "", "" ); + CAF_PDM_InitField( &isActive, "Active", true, "Active" ); isActive.uiCapability()->setUiHidden( true ); } diff --git a/ApplicationLibCode/ProjectDataModel/Completions/Rim3dWellLogCurveCollection.cpp b/ApplicationLibCode/ProjectDataModel/Completions/Rim3dWellLogCurveCollection.cpp index e21fe7ef4c..cc7533fccc 100644 --- a/ApplicationLibCode/ProjectDataModel/Completions/Rim3dWellLogCurveCollection.cpp +++ b/ApplicationLibCode/ProjectDataModel/Completions/Rim3dWellLogCurveCollection.cpp @@ -34,14 +34,14 @@ Rim3dWellLogCurveCollection::Rim3dWellLogCurveCollection() { CAF_PDM_InitObject( "3D Track", ":/WellLogCurve16x16.png", "", "" ); - CAF_PDM_InitField( &m_showPlot, "Show3dWellLogCurves", true, "Show 3d Well Log Curves", "", "", "" ); + CAF_PDM_InitField( &m_showPlot, "Show3dWellLogCurves", true, "Show 3d Well Log Curves" ); m_showPlot.uiCapability()->setUiHidden( true ); - CAF_PDM_InitField( &m_planeWidthScaling, "PlaneWidthScaling", 1.0f, "Width Scaling", "", "", "" ); + CAF_PDM_InitField( &m_planeWidthScaling, "PlaneWidthScaling", 1.0f, "Width Scaling" ); m_planeWidthScaling.uiCapability()->setUiEditorTypeName( caf::PdmUiDoubleSliderEditor::uiEditorTypeName() ); - CAF_PDM_InitField( &m_showGrid, "Show3dWellLogGrid", true, "Show Grid", "", "", "" ); - CAF_PDM_InitField( &m_showBackground, "Show3dWellLogBackground", false, "Show Background", "", "", "" ); - CAF_PDM_InitFieldNoDefault( &m_3dWellLogCurves, "ArrayOf3dWellLogCurves", "", "", "", "" ); + CAF_PDM_InitField( &m_showGrid, "Show3dWellLogGrid", true, "Show Grid" ); + CAF_PDM_InitField( &m_showBackground, "Show3dWellLogBackground", false, "Show Background" ); + CAF_PDM_InitFieldNoDefault( &m_3dWellLogCurves, "ArrayOf3dWellLogCurves", "" ); m_3dWellLogCurves.uiCapability()->setUiTreeHidden( true ); } diff --git a/ApplicationLibCode/ProjectDataModel/Completions/RimCompletionTemplateCollection.cpp b/ApplicationLibCode/ProjectDataModel/Completions/RimCompletionTemplateCollection.cpp index 0df5e53e38..340d10d7d7 100644 --- a/ApplicationLibCode/ProjectDataModel/Completions/RimCompletionTemplateCollection.cpp +++ b/ApplicationLibCode/ProjectDataModel/Completions/RimCompletionTemplateCollection.cpp @@ -36,17 +36,17 @@ RimCompletionTemplateCollection::RimCompletionTemplateCollection() { CAF_PDM_InitObject( "Completion Templates", ":/CompletionsSymbol16x16.png", "", "" ); - CAF_PDM_InitFieldNoDefault( &m_fractureTemplates, "FractureTemplates", "", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_fractureTemplates, "FractureTemplates", "" ); m_fractureTemplates = new RimFractureTemplateCollection; m_fractureTemplates->addDefaultEllipseTemplate(); - CAF_PDM_InitFieldNoDefault( &m_stimPlanModelTemplates, "StimPlanModelTemplates", "", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_stimPlanModelTemplates, "StimPlanModelTemplates", "" ); m_stimPlanModelTemplates = new RimStimPlanModelTemplateCollection; - CAF_PDM_InitFieldNoDefault( &m_valveTemplates, "ValveTemplates", "", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_valveTemplates, "ValveTemplates", "" ); m_valveTemplates = new RimValveTemplateCollection; - CAF_PDM_InitFieldNoDefault( &m_fractureGroupStatisticsCollection, "FractureGroupStatisticsCollection", "", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_fractureGroupStatisticsCollection, "FractureGroupStatisticsCollection", "" ); m_fractureGroupStatisticsCollection = new RimEnsembleFractureStatisticsCollection; } diff --git a/ApplicationLibCode/ProjectDataModel/Completions/RimEllipseFractureTemplate.cpp b/ApplicationLibCode/ProjectDataModel/Completions/RimEllipseFractureTemplate.cpp index 9a3fb5073a..e622bf1d92 100644 --- a/ApplicationLibCode/ProjectDataModel/Completions/RimEllipseFractureTemplate.cpp +++ b/ApplicationLibCode/ProjectDataModel/Completions/RimEllipseFractureTemplate.cpp @@ -52,10 +52,10 @@ RimEllipseFractureTemplate::RimEllipseFractureTemplate() { CAF_PDM_InitObject( "Fracture Template", ":/FractureTemplate16x16.png", "", "" ); - CAF_PDM_InitField( &m_halfLength, "HalfLength", 0.0, "Half Length Xf", "", "", "" ); - CAF_PDM_InitField( &m_height, "Height", 0.0, "Height", "", "", "" ); - CAF_PDM_InitField( &m_width, "Width", 0.0, "Width", "", "", "" ); - CAF_PDM_InitField( &m_permeability, "Permeability", 0.0, "Permeability [mD]", "", "", "" ); + CAF_PDM_InitField( &m_halfLength, "HalfLength", 0.0, "Half Length Xf" ); + CAF_PDM_InitField( &m_height, "Height", 0.0, "Height" ); + CAF_PDM_InitField( &m_width, "Width", 0.0, "Width" ); + CAF_PDM_InitField( &m_permeability, "Permeability", 0.0, "Permeability [mD]" ); setDeletable( true ); } diff --git a/ApplicationLibCode/ProjectDataModel/Completions/RimEnsembleFractureStatistics.cpp b/ApplicationLibCode/ProjectDataModel/Completions/RimEnsembleFractureStatistics.cpp index 4871961b0d..d27f2cf63c 100644 --- a/ApplicationLibCode/ProjectDataModel/Completions/RimEnsembleFractureStatistics.cpp +++ b/ApplicationLibCode/ProjectDataModel/Completions/RimEnsembleFractureStatistics.cpp @@ -123,9 +123,9 @@ RimEnsembleFractureStatistics::RimEnsembleFractureStatistics() { CAF_PDM_InitObject( "Ensemble Fracture Statistics", ":/FractureTemplate16x16.png", "", "" ); - CAF_PDM_InitFieldNoDefault( &m_filePaths, "FilePaths", "", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_filePaths, "FilePaths", "" ); - CAF_PDM_InitFieldNoDefault( &m_filePathsTable, "FilePathsTable", "File Paths Table", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_filePathsTable, "FilePathsTable", "File Paths Table" ); m_filePathsTable.uiCapability()->setUiEditorTypeName( caf::PdmUiTextEditor::uiEditorTypeName() ); m_filePathsTable.uiCapability()->setUiLabelPosition( caf::PdmUiItemInfo::HIDDEN ); m_filePathsTable.uiCapability()->setUiReadOnly( true ); @@ -139,32 +139,32 @@ RimEnsembleFractureStatistics::RimEnsembleFractureStatistics() "", "" ); - CAF_PDM_InitFieldNoDefault( &m_statisticsTable, "StatisticsTable", "Statistics Table", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_statisticsTable, "StatisticsTable", "Statistics Table" ); m_statisticsTable.uiCapability()->setUiEditorTypeName( caf::PdmUiTextEditor::uiEditorTypeName() ); m_statisticsTable.uiCapability()->setUiLabelPosition( caf::PdmUiItemInfo::HIDDEN ); m_statisticsTable.uiCapability()->setUiReadOnly( true ); m_statisticsTable.xmlCapability()->disableIO(); - CAF_PDM_InitFieldNoDefault( &m_meshAlignmentType, "MeshAlignmentType", "Mesh Alignment", "", "", "" ); - CAF_PDM_InitFieldNoDefault( &m_meshType, "MeshType", "Mesh Type", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_meshAlignmentType, "MeshAlignmentType", "Mesh Alignment" ); + CAF_PDM_InitFieldNoDefault( &m_meshType, "MeshType", "Mesh Type" ); // Uniform sampling - CAF_PDM_InitField( &m_numSamplesX, "NumberOfSamplesX", 100, "X", "", "", "" ); - CAF_PDM_InitField( &m_numSamplesY, "NumberOfSamplesY", 200, "Y", "", "", "" ); + CAF_PDM_InitField( &m_numSamplesX, "NumberOfSamplesX", 100, "X" ); + CAF_PDM_InitField( &m_numSamplesY, "NumberOfSamplesY", 200, "Y" ); // Adaptive sampling - CAF_PDM_InitFieldNoDefault( &m_adaptiveMeanType, "AdaptiveMeanType", "Mean Type", "", "", "" ); - CAF_PDM_InitFieldNoDefault( &m_adaptiveNumLayersType, "AdaptiveNumLayersType", "Number of Layers", "", "", "" ); - CAF_PDM_InitField( &m_adaptiveNumLayers, "AdaptiveNumLayers", 30, "Number of Layers Y", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_adaptiveMeanType, "AdaptiveMeanType", "Mean Type" ); + CAF_PDM_InitFieldNoDefault( &m_adaptiveNumLayersType, "AdaptiveNumLayersType", "Number of Layers" ); + CAF_PDM_InitField( &m_adaptiveNumLayers, "AdaptiveNumLayers", 30, "Number of Layers Y" ); std::vector> defaultStatisticsTypes = { caf::AppEnum( RimEnsembleFractureStatistics::StatisticsType::MEAN ) }; - CAF_PDM_InitField( &m_selectedStatisticsType, "SelectedStatisticsType", defaultStatisticsTypes, "Statistics Type", "", "", "" ); + CAF_PDM_InitField( &m_selectedStatisticsType, "SelectedStatisticsType", defaultStatisticsTypes, "Statistics Type" ); m_selectedStatisticsType.uiCapability()->setUiEditorTypeName( caf::PdmUiTreeSelectionEditor::uiEditorTypeName() ); m_selectedStatisticsType.uiCapability()->setUiLabelPosition( caf::PdmUiItemInfo::TOP ); - CAF_PDM_InitFieldNoDefault( &m_computeStatistics, "ComputeStatistics", "Compute Templates", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_computeStatistics, "ComputeStatistics", "Compute Templates" ); m_computeStatistics.uiCapability()->setUiEditorTypeName( caf::PdmUiToolButtonEditor::uiEditorTypeName() ); m_computeStatistics.uiCapability()->setUiLabelPosition( caf::PdmUiItemInfo::HIDDEN ); diff --git a/ApplicationLibCode/ProjectDataModel/Completions/RimEnsembleFractureStatisticsCollection.cpp b/ApplicationLibCode/ProjectDataModel/Completions/RimEnsembleFractureStatisticsCollection.cpp index b47cd33a1e..504d27475e 100644 --- a/ApplicationLibCode/ProjectDataModel/Completions/RimEnsembleFractureStatisticsCollection.cpp +++ b/ApplicationLibCode/ProjectDataModel/Completions/RimEnsembleFractureStatisticsCollection.cpp @@ -29,7 +29,7 @@ RimEnsembleFractureStatisticsCollection::RimEnsembleFractureStatisticsCollection { CAF_PDM_InitObject( "Ensemble Fracture Statistics", ":/FractureTemplates16x16.png", "", "" ); - CAF_PDM_InitFieldNoDefault( &m_fractureGroupStatistics, "FractureGroupStatistics", "", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_fractureGroupStatistics, "FractureGroupStatistics", "" ); m_fractureGroupStatistics.uiCapability()->setUiTreeHidden( true ); } diff --git a/ApplicationLibCode/ProjectDataModel/Completions/RimFishbones.cpp b/ApplicationLibCode/ProjectDataModel/Completions/RimFishbones.cpp index 9ba0198e99..e0a2aa37cd 100644 --- a/ApplicationLibCode/ProjectDataModel/Completions/RimFishbones.cpp +++ b/ApplicationLibCode/ProjectDataModel/Completions/RimFishbones.cpp @@ -71,18 +71,18 @@ RimFishbones::RimFishbones() { CAF_PDM_InitObject( "FishbonesMultipleSubs", ":/FishBoneGroup16x16.png", "", "" ); - CAF_PDM_InitField( &m_isActive, "Active", true, "Active", "", "", "" ); + CAF_PDM_InitField( &m_isActive, "Active", true, "Active" ); m_isActive.uiCapability()->setUiHidden( true ); - CAF_PDM_InitFieldNoDefault( &m_name, "Name", "Name", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_name, "Name", "Name" ); m_name.registerGetMethod( this, &RimFishbones::generatedName ); m_name.uiCapability()->setUiReadOnly( true ); m_name.xmlCapability()->setIOWritable( false ); cvf::Color3f defaultColor = RiaColorTables::wellPathComponentColors()[RiaDefines::WellPathComponentType::FISHBONES]; - CAF_PDM_InitField( &fishbonesColor, "Color", defaultColor, "Fishbones Color", "", "", "" ); + CAF_PDM_InitField( &fishbonesColor, "Color", defaultColor, "Fishbones Color" ); - CAF_PDM_InitField( &m_lateralCountPerSub, "LateralCountPerSub", 3, "Laterals Per Sub", "", "", "" ); + CAF_PDM_InitField( &m_lateralCountPerSub, "LateralCountPerSub", 3, "Laterals Per Sub" ); CAF_PDM_InitField( &m_lateralLength, "LateralLength", QString( "11.0" ), @@ -91,10 +91,10 @@ RimFishbones::RimFishbones() "Specify multiple length values if the sub lengths differ", "" ); - CAF_PDM_InitField( &m_lateralExitAngle, "LateralExitAngle", 35.0, "Exit Angle [deg]", "", "", "" ); - CAF_PDM_InitField( &m_lateralBuildAngle, "LateralBuildAngle", 6.0, "Build Angle [deg/m]", "", "", "" ); + CAF_PDM_InitField( &m_lateralExitAngle, "LateralExitAngle", 35.0, "Exit Angle [deg]" ); + CAF_PDM_InitField( &m_lateralBuildAngle, "LateralBuildAngle", 6.0, "Build Angle [deg/m]" ); - CAF_PDM_InitField( &m_lateralTubingDiameter, "LateralTubingDiameter", 8.0, "Tubing Diameter [mm]", "", "", "" ); + CAF_PDM_InitField( &m_lateralTubingDiameter, "LateralTubingDiameter", 8.0, "Tubing Diameter [mm]" ); CAF_PDM_InitField( &m_lateralOpenHoleRoghnessFactor, "LateralOpenHoleRoghnessFactor", @@ -119,12 +119,12 @@ RimFishbones::RimFishbones() "", "" ); - CAF_PDM_InitField( &m_icdCount, "IcdCount", 2, "ICDs per Sub", "", "", "" ); - CAF_PDM_InitField( &m_icdOrificeDiameter, "IcdOrificeDiameter", 7.0, "ICD Orifice Diameter [mm]", "", "", "" ); - CAF_PDM_InitField( &m_icdFlowCoefficient, "IcdFlowCoefficient", 1.5, "ICD Flow Coefficient", "", "", "" ); + CAF_PDM_InitField( &m_icdCount, "IcdCount", 2, "ICDs per Sub" ); + CAF_PDM_InitField( &m_icdOrificeDiameter, "IcdOrificeDiameter", 7.0, "ICD Orifice Diameter [mm]" ); + CAF_PDM_InitField( &m_icdFlowCoefficient, "IcdFlowCoefficient", 1.5, "ICD Flow Coefficient" ); initialiseObsoleteFields(); - CAF_PDM_InitFieldNoDefault( &m_valveLocations, "ValveLocations", "Valve Locations", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_valveLocations, "ValveLocations", "Valve Locations" ); m_valveLocations = new RimMultipleValveLocations(); m_valveLocations->findField( "RangeValveCount" )->uiCapability()->setUiName( "Number of Subs" ); m_valveLocations.uiCapability()->setUiTreeHidden( true ); @@ -140,10 +140,7 @@ RimFishbones::RimFishbones() CAF_PDM_InitFieldNoDefault( &m_installationRotationAngles, "InstallationRotationAngles", - "Installation Rotation Angles [deg]", - "", - "", - "" ); + "Installation Rotation Angles [deg]" ); m_installationRotationAngles.uiCapability()->setUiHidden( true ); CAF_PDM_InitField( &m_fixedInstallationRotationAngle, "FixedInstallationRotationAngle", @@ -153,7 +150,7 @@ RimFishbones::RimFishbones() "", "" ); - CAF_PDM_InitFieldNoDefault( &m_pipeProperties, "PipeProperties", "Pipe Properties", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_pipeProperties, "PipeProperties", "Pipe Properties" ); m_pipeProperties.uiCapability()->setUiTreeHidden( true ); m_pipeProperties.uiCapability()->setUiTreeChildrenHidden( true ); @@ -767,10 +764,10 @@ void RimFishbones::initialiseObsoleteFields() "" ); m_subsLocationMode_OBSOLETE.xmlCapability()->setIOWritable( false ); - CAF_PDM_InitField( &m_rangeStart_OBSOLETE, "RangeStart", std::numeric_limits::infinity(), "Start MD [m]", "", "", "" ); + CAF_PDM_InitField( &m_rangeStart_OBSOLETE, "RangeStart", std::numeric_limits::infinity(), "Start MD [m]" ); m_rangeStart_OBSOLETE.xmlCapability()->setIOWritable( false ); - CAF_PDM_InitField( &m_rangeEnd_OBSOLETE, "RangeEnd", std::numeric_limits::infinity(), "End MD [m]", "", "", "" ); + CAF_PDM_InitField( &m_rangeEnd_OBSOLETE, "RangeEnd", std::numeric_limits::infinity(), "End MD [m]" ); m_rangeEnd_OBSOLETE.xmlCapability()->setIOWritable( false ); CAF_PDM_InitField( &m_rangeSubSpacing_OBSOLETE, @@ -782,10 +779,10 @@ void RimFishbones::initialiseObsoleteFields() "" ); m_rangeSubSpacing_OBSOLETE.xmlCapability()->setIOWritable( false ); - CAF_PDM_InitField( &m_rangeSubCount_OBSOLETE, "RangeSubCount", -1, "Number of Subs", "", "", "" ); + CAF_PDM_InitField( &m_rangeSubCount_OBSOLETE, "RangeSubCount", -1, "Number of Subs" ); m_rangeSubCount_OBSOLETE.xmlCapability()->setIOWritable( false ); - CAF_PDM_InitFieldNoDefault( &m_locationOfSubs_OBSOLETE, "LocationOfSubs", "Measured Depths [m]", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_locationOfSubs_OBSOLETE, "LocationOfSubs", "Measured Depths [m]" ); m_locationOfSubs_OBSOLETE.xmlCapability()->setIOWritable( false ); } diff --git a/ApplicationLibCode/ProjectDataModel/Completions/RimFishbonesCollection.cpp b/ApplicationLibCode/ProjectDataModel/Completions/RimFishbonesCollection.cpp index c2ded89a79..9a825cd481 100644 --- a/ApplicationLibCode/ProjectDataModel/Completions/RimFishbonesCollection.cpp +++ b/ApplicationLibCode/ProjectDataModel/Completions/RimFishbonesCollection.cpp @@ -45,12 +45,12 @@ RimFishbonesCollection::RimFishbonesCollection() nameField()->uiCapability()->setUiHidden( true ); this->setName( "Fishbones" ); - CAF_PDM_InitFieldNoDefault( &m_fishbones, "FishbonesSubs", "fishbonesSubs", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_fishbones, "FishbonesSubs", "fishbonesSubs" ); m_fishbones.uiCapability()->setUiTreeHidden( true ); - CAF_PDM_InitField( &m_startMD, "StartMD", HUGE_VAL, "Start MD", "", "", "" ); - CAF_PDM_InitField( &m_mainBoreDiameter, "MainBoreDiameter", 0.216, "Main Bore Diameter", "", "", "" ); - CAF_PDM_InitField( &m_skinFactor, "MainBoreSkinFactor", 0., "Main Bore Skin Factor [0..1]", "", "", "" ); + CAF_PDM_InitField( &m_startMD, "StartMD", HUGE_VAL, "Start MD" ); + CAF_PDM_InitField( &m_mainBoreDiameter, "MainBoreDiameter", 0.216, "Main Bore Diameter" ); + CAF_PDM_InitField( &m_skinFactor, "MainBoreSkinFactor", 0., "Main Bore Skin Factor [0..1]" ); manuallyModifiedStartMD = false; } diff --git a/ApplicationLibCode/ProjectDataModel/Completions/RimFishbonesPipeProperties.cpp b/ApplicationLibCode/ProjectDataModel/Completions/RimFishbonesPipeProperties.cpp index cd762a403c..bc9dead59e 100644 --- a/ApplicationLibCode/ProjectDataModel/Completions/RimFishbonesPipeProperties.cpp +++ b/ApplicationLibCode/ProjectDataModel/Completions/RimFishbonesPipeProperties.cpp @@ -31,10 +31,10 @@ CAF_PDM_SOURCE_INIT( RimFishbonesPipeProperties, "FishbonesPipeProperties" ); //-------------------------------------------------------------------------------------------------- RimFishbonesPipeProperties::RimFishbonesPipeProperties() { - CAF_PDM_InitObject( "FishbonesPipeProperties", "", "", "" ); + CAF_PDM_InitObject( "FishbonesPipeProperties" ); - CAF_PDM_InitField( &m_lateralHoleDiameter, "LateralHoleDiameter", 12.5, "Hole Diameter [mm]", "", "", "" ); - CAF_PDM_InitField( &m_skinFactor, "SkinFactor", 0.0, "Skin Factor [0..1]", "", "", "" ); + CAF_PDM_InitField( &m_lateralHoleDiameter, "LateralHoleDiameter", 12.5, "Hole Diameter [mm]" ); + CAF_PDM_InitField( &m_skinFactor, "SkinFactor", 0.0, "Skin Factor [0..1]" ); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/ProjectDataModel/Completions/RimFracture.cpp b/ApplicationLibCode/ProjectDataModel/Completions/RimFracture.cpp index b8e0f83817..f4a0b523cf 100644 --- a/ApplicationLibCode/ProjectDataModel/Completions/RimFracture.cpp +++ b/ApplicationLibCode/ProjectDataModel/Completions/RimFracture.cpp @@ -95,10 +95,10 @@ void setDefaultFractureColorResult() //-------------------------------------------------------------------------------------------------- RimFracture::RimFracture() { - CAF_PDM_InitObject( "Fracture", "", "", "" ); + CAF_PDM_InitObject( "Fracture" ); - CAF_PDM_InitFieldNoDefault( &m_fractureTemplate, "FractureDef", "Fracture Template", "", "", "" ); - CAF_PDM_InitField( &m_editFractureTemplate, "EditTemplate", false, "Edit", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_fractureTemplate, "FractureDef", "Fracture Template" ); + CAF_PDM_InitField( &m_editFractureTemplate, "EditTemplate", false, "Edit" ); m_editFractureTemplate.uiCapability()->setUiEditorTypeName( caf::PdmUiToolButtonEditor::uiEditorTypeName() ); m_editFractureTemplate.uiCapability()->setUiLabelPosition( caf::PdmUiItemInfo::HIDDEN ); @@ -112,7 +112,7 @@ RimFracture::RimFracture() m_createEllipseFractureTemplate.uiCapability()->setUiEditorTypeName( caf::PdmUiPushButtonEditor::uiEditorTypeName() ); m_createEllipseFractureTemplate.uiCapability()->setUiLabelPosition( caf::PdmUiItemInfo::TOP ); - CAF_PDM_InitField( &m_createStimPlanFractureTemplate, "CreateStimPlanTemplate", false, "Create New Template?", "", "", "" ); + CAF_PDM_InitField( &m_createStimPlanFractureTemplate, "CreateStimPlanTemplate", false, "Create New Template?" ); m_createStimPlanFractureTemplate.uiCapability()->setUiEditorTypeName( caf::PdmUiPushButtonEditor::uiEditorTypeName() ); m_createStimPlanFractureTemplate.uiCapability()->setUiLabelPosition( caf::PdmUiItemInfo::TOP ); @@ -124,28 +124,28 @@ RimFracture::RimFracture() "", "" ); - CAF_PDM_InitField( &m_wellPathDepthAtFracture, "WellPathDepthAtFracture", 0.0, "Well/Fracture Intersection Depth", "", "", "" ); + CAF_PDM_InitField( &m_wellPathDepthAtFracture, "WellPathDepthAtFracture", 0.0, "Well/Fracture Intersection Depth" ); m_wellPathDepthAtFracture.uiCapability()->setUiEditorTypeName( caf::PdmUiDoubleSliderEditor::uiEditorTypeName() ); - CAF_PDM_InitFieldNoDefault( &m_anchorPosition, "AnchorPosition", "Anchor Position", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_anchorPosition, "AnchorPosition", "Anchor Position" ); m_anchorPosition.uiCapability()->setUiHidden( true ); m_anchorPosition.xmlCapability()->disableIO(); - CAF_PDM_InitFieldNoDefault( &m_uiAnchorPosition, "ui_positionAtWellpath", "Fracture Position", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_uiAnchorPosition, "ui_positionAtWellpath", "Fracture Position" ); m_uiAnchorPosition.registerGetMethod( this, &RimFracture::fracturePositionForUi ); m_uiAnchorPosition.uiCapability()->setUiReadOnly( true ); m_uiAnchorPosition.xmlCapability()->disableIO(); - CAF_PDM_InitField( &m_azimuth, "Azimuth", 0.0, "Azimuth", "", "", "" ); + CAF_PDM_InitField( &m_azimuth, "Azimuth", 0.0, "Azimuth" ); m_azimuth.uiCapability()->setUiEditorTypeName( caf::PdmUiDoubleSliderEditor::uiEditorTypeName() ); - CAF_PDM_InitField( &m_perforationLength, "PerforationLength", 1.0, "Perforation Length", "", "", "" ); - CAF_PDM_InitField( &m_perforationEfficiency, "PerforationEfficiency", 1.0, "Perforation Efficiency", "", "", "" ); + CAF_PDM_InitField( &m_perforationLength, "PerforationLength", 1.0, "Perforation Length" ); + CAF_PDM_InitField( &m_perforationEfficiency, "PerforationEfficiency", 1.0, "Perforation Efficiency" ); m_perforationEfficiency.uiCapability()->setUiEditorTypeName( caf::PdmUiDoubleSliderEditor::uiEditorTypeName() ); - CAF_PDM_InitField( &m_wellDiameter, "WellDiameter", 0.216, "Well Diameter at Fracture", "", "", "" ); - CAF_PDM_InitField( &m_dip, "Dip", 0.0, "Dip", "", "", "" ); - CAF_PDM_InitField( &m_tilt, "Tilt", 0.0, "Tilt", "", "", "" ); + CAF_PDM_InitField( &m_wellDiameter, "WellDiameter", 0.216, "Well Diameter at Fracture" ); + CAF_PDM_InitField( &m_dip, "Dip", 0.0, "Dip" ); + CAF_PDM_InitField( &m_tilt, "Tilt", 0.0, "Tilt" ); CAF_PDM_InitField( &m_fractureUnit, "FractureUnit", @@ -156,19 +156,16 @@ RimFracture::RimFracture() "" ); m_fractureUnit.uiCapability()->setUiReadOnly( true ); - CAF_PDM_InitField( &m_stimPlanTimeIndexToPlot, "TimeIndexToPlot", 0, "StimPlan Time Step", "", "", "" ); + CAF_PDM_InitField( &m_stimPlanTimeIndexToPlot, "TimeIndexToPlot", 0, "StimPlan Time Step" ); - CAF_PDM_InitFieldNoDefault( &m_uiWellPathAzimuth, "WellPathAzimuth", "Well Path Azimuth", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_uiWellPathAzimuth, "WellPathAzimuth", "Well Path Azimuth" ); m_uiWellPathAzimuth.registerGetMethod( this, &RimFracture::wellAzimuthAtFracturePositionText ); m_uiWellPathAzimuth.uiCapability()->setUiReadOnly( true ); m_uiWellPathAzimuth.xmlCapability()->disableIO(); CAF_PDM_InitFieldNoDefault( &m_uiWellFractureAzimuthDiff, "WellFractureAzimuthDiff", - "Azimuth Difference Between\nFracture and Well", - "", - "", - "" ); + "Azimuth Difference Between\nFracture and Well" ); m_uiWellFractureAzimuthDiff.registerGetMethod( this, &RimFracture::wellFractureAzimuthDiffText ); m_uiWellFractureAzimuthDiff.uiCapability()->setUiReadOnly( true ); m_uiWellFractureAzimuthDiff.xmlCapability()->disableIO(); diff --git a/ApplicationLibCode/ProjectDataModel/Completions/RimFractureContainment.cpp b/ApplicationLibCode/ProjectDataModel/Completions/RimFractureContainment.cpp index 60b706d065..78ac9829f9 100644 --- a/ApplicationLibCode/ProjectDataModel/Completions/RimFractureContainment.cpp +++ b/ApplicationLibCode/ProjectDataModel/Completions/RimFractureContainment.cpp @@ -30,9 +30,9 @@ CAF_PDM_SOURCE_INIT( RimFractureContainment, "FractureContainment" ); //-------------------------------------------------------------------------------------------------- RimFractureContainment::RimFractureContainment() { - CAF_PDM_InitObject( "Fracture Containment", "", "", "" ); + CAF_PDM_InitObject( "Fracture Containment" ); - CAF_PDM_InitField( &m_useContainment, "IsUsingFractureContainment", false, "Use Containment", "", "", "" ); + CAF_PDM_InitField( &m_useContainment, "IsUsingFractureContainment", false, "Use Containment" ); CAF_PDM_InitField( &m_topKLayer, "TopKLayer", 0, " Top Layer", "", "Do not allow fracture to grow into this layer", "" ); CAF_PDM_InitField( &m_baseKLayer, "BaseKLayer", 0, " Base Layer", "", "Do not allow fracture to grow into this layer", "" ); diff --git a/ApplicationLibCode/ProjectDataModel/Completions/RimFractureExportSettings.cpp b/ApplicationLibCode/ProjectDataModel/Completions/RimFractureExportSettings.cpp index 4d666c3a91..58f7b45627 100644 --- a/ApplicationLibCode/ProjectDataModel/Completions/RimFractureExportSettings.cpp +++ b/ApplicationLibCode/ProjectDataModel/Completions/RimFractureExportSettings.cpp @@ -30,12 +30,12 @@ CAF_PDM_SOURCE_INIT( RimFractureExportSettings, "RimFractureExportSettings" ); //-------------------------------------------------------------------------------------------------- RimFractureExportSettings::RimFractureExportSettings() { - CAF_PDM_InitObject( "RimFractureExportSettings", "", "", "" ); + CAF_PDM_InitObject( "RimFractureExportSettings" ); - CAF_PDM_InitFieldNoDefault( &fileName, "Filename", "Export Filename", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &fileName, "Filename", "Export Filename" ); fileName.uiCapability()->setUiEditorTypeName( caf::PdmUiFilePathEditor::uiEditorTypeName() ); - CAF_PDM_InitFieldNoDefault( &caseToApply, "CaseToApply", "Case to Apply", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &caseToApply, "CaseToApply", "Case to Apply" ); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/ProjectDataModel/Completions/RimFractureTemplate.cpp b/ApplicationLibCode/ProjectDataModel/Completions/RimFractureTemplate.cpp index 2963c303db..600e0e7c33 100644 --- a/ApplicationLibCode/ProjectDataModel/Completions/RimFractureTemplate.cpp +++ b/ApplicationLibCode/ProjectDataModel/Completions/RimFractureTemplate.cpp @@ -102,10 +102,6 @@ void caf::AppEnum::setUp() } // namespace caf -// TODO Move to cafPdmObject.h -#define CAF_PDM_InitField_Basic( field, keyword, default, uiName ) \ - CAF_PDM_InitField( field, keyword, default, uiName, "", "", "" ) - CAF_PDM_XML_ABSTRACT_SOURCE_INIT( RimFractureTemplate, "FractureTemplate", "RimFractureTemplate" ); //-------------------------------------------------------------------------------------------------- @@ -116,12 +112,12 @@ RimFractureTemplate::RimFractureTemplate() { CAF_PDM_InitScriptableObject( "Fracture Template", ":/FractureTemplate16x16.png", "", "" ); - CAF_PDM_InitField( &m_id, "Id", -1, "ID", "", "", "" ); + CAF_PDM_InitField( &m_id, "Id", -1, "ID" ); m_id.uiCapability()->setUiReadOnly( true ); - CAF_PDM_InitField( &m_name, "UserDescription", QString( "Fracture Template" ), "Name", "", "", "" ); + CAF_PDM_InitField( &m_name, "UserDescription", QString( "Fracture Template" ), "Name" ); - CAF_PDM_InitFieldNoDefault( &m_nameAndUnit, "NameAndUnit", "NameAndUnit", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_nameAndUnit, "NameAndUnit", "NameAndUnit" ); m_nameAndUnit.registerGetMethod( this, &RimFractureTemplate::nameAndUnit ); m_nameAndUnit.uiCapability()->setUiHidden( true ); m_nameAndUnit.xmlCapability()->disableIO(); @@ -143,16 +139,16 @@ RimFractureTemplate::RimFractureTemplate() "", "" ); - CAF_PDM_InitScriptableField( &m_azimuthAngle, "AzimuthAngle", 0.0f, "Azimuth Angle", "", "", "" ); + CAF_PDM_InitScriptableField( &m_azimuthAngle, "AzimuthAngle", 0.0f, "Azimuth Angle" ); - CAF_PDM_InitField( &m_skinFactor, "SkinFactor", 0.0f, "Skin Factor", "", "", "" ); + CAF_PDM_InitField( &m_skinFactor, "SkinFactor", 0.0f, "Skin Factor" ); - CAF_PDM_InitField( &m_perforationLength, "PerforationLength", 1.0, "Perforation Length", "", "", "" ); + CAF_PDM_InitField( &m_perforationLength, "PerforationLength", 1.0, "Perforation Length" ); - CAF_PDM_InitField( &m_perforationEfficiency, "PerforationEfficiency", 1.0, "Perforation Efficiency", "", "", "" ); + CAF_PDM_InitField( &m_perforationEfficiency, "PerforationEfficiency", 1.0, "Perforation Efficiency" ); m_perforationEfficiency.uiCapability()->setUiEditorTypeName( caf::PdmUiDoubleSliderEditor::uiEditorTypeName() ); - CAF_PDM_InitField( &m_wellDiameter, "WellDiameter", 0.216, "Well Diameter at Fracture", "", "", "" ); + CAF_PDM_InitField( &m_wellDiameter, "WellDiameter", 0.216, "Well Diameter at Fracture" ); CAF_PDM_InitField( &m_conductivityType, "ConductivityType", caf::AppEnum( FINITE_CONDUCTIVITY ), @@ -161,30 +157,30 @@ RimFractureTemplate::RimFractureTemplate() "", "" ); - CAF_PDM_InitField( &m_wellPathDepthAtFracture, "WellPathDepthAtFracture", 0.0, "Well/Fracture Intersection Depth", "", "", "" ); + CAF_PDM_InitField( &m_wellPathDepthAtFracture, "WellPathDepthAtFracture", 0.0, "Well/Fracture Intersection Depth" ); m_wellPathDepthAtFracture.uiCapability()->setUiEditorTypeName( caf::PdmUiDoubleSliderEditor::uiEditorTypeName() ); - CAF_PDM_InitFieldNoDefault( &m_fractureContainment, "FractureContainmentField", "Fracture Containment", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_fractureContainment, "FractureContainmentField", "Fracture Containment" ); m_fractureContainment = new RimFractureContainment(); m_fractureContainment.uiCapability()->setUiTreeHidden( true ); m_fractureContainment.uiCapability()->setUiTreeChildrenHidden( true ); // Non-Darcy Flow options - CAF_PDM_InitFieldNoDefault( &m_nonDarcyFlowType, "NonDarcyFlowType", "Non-Darcy Flow", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_nonDarcyFlowType, "NonDarcyFlowType", "Non-Darcy Flow" ); - CAF_PDM_InitField( &m_userDefinedDFactor, "UserDefinedDFactor", 1.0, "D Factor", "", "", "" ); + CAF_PDM_InitField( &m_userDefinedDFactor, "UserDefinedDFactor", 1.0, "D Factor" ); - CAF_PDM_InitFieldNoDefault( &m_fractureWidthType, "FractureWidthType", "Type", "", "", "" ); - CAF_PDM_InitField_Basic( &m_fractureWidth, "FractureWidth", 0.01, "Fracture Width (h)" ); + CAF_PDM_InitFieldNoDefault( &m_fractureWidthType, "FractureWidthType", "Type" ); + CAF_PDM_InitField( &m_fractureWidth, "FractureWidth", 0.01, "Fracture Width (h)" ); - CAF_PDM_InitFieldNoDefault( &m_betaFactorType, "BetaFactorType", "Type", "", "", "" ); - CAF_PDM_InitField_Basic( &m_inertialCoefficient, - "InertialCoefficient", - 0.006083236, - "Inertial Coefficient (β) [Forch. unit]" ); + CAF_PDM_InitFieldNoDefault( &m_betaFactorType, "BetaFactorType", "Type" ); + CAF_PDM_InitField( &m_inertialCoefficient, + "InertialCoefficient", + 0.006083236, + "Inertial Coefficient (β) [Forch. unit]" ); - CAF_PDM_InitFieldNoDefault( &m_permeabilityType, "PermeabilityType", "Type", "", "", "" ); - CAF_PDM_InitField_Basic( &m_relativePermeability, "RelativePermeability", 1.0, "Relative Permeability" ); + 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, @@ -208,22 +204,22 @@ RimFractureTemplate::RimFractureTemplate() "Gas viscosity at bottom hole pressure", "" ); - CAF_PDM_InitFieldNoDefault( &m_dFactorDisplayField, "dFactorDisplayField", "D Factor", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_dFactorDisplayField, "dFactorDisplayField", "D Factor" ); m_dFactorDisplayField.registerGetMethod( this, &RimFractureTemplate::dFactorForTemplate ); m_dFactorDisplayField.uiCapability()->setUiEditorTypeName( caf::PdmUiDoubleValueEditor::uiEditorTypeName() ); m_dFactorDisplayField.uiCapability()->setUiReadOnly( true ); m_dFactorDisplayField.xmlCapability()->disableIO(); - CAF_PDM_InitFieldNoDefault( &m_dFactorSummaryText, "dFactorSummaryText", "D Factor Summary", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_dFactorSummaryText, "dFactorSummaryText", "D Factor Summary" ); m_dFactorSummaryText.registerGetMethod( this, &RimFractureTemplate::dFactorSummary ); m_dFactorSummaryText.uiCapability()->setUiReadOnly( true ); m_dFactorSummaryText.uiCapability()->setUiEditorTypeName( caf::PdmUiTextEditor::uiEditorTypeName() ); m_dFactorSummaryText.uiCapability()->setUiLabelPosition( caf::PdmUiItemInfo::LabelPosType::TOP ); m_dFactorSummaryText.xmlCapability()->disableIO(); - CAF_PDM_InitField( &m_heightScaleFactor, "HeightScaleFactor", 1.0, "Height", "", "", "" ); - CAF_PDM_InitField( &m_halfLengthScaleFactor, "WidthScaleFactor", 1.0, "Half Length", "", "", "" ); - CAF_PDM_InitField( &m_dFactorScaleFactor, "DFactorScaleFactor", 1.0, "D-factor", "", "", "" ); + CAF_PDM_InitField( &m_heightScaleFactor, "HeightScaleFactor", 1.0, "Height" ); + CAF_PDM_InitField( &m_halfLengthScaleFactor, "WidthScaleFactor", 1.0, "Half Length" ); + CAF_PDM_InitField( &m_dFactorScaleFactor, "DFactorScaleFactor", 1.0, "D-factor" ); CAF_PDM_InitField( &m_conductivityScaleFactor, "ConductivityFactor", 1.0, @@ -231,7 +227,7 @@ RimFractureTemplate::RimFractureTemplate() "", "The conductivity values read from file will be scaled with this parameters", "" ); - CAF_PDM_InitField( &m_scaleApplyButton, "ScaleApplyButton", false, "Apply", "", "", "" ); + CAF_PDM_InitField( &m_scaleApplyButton, "ScaleApplyButton", false, "Apply" ); m_scaleApplyButton.xmlCapability()->disableIO(); m_scaleApplyButton.uiCapability()->setUiEditorTypeName( caf::PdmUiPushButtonEditor::uiEditorTypeName() ); diff --git a/ApplicationLibCode/ProjectDataModel/Completions/RimFractureTemplateCollection.cpp b/ApplicationLibCode/ProjectDataModel/Completions/RimFractureTemplateCollection.cpp index 1401552e57..c83e603568 100644 --- a/ApplicationLibCode/ProjectDataModel/Completions/RimFractureTemplateCollection.cpp +++ b/ApplicationLibCode/ProjectDataModel/Completions/RimFractureTemplateCollection.cpp @@ -62,10 +62,10 @@ RimFractureTemplateCollection::RimFractureTemplateCollection() "", "" ); - CAF_PDM_InitFieldNoDefault( &m_fractureDefinitions, "FractureDefinitions", "", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_fractureDefinitions, "FractureDefinitions", "" ); m_fractureDefinitions.uiCapability()->setUiTreeHidden( true ); - CAF_PDM_InitField( &m_nextValidFractureTemplateId, "NextValidFractureTemplateId", 0, "", "", "", "" ); + CAF_PDM_InitField( &m_nextValidFractureTemplateId, "NextValidFractureTemplateId", 0, "" ); m_nextValidFractureTemplateId.uiCapability()->setUiHidden( true ); } diff --git a/ApplicationLibCode/ProjectDataModel/Completions/RimMswCompletionParameters.cpp b/ApplicationLibCode/ProjectDataModel/Completions/RimMswCompletionParameters.cpp index ef5a9d53d2..b12bad4991 100644 --- a/ApplicationLibCode/ProjectDataModel/Completions/RimMswCompletionParameters.cpp +++ b/ApplicationLibCode/ProjectDataModel/Completions/RimMswCompletionParameters.cpp @@ -65,10 +65,10 @@ RimMswCompletionParameters::RimMswCompletionParameters() { 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_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_customValuesForLateral, "CustomValuesForLateral", false, "Custom Values for Lateral" ); CAF_PDM_InitField( &m_linerDiameter, "LinerDiameter", std::numeric_limits::infinity(), @@ -84,11 +84,11 @@ RimMswCompletionParameters::RimMswCompletionParameters() "", "" ); - CAF_PDM_InitFieldNoDefault( &m_pressureDrop, "PressureDrop", "Pressure Drop", "", "", "" ); - CAF_PDM_InitFieldNoDefault( &m_lengthAndDepth, "LengthAndDepth", "Length and Depth", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_pressureDrop, "PressureDrop", "Pressure Drop" ); + CAF_PDM_InitFieldNoDefault( &m_lengthAndDepth, "LengthAndDepth", "Length and Depth" ); - CAF_PDM_InitField( &m_enforceMaxSegmentLength, "EnforceMaxSegmentLength", false, "Enforce Max Segment Length", "", "", "" ); - CAF_PDM_InitField( &m_maxSegmentLength, "MaxSegmentLength", 200.0, "Max Segment Length", "", "", "" ); + CAF_PDM_InitField( &m_enforceMaxSegmentLength, "EnforceMaxSegmentLength", false, "Enforce Max Segment Length" ); + CAF_PDM_InitField( &m_maxSegmentLength, "MaxSegmentLength", 200.0, "Max Segment Length" ); m_maxSegmentLength.uiCapability()->setUiHidden( true ); } diff --git a/ApplicationLibCode/ProjectDataModel/Completions/RimMultipleValveLocations.cpp b/ApplicationLibCode/ProjectDataModel/Completions/RimMultipleValveLocations.cpp index db382fd77c..841d1c1522 100644 --- a/ApplicationLibCode/ProjectDataModel/Completions/RimMultipleValveLocations.cpp +++ b/ApplicationLibCode/ProjectDataModel/Completions/RimMultipleValveLocations.cpp @@ -60,18 +60,18 @@ RimMultipleValveLocations::RimMultipleValveLocations() "", "", "" ); - CAF_PDM_InitField( &m_rangeStart, "RangeStart", 100.0, "Start MD [m]", "", "", "" ); + CAF_PDM_InitField( &m_rangeStart, "RangeStart", 100.0, "Start MD [m]" ); m_rangeStart.uiCapability()->setUiEditorTypeName( caf::PdmUiDoubleValueEditor::uiEditorTypeName() ); - CAF_PDM_InitField( &m_rangeEnd, "RangeEnd", 250.0, "End MD [m]", "", "", "" ); + CAF_PDM_InitField( &m_rangeEnd, "RangeEnd", 250.0, "End MD [m]" ); m_rangeEnd.uiCapability()->setUiEditorTypeName( caf::PdmUiDoubleValueEditor::uiEditorTypeName() ); - CAF_PDM_InitFieldNoDefault( &m_rangeValveSpacing, "ValveSpacing", "Spacing [m]", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_rangeValveSpacing, "ValveSpacing", "Spacing [m]" ); m_rangeValveSpacing.uiCapability()->setUiEditorTypeName( caf::PdmUiDoubleValueEditor::uiEditorTypeName() ); - CAF_PDM_InitField( &m_rangeValveCount, "RangeValveCount", 13, "Number of Valves", "", "", "" ); + CAF_PDM_InitField( &m_rangeValveCount, "RangeValveCount", 13, "Number of Valves" ); - CAF_PDM_InitFieldNoDefault( &m_locationOfValves, "LocationOfValves", "Measured Depths [m]", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_locationOfValves, "LocationOfValves", "Measured Depths [m]" ); m_locationOfValves.uiCapability()->setUiEditorTypeName( caf::PdmUiListEditor::uiEditorTypeName() ); } diff --git a/ApplicationLibCode/ProjectDataModel/Completions/RimNonDarcyPerforationParameters.cpp b/ApplicationLibCode/ProjectDataModel/Completions/RimNonDarcyPerforationParameters.cpp index 08fd1d89db..198eeba911 100644 --- a/ApplicationLibCode/ProjectDataModel/Completions/RimNonDarcyPerforationParameters.cpp +++ b/ApplicationLibCode/ProjectDataModel/Completions/RimNonDarcyPerforationParameters.cpp @@ -45,9 +45,9 @@ RimNonDarcyPerforationParameters::RimNonDarcyPerforationParameters() { CAF_PDM_InitObject( "NonDarcyPerforationParameters", ":/CompletionsSymbol16x16.png", "", "" ); - CAF_PDM_InitFieldNoDefault( &m_nonDarcyFlowType, "NonDarcyFlowType", "Non-Darcy Flow", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_nonDarcyFlowType, "NonDarcyFlowType", "Non-Darcy Flow" ); - CAF_PDM_InitField( &m_userDefinedDFactor, "UserDefinedDFactor", 1.0, "D Factor", "", "", "" ); + CAF_PDM_InitField( &m_userDefinedDFactor, "UserDefinedDFactor", 1.0, "D Factor" ); CAF_PDM_InitField( &m_gridPermeabilityScalingFactor, "GridPermeabilityScalingFactor", @@ -57,7 +57,7 @@ RimNonDarcyPerforationParameters::RimNonDarcyPerforationParameters() "", "" ); - CAF_PDM_InitField( &m_wellRadius, "WellRadius", 0.108, "Well Radius (rw) [m]", "", "", "" ); + CAF_PDM_InitField( &m_wellRadius, "WellRadius", 0.108, "Well Radius (rw) [m]" ); CAF_PDM_InitField( &m_relativeGasDensity, "RelativeGasDensity", @@ -90,7 +90,7 @@ RimNonDarcyPerforationParameters::RimNonDarcyPerforationParameters() "", "" ); - CAF_PDM_InitField( &m_porosityScalingFactor, "PorosityScalingFactor", 0.0, "Porosity Scaling Factor (C)", "", "", "" ); + CAF_PDM_InitField( &m_porosityScalingFactor, "PorosityScalingFactor", 0.0, "Porosity Scaling Factor (C)" ); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/ProjectDataModel/Completions/RimPerforationCollection.cpp b/ApplicationLibCode/ProjectDataModel/Completions/RimPerforationCollection.cpp index d7d1b88003..9e9942269b 100644 --- a/ApplicationLibCode/ProjectDataModel/Completions/RimPerforationCollection.cpp +++ b/ApplicationLibCode/ProjectDataModel/Completions/RimPerforationCollection.cpp @@ -45,10 +45,10 @@ RimPerforationCollection::RimPerforationCollection() nameField()->uiCapability()->setUiHidden( true ); this->setName( "Perforations" ); - CAF_PDM_InitFieldNoDefault( &m_perforations, "Perforations", "Perforations", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_perforations, "Perforations", "Perforations" ); m_perforations.uiCapability()->setUiTreeHidden( true ); - CAF_PDM_InitFieldNoDefault( &m_nonDarcyParameters, "NonDarcyParameters", "Non-Darcy Parameters", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_nonDarcyParameters, "NonDarcyParameters", "Non-Darcy Parameters" ); m_nonDarcyParameters = new RimNonDarcyPerforationParameters(); m_nonDarcyParameters.uiCapability()->setUiTreeHidden( true ); m_nonDarcyParameters.uiCapability()->setUiTreeChildrenHidden( true ); diff --git a/ApplicationLibCode/ProjectDataModel/Completions/RimPerforationInterval.cpp b/ApplicationLibCode/ProjectDataModel/Completions/RimPerforationInterval.cpp index e7345dad17..cba31005cd 100644 --- a/ApplicationLibCode/ProjectDataModel/Completions/RimPerforationInterval.cpp +++ b/ApplicationLibCode/ProjectDataModel/Completions/RimPerforationInterval.cpp @@ -43,21 +43,21 @@ RimPerforationInterval::RimPerforationInterval() { 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", "", "", "" ); - CAF_PDM_InitField( &m_diameter, "Diameter", 0.216, "Diameter", "", "", "" ); - CAF_PDM_InitField( &m_skinFactor, "SkinFactor", 0.0, "Skin Factor", "", "", "" ); + CAF_PDM_InitField( &m_startMD, "StartMeasuredDepth", 0.0, "Start MD" ); + CAF_PDM_InitField( &m_endMD, "EndMeasuredDepth", 0.0, "End MD" ); + CAF_PDM_InitField( &m_diameter, "Diameter", 0.216, "Diameter" ); + CAF_PDM_InitField( &m_skinFactor, "SkinFactor", 0.0, "Skin Factor" ); - CAF_PDM_InitField( &m_startOfHistory_OBSOLETE, "StartOfHistory", true, "All Timesteps", "", "", "" ); + CAF_PDM_InitField( &m_startOfHistory_OBSOLETE, "StartOfHistory", true, "All Timesteps" ); m_startOfHistory_OBSOLETE.xmlCapability()->setIOWritable( false ); - CAF_PDM_InitField( &m_useCustomStartDate, "UseCustomStartDate", false, "Custom Start Date", "", "", "" ); - CAF_PDM_InitField( &m_startDate, "StartDate", QDateTime::currentDateTime(), "Start Date", "", "", "" ); + CAF_PDM_InitField( &m_useCustomStartDate, "UseCustomStartDate", false, "Custom Start Date" ); + CAF_PDM_InitField( &m_startDate, "StartDate", QDateTime::currentDateTime(), "Start Date" ); - CAF_PDM_InitField( &m_useCustomEndDate, "UseCustomEndDate", false, "Custom End Date", "", "", "" ); - CAF_PDM_InitField( &m_endDate, "EndDate", QDateTime::currentDateTime(), "End Date", "", "", "" ); + CAF_PDM_InitField( &m_useCustomEndDate, "UseCustomEndDate", false, "Custom End Date" ); + CAF_PDM_InitField( &m_endDate, "EndDate", QDateTime::currentDateTime(), "End Date" ); - CAF_PDM_InitFieldNoDefault( &m_valves, "Valves", "Valves", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_valves, "Valves", "Valves" ); m_valves.uiCapability()->setUiTreeHidden( true ); nameField()->uiCapability()->setUiReadOnly( true ); diff --git a/ApplicationLibCode/ProjectDataModel/Completions/RimSimWellFracture.cpp b/ApplicationLibCode/ProjectDataModel/Completions/RimSimWellFracture.cpp index 23b92f0f4f..2f1e6a41d2 100644 --- a/ApplicationLibCode/ProjectDataModel/Completions/RimSimWellFracture.cpp +++ b/ApplicationLibCode/ProjectDataModel/Completions/RimSimWellFracture.cpp @@ -42,15 +42,15 @@ RimSimWellFracture::RimSimWellFracture( void ) { CAF_PDM_InitObject( "SimWellFracture", ":/FractureSymbol16x16.png", "", "" ); - CAF_PDM_InitField( &m_location, "MeasuredDepth", 0.0f, "Pseudo Length Location", "", "", "" ); + CAF_PDM_InitField( &m_location, "MeasuredDepth", 0.0f, "Pseudo Length Location" ); m_location.uiCapability()->setUiEditorTypeName( caf::PdmUiDoubleSliderEditor::uiEditorTypeName() ); - CAF_PDM_InitFieldNoDefault( &m_displayIJK, "Cell_IJK", "Cell IJK", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_displayIJK, "Cell_IJK", "Cell IJK" ); m_displayIJK.registerGetMethod( this, &RimSimWellFracture::createOneBasedIJKText ); m_displayIJK.uiCapability()->setUiReadOnly( true ); m_displayIJK.xmlCapability()->disableIO(); - CAF_PDM_InitField( &m_branchIndex, "Branch", 0, "Branch", "", "", "" ); + CAF_PDM_InitField( &m_branchIndex, "Branch", 0, "Branch" ); setDeletable( true ); } diff --git a/ApplicationLibCode/ProjectDataModel/Completions/RimSimWellFractureCollection.cpp b/ApplicationLibCode/ProjectDataModel/Completions/RimSimWellFractureCollection.cpp index ed3f50dfdb..e4a661da37 100644 --- a/ApplicationLibCode/ProjectDataModel/Completions/RimSimWellFractureCollection.cpp +++ b/ApplicationLibCode/ProjectDataModel/Completions/RimSimWellFractureCollection.cpp @@ -30,7 +30,7 @@ RimSimWellFractureCollection::RimSimWellFractureCollection( void ) { CAF_PDM_InitObject( "Fractures", ":/FractureLayout16x16.png", "", "" ); - CAF_PDM_InitFieldNoDefault( &simwellFractures, "Fractures", "", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &simwellFractures, "Fractures", "" ); simwellFractures.uiCapability()->setUiTreeHidden( true ); setDeletable( true ); diff --git a/ApplicationLibCode/ProjectDataModel/Completions/RimStimPlanFractureTemplate.cpp b/ApplicationLibCode/ProjectDataModel/Completions/RimStimPlanFractureTemplate.cpp index f2d44d975c..3a4cc43b07 100644 --- a/ApplicationLibCode/ProjectDataModel/Completions/RimStimPlanFractureTemplate.cpp +++ b/ApplicationLibCode/ProjectDataModel/Completions/RimStimPlanFractureTemplate.cpp @@ -74,7 +74,7 @@ RimStimPlanFractureTemplate::RimStimPlanFractureTemplate() { CAF_PDM_InitScriptableObject( "Fracture Template", ":/FractureTemplate16x16.png", "", "" ); - CAF_PDM_InitFieldNoDefault( &m_stimPlanFileName, "StimPlanFileName", "File Name", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_stimPlanFileName, "StimPlanFileName", "File Name" ); m_stimPlanFileName.uiCapability()->setUiEditorTypeName( caf::PdmUiFilePathEditor::uiEditorTypeName() ); CAF_PDM_InitField( &m_userDefinedWellPathDepthAtFracture, @@ -85,10 +85,10 @@ RimStimPlanFractureTemplate::RimStimPlanFractureTemplate() "", "" ); - CAF_PDM_InitField( &m_borderPolygonResultName, "BorderPolygonResultName", QString( "" ), "Parameter", "", "", "" ); + CAF_PDM_InitField( &m_borderPolygonResultName, "BorderPolygonResultName", QString( "" ), "Parameter" ); m_borderPolygonResultName.uiCapability()->setUiHidden( true ); - CAF_PDM_InitField( &m_activeTimeStepIndex, "ActiveTimeStepIndex", 0, "Active TimeStep Index", "", "", "" ); + CAF_PDM_InitField( &m_activeTimeStepIndex, "ActiveTimeStepIndex", 0, "Active TimeStep Index" ); CAF_PDM_InitField( &m_conductivityResultNameOnFile, "ConductivityResultName", QString( "" ), @@ -97,13 +97,13 @@ RimStimPlanFractureTemplate::RimStimPlanFractureTemplate() "", "" ); - CAF_PDM_InitFieldNoDefault( &m_propertiesTable, "PropertiesTable", "Properties Table", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_propertiesTable, "PropertiesTable", "Properties Table" ); m_propertiesTable.uiCapability()->setUiEditorTypeName( caf::PdmUiTextEditor::uiEditorTypeName() ); m_propertiesTable.uiCapability()->setUiLabelPosition( caf::PdmUiItemInfo::HIDDEN ); m_propertiesTable.uiCapability()->setUiReadOnly( true ); m_propertiesTable.xmlCapability()->disableIO(); - CAF_PDM_InitField( &m_showStimPlanMesh_OBSOLETE, "ShowStimPlanMesh", true, "", "", "", "" ); + CAF_PDM_InitField( &m_showStimPlanMesh_OBSOLETE, "ShowStimPlanMesh", true, "" ); m_showStimPlanMesh_OBSOLETE.uiCapability()->setUiHidden( true ); m_readError = false; diff --git a/ApplicationLibCode/ProjectDataModel/Completions/RimValveTemplate.cpp b/ApplicationLibCode/ProjectDataModel/Completions/RimValveTemplate.cpp index 9e57033c1b..97bf58736e 100644 --- a/ApplicationLibCode/ProjectDataModel/Completions/RimValveTemplate.cpp +++ b/ApplicationLibCode/ProjectDataModel/Completions/RimValveTemplate.cpp @@ -41,16 +41,16 @@ RimValveTemplate::RimValveTemplate() "" ); m_valveTemplateUnit.uiCapability()->setUiReadOnly( true ); - CAF_PDM_InitFieldNoDefault( &m_type, "CompletionType", "Type", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_type, "CompletionType", "Type" ); m_type = RiaDefines::WellPathComponentType::ICD; - CAF_PDM_InitField( &m_userLabel, "UserLabel", QString( "Template" ), "Name", "", "", "" ); + CAF_PDM_InitField( &m_userLabel, "UserLabel", QString( "Template" ), "Name" ); this->setName( fullLabel() ); - CAF_PDM_InitField( &m_orificeDiameter, "OrificeDiameter", 8.0, "Orifice Diameter [mm]", "", "", "" ); - CAF_PDM_InitField( &m_flowCoefficient, "FlowCoefficient", 0.7, "Flow Coefficient", "", "", "" ); + CAF_PDM_InitField( &m_orificeDiameter, "OrificeDiameter", 8.0, "Orifice Diameter [mm]" ); + CAF_PDM_InitField( &m_flowCoefficient, "FlowCoefficient", 0.7, "Flow Coefficient" ); - CAF_PDM_InitFieldNoDefault( &m_aicdParameters, "AICDParameters", "AICD Parameters", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_aicdParameters, "AICDParameters", "AICD Parameters" ); m_aicdParameters = new RimWellPathAicdParameters; m_aicdParameters.uiCapability()->setUiTreeHidden( true ); m_aicdParameters.uiCapability()->setUiTreeChildrenHidden( true ); diff --git a/ApplicationLibCode/ProjectDataModel/Completions/RimValveTemplateCollection.cpp b/ApplicationLibCode/ProjectDataModel/Completions/RimValveTemplateCollection.cpp index 087d3b336b..9241f5f244 100644 --- a/ApplicationLibCode/ProjectDataModel/Completions/RimValveTemplateCollection.cpp +++ b/ApplicationLibCode/ProjectDataModel/Completions/RimValveTemplateCollection.cpp @@ -29,13 +29,8 @@ CAF_PDM_SOURCE_INIT( RimValveTemplateCollection, "ValveTemplateCollection" ); RimValveTemplateCollection::RimValveTemplateCollection() { 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", - "", - "", - "" ); + CAF_PDM_InitFieldNoDefault( &m_valveDefinitions, "ValveDefinitions", "" ); + CAF_PDM_InitFieldNoDefault( &m_defaultUnitsForValveTemplates, "ValveUnits", "Default unit system for valve templates" ); m_defaultUnitsForValveTemplates = RiaDefines::EclipseUnitSystem::UNITS_METRIC; m_valveDefinitions.uiCapability()->setUiTreeHidden( true ); addDefaultValveTemplates(); diff --git a/ApplicationLibCode/ProjectDataModel/Completions/RimWellPathAicdParameters.cpp b/ApplicationLibCode/ProjectDataModel/Completions/RimWellPathAicdParameters.cpp index 2f32516afb..f2a7e5fa36 100644 --- a/ApplicationLibCode/ProjectDataModel/Completions/RimWellPathAicdParameters.cpp +++ b/ApplicationLibCode/ProjectDataModel/Completions/RimWellPathAicdParameters.cpp @@ -35,35 +35,23 @@ CAF_PDM_SOURCE_INIT( RimWellPathAicdParameters, "WellPathAicdParameters" ); //-------------------------------------------------------------------------------------------------- RimWellPathAicdParameters::RimWellPathAicdParameters() { - CAF_PDM_InitObject( "RimWellPathAicdParameters", "", "", "" ); + CAF_PDM_InitObject( "RimWellPathAicdParameters" ); - CAF_PDM_InitField( &m_deviceOpen, "DeviceOpen", true, "Device Open?", "", "", "" ); + CAF_PDM_InitField( &m_deviceOpen, "DeviceOpen", true, "Device Open?" ); - CAF_PDM_InitFieldNoDefault( &m_aicdParameterFields[AICD_STRENGTH], "StrengthAICD", "Strength of AICD", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_aicdParameterFields[AICD_STRENGTH], "StrengthAICD", "Strength of AICD" ); CAF_PDM_InitFieldNoDefault( &m_aicdParameterFields[AICD_DENSITY_CALIB_FLUID], "DensityCalibrationFluid", - "Calibration Fluid Density (kg/m^3)", - "", - "", - "" ); + "Calibration Fluid Density (kg/m^3)" ); CAF_PDM_InitFieldNoDefault( &m_aicdParameterFields[AICD_VISCOSITY_CALIB_FLUID], "ViscosityCalibrationFluid", - "Calibration Fluid Viscosity (cP)", - "", - "", - "" ); + "Calibration Fluid Viscosity (cP)" ); CAF_PDM_InitFieldNoDefault( &m_aicdParameterFields[AICD_VOL_FLOW_EXP], "VolumeFlowRateExponent", - "Volume Flow Rate Exponent", - "", - "", - "" ); + "Volume Flow Rate Exponent" ); CAF_PDM_InitFieldNoDefault( &m_aicdParameterFields[AICD_VISOSITY_FUNC_EXP], "ViscosityFunctionExponent", - "Viscosity Function Exponent", - "", - "", - "" ); + "Viscosity Function Exponent" ); CAF_PDM_InitField( &m_aicdParameterFields[AICD_CRITICAL_WATER_IN_LIQUID_FRAC], "CriticalWaterLiquidFractionEmul", diff --git a/ApplicationLibCode/ProjectDataModel/Completions/RimWellPathCompletionSettings.cpp b/ApplicationLibCode/ProjectDataModel/Completions/RimWellPathCompletionSettings.cpp index 0a3ea14c80..81b1f61783 100644 --- a/ApplicationLibCode/ProjectDataModel/Completions/RimWellPathCompletionSettings.cpp +++ b/ApplicationLibCode/ProjectDataModel/Completions/RimWellPathCompletionSettings.cpp @@ -78,21 +78,21 @@ CAF_PDM_SOURCE_INIT( RimWellPathCompletionSettings, "WellPathCompletionSettings" RimWellPathCompletionSettings::RimWellPathCompletionSettings() { CAF_PDM_InitObject( "Completion Settings", ":/CompletionsSymbol16x16.png", "", "" ); - CAF_PDM_InitField( &m_wellNameForExport, "WellNameForExport", QString(), "Well Name", "", "", "" ); + CAF_PDM_InitField( &m_wellNameForExport, "WellNameForExport", QString(), "Well Name" ); m_wellNameForExport.uiCapability()->setUiEditorTypeName( caf::PdmUiLineEditor::uiEditorTypeName() ); - CAF_PDM_InitField( &m_wellGroupName, "WellGroupNameForExport", QString(), "Well Group Name", "", "", "" ); - CAF_PDM_InitField( &m_referenceDepth, "ReferenceDepthForExport", QString(), "Reference Depth for BHP", "", "", "" ); - CAF_PDM_InitFieldNoDefault( &m_preferredFluidPhase, "WellTypeForExport", "Preferred Fluid Phase", "", "", "" ); - CAF_PDM_InitField( &m_drainageRadiusForPI, "DrainageRadiusForPI", QString( "0.0" ), "Drainage Radius for PI", "", "", "" ); - CAF_PDM_InitFieldNoDefault( &m_gasInflowEquation, "GasInflowEq", "Gas Inflow Equation", "", "", "" ); - CAF_PDM_InitFieldNoDefault( &m_automaticWellShutIn, "AutoWellShutIn", "Automatic well shut-in", "", "", "" ); - CAF_PDM_InitField( &m_allowWellCrossFlow, "AllowWellCrossFlow", true, "Allow Well Cross-Flow", "", "", "" ); - CAF_PDM_InitField( &m_wellBoreFluidPVTTable, "WellBoreFluidPVTTable", 0, "Wellbore Fluid PVT table", "", "", "" ); - CAF_PDM_InitFieldNoDefault( &m_hydrostaticDensity, "HydrostaticDensity", "Hydrostatic Density", "", "", "" ); - CAF_PDM_InitField( &m_fluidInPlaceRegion, "FluidInPlaceRegion", 0, "Fluid In-Place Region", "", "", "" ); + CAF_PDM_InitField( &m_wellGroupName, "WellGroupNameForExport", QString(), "Well Group Name" ); + CAF_PDM_InitField( &m_referenceDepth, "ReferenceDepthForExport", QString(), "Reference Depth for BHP" ); + CAF_PDM_InitFieldNoDefault( &m_preferredFluidPhase, "WellTypeForExport", "Preferred Fluid Phase" ); + CAF_PDM_InitField( &m_drainageRadiusForPI, "DrainageRadiusForPI", QString( "0.0" ), "Drainage Radius for PI" ); + CAF_PDM_InitFieldNoDefault( &m_gasInflowEquation, "GasInflowEq", "Gas Inflow Equation" ); + CAF_PDM_InitFieldNoDefault( &m_automaticWellShutIn, "AutoWellShutIn", "Automatic well shut-in" ); + CAF_PDM_InitField( &m_allowWellCrossFlow, "AllowWellCrossFlow", true, "Allow Well Cross-Flow" ); + CAF_PDM_InitField( &m_wellBoreFluidPVTTable, "WellBoreFluidPVTTable", 0, "Wellbore Fluid PVT table" ); + CAF_PDM_InitFieldNoDefault( &m_hydrostaticDensity, "HydrostaticDensity", "Hydrostatic Density" ); + CAF_PDM_InitField( &m_fluidInPlaceRegion, "FluidInPlaceRegion", 0, "Fluid In-Place Region" ); - CAF_PDM_InitFieldNoDefault( &m_mswParameters, "MswParameters", "Multi Segment Well Parameters", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_mswParameters, "MswParameters", "Multi Segment Well Parameters" ); m_mswParameters = new RimMswCompletionParameters; m_mswParameters.uiCapability()->setUiTreeHidden( true ); m_mswParameters.uiCapability()->setUiTreeChildrenHidden( true ); diff --git a/ApplicationLibCode/ProjectDataModel/Completions/RimWellPathCompletions.cpp b/ApplicationLibCode/ProjectDataModel/Completions/RimWellPathCompletions.cpp index 7cd6bada20..e7769aaca6 100644 --- a/ApplicationLibCode/ProjectDataModel/Completions/RimWellPathCompletions.cpp +++ b/ApplicationLibCode/ProjectDataModel/Completions/RimWellPathCompletions.cpp @@ -51,29 +51,29 @@ RimWellPathCompletions::RimWellPathCompletions() { CAF_PDM_InitObject( "Completions", ":/CompletionsSymbol16x16.png", "", "" ); - CAF_PDM_InitFieldNoDefault( &m_perforationCollection, "Perforations", "Perforations", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_perforationCollection, "Perforations", "Perforations" ); m_perforationCollection = new RimPerforationCollection; m_perforationCollection.uiCapability()->setUiTreeHidden( true ); - CAF_PDM_InitFieldNoDefault( &m_fishbonesCollection, "Fishbones", "Fishbones", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_fishbonesCollection, "Fishbones", "Fishbones" ); m_fishbonesCollection = new RimFishbonesCollection; m_fishbonesCollection.uiCapability()->setUiTreeHidden( true ); - CAF_PDM_InitFieldNoDefault( &m_fractureCollection, "Fractures", "Fractures", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_fractureCollection, "Fractures", "Fractures" ); m_fractureCollection = new RimWellPathFractureCollection; m_fractureCollection.uiCapability()->setUiTreeHidden( true ); - CAF_PDM_InitFieldNoDefault( &m_stimPlanModelCollection, "StimPlanModels", "StimPlan Models", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_stimPlanModelCollection, "StimPlanModels", "StimPlan Models" ); m_stimPlanModelCollection = new RimStimPlanModelCollection; m_stimPlanModelCollection.uiCapability()->setUiTreeHidden( true ); - CAF_PDM_InitField( &m_wellNameForExport_OBSOLETE, "WellNameForExport", QString(), "Well Name", "", "", "" ); + CAF_PDM_InitField( &m_wellNameForExport_OBSOLETE, "WellNameForExport", QString(), "Well Name" ); m_wellNameForExport_OBSOLETE.xmlCapability()->setIOWritable( false ); - CAF_PDM_InitField( &m_wellGroupName_OBSOLETE, "WellGroupNameForExport", QString(), "Well Group Name", "", "", "" ); + CAF_PDM_InitField( &m_wellGroupName_OBSOLETE, "WellGroupNameForExport", QString(), "Well Group Name" ); m_wellGroupName_OBSOLETE.xmlCapability()->setIOWritable( false ); - CAF_PDM_InitField( &m_referenceDepth_OBSOLETE, "ReferenceDepthForExport", QString(), "Reference Depth for BHP", "", "", "" ); + CAF_PDM_InitField( &m_referenceDepth_OBSOLETE, "ReferenceDepthForExport", QString(), "Reference Depth for BHP" ); m_referenceDepth_OBSOLETE.xmlCapability()->setIOWritable( false ); - CAF_PDM_InitFieldNoDefault( &m_preferredFluidPhase_OBSOLETE, "WellTypeForExport", "Preferred Fluid Phase", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_preferredFluidPhase_OBSOLETE, "WellTypeForExport", "Preferred Fluid Phase" ); m_preferredFluidPhase_OBSOLETE.xmlCapability()->setIOWritable( false ); CAF_PDM_InitField( &m_drainageRadiusForPI_OBSOLETE, "DrainageRadiusForPI", @@ -83,17 +83,17 @@ RimWellPathCompletions::RimWellPathCompletions() "", "" ); m_drainageRadiusForPI_OBSOLETE.xmlCapability()->setIOWritable( false ); - CAF_PDM_InitFieldNoDefault( &m_gasInflowEquation_OBSOLETE, "GasInflowEq", "Gas Inflow Equation", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_gasInflowEquation_OBSOLETE, "GasInflowEq", "Gas Inflow Equation" ); m_gasInflowEquation_OBSOLETE.xmlCapability()->setIOWritable( false ); - CAF_PDM_InitFieldNoDefault( &m_automaticWellShutIn_OBSOLETE, "AutoWellShutIn", "Automatic well shut-in", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_automaticWellShutIn_OBSOLETE, "AutoWellShutIn", "Automatic well shut-in" ); m_automaticWellShutIn_OBSOLETE.xmlCapability()->setIOWritable( false ); - CAF_PDM_InitField( &m_allowWellCrossFlow_OBSOLETE, "AllowWellCrossFlow", true, "Allow Well Cross-Flow", "", "", "" ); + CAF_PDM_InitField( &m_allowWellCrossFlow_OBSOLETE, "AllowWellCrossFlow", true, "Allow Well Cross-Flow" ); m_allowWellCrossFlow_OBSOLETE.xmlCapability()->setIOWritable( false ); - CAF_PDM_InitField( &m_wellBoreFluidPVTTable_OBSOLETE, "WellBoreFluidPVTTable", 0, "Wellbore Fluid PVT table", "", "", "" ); + CAF_PDM_InitField( &m_wellBoreFluidPVTTable_OBSOLETE, "WellBoreFluidPVTTable", 0, "Wellbore Fluid PVT table" ); m_wellBoreFluidPVTTable_OBSOLETE.xmlCapability()->setIOWritable( false ); - CAF_PDM_InitFieldNoDefault( &m_hydrostaticDensity_OBSOLETE, "HydrostaticDensity", "Hydrostatic Density", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_hydrostaticDensity_OBSOLETE, "HydrostaticDensity", "Hydrostatic Density" ); m_hydrostaticDensity_OBSOLETE.xmlCapability()->setIOWritable( false ); - CAF_PDM_InitField( &m_fluidInPlaceRegion_OBSOLETE, "FluidInPlaceRegion", 0, "Fluid In-Place Region", "", "", "" ); + CAF_PDM_InitField( &m_fluidInPlaceRegion_OBSOLETE, "FluidInPlaceRegion", 0, "Fluid In-Place Region" ); m_fluidInPlaceRegion_OBSOLETE.xmlCapability()->setIOWritable( false ); } diff --git a/ApplicationLibCode/ProjectDataModel/Completions/RimWellPathFracture.cpp b/ApplicationLibCode/ProjectDataModel/Completions/RimWellPathFracture.cpp index 8fe6f71d90..1ef4d8cf8f 100644 --- a/ApplicationLibCode/ProjectDataModel/Completions/RimWellPathFracture.cpp +++ b/ApplicationLibCode/ProjectDataModel/Completions/RimWellPathFracture.cpp @@ -37,7 +37,7 @@ RimWellPathFracture::RimWellPathFracture( void ) { CAF_PDM_InitObject( "Fracture", ":/FractureSymbol16x16.png", "", "" ); - CAF_PDM_InitField( &m_measuredDepth, "MeasuredDepth", 0.0f, "Measured Depth Location", "", "", "" ); + CAF_PDM_InitField( &m_measuredDepth, "MeasuredDepth", 0.0f, "Measured Depth Location" ); m_measuredDepth.uiCapability()->setUiEditorTypeName( caf::PdmUiDoubleSliderEditor::uiEditorTypeName() ); setDeletable( true ); diff --git a/ApplicationLibCode/ProjectDataModel/Completions/RimWellPathFractureCollection.cpp b/ApplicationLibCode/ProjectDataModel/Completions/RimWellPathFractureCollection.cpp index e1cd281aea..00282f1ec2 100644 --- a/ApplicationLibCode/ProjectDataModel/Completions/RimWellPathFractureCollection.cpp +++ b/ApplicationLibCode/ProjectDataModel/Completions/RimWellPathFractureCollection.cpp @@ -32,7 +32,7 @@ RimWellPathFractureCollection::RimWellPathFractureCollection( void ) { CAF_PDM_InitObject( "Fractures", ":/FractureLayout16x16.png", "", "" ); - CAF_PDM_InitFieldNoDefault( &m_fractures, "Fractures", "", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_fractures, "Fractures", "" ); m_fractures.uiCapability()->setUiTreeHidden( true ); setName( "Fractures" ); diff --git a/ApplicationLibCode/ProjectDataModel/Completions/RimWellPathValve.cpp b/ApplicationLibCode/ProjectDataModel/Completions/RimWellPathValve.cpp index 4ec0e90752..f934ab32cd 100644 --- a/ApplicationLibCode/ProjectDataModel/Completions/RimWellPathValve.cpp +++ b/ApplicationLibCode/ProjectDataModel/Completions/RimWellPathValve.cpp @@ -46,11 +46,11 @@ RimWellPathValve::RimWellPathValve() { CAF_PDM_InitObject( "WellPathValve", ":/ICDValve16x16.png", "", "" ); - CAF_PDM_InitFieldNoDefault( &m_valveTemplate, "ValveTemplate", "Valve Template", "", "", "" ); - CAF_PDM_InitField( &m_measuredDepth, "StartMeasuredDepth", 0.0, "Start MD", "", "", "" ); - CAF_PDM_InitFieldNoDefault( &m_multipleValveLocations, "ValveLocations", "Valve Locations", "", "", "" ); - CAF_PDM_InitField( &m_editValveTemplate, "EditTemplate", false, "Edit", "", "", "" ); - CAF_PDM_InitField( &m_createValveTemplate, "CreateTemplate", false, "Create", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_valveTemplate, "ValveTemplate", "Valve Template" ); + CAF_PDM_InitField( &m_measuredDepth, "StartMeasuredDepth", 0.0, "Start MD" ); + CAF_PDM_InitFieldNoDefault( &m_multipleValveLocations, "ValveLocations", "Valve Locations" ); + CAF_PDM_InitField( &m_editValveTemplate, "EditTemplate", false, "Edit" ); + CAF_PDM_InitField( &m_createValveTemplate, "CreateTemplate", false, "Create" ); m_measuredDepth.uiCapability()->setUiEditorTypeName( caf::PdmUiDoubleSliderEditor::uiEditorTypeName() ); m_multipleValveLocations = new RimMultipleValveLocations; diff --git a/ApplicationLibCode/ProjectDataModel/CorrelationPlots/RimAbstractCorrelationPlot.cpp b/ApplicationLibCode/ProjectDataModel/CorrelationPlots/RimAbstractCorrelationPlot.cpp index fa23d13bbd..27c565d1cc 100644 --- a/ApplicationLibCode/ProjectDataModel/CorrelationPlots/RimAbstractCorrelationPlot.cpp +++ b/ApplicationLibCode/ProjectDataModel/CorrelationPlots/RimAbstractCorrelationPlot.cpp @@ -53,40 +53,40 @@ RimAbstractCorrelationPlot::RimAbstractCorrelationPlot() CAF_PDM_InitObject( "Abstract Correlation Plot", ":/CorrelationPlot16x16.png", "", "" ); this->setDeletable( true ); - CAF_PDM_InitFieldNoDefault( &m_selectedVarsUiField, "SelectedVariableDisplayVar", "Vector", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_selectedVarsUiField, "SelectedVariableDisplayVar", "Vector" ); m_selectedVarsUiField.xmlCapability()->disableIO(); m_selectedVarsUiField.uiCapability()->setUiReadOnly( true ); m_selectedVarsUiField.uiCapability()->setUiEditorTypeName( caf::PdmUiLineEditor::uiEditorTypeName() ); - CAF_PDM_InitFieldNoDefault( &m_dataSources, "AnalysisPlotData", "", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_dataSources, "AnalysisPlotData", "" ); m_dataSources.uiCapability()->setUiTreeChildrenHidden( true ); m_dataSources.uiCapability()->setUiTreeHidden( true ); - CAF_PDM_InitFieldNoDefault( &m_pushButtonSelectSummaryAddress, "SelectAddress", "", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_pushButtonSelectSummaryAddress, "SelectAddress", "" ); caf::PdmUiPushButtonEditor::configureEditorForField( &m_pushButtonSelectSummaryAddress ); m_pushButtonSelectSummaryAddress.uiCapability()->setUiLabelPosition( caf::PdmUiItemInfo::HIDDEN ); m_pushButtonSelectSummaryAddress = false; - CAF_PDM_InitFieldNoDefault( &m_timeStepFilter, "TimeStepFilter", "Available Time Steps", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_timeStepFilter, "TimeStepFilter", "Available Time Steps" ); - CAF_PDM_InitFieldNoDefault( &m_timeStep, "TimeStep", "Time Step", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_timeStep, "TimeStep", "Time Step" ); m_timeStep.uiCapability()->setUiEditorTypeName( caf::PdmUiComboBoxEditor::uiEditorTypeName() ); - CAF_PDM_InitField( &m_useAutoPlotTitle, "AutoTitle", true, "Automatic Plot Title", "", "", "" ); - CAF_PDM_InitField( &m_description, "PlotTitle", QString( "Correlation Plot" ), "Custom Plot Title", "", "", "" ); + CAF_PDM_InitField( &m_useAutoPlotTitle, "AutoTitle", true, "Automatic Plot Title" ); + CAF_PDM_InitField( &m_description, "PlotTitle", QString( "Correlation Plot" ), "Custom Plot Title" ); - CAF_PDM_InitFieldNoDefault( &m_labelFontSize, "LabelFontSize", "Label Font Size", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_labelFontSize, "LabelFontSize", "Label Font Size" ); m_labelFontSize = caf::FontTools::RelativeSize::XSmall; - CAF_PDM_InitFieldNoDefault( &m_axisTitleFontSize, "AxisTitleFontSize", "Axis Title Font Size", "", "", "" ); - CAF_PDM_InitFieldNoDefault( &m_axisValueFontSize, "AxisValueFontSize", "Axis Value Font Size", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_axisTitleFontSize, "AxisTitleFontSize", "Axis Title Font Size" ); + CAF_PDM_InitFieldNoDefault( &m_axisValueFontSize, "AxisValueFontSize", "Axis Value Font Size" ); m_axisValueFontSize = caf::FontTools::RelativeSize::XSmall; m_legendFontSize = caf::FontTools::RelativeSize::XSmall; - CAF_PDM_InitField( &m_useCaseFilter, "UseCaseFilter", false, "Use Ensemble Filter", "", "", "" ); - CAF_PDM_InitFieldNoDefault( &m_curveSetForFiltering, "CurveSetForFiltering", " Ensemble Filter", "", "", "" ); - CAF_PDM_InitField( &m_editCaseFilter, "EditCaseFilter", false, "Edit", "", "", "" ); + CAF_PDM_InitField( &m_useCaseFilter, "UseCaseFilter", false, "Use Ensemble Filter" ); + CAF_PDM_InitFieldNoDefault( &m_curveSetForFiltering, "CurveSetForFiltering", " Ensemble Filter" ); + CAF_PDM_InitField( &m_editCaseFilter, "EditCaseFilter", false, "Edit" ); m_editCaseFilter.uiCapability()->setUiEditorTypeName( caf::PdmUiToolButtonEditor::uiEditorTypeName() ); m_editCaseFilter.uiCapability()->setUiLabelPosition( caf::PdmUiItemInfo::HIDDEN ); } diff --git a/ApplicationLibCode/ProjectDataModel/CorrelationPlots/RimCorrelationMatrixPlot.cpp b/ApplicationLibCode/ProjectDataModel/CorrelationPlots/RimCorrelationMatrixPlot.cpp index c18f39d799..3854b390b2 100644 --- a/ApplicationLibCode/ProjectDataModel/CorrelationPlots/RimCorrelationMatrixPlot.cpp +++ b/ApplicationLibCode/ProjectDataModel/CorrelationPlots/RimCorrelationMatrixPlot.cpp @@ -155,9 +155,9 @@ RimCorrelationMatrixPlot::RimCorrelationMatrixPlot() { 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", "", "", "" ); - CAF_PDM_InitField( &m_sortByAbsoluteValues, "CorrelationAbsSorting", true, "Sort by Absolute Values", "", "", "" ); + CAF_PDM_InitField( &m_showAbsoluteValues, "CorrelationAbsValues", false, "Show Absolute Values" ); + CAF_PDM_InitFieldNoDefault( &m_sortByValues, "CorrelationSorting", "Sort Matrix by Values" ); + CAF_PDM_InitField( &m_sortByAbsoluteValues, "CorrelationAbsSorting", true, "Sort by Absolute Values" ); CAF_PDM_InitField( &m_excludeParametersWithoutVariation, "ExcludeParamsWithoutVariation", true, @@ -165,10 +165,10 @@ RimCorrelationMatrixPlot::RimCorrelationMatrixPlot() "", "", "" ); - 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", "", "", "", "" ); - CAF_PDM_InitFieldNoDefault( &m_selectedParametersList, "SelectedParameters", "Select Parameters", "", "", "" ); + 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", "" ); + CAF_PDM_InitFieldNoDefault( &m_selectedParametersList, "SelectedParameters", "Select Parameters" ); m_selectedParametersList.uiCapability()->setUiLabelPosition( caf::PdmUiItemInfo::TOP ); m_selectedParametersList.uiCapability()->setUiEditorTypeName( caf::PdmUiTreeSelectionEditor::uiEditorTypeName() ); diff --git a/ApplicationLibCode/ProjectDataModel/CorrelationPlots/RimCorrelationPlot.cpp b/ApplicationLibCode/ProjectDataModel/CorrelationPlots/RimCorrelationPlot.cpp index 00cb8e2063..1bd83921e4 100644 --- a/ApplicationLibCode/ProjectDataModel/CorrelationPlots/RimCorrelationPlot.cpp +++ b/ApplicationLibCode/ProjectDataModel/CorrelationPlots/RimCorrelationPlot.cpp @@ -57,8 +57,8 @@ RimCorrelationPlot::RimCorrelationPlot() { 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_showAbsoluteValues, "CorrelationAbsValues", false, "Show Absolute Values" ); + CAF_PDM_InitField( &m_sortByAbsoluteValues, "CorrelationAbsSorting", true, "Sort by Absolute Values" ); CAF_PDM_InitField( &m_excludeParametersWithoutVariation, "ExcludeParamsWithoutVariation", true, @@ -66,10 +66,10 @@ RimCorrelationPlot::RimCorrelationPlot() "", "", "" ); - CAF_PDM_InitField( &m_showOnlyTopNCorrelations, "ShowOnlyTopNCorrelations", true, "Show Only Top Correlations", "", "", "" ); - CAF_PDM_InitField( &m_topNFilterCount, "TopNFilterCount", 20, "Number rows/columns", "", "", "" ); + 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_selectedParametersList, "SelectedParameters", "Select Parameters", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_selectedParametersList, "SelectedParameters", "Select Parameters" ); m_selectedParametersList.uiCapability()->setUiLabelPosition( caf::PdmUiItemInfo::TOP ); m_selectedParametersList.uiCapability()->setUiEditorTypeName( caf::PdmUiTreeSelectionEditor::uiEditorTypeName() ); diff --git a/ApplicationLibCode/ProjectDataModel/CorrelationPlots/RimCorrelationPlotCollection.cpp b/ApplicationLibCode/ProjectDataModel/CorrelationPlots/RimCorrelationPlotCollection.cpp index d2397fa512..aed8b5d18c 100644 --- a/ApplicationLibCode/ProjectDataModel/CorrelationPlots/RimCorrelationPlotCollection.cpp +++ b/ApplicationLibCode/ProjectDataModel/CorrelationPlots/RimCorrelationPlotCollection.cpp @@ -36,8 +36,8 @@ RimCorrelationPlotCollection::RimCorrelationPlotCollection() { CAF_PDM_InitObject( "Ensemble Correlation Plots", ":/CorrelationPlots16x16.png", "", "" ); - CAF_PDM_InitFieldNoDefault( &m_correlationPlots, "CorrelationPlots", "Correlation Plots", "", "", "" ); - CAF_PDM_InitFieldNoDefault( &m_correlationReports, "CorrelationReports", "Correlation Reports", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_correlationPlots, "CorrelationPlots", "Correlation Plots" ); + CAF_PDM_InitFieldNoDefault( &m_correlationReports, "CorrelationReports", "Correlation Reports" ); m_correlationPlots.uiCapability()->setUiTreeHidden( true ); m_correlationReports.uiCapability()->setUiTreeHidden( true ); diff --git a/ApplicationLibCode/ProjectDataModel/CorrelationPlots/RimCorrelationReportPlot.cpp b/ApplicationLibCode/ProjectDataModel/CorrelationPlots/RimCorrelationReportPlot.cpp index a8fde71a64..eda2bdaaf1 100644 --- a/ApplicationLibCode/ProjectDataModel/CorrelationPlots/RimCorrelationReportPlot.cpp +++ b/ApplicationLibCode/ProjectDataModel/CorrelationPlots/RimCorrelationReportPlot.cpp @@ -54,18 +54,18 @@ RimCorrelationReportPlot::RimCorrelationReportPlot() CAF_PDM_InitObject( "Correlation Report Plot", ":/CorrelationReportPlot16x16.png", "", "" ); this->setDeletable( true ); - CAF_PDM_InitFieldNoDefault( &m_plotWindowTitle, "PlotWindowTitle", "Title", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_plotWindowTitle, "PlotWindowTitle", "Title" ); m_plotWindowTitle.registerGetMethod( this, &RimCorrelationReportPlot::createPlotWindowTitle ); - CAF_PDM_InitFieldNoDefault( &m_correlationMatrixPlot, "MatrixPlot", "Matrix Plot", "", "", "" ); - CAF_PDM_InitFieldNoDefault( &m_correlationPlot, "CorrelationPlot", "Correlation Plot", "", "", "" ); - CAF_PDM_InitFieldNoDefault( &m_parameterResultCrossPlot, "CrossPlot", "Cross Plot", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_correlationMatrixPlot, "MatrixPlot", "Matrix Plot" ); + CAF_PDM_InitFieldNoDefault( &m_correlationPlot, "CorrelationPlot", "Correlation Plot" ); + CAF_PDM_InitFieldNoDefault( &m_parameterResultCrossPlot, "CrossPlot", "Cross Plot" ); - CAF_PDM_InitFieldNoDefault( &m_subTitleFontSize, "SubTitleFontSize", "Sub Plot Title Font Size", "", "", "" ); - CAF_PDM_InitFieldNoDefault( &m_labelFontSize, "LabelFontSize", "Label Font Size", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_subTitleFontSize, "SubTitleFontSize", "Sub Plot Title Font Size" ); + CAF_PDM_InitFieldNoDefault( &m_labelFontSize, "LabelFontSize", "Label Font Size" ); - CAF_PDM_InitFieldNoDefault( &m_axisTitleFontSize, "AxisTitleFontSize", "Axis Title Font Size", "", "", "" ); - CAF_PDM_InitFieldNoDefault( &m_axisValueFontSize, "AxisValueFontSize", "Axis Value Font Size", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_axisTitleFontSize, "AxisTitleFontSize", "Axis Title Font Size" ); + CAF_PDM_InitFieldNoDefault( &m_axisValueFontSize, "AxisValueFontSize", "Axis Value Font Size" ); setAsPlotMdiWindow(); diff --git a/ApplicationLibCode/ProjectDataModel/CorrelationPlots/RimParameterResultCrossPlot.cpp b/ApplicationLibCode/ProjectDataModel/CorrelationPlots/RimParameterResultCrossPlot.cpp index 84d8dd3ef3..fe5fa1c3e7 100644 --- a/ApplicationLibCode/ProjectDataModel/CorrelationPlots/RimParameterResultCrossPlot.cpp +++ b/ApplicationLibCode/ProjectDataModel/CorrelationPlots/RimParameterResultCrossPlot.cpp @@ -68,7 +68,7 @@ RimParameterResultCrossPlot::RimParameterResultCrossPlot() { CAF_PDM_InitObject( "ParameterResultCross Plot", ":/CorrelationCrossPlot16x16.png", "", "" ); - CAF_PDM_InitField( &m_ensembleParameter, "EnsembleParameter", QString( "" ), "Ensemble Parameter", "", "", "" ); + CAF_PDM_InitField( &m_ensembleParameter, "EnsembleParameter", QString( "" ), "Ensemble Parameter" ); m_ensembleParameter.uiCapability()->setUiEditorTypeName( caf::PdmUiComboBoxEditor::uiEditorTypeName() ); m_selectMultipleVectors = true; diff --git a/ApplicationLibCode/ProjectDataModel/Faults/RimFaultInView.cpp b/ApplicationLibCode/ProjectDataModel/Faults/RimFaultInView.cpp index d94eea6e7a..0f35749077 100644 --- a/ApplicationLibCode/ProjectDataModel/Faults/RimFaultInView.cpp +++ b/ApplicationLibCode/ProjectDataModel/Faults/RimFaultInView.cpp @@ -33,14 +33,14 @@ RimFaultInView::RimFaultInView() { CAF_PDM_InitObject( "RimFault", ":/draw_style_faults_24x24.png", "", "" ); - CAF_PDM_InitFieldNoDefault( &name, "FaultName", "Name", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &name, "FaultName", "Name" ); name.uiCapability()->setUiHidden( true ); name.uiCapability()->setUiReadOnly( true ); - CAF_PDM_InitField( &showFault, "ShowFault", true, "Show Fault", "", "", "" ); + CAF_PDM_InitField( &showFault, "ShowFault", true, "Show Fault" ); showFault.uiCapability()->setUiHidden( true ); - CAF_PDM_InitField( &faultColor, "Color", cvf::Color3f( 0.588f, 0.588f, 0.804f ), "Fault Color", "", "", "" ); + CAF_PDM_InitField( &faultColor, "Color", cvf::Color3f( 0.588f, 0.588f, 0.804f ), "Fault Color" ); m_rigFault = nullptr; } diff --git a/ApplicationLibCode/ProjectDataModel/Faults/RimFaultInViewCollection.cpp b/ApplicationLibCode/ProjectDataModel/Faults/RimFaultInViewCollection.cpp index ea0d1cf13c..dafee52400 100644 --- a/ApplicationLibCode/ProjectDataModel/Faults/RimFaultInViewCollection.cpp +++ b/ApplicationLibCode/ProjectDataModel/Faults/RimFaultInViewCollection.cpp @@ -62,12 +62,12 @@ RimFaultInViewCollection::RimFaultInViewCollection() { CAF_PDM_InitObject( "Faults", ":/draw_style_faults_24x24.png", "", "" ); - CAF_PDM_InitField( &showFaultCollection, "Active", true, "Active", "", "", "" ); + CAF_PDM_InitField( &showFaultCollection, "Active", true, "Active" ); showFaultCollection.uiCapability()->setUiHidden( true ); - CAF_PDM_InitField( &showFaultFaces, "ShowFaultFaces", true, "Show Defined faces", "", "", "" ); - CAF_PDM_InitField( &showOppositeFaultFaces, "ShowOppositeFaultFaces", true, "Show Opposite Faces", "", "", "" ); - CAF_PDM_InitField( &m_showFaultsOutsideFilters, "ShowFaultsOutsideFilters", true, "Show Faults Outside Filters", "", "", "" ); + CAF_PDM_InitField( &showFaultFaces, "ShowFaultFaces", true, "Show Defined faces" ); + CAF_PDM_InitField( &showOppositeFaultFaces, "ShowOppositeFaultFaces", true, "Show Opposite Faces" ); + CAF_PDM_InitField( &m_showFaultsOutsideFilters, "ShowFaultsOutsideFilters", true, "Show Faults Outside Filters" ); CAF_PDM_InitField( &faultResult, "FaultFaceCulling", @@ -78,11 +78,11 @@ RimFaultInViewCollection::RimFaultInViewCollection() "", "" ); - CAF_PDM_InitField( &showFaultLabel, "ShowFaultLabel", false, "Show Labels", "", "", "" ); + CAF_PDM_InitField( &showFaultLabel, "ShowFaultLabel", false, "Show Labels" ); cvf::Color3f defWellLabelColor = RiaPreferences::current()->defaultWellLabelColor(); - CAF_PDM_InitField( &faultLabelColor, "FaultLabelColor", defWellLabelColor, "Label Color", "", "", "" ); + CAF_PDM_InitField( &faultLabelColor, "FaultLabelColor", defWellLabelColor, "Label Color" ); - CAF_PDM_InitField( &showNNCs, "ShowNNCs", true, "Show NNCs", "", "", "" ); + CAF_PDM_InitField( &showNNCs, "ShowNNCs", true, "Show NNCs" ); CAF_PDM_InitField( &hideNncsWhenNoResultIsAvailable, "HideNncsWhenNoResultIsAvailable", true, @@ -91,14 +91,14 @@ RimFaultInViewCollection::RimFaultInViewCollection() "", "" ); - CAF_PDM_InitFieldNoDefault( &faults, "Faults", "Faults", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &faults, "Faults", "Faults" ); faults.uiCapability()->setUiTreeHidden( true ); - CAF_PDM_InitField( &m_enableFaultRA, "EnableFaultRA", false, "Enable Fault RA", "", "", "" ); + CAF_PDM_InitField( &m_enableFaultRA, "EnableFaultRA", false, "Enable Fault RA" ); m_enableFaultRA.uiCapability()->setUiReadOnly( true ); m_enableFaultRA.uiCapability()->setUiHidden( true ); - CAF_PDM_InitFieldNoDefault( &m_faultRASettings, "FaultRASettings", "Reactivation Assessment Settings", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_faultRASettings, "FaultRASettings", "Reactivation Assessment Settings" ); m_faultRASettings = new RimFaultRASettings(); m_faultRASettings.uiCapability()->setUiHidden( true ); m_faultRASettings.uiCapability()->setUiTreeHidden( true ); diff --git a/ApplicationLibCode/ProjectDataModel/Faults/RimFaultRAPostprocSettings.cpp b/ApplicationLibCode/ProjectDataModel/Faults/RimFaultRAPostprocSettings.cpp index ae7f05efcc..031c09847d 100644 --- a/ApplicationLibCode/ProjectDataModel/Faults/RimFaultRAPostprocSettings.cpp +++ b/ApplicationLibCode/ProjectDataModel/Faults/RimFaultRAPostprocSettings.cpp @@ -32,13 +32,13 @@ RimFaultRAPostprocSettings::RimFaultRAPostprocSettings() { 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", "", "", "" ); - CAF_PDM_InitField( &m_endTimestepEclipse, "EndTimeStepEclipse", 0, "End Time Step", "", "", "" ); - CAF_PDM_InitField( &m_geomechEnabled, "GeomechEnabled", false, "GeoMechanical Input Available", "", "", "" ); - CAF_PDM_InitField( &m_basicMacrisDatabase, "BasicMacrisDatabase", QString( "" ), "Basic Macris Database", "", "", "" ); - CAF_PDM_InitField( &m_advancedMacrisDatabase, "AdvancedMacrisDatabase", QString( "" ), "Advanced Macris Database", "", "", "" ); - CAF_PDM_InitFieldNoDefault( &m_postprocParameters, "PostprocParameters", "Post-Processing Parameters", "", "", "" ); + CAF_PDM_InitField( &m_baseDir, "BaseDir", QString( "" ), "Working Directory" ); + CAF_PDM_InitField( &m_startTimestepEclipse, "StartTimeStepEclipse", 0, "Start Time Step" ); + CAF_PDM_InitField( &m_endTimestepEclipse, "EndTimeStepEclipse", 0, "End Time Step" ); + CAF_PDM_InitField( &m_geomechEnabled, "GeomechEnabled", false, "GeoMechanical Input Available" ); + CAF_PDM_InitField( &m_basicMacrisDatabase, "BasicMacrisDatabase", QString( "" ), "Basic Macris Database" ); + CAF_PDM_InitField( &m_advancedMacrisDatabase, "AdvancedMacrisDatabase", QString( "" ), "Advanced Macris Database" ); + CAF_PDM_InitFieldNoDefault( &m_postprocParameters, "PostprocParameters", "Post-Processing Parameters" ); m_postprocParameters = new RimParameterGroup(); } diff --git a/ApplicationLibCode/ProjectDataModel/Faults/RimFaultRAPreprocSettings.cpp b/ApplicationLibCode/ProjectDataModel/Faults/RimFaultRAPreprocSettings.cpp index cf3d80ea48..cb088e1168 100644 --- a/ApplicationLibCode/ProjectDataModel/Faults/RimFaultRAPreprocSettings.cpp +++ b/ApplicationLibCode/ProjectDataModel/Faults/RimFaultRAPreprocSettings.cpp @@ -42,29 +42,29 @@ RimFaultRAPreprocSettings::RimFaultRAPreprocSettings() { CAF_PDM_InitObject( "Fault RA Preproc Settings", ":/fault_react_24x24.png", "", "" ); - CAF_PDM_InitField( &m_startTimestepEclipse, "StartTimeStepEclipse", 0, "Start Time Step", "", "", "" ); + CAF_PDM_InitField( &m_startTimestepEclipse, "StartTimeStepEclipse", 0, "Start Time Step" ); m_startTimestepEclipse.uiCapability()->setUiEditorTypeName( caf::PdmUiComboBoxEditor::uiEditorTypeName() ); - CAF_PDM_InitField( &m_endTimestepEclipse, "EndTimeStepEclipse", 0, "End Time Step", "", "", "" ); + CAF_PDM_InitField( &m_endTimestepEclipse, "EndTimeStepEclipse", 0, "End Time Step" ); m_endTimestepEclipse.uiCapability()->setUiEditorTypeName( caf::PdmUiComboBoxEditor::uiEditorTypeName() ); - CAF_PDM_InitField( &m_startTimestepGeoMech, "StartTimeStepGeoMech", 0, "Start Time Step", "", "", "" ); + CAF_PDM_InitField( &m_startTimestepGeoMech, "StartTimeStepGeoMech", 0, "Start Time Step" ); m_startTimestepGeoMech.uiCapability()->setUiEditorTypeName( caf::PdmUiComboBoxEditor::uiEditorTypeName() ); - CAF_PDM_InitField( &m_endTimestepGeoMech, "EndTimeStepGeoMech", 0, "End Time Step", "", "", "" ); + CAF_PDM_InitField( &m_endTimestepGeoMech, "EndTimeStepGeoMech", 0, "End Time Step" ); m_endTimestepGeoMech.uiCapability()->setUiEditorTypeName( caf::PdmUiComboBoxEditor::uiEditorTypeName() ); - CAF_PDM_InitFieldNoDefault( &m_eclipseCase, "EclipseCase", "Eclipse Case", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_eclipseCase, "EclipseCase", "Eclipse Case" ); m_eclipseCase.setValue( nullptr ); - CAF_PDM_InitFieldNoDefault( &m_geomechCase, "GeomechCase", "GeoMech Case", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_geomechCase, "GeomechCase", "GeoMech Case" ); m_geomechCase.setValue( nullptr ); - CAF_PDM_InitFieldNoDefault( &m_baseDir, "BaseDir", "Output Directory", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_baseDir, "BaseDir", "Output Directory" ); m_baseDir.uiCapability()->setUiReadOnly( true ); - CAF_PDM_InitField( &m_cleanBaseDir, "CleanBaseDir", false, "Clean Output Directory", "", "", "" ); - CAF_PDM_InitField( &m_smoothEclipseData, "SmoothEclipseData", true, "Smooth Eclipse Data", "", "", "" ); + CAF_PDM_InitField( &m_cleanBaseDir, "CleanBaseDir", false, "Clean Output Directory" ); + CAF_PDM_InitField( &m_smoothEclipseData, "SmoothEclipseData", true, "Smooth Eclipse Data" ); - CAF_PDM_InitField( &m_elasticTableFilename, "ElasticTableFilename", QString( "" ), "Elastic Table", "", "", "" ); + CAF_PDM_InitField( &m_elasticTableFilename, "ElasticTableFilename", QString( "" ), "Elastic Table" ); m_elasticTableFilename.uiCapability()->setUiEditorTypeName( caf::PdmUiFilePathEditor::uiEditorTypeName() ); m_elasticTableFilename.uiCapability()->setUiLabelPosition( caf::PdmUiItemInfo::HIDDEN ); } diff --git a/ApplicationLibCode/ProjectDataModel/Faults/RimFaultRASettings.cpp b/ApplicationLibCode/ProjectDataModel/Faults/RimFaultRASettings.cpp index 76c71e509a..69b28c9e5d 100644 --- a/ApplicationLibCode/ProjectDataModel/Faults/RimFaultRASettings.cpp +++ b/ApplicationLibCode/ProjectDataModel/Faults/RimFaultRASettings.cpp @@ -55,31 +55,31 @@ RimFaultRASettings::RimFaultRASettings() { CAF_PDM_InitObject( "Reactivation Assessment Settings", ":/fault_react_24x24.png", "", "" ); - CAF_PDM_InitFieldNoDefault( &m_eclipseCase, "EclipseCase", "Eclipse Case", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_eclipseCase, "EclipseCase", "Eclipse Case" ); m_eclipseCase.uiCapability()->setUiReadOnly( true ); - CAF_PDM_InitFieldNoDefault( &m_geomechCase, "GeomechCase", "GeoMech Case", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_geomechCase, "GeomechCase", "GeoMech Case" ); m_geomechCase.uiCapability()->setUiReadOnly( true ); - CAF_PDM_InitFieldNoDefault( &m_eclipseFRAGeneratedCase, "EclipseFRACase", "Eclipse FRA Case", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_eclipseFRAGeneratedCase, "EclipseFRACase", "Eclipse FRA Case" ); m_eclipseFRAGeneratedCase.uiCapability()->setUiReadOnly( true ); - CAF_PDM_InitFieldNoDefault( &m_baseDir, "BaseDir", "Working Directory", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_baseDir, "BaseDir", "Working Directory" ); m_baseDir.uiCapability()->setUiReadOnly( true ); - CAF_PDM_InitField( &m_elasticTableFilename, "ElasticTableFilename", QString( "" ), "Elastic Table", "", "", "" ); + CAF_PDM_InitField( &m_elasticTableFilename, "ElasticTableFilename", QString( "" ), "Elastic Table" ); m_elasticTableFilename.uiCapability()->setUiEditorTypeName( caf::PdmUiFilePathEditor::uiEditorTypeName() ); m_elasticTableFilename.uiCapability()->setUiLabelPosition( caf::PdmUiItemInfo::TOP ); - CAF_PDM_InitField( &m_startTimestepEclipse, "StartTimeStepEclipse", 0, "Start Time Step", "", "", "" ); + CAF_PDM_InitField( &m_startTimestepEclipse, "StartTimeStepEclipse", 0, "Start Time Step" ); m_startTimestepEclipse.uiCapability()->setUiEditorTypeName( caf::PdmUiComboBoxEditor::uiEditorTypeName() ); - CAF_PDM_InitField( &m_endTimestepEclipse, "EndTimeStepEclipse", 0, "End Time Step", "", "", "" ); + CAF_PDM_InitField( &m_endTimestepEclipse, "EndTimeStepEclipse", 0, "End Time Step" ); m_endTimestepEclipse.uiCapability()->setUiEditorTypeName( caf::PdmUiComboBoxEditor::uiEditorTypeName() ); - CAF_PDM_InitField( &m_startTimestepGeoMech, "StartTimeStepGeoMech", 0, "Start Time Step", "", "", "" ); + CAF_PDM_InitField( &m_startTimestepGeoMech, "StartTimeStepGeoMech", 0, "Start Time Step" ); m_startTimestepGeoMech.uiCapability()->setUiEditorTypeName( caf::PdmUiComboBoxEditor::uiEditorTypeName() ); m_startTimestepGeoMech.uiCapability()->setUiReadOnly( true ); - CAF_PDM_InitField( &m_endTimestepGeoMech, "EndTimeStepGeoMech", 0, "End Time Step", "", "", "" ); + CAF_PDM_InitField( &m_endTimestepGeoMech, "EndTimeStepGeoMech", 0, "End Time Step" ); m_endTimestepGeoMech.uiCapability()->setUiEditorTypeName( caf::PdmUiComboBoxEditor::uiEditorTypeName() ); m_endTimestepGeoMech.uiCapability()->setUiReadOnly( true ); @@ -91,8 +91,8 @@ RimFaultRASettings::RimFaultRASettings() "", "" ); - CAF_PDM_InitFieldNoDefault( &m_basicParametersRI, "BasicParametersRI", "Basic ResInsight Parameters", "", "", "" ); - CAF_PDM_InitFieldNoDefault( &m_advancedParametersRI, "AdvancedParametersRI", "Advanced ResInsight Parameters", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_basicParametersRI, "BasicParametersRI", "Basic ResInsight Parameters" ); + CAF_PDM_InitFieldNoDefault( &m_advancedParametersRI, "AdvancedParametersRI", "Advanced ResInsight Parameters" ); setupResInsightParameters(); } diff --git a/ApplicationLibCode/ProjectDataModel/Flow/RimDataSourceForRftPlt.cpp b/ApplicationLibCode/ProjectDataModel/Flow/RimDataSourceForRftPlt.cpp index f2ddf34450..7a8c33f53f 100644 --- a/ApplicationLibCode/ProjectDataModel/Flow/RimDataSourceForRftPlt.cpp +++ b/ApplicationLibCode/ProjectDataModel/Flow/RimDataSourceForRftPlt.cpp @@ -102,11 +102,11 @@ RifDataSourceForRftPlt RimDataSourceForRftPlt::address() const //-------------------------------------------------------------------------------------------------- void RimDataSourceForRftPlt::InitPdmObject() { - CAF_PDM_InitFieldNoDefault( &m_sourceType, "SourceType", "Source Type", "", "", "" ); - CAF_PDM_InitFieldNoDefault( &m_eclCase, "EclipseCase", "Eclipse Case", "", "", "" ); - CAF_PDM_InitFieldNoDefault( &m_wellLogFile, "WellLogFile", "Well Log File", "", "", "" ); - CAF_PDM_InitFieldNoDefault( &m_ensemble, "Ensemble", "Ensemble", "", "", "" ); - CAF_PDM_InitFieldNoDefault( &m_observedFmuRftData, "ObservedFmuRftData", "Observed FMU Data", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_sourceType, "SourceType", "Source Type" ); + CAF_PDM_InitFieldNoDefault( &m_eclCase, "EclipseCase", "Eclipse Case" ); + CAF_PDM_InitFieldNoDefault( &m_wellLogFile, "WellLogFile", "Well Log File" ); + CAF_PDM_InitFieldNoDefault( &m_ensemble, "Ensemble", "Ensemble" ); + CAF_PDM_InitFieldNoDefault( &m_observedFmuRftData, "ObservedFmuRftData", "Observed FMU Data" ); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/ProjectDataModel/Flow/RimFlowCharacteristicsPlot.cpp b/ApplicationLibCode/ProjectDataModel/Flow/RimFlowCharacteristicsPlot.cpp index 65e556d5a5..fbedaf8bfa 100644 --- a/ApplicationLibCode/ProjectDataModel/Flow/RimFlowCharacteristicsPlot.cpp +++ b/ApplicationLibCode/ProjectDataModel/Flow/RimFlowCharacteristicsPlot.cpp @@ -70,15 +70,15 @@ RimFlowCharacteristicsPlot::RimFlowCharacteristicsPlot() { CAF_PDM_InitObject( "Flow Characteristics", ":/FlowCharPlot16x16.png", "", "" ); - CAF_PDM_InitFieldNoDefault( &m_case, "FlowCase", "Case", "", "", "" ); - CAF_PDM_InitFieldNoDefault( &m_flowDiagSolution, "FlowDiagSolution", "Flow Diag Solution", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_case, "FlowCase", "Case" ); + CAF_PDM_InitFieldNoDefault( &m_flowDiagSolution, "FlowDiagSolution", "Flow Diag Solution" ); m_flowDiagSolution.uiCapability()->setUiHidden( true ); - CAF_PDM_InitFieldNoDefault( &m_timeStepSelectionType, "TimeSelectionType", "Time Steps", "", "", "" ); - CAF_PDM_InitFieldNoDefault( &m_selectedTimeSteps, "SelectedTimeSteps", "", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_timeStepSelectionType, "TimeSelectionType", "Time Steps" ); + CAF_PDM_InitFieldNoDefault( &m_selectedTimeSteps, "SelectedTimeSteps", "" ); m_selectedTimeSteps.uiCapability()->setUiHidden( true ); - CAF_PDM_InitFieldNoDefault( &m_selectedTimeStepsUi, "SelectedTimeStepsUi", "", "", "", "" ); - CAF_PDM_InitFieldNoDefault( &m_applyTimeSteps, "ApplyTimeSteps", "", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_selectedTimeStepsUi, "SelectedTimeStepsUi", "" ); + CAF_PDM_InitFieldNoDefault( &m_applyTimeSteps, "ApplyTimeSteps", "" ); caf::PdmUiPushButtonEditor::configureEditorForField( &m_applyTimeSteps ); CAF_PDM_InitField( &m_maxPvFraction, @@ -90,19 +90,19 @@ RimFlowCharacteristicsPlot::RimFlowCharacteristicsPlot() "Volume.", "" ); - CAF_PDM_InitField( &m_showLegend, "ShowLegend", true, "Legend", "", "", "" ); + CAF_PDM_InitField( &m_showLegend, "ShowLegend", true, "Legend" ); // Region group - CAF_PDM_InitFieldNoDefault( &m_cellFilter, "CellFilter", "Cell Filter", "", "", "" ); - CAF_PDM_InitFieldNoDefault( &m_cellFilterView, "CellFilterView", "View", "", "", "" ); - CAF_PDM_InitField( &m_tracerFilter, "TracerFilter", QString(), "Tracer Filter", "", "", "" ); - CAF_PDM_InitFieldNoDefault( &m_selectedTracerNames, "SelectedTracerNames", " ", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_cellFilter, "CellFilter", "Cell Filter" ); + CAF_PDM_InitFieldNoDefault( &m_cellFilterView, "CellFilterView", "View" ); + CAF_PDM_InitField( &m_tracerFilter, "TracerFilter", QString(), "Tracer Filter" ); + CAF_PDM_InitFieldNoDefault( &m_selectedTracerNames, "SelectedTracerNames", " " ); m_selectedTracerNames.uiCapability()->setUiEditorTypeName( caf::PdmUiListEditor::uiEditorTypeName() ); - CAF_PDM_InitFieldNoDefault( &m_showRegion, "ShowRegion", "", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_showRegion, "ShowRegion", "" ); caf::PdmUiPushButtonEditor::configureEditorForField( &m_showRegion ); - CAF_PDM_InitField( &m_minCommunication, "MinCommunication", 0.0, "Min Communication", "", "", "" ); - CAF_PDM_InitField( &m_maxTof, "MaxTof", 146000, "Max Time of Flight [days]", "", "", "" ); + CAF_PDM_InitField( &m_minCommunication, "MinCommunication", 0.0, "Min Communication" ); + CAF_PDM_InitField( &m_maxTof, "MaxTof", 146000, "Max Time of Flight [days]" ); this->m_showWindow = false; setAsPlotMdiWindow(); diff --git a/ApplicationLibCode/ProjectDataModel/Flow/RimFlowDiagSolution.cpp b/ApplicationLibCode/ProjectDataModel/Flow/RimFlowDiagSolution.cpp index 7c0069572b..9ffe5931f6 100644 --- a/ApplicationLibCode/ProjectDataModel/Flow/RimFlowDiagSolution.cpp +++ b/ApplicationLibCode/ProjectDataModel/Flow/RimFlowDiagSolution.cpp @@ -70,8 +70,8 @@ QString RimFlowDiagSolution::addCrossFlowEnding( const QString& wellName ) //-------------------------------------------------------------------------------------------------- RimFlowDiagSolution::RimFlowDiagSolution( void ) { - CAF_PDM_InitObject( "Flow Diagnostics Solution", "", "", "" ); - CAF_PDM_InitField( &m_userDescription, "UserDescription", QString( "All Wells" ), "Description", "", "", "" ); + CAF_PDM_InitObject( "Flow Diagnostics Solution" ); + CAF_PDM_InitField( &m_userDescription, "UserDescription", QString( "All Wells" ), "Description" ); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/ProjectDataModel/Flow/RimFlowPlotCollection.cpp b/ApplicationLibCode/ProjectDataModel/Flow/RimFlowPlotCollection.cpp index 251ee0ed3b..f61dfb9969 100644 --- a/ApplicationLibCode/ProjectDataModel/Flow/RimFlowPlotCollection.cpp +++ b/ApplicationLibCode/ProjectDataModel/Flow/RimFlowPlotCollection.cpp @@ -35,25 +35,22 @@ RimFlowPlotCollection::RimFlowPlotCollection() { CAF_PDM_InitObject( "Flow Diagnostics Plots", ":/WellAllocPlots16x16.png", "", "" ); - CAF_PDM_InitFieldNoDefault( &m_flowCharacteristicsPlot, "FlowCharacteristicsPlot", "", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_flowCharacteristicsPlot, "FlowCharacteristicsPlot", "" ); m_flowCharacteristicsPlot.uiCapability()->setUiTreeHidden( true ); - CAF_PDM_InitFieldNoDefault( &m_defaultWellAllocPlot, "DefaultWellAllocationPlot", "", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_defaultWellAllocPlot, "DefaultWellAllocationPlot", "" ); m_defaultWellAllocPlot.uiCapability()->setUiTreeHidden( true ); - // CAF_PDM_InitFieldNoDefault( &m_dbgWellDistributionPlot, "DbgWellDistributionPlot", "", "", "", "" ); + // CAF_PDM_InitFieldNoDefault( &m_dbgWellDistributionPlot, "DbgWellDistributionPlot", ""); // m_dbgWellDistributionPlot.uiCapability()->setUiHidden( true ); - CAF_PDM_InitFieldNoDefault( &m_wellDistributionPlotCollection, "WellDistributionPlotCollection", "", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_wellDistributionPlotCollection, "WellDistributionPlotCollection", "" ); m_wellDistributionPlotCollection.uiCapability()->setUiTreeHidden( true ); - CAF_PDM_InitFieldNoDefault( &m_storedWellAllocPlots, "StoredWellAllocationPlots", "Stored Well Allocation Plots", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_storedWellAllocPlots, "StoredWellAllocationPlots", "Stored Well Allocation Plots" ); CAF_PDM_InitFieldNoDefault( &m_storedFlowCharacteristicsPlots, "StoredFlowCharacteristicsPlots", - "Stored Flow Characteristics Plots", - "", - "", - "" ); + "Stored Flow Characteristics Plots" ); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/ProjectDataModel/Flow/RimTofAccumulatedPhaseFractionsPlot.cpp b/ApplicationLibCode/ProjectDataModel/Flow/RimTofAccumulatedPhaseFractionsPlot.cpp index a9967e0e49..f4774a6f73 100644 --- a/ApplicationLibCode/ProjectDataModel/Flow/RimTofAccumulatedPhaseFractionsPlot.cpp +++ b/ApplicationLibCode/ProjectDataModel/Flow/RimTofAccumulatedPhaseFractionsPlot.cpp @@ -46,13 +46,13 @@ RimTofAccumulatedPhaseFractionsPlot::RimTofAccumulatedPhaseFractionsPlot() { 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", "", "", "" ); + CAF_PDM_InitField( &m_userName, "PlotDescription", QString( "Cumulative Saturation by Time of Flight" ), "Name" ); m_userName.uiCapability()->setUiHidden( true ); - CAF_PDM_InitField( &m_showPlotTitle, "ShowPlotTitle", true, "Show Plot Title", "", "", "" ); + CAF_PDM_InitField( &m_showPlotTitle, "ShowPlotTitle", true, "Show Plot Title" ); m_showPlotTitle.uiCapability()->setUiHidden( true ); - CAF_PDM_InitField( &m_maxTof, "MaxTof", 50, "Max Time of Flight [year]", "", "", "" ); + CAF_PDM_InitField( &m_maxTof, "MaxTof", 50, "Max Time of Flight [year]" ); m_showWindow = false; } diff --git a/ApplicationLibCode/ProjectDataModel/Flow/RimTotalWellAllocationPlot.cpp b/ApplicationLibCode/ProjectDataModel/Flow/RimTotalWellAllocationPlot.cpp index 3551837b03..d028fff882 100644 --- a/ApplicationLibCode/ProjectDataModel/Flow/RimTotalWellAllocationPlot.cpp +++ b/ApplicationLibCode/ProjectDataModel/Flow/RimTotalWellAllocationPlot.cpp @@ -44,10 +44,10 @@ RimTotalWellAllocationPlot::RimTotalWellAllocationPlot() { CAF_PDM_InitObject( "Total Allocation", ":/WellAllocPie16x16.png", "", "" ); - CAF_PDM_InitField( &m_userName, "PlotDescription", QString( "Total Allocation" ), "Name", "", "", "" ); + CAF_PDM_InitField( &m_userName, "PlotDescription", QString( "Total Allocation" ), "Name" ); m_userName.uiCapability()->setUiReadOnly( true ); - CAF_PDM_InitField( &m_showPlotTitle, "ShowPlotTitle", true, "Show Plot Title", "", "", "" ); + CAF_PDM_InitField( &m_showPlotTitle, "ShowPlotTitle", true, "Show Plot Title" ); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/ProjectDataModel/Flow/RimWellAllocationPlot.cpp b/ApplicationLibCode/ProjectDataModel/Flow/RimWellAllocationPlot.cpp index 54c262279e..c00e3a3f60 100644 --- a/ApplicationLibCode/ProjectDataModel/Flow/RimWellAllocationPlot.cpp +++ b/ApplicationLibCode/ProjectDataModel/Flow/RimWellAllocationPlot.cpp @@ -76,10 +76,10 @@ RimWellAllocationPlot::RimWellAllocationPlot() { CAF_PDM_InitObject( "Well Allocation Plot", ":/WellAllocPlot16x16.png", "", "" ); - CAF_PDM_InitField( &m_userName, "PlotDescription", QString( "Flow Diagnostics Plot" ), "Name", "", "", "" ); + CAF_PDM_InitField( &m_userName, "PlotDescription", QString( "Flow Diagnostics Plot" ), "Name" ); m_userName.uiCapability()->setUiReadOnly( true ); - CAF_PDM_InitField( &m_showPlotTitle, "ShowPlotTitle", true, "Show Plot Title", "", "", "" ); + CAF_PDM_InitField( &m_showPlotTitle, "ShowPlotTitle", true, "Show Plot Title" ); CAF_PDM_InitField( &m_branchDetection, "BranchDetection", @@ -89,16 +89,16 @@ RimWellAllocationPlot::RimWellAllocationPlot() "Compute branches based on how simulation well cells are organized", "" ); - CAF_PDM_InitFieldNoDefault( &m_case, "CurveCase", "Case", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_case, "CurveCase", "Case" ); m_case.uiCapability()->setUiTreeChildrenHidden( true ); - CAF_PDM_InitField( &m_timeStep, "PlotTimeStep", 0, "Time Step", "", "", "" ); - CAF_PDM_InitField( &m_wellName, "WellName", QString( "None" ), "Well", "", "", "" ); - CAF_PDM_InitFieldNoDefault( &m_flowDiagSolution, "FlowDiagSolution", "Plot Type", "", "", "" ); - CAF_PDM_InitFieldNoDefault( &m_flowType, "FlowType", "Flow Type", "", "", "" ); - CAF_PDM_InitField( &m_groupSmallContributions, "GroupSmallContributions", true, "Group Small Contributions", "", "", "" ); - CAF_PDM_InitField( &m_smallContributionsThreshold, "SmallContributionsThreshold", 0.005, "Threshold", "", "", "" ); - CAF_PDM_InitFieldNoDefault( &m_accumulatedWellFlowPlot, "AccumulatedWellFlowPlot", "Accumulated Well Flow", "", "", "" ); + CAF_PDM_InitField( &m_timeStep, "PlotTimeStep", 0, "Time Step" ); + CAF_PDM_InitField( &m_wellName, "WellName", QString( "None" ), "Well" ); + CAF_PDM_InitFieldNoDefault( &m_flowDiagSolution, "FlowDiagSolution", "Plot Type" ); + CAF_PDM_InitFieldNoDefault( &m_flowType, "FlowType", "Flow Type" ); + CAF_PDM_InitField( &m_groupSmallContributions, "GroupSmallContributions", true, "Group Small Contributions" ); + CAF_PDM_InitField( &m_smallContributionsThreshold, "SmallContributionsThreshold", 0.005, "Threshold" ); + CAF_PDM_InitFieldNoDefault( &m_accumulatedWellFlowPlot, "AccumulatedWellFlowPlot", "Accumulated Well Flow" ); m_accumulatedWellFlowPlot.uiCapability()->setUiTreeHidden( true ); m_accumulatedWellFlowPlot = new RimWellLogPlot; m_accumulatedWellFlowPlot->setDepthUnit( RiaDefines::DepthUnitType::UNIT_NONE ); @@ -106,20 +106,17 @@ RimWellAllocationPlot::RimWellAllocationPlot() m_accumulatedWellFlowPlot->setLegendsVisible( false ); m_accumulatedWellFlowPlot->uiCapability()->setUiIconFromResourceString( ":/WellFlowPlot16x16.png" ); - CAF_PDM_InitFieldNoDefault( &m_totalWellAllocationPlot, "TotalWellFlowPlot", "Total Well Flow", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_totalWellAllocationPlot, "TotalWellFlowPlot", "Total Well Flow" ); m_totalWellAllocationPlot.uiCapability()->setUiTreeHidden( true ); m_totalWellAllocationPlot = new RimTotalWellAllocationPlot; - CAF_PDM_InitFieldNoDefault( &m_wellAllocationPlotLegend, "WellAllocLegend", "Legend", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_wellAllocationPlotLegend, "WellAllocLegend", "Legend" ); m_wellAllocationPlotLegend.uiCapability()->setUiTreeHidden( true ); m_wellAllocationPlotLegend = new RimWellAllocationPlotLegend; CAF_PDM_InitFieldNoDefault( &m_tofAccumulatedPhaseFractionsPlot, "TofAccumulatedPhaseFractionsPlot", - "TOF Accumulated Phase Fractions", - "", - "", - "" ); + "TOF Accumulated Phase Fractions" ); m_tofAccumulatedPhaseFractionsPlot.uiCapability()->setUiTreeHidden( true ); m_tofAccumulatedPhaseFractionsPlot = new RimTofAccumulatedPhaseFractionsPlot; diff --git a/ApplicationLibCode/ProjectDataModel/Flow/RimWellAllocationPlotLegend.cpp b/ApplicationLibCode/ProjectDataModel/Flow/RimWellAllocationPlotLegend.cpp index 479752b735..d3f9faf106 100644 --- a/ApplicationLibCode/ProjectDataModel/Flow/RimWellAllocationPlotLegend.cpp +++ b/ApplicationLibCode/ProjectDataModel/Flow/RimWellAllocationPlotLegend.cpp @@ -27,7 +27,7 @@ CAF_PDM_SOURCE_INIT( RimWellAllocationPlotLegend, "WellAllocationPlotLegend" ); RimWellAllocationPlotLegend::RimWellAllocationPlotLegend() { CAF_PDM_InitObject( "Legend", ":/WellAllocLegend16x16.png", "", "" ); - CAF_PDM_InitField( &m_showLegend, "ShowPlotLegend", true, "Show Plot Legend", "", "", "" ); + CAF_PDM_InitField( &m_showLegend, "ShowPlotLegend", true, "Show Plot Legend" ); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/ProjectDataModel/Flow/RimWellDistributionPlot.cpp b/ApplicationLibCode/ProjectDataModel/Flow/RimWellDistributionPlot.cpp index e3d8aa4402..a3e3e3a607 100644 --- a/ApplicationLibCode/ProjectDataModel/Flow/RimWellDistributionPlot.cpp +++ b/ApplicationLibCode/ProjectDataModel/Flow/RimWellDistributionPlot.cpp @@ -59,13 +59,13 @@ RimWellDistributionPlot::RimWellDistributionPlot( RiaDefines::PhaseType phase ) { // cvf::Trace::show("RimWellDistributionPlot::RimWellDistributionPlot()"); - CAF_PDM_InitObject( "Cumulative Phase Distribution Plot", "", "", "" ); + CAF_PDM_InitObject( "Cumulative Phase Distribution Plot" ); - CAF_PDM_InitFieldNoDefault( &m_case, "Case", "Case", "", "", "" ); - CAF_PDM_InitField( &m_timeStepIndex, "TimeStepIndex", -1, "Time Step", "", "", "" ); - CAF_PDM_InitField( &m_wellName, "WellName", QString( "None" ), "Well", "", "", "" ); - CAF_PDM_InitField( &m_phase, "Phase", caf::AppEnum( phase ), "Phase", "", "", "" ); - CAF_PDM_InitField( &m_groupSmallContributions, "GroupSmallContributions", true, "Group Small Contributions", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_case, "Case", "Case" ); + CAF_PDM_InitField( &m_timeStepIndex, "TimeStepIndex", -1, "Time Step" ); + CAF_PDM_InitField( &m_wellName, "WellName", QString( "None" ), "Well" ); + CAF_PDM_InitField( &m_phase, "Phase", caf::AppEnum( phase ), "Phase" ); + CAF_PDM_InitField( &m_groupSmallContributions, "GroupSmallContributions", true, "Group Small Contributions" ); CAF_PDM_InitField( &m_smallContributionsRelativeThreshold, "SmallContributionsRelativeThreshold", 0.005, @@ -74,7 +74,7 @@ RimWellDistributionPlot::RimWellDistributionPlot( RiaDefines::PhaseType phase ) "", "" ); - CAF_PDM_InitField( &m_maximumTof, "MaximumTOF", 20.0, "Maximum Time of Flight [0, 200]", "", "", "" ); + CAF_PDM_InitField( &m_maximumTof, "MaximumTOF", 20.0, "Maximum Time of Flight [0, 200]" ); m_showWindow = false; m_showPlotLegends = true; diff --git a/ApplicationLibCode/ProjectDataModel/Flow/RimWellDistributionPlotCollection.cpp b/ApplicationLibCode/ProjectDataModel/Flow/RimWellDistributionPlotCollection.cpp index 68d47b1e6a..8c6dfe99b6 100644 --- a/ApplicationLibCode/ProjectDataModel/Flow/RimWellDistributionPlotCollection.cpp +++ b/ApplicationLibCode/ProjectDataModel/Flow/RimWellDistributionPlotCollection.cpp @@ -61,10 +61,10 @@ RimWellDistributionPlotCollection::RimWellDistributionPlotCollection() 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", "", "", "" ); - CAF_PDM_InitField( &m_wellName, "WellName", QString( "None" ), "Well", "", "", "" ); - CAF_PDM_InitField( &m_groupSmallContributions, "GroupSmallContributions", true, "Group Small Contributions", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_case, "Case", "Case" ); + CAF_PDM_InitField( &m_timeStepIndex, "TimeStepIndex", -1, "Time Step" ); + CAF_PDM_InitField( &m_wellName, "WellName", QString( "None" ), "Well" ); + CAF_PDM_InitField( &m_groupSmallContributions, "GroupSmallContributions", true, "Group Small Contributions" ); CAF_PDM_InitField( &m_smallContributionsRelativeThreshold, "SmallContributionsRelativeThreshold", 0.005, @@ -73,15 +73,15 @@ RimWellDistributionPlotCollection::RimWellDistributionPlotCollection() "", "" ); - CAF_PDM_InitField( &m_maximumTof, "MaximumTOF", 20.0, "Maximum Time of Flight [0, 200]", "", "", "" ); + CAF_PDM_InitField( &m_maximumTof, "MaximumTOF", 20.0, "Maximum Time of Flight [0, 200]" ); - CAF_PDM_InitFieldNoDefault( &m_plots, "Plots", "", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_plots, "Plots", "" ); m_plots.uiCapability()->setUiTreeHidden( true ); m_plots.uiCapability()->setUiTreeChildrenHidden( true ); - CAF_PDM_InitField( &m_showOil, "ShowOil", true, "Show Oil", "", "", "" ); - CAF_PDM_InitField( &m_showGas, "ShowGas", true, "Show Gas", "", "", "" ); - CAF_PDM_InitField( &m_showWater, "ShowWater", true, "Show Water", "", "", "" ); + CAF_PDM_InitField( &m_showOil, "ShowOil", true, "Show Oil" ); + CAF_PDM_InitField( &m_showGas, "ShowGas", true, "Show Gas" ); + CAF_PDM_InitField( &m_showWater, "ShowWater", true, "Show Water" ); CAF_PDM_InitField( &m_plotWindowTitle, "PlotDescription", diff --git a/ApplicationLibCode/ProjectDataModel/Flow/RimWellFlowRateCurve.cpp b/ApplicationLibCode/ProjectDataModel/Flow/RimWellFlowRateCurve.cpp index 71c8b784ba..4ed994addd 100644 --- a/ApplicationLibCode/ProjectDataModel/Flow/RimWellFlowRateCurve.cpp +++ b/ApplicationLibCode/ProjectDataModel/Flow/RimWellFlowRateCurve.cpp @@ -46,7 +46,7 @@ CAF_PDM_SOURCE_INIT( RimWellFlowRateCurve, "WellFlowRateCurve" ); //-------------------------------------------------------------------------------------------------- RimWellFlowRateCurve::RimWellFlowRateCurve() { - CAF_PDM_InitObject( "Flow Rate Curve", "", "", "" ); + CAF_PDM_InitObject( "Flow Rate Curve" ); m_groupId = 0; m_doFillCurve = true; } diff --git a/ApplicationLibCode/ProjectDataModel/Flow/RimWellPltPlot.cpp b/ApplicationLibCode/ProjectDataModel/Flow/RimWellPltPlot.cpp index 77e866a49f..6d453c3287 100644 --- a/ApplicationLibCode/ProjectDataModel/Flow/RimWellPltPlot.cpp +++ b/ApplicationLibCode/ProjectDataModel/Flow/RimWellPltPlot.cpp @@ -100,30 +100,30 @@ RimWellPltPlot::RimWellPltPlot() { CAF_PDM_InitObject( "Well Allocation Plot", ":/WellFlowPlot16x16.png", "", "" ); - CAF_PDM_InitFieldNoDefault( &m_wellLogPlot_OBSOLETE, "WellLog", "WellLog", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_wellLogPlot_OBSOLETE, "WellLog", "WellLog" ); m_wellLogPlot_OBSOLETE.uiCapability()->setUiTreeHidden( true ); m_wellLogPlot_OBSOLETE.xmlCapability()->setIOWritable( false ); - CAF_PDM_InitFieldNoDefault( &m_wellPathName, "WellName", "Well Name", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_wellPathName, "WellName", "Well Name" ); - CAF_PDM_InitFieldNoDefault( &m_selectedSources, "SourcesInternal", "Sources Internal", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_selectedSources, "SourcesInternal", "Sources Internal" ); m_selectedSources.uiCapability()->setUiEditorTypeName( caf::PdmUiTreeSelectionEditor::uiEditorTypeName() ); m_selectedSources.uiCapability()->setUiLabelPosition( caf::PdmUiItemInfo::HIDDEN ); m_selectedSources.uiCapability()->setAutoAddingOptionFromValue( false ); m_selectedSources.xmlCapability()->disableIO(); - CAF_PDM_InitFieldNoDefault( &m_selectedSourcesForIo, "Sources", "Sources", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_selectedSourcesForIo, "Sources", "Sources" ); m_selectedSourcesForIo.uiCapability()->setUiTreeHidden( true ); - CAF_PDM_InitFieldNoDefault( &m_selectedTimeSteps, "TimeSteps", "Time Steps", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_selectedTimeSteps, "TimeSteps", "Time Steps" ); m_selectedTimeSteps.uiCapability()->setUiEditorTypeName( caf::PdmUiTreeSelectionEditor::uiEditorTypeName() ); m_selectedTimeSteps.uiCapability()->setUiLabelPosition( caf::PdmUiItemInfo::HIDDEN ); m_selectedTimeSteps.uiCapability()->setAutoAddingOptionFromValue( false ); - CAF_PDM_InitField( &m_useStandardConditionCurves, "UseStandardConditionCurves", true, "Standard Volume", "", "", "" ); - CAF_PDM_InitField( &m_useReservoirConditionCurves, "UseReservoirConditionCurves", true, "Reservoir Volume", "", "", "" ); + CAF_PDM_InitField( &m_useStandardConditionCurves, "UseStandardConditionCurves", true, "Standard Volume" ); + CAF_PDM_InitField( &m_useReservoirConditionCurves, "UseReservoirConditionCurves", true, "Reservoir Volume" ); - CAF_PDM_InitFieldNoDefault( &m_phases, "Phases", "Phases", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_phases, "Phases", "Phases" ); m_phases.uiCapability()->setUiEditorTypeName( caf::PdmUiTreeSelectionEditor::uiEditorTypeName() ); m_phases = std::vector>( { FLOW_PHASE_OIL, FLOW_PHASE_GAS, FLOW_PHASE_WATER } ); m_phases.uiCapability()->setUiLabelPosition( caf::PdmUiItemInfo::HIDDEN ); diff --git a/ApplicationLibCode/ProjectDataModel/Flow/RimWellRftEnsembleCurveSet.cpp b/ApplicationLibCode/ProjectDataModel/Flow/RimWellRftEnsembleCurveSet.cpp index 6a66cdb702..9dbab135f8 100644 --- a/ApplicationLibCode/ProjectDataModel/Flow/RimWellRftEnsembleCurveSet.cpp +++ b/ApplicationLibCode/ProjectDataModel/Flow/RimWellRftEnsembleCurveSet.cpp @@ -39,21 +39,21 @@ CAF_PDM_SOURCE_INIT( RimWellRftEnsembleCurveSet, "WellRftEnsembleCurveSet" ); RimWellRftEnsembleCurveSet::RimWellRftEnsembleCurveSet() { CAF_PDM_InitObject( "Ensemble Curve Set", ":/EnsembleCurveSet16x16.png", "", "" ); - CAF_PDM_InitFieldNoDefault( &m_ensemble, "Ensemble", "Ensemble", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_ensemble, "Ensemble", "Ensemble" ); m_ensemble.uiCapability()->setUiTreeChildrenHidden( true ); m_ensemble.uiCapability()->setAutoAddingOptionFromValue( false ); - CAF_PDM_InitFieldNoDefault( &m_ensembleName, "NameAndUnit", "NameAndUnit", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_ensembleName, "NameAndUnit", "NameAndUnit" ); m_ensembleName.registerGetMethod( this, &RimWellRftEnsembleCurveSet::ensembleName ); m_ensembleName.uiCapability()->setUiHidden( true ); m_ensembleName.xmlCapability()->disableIO(); - CAF_PDM_InitField( &m_ensembleColorMode, "ColorMode", ColorModeEnum( ColorMode::SINGLE_COLOR ), "Coloring Mode", "", "", "" ); + CAF_PDM_InitField( &m_ensembleColorMode, "ColorMode", ColorModeEnum( ColorMode::SINGLE_COLOR ), "Coloring Mode" ); - CAF_PDM_InitField( &m_ensembleParameter, "EnsembleParameter", QString( "" ), "Ensemble Parameter", "", "", "" ); + CAF_PDM_InitField( &m_ensembleParameter, "EnsembleParameter", QString( "" ), "Ensemble Parameter" ); m_ensembleParameter.uiCapability()->setUiEditorTypeName( caf::PdmUiListEditor::uiEditorTypeName() ); - CAF_PDM_InitFieldNoDefault( &m_ensembleLegendConfig, "LegendConfig", "", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_ensembleLegendConfig, "LegendConfig", "" ); m_ensembleLegendConfig = new RimRegularLegendConfig(); m_ensembleLegendConfig->setColorLegend( RimRegularLegendConfig::mapToColorLegend( RimEnsembleCurveSetColorManager::DEFAULT_ENSEMBLE_COLOR_RANGE ) ); diff --git a/ApplicationLibCode/ProjectDataModel/Flow/RimWellRftPlot.cpp b/ApplicationLibCode/ProjectDataModel/Flow/RimWellRftPlot.cpp index b3d1838b28..b1c48c05e3 100644 --- a/ApplicationLibCode/ProjectDataModel/Flow/RimWellRftPlot.cpp +++ b/ApplicationLibCode/ProjectDataModel/Flow/RimWellRftPlot.cpp @@ -84,18 +84,18 @@ RimWellRftPlot::RimWellRftPlot() { 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", "", "", "" ); - CAF_PDM_InitField( &m_showErrorInObservedData, "ShowErrorObserved", true, "Show Observed Data Error", "", "", "" ); + CAF_PDM_InitField( &m_showStatisticsCurves, "ShowStatisticsCurves", true, "Show Statistics Curves" ); + CAF_PDM_InitField( &m_showEnsembleCurves, "ShowEnsembleCurves", true, "Show Ensemble Curves" ); + CAF_PDM_InitField( &m_showErrorInObservedData, "ShowErrorObserved", true, "Show Observed Data Error" ); - CAF_PDM_InitFieldNoDefault( &m_wellLogPlot_OBSOLETE, "WellLog", "Well Log", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_wellLogPlot_OBSOLETE, "WellLog", "Well Log" ); m_wellLogPlot_OBSOLETE.uiCapability()->setUiTreeHidden( true ); m_wellLogPlot_OBSOLETE.xmlCapability()->setIOWritable( false ); m_depthType = RiaDefines::DepthTypeEnum::TRUE_VERTICAL_DEPTH; - CAF_PDM_InitFieldNoDefault( &m_wellPathNameOrSimWellName, "WellName", "Well Name", "", "", "" ); - CAF_PDM_InitField( &m_branchIndex, "BranchIndex", 0, "Branch Index", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_wellPathNameOrSimWellName, "WellName", "Well Name" ); + CAF_PDM_InitField( &m_branchIndex, "BranchIndex", 0, "Branch Index" ); CAF_PDM_InitField( &m_branchDetection, "BranchDetection", true, @@ -104,24 +104,24 @@ RimWellRftPlot::RimWellRftPlot() "Compute branches based on how simulation well cells are organized", "" ); - CAF_PDM_InitFieldNoDefault( &m_selectedSources, "Sources", "Sources", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_selectedSources, "Sources", "Sources" ); m_selectedSources.uiCapability()->setUiEditorTypeName( caf::PdmUiTreeSelectionEditor::uiEditorTypeName() ); m_selectedSources.xmlCapability()->disableIO(); m_selectedSources.uiCapability()->setUiLabelPosition( caf::PdmUiItemInfo::HIDDEN ); m_selectedSources.uiCapability()->setAutoAddingOptionFromValue( false ); - CAF_PDM_InitFieldNoDefault( &m_selectedTimeSteps, "TimeSteps", "Time Steps", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_selectedTimeSteps, "TimeSteps", "Time Steps" ); m_selectedTimeSteps.uiCapability()->setUiEditorTypeName( caf::PdmUiTreeSelectionEditor::uiEditorTypeName() ); m_selectedTimeSteps.xmlCapability()->disableIO(); m_selectedTimeSteps.uiCapability()->setUiLabelPosition( caf::PdmUiItemInfo::HIDDEN ); m_selectedTimeSteps.uiCapability()->setAutoAddingOptionFromValue( false ); - CAF_PDM_InitFieldNoDefault( &m_wellPathCollection, "WellPathCollection", "Well Path Collection", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_wellPathCollection, "WellPathCollection", "Well Path Collection" ); m_wellPathCollection.uiCapability()->setUiHidden( true ); m_wellPathCollection.xmlCapability()->disableIO(); m_wellPathCollection = RimProject::current()->activeOilField()->wellPathCollection(); - CAF_PDM_InitFieldNoDefault( &m_ensembleCurveSets, "EnsembleCurveSets", "Ensemble Curve Sets", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_ensembleCurveSets, "EnsembleCurveSets", "Ensemble Curve Sets" ); // TODO: may want to support TRUE_VERTICAL_DEPTH_RKB in the future // It was developed for regular well log plots and requires some more work for RFT plots. diff --git a/ApplicationLibCode/ProjectDataModel/GeoMech/RimGeoMechCase.cpp b/ApplicationLibCode/ProjectDataModel/GeoMech/RimGeoMechCase.cpp index 3d4e414d33..3ac6c28523 100644 --- a/ApplicationLibCode/ProjectDataModel/GeoMech/RimGeoMechCase.cpp +++ b/ApplicationLibCode/ProjectDataModel/GeoMech/RimGeoMechCase.cpp @@ -126,31 +126,26 @@ RimGeoMechCase::RimGeoMechCase( void ) "Used to calculate the SE:SFI result", "" ); - CAF_PDM_InitFieldNoDefault( &m_elementPropertyFileNames, "ElementPropertyFileNames", "Element Property Files", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_elementPropertyFileNames, "ElementPropertyFileNames", "Element Property Files" ); - CAF_PDM_InitFieldNoDefault( &m_elementPropertyFileNameIndexUiSelection, - "ElementPropertyFileNameIndexUiSelection", - "", - "", - "", - "" ); + CAF_PDM_InitFieldNoDefault( &m_elementPropertyFileNameIndexUiSelection, "ElementPropertyFileNameIndexUiSelection", "" ); m_elementPropertyFileNameIndexUiSelection.xmlCapability()->disableIO(); - CAF_PDM_InitField( &m_importElementPropertyFileCommand, "importElementPropertyFileCommad", false, "", "", "", "" ); + CAF_PDM_InitField( &m_importElementPropertyFileCommand, "importElementPropertyFileCommad", false, "" ); caf::PdmUiPushButtonEditor::configureEditorForField( &m_importElementPropertyFileCommand ); - CAF_PDM_InitField( &m_closeElementPropertyFileCommand, "closeElementPropertyFileCommad", false, "", "", "", "" ); + CAF_PDM_InitField( &m_closeElementPropertyFileCommand, "closeElementPropertyFileCommad", false, "" ); caf::PdmUiPushButtonEditor::configureEditorForField( &m_closeElementPropertyFileCommand ); - CAF_PDM_InitField( &m_reloadElementPropertyFileCommand, "reloadElementPropertyFileCommand", false, "", "", "", "" ); + CAF_PDM_InitField( &m_reloadElementPropertyFileCommand, "reloadElementPropertyFileCommand", false, "" ); caf::PdmUiPushButtonEditor::configureEditorForField( &m_reloadElementPropertyFileCommand ); caf::AppEnum defaultBiotCoefficientType = RimGeoMechCase::BiotCoefficientType::BIOT_NONE; - CAF_PDM_InitField( &m_biotCoefficientType, "BiotCoefficientType", defaultBiotCoefficientType, "Biot Coefficient", "", "", "" ); - CAF_PDM_InitField( &m_biotFixedCoefficient, "BiotFixedCoefficient", 1.0, "Fixed Coefficient", "", "", "" ); + CAF_PDM_InitField( &m_biotCoefficientType, "BiotCoefficientType", defaultBiotCoefficientType, "Biot Coefficient" ); + CAF_PDM_InitField( &m_biotFixedCoefficient, "BiotFixedCoefficient", 1.0, "Fixed Coefficient" ); m_biotFixedCoefficient.uiCapability()->setUiEditorTypeName( caf::PdmUiDoubleValueEditor::uiEditorTypeName() ); - CAF_PDM_InitField( &m_biotResultAddress, "BiotResultAddress", QString( "" ), "Value", "", "", "" ); + CAF_PDM_InitField( &m_biotResultAddress, "BiotResultAddress", QString( "" ), "Value" ); m_biotResultAddress.uiCapability()->setUiEditorTypeName( caf::PdmUiListEditor::uiEditorTypeName() ); caf::AppEnum defaultInitialPermeabilityType = @@ -171,25 +166,20 @@ RimGeoMechCase::RimGeoMechCase( void ) "" ); m_initialPermeabilityFixed.uiCapability()->setUiEditorTypeName( caf::PdmUiDoubleValueEditor::uiEditorTypeName() ); - CAF_PDM_InitField( &m_initialPermeabilityResultAddress, "InitialPermeabilityAddress", QString( "" ), "Value", "", "", "" ); + CAF_PDM_InitField( &m_initialPermeabilityResultAddress, "InitialPermeabilityAddress", QString( "" ), "Value" ); m_initialPermeabilityResultAddress.uiCapability()->setUiEditorTypeName( caf::PdmUiListEditor::uiEditorTypeName() ); - CAF_PDM_InitField( &m_permeabilityExponent, "PermeabilityExponent", 1.0, "Permeability Exponent", "", "", "" ); + CAF_PDM_InitField( &m_permeabilityExponent, "PermeabilityExponent", 1.0, "Permeability Exponent" ); m_permeabilityExponent.uiCapability()->setUiEditorTypeName( caf::PdmUiDoubleValueEditor::uiEditorTypeName() ); - CAF_PDM_InitField( &m_waterDensityShearSlipIndicator, "WaterDensityShearSlipIndicator", 1.03, "Water Density", "", "", "" ); + CAF_PDM_InitField( &m_waterDensityShearSlipIndicator, "WaterDensityShearSlipIndicator", 1.03, "Water Density" ); m_waterDensityShearSlipIndicator.uiCapability()->setUiEditorTypeName( caf::PdmUiDoubleValueEditor::uiEditorTypeName() ); - CAF_PDM_InitFieldNoDefault( &m_contourMapCollection, "ContourMaps", "2d Contour Maps", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_contourMapCollection, "ContourMaps", "2d Contour Maps" ); m_contourMapCollection = new RimGeoMechContourMapViewCollection; m_contourMapCollection.uiCapability()->setUiTreeHidden( true ); - CAF_PDM_InitFieldNoDefault( &m_mudWeightWindowParameters, - "MudWeightWindowParameters", - "Mud Weight Window Parameters", - "", - "", - "" ); + CAF_PDM_InitFieldNoDefault( &m_mudWeightWindowParameters, "MudWeightWindowParameters", "Mud Weight Window Parameters" ); m_mudWeightWindowParameters = new RimMudWeightWindowParameters; m_mudWeightWindowParameters.uiCapability()->setUiTreeHidden( true ); diff --git a/ApplicationLibCode/ProjectDataModel/GeoMech/RimGeoMechCellColors.cpp b/ApplicationLibCode/ProjectDataModel/GeoMech/RimGeoMechCellColors.cpp index 52ff1fb461..54b29c9636 100644 --- a/ApplicationLibCode/ProjectDataModel/GeoMech/RimGeoMechCellColors.cpp +++ b/ApplicationLibCode/ProjectDataModel/GeoMech/RimGeoMechCellColors.cpp @@ -32,7 +32,7 @@ CAF_PDM_SOURCE_INIT( RimGeoMechCellColors, "GeoMechResultSlot" ); RimGeoMechCellColors::RimGeoMechCellColors( void ) : legendConfigChanged( this ) { - CAF_PDM_InitFieldNoDefault( &legendConfig, "LegendDefinition", "Color Legend", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &legendConfig, "LegendDefinition", "Color Legend" ); this->legendConfig = new RimRegularLegendConfig(); legendConfig.uiCapability()->setUiTreeHidden( true ); legendConfig->changed.connect( this, &RimGeoMechCellColors::onLegendConfigChanged ); diff --git a/ApplicationLibCode/ProjectDataModel/GeoMech/RimGeoMechContourMapProjection.cpp b/ApplicationLibCode/ProjectDataModel/GeoMech/RimGeoMechContourMapProjection.cpp index c4bb67d966..c288a0f957 100644 --- a/ApplicationLibCode/ProjectDataModel/GeoMech/RimGeoMechContourMapProjection.cpp +++ b/ApplicationLibCode/ProjectDataModel/GeoMech/RimGeoMechContourMapProjection.cpp @@ -60,8 +60,8 @@ RimGeoMechContourMapProjection::RimGeoMechContourMapProjection() : m_kLayers( 0u ) { 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_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, diff --git a/ApplicationLibCode/ProjectDataModel/GeoMech/RimGeoMechContourMapView.cpp b/ApplicationLibCode/ProjectDataModel/GeoMech/RimGeoMechContourMapView.cpp index 90e6987738..bcf3feaf23 100644 --- a/ApplicationLibCode/ProjectDataModel/GeoMech/RimGeoMechContourMapView.cpp +++ b/ApplicationLibCode/ProjectDataModel/GeoMech/RimGeoMechContourMapView.cpp @@ -58,11 +58,11 @@ RimGeoMechContourMapView::RimGeoMechContourMapView() "GeoMechContourMap", "A contour map for GeoMech cases" ); - CAF_PDM_InitFieldNoDefault( &m_contourMapProjection, "ContourMapProjection", "Contour Map Projection", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_contourMapProjection, "ContourMapProjection", "Contour Map Projection" ); m_contourMapProjection = new RimGeoMechContourMapProjection(); - CAF_PDM_InitField( &m_showAxisLines, "ShowAxisLines", true, "Show Axis Lines", "", "", "" ); - CAF_PDM_InitField( &m_showScaleLegend, "ShowScaleLegend", true, "Show Scale Legend", "", "", "" ); + CAF_PDM_InitField( &m_showAxisLines, "ShowAxisLines", true, "Show Axis Lines" ); + CAF_PDM_InitField( &m_showScaleLegend, "ShowScaleLegend", true, "Show Scale Legend" ); m_gridCollection->setActive( false ); // This is also not added to the tree view, so cannot be enabled. diff --git a/ApplicationLibCode/ProjectDataModel/GeoMech/RimGeoMechModels.cpp b/ApplicationLibCode/ProjectDataModel/GeoMech/RimGeoMechModels.cpp index 7489dd88cd..cacbf602cb 100644 --- a/ApplicationLibCode/ProjectDataModel/GeoMech/RimGeoMechModels.cpp +++ b/ApplicationLibCode/ProjectDataModel/GeoMech/RimGeoMechModels.cpp @@ -36,7 +36,7 @@ RimGeoMechModels::RimGeoMechModels( void ) { CAF_PDM_InitObject( "Geomechanical Models", ":/GeoMechCases48x48.png", "", "" ); - CAF_PDM_InitFieldNoDefault( &m_cases, "Cases", "", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_cases, "Cases", "" ); m_cases.uiCapability()->setUiTreeHidden( true ); } diff --git a/ApplicationLibCode/ProjectDataModel/GeoMech/RimGeoMechPart.cpp b/ApplicationLibCode/ProjectDataModel/GeoMech/RimGeoMechPart.cpp index ab35aa23d6..bcf36365dc 100644 --- a/ApplicationLibCode/ProjectDataModel/GeoMech/RimGeoMechPart.cpp +++ b/ApplicationLibCode/ProjectDataModel/GeoMech/RimGeoMechPart.cpp @@ -32,7 +32,7 @@ RimGeoMechPart::RimGeoMechPart() { CAF_PDM_InitScriptableObject( "GeoMechPart", ":/GeoMechCase24x24.png", "", "" ); - CAF_PDM_InitScriptableFieldNoDefault( &m_partId, "PartId", "Part Id", "", "", "" ); + CAF_PDM_InitScriptableFieldNoDefault( &m_partId, "PartId", "Part Id" ); m_partId.uiCapability()->setUiReadOnly( true ); nameField()->uiCapability()->setUiReadOnly( true ); diff --git a/ApplicationLibCode/ProjectDataModel/GeoMech/RimGeoMechPartCollection.cpp b/ApplicationLibCode/ProjectDataModel/GeoMech/RimGeoMechPartCollection.cpp index f26cd94e5b..4f1346e9ea 100644 --- a/ApplicationLibCode/ProjectDataModel/GeoMech/RimGeoMechPartCollection.cpp +++ b/ApplicationLibCode/ProjectDataModel/GeoMech/RimGeoMechPartCollection.cpp @@ -43,7 +43,7 @@ RimGeoMechPartCollection::RimGeoMechPartCollection() { CAF_PDM_InitScriptableObject( "Parts", ":/GeoMechCase24x24.png", "", "" ); - CAF_PDM_InitScriptableFieldNoDefault( &m_parts, "Parts", "Parts", "", "", "" ); + CAF_PDM_InitScriptableFieldNoDefault( &m_parts, "Parts", "Parts" ); m_parts.uiCapability()->setUiTreeHidden( true ); setDeletable( false ); diff --git a/ApplicationLibCode/ProjectDataModel/GeoMech/RimGeoMechResultDefinition.cpp b/ApplicationLibCode/ProjectDataModel/GeoMech/RimGeoMechResultDefinition.cpp index 07841aba05..de1650bb0b 100644 --- a/ApplicationLibCode/ProjectDataModel/GeoMech/RimGeoMechResultDefinition.cpp +++ b/ApplicationLibCode/ProjectDataModel/GeoMech/RimGeoMechResultDefinition.cpp @@ -78,13 +78,13 @@ RimGeoMechResultDefinition::RimGeoMechResultDefinition( void ) { CAF_PDM_InitObject( "Color Result", ":/CellResult.png", "", "" ); - CAF_PDM_InitFieldNoDefault( &m_resultPositionType, "ResultPositionType", "Result Position", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_resultPositionType, "ResultPositionType", "Result Position" ); m_resultPositionType.uiCapability()->setUiHidden( true ); - CAF_PDM_InitField( &m_resultFieldName, "ResultFieldName", QString( "" ), "Field Name", "", "", "" ); + CAF_PDM_InitField( &m_resultFieldName, "ResultFieldName", QString( "" ), "Field Name" ); m_resultFieldName.uiCapability()->setUiHidden( true ); - CAF_PDM_InitField( &m_resultComponentName, "ResultComponentName", QString( "" ), "Component", "", "", "" ); + CAF_PDM_InitField( &m_resultComponentName, "ResultComponentName", QString( "" ), "Component" ); m_resultComponentName.uiCapability()->setUiHidden( true ); CAF_PDM_InitField( &m_timeLapseBaseTimestep, @@ -94,15 +94,15 @@ RimGeoMechResultDefinition::RimGeoMechResultDefinition( void ) "", "", "" ); - CAF_PDM_InitField( &m_referenceTimeStep, "ReferenceTimeStep", 0, "Reference Time Step", "", "", "" ); + CAF_PDM_InitField( &m_referenceTimeStep, "ReferenceTimeStep", 0, "Reference Time Step" ); - CAF_PDM_InitField( &m_compactionRefLayer, "CompactionRefLayer", 0, "Compaction Ref Layer", "", "", "" ); + CAF_PDM_InitField( &m_compactionRefLayer, "CompactionRefLayer", 0, "Compaction Ref Layer" ); m_compactionRefLayer.uiCapability()->setUiHidden( true ); - CAF_PDM_InitFieldNoDefault( &m_resultPositionTypeUiField, "ResultPositionTypeUi", "Result Position", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_resultPositionTypeUiField, "ResultPositionTypeUi", "Result Position" ); m_resultPositionTypeUiField.xmlCapability()->disableIO(); - CAF_PDM_InitField( &m_resultVariableUiField, "ResultVariableUI", QString( "" ), "Value", "", "", "" ); + CAF_PDM_InitField( &m_resultVariableUiField, "ResultVariableUI", QString( "" ), "Value" ); m_resultVariableUiField.xmlCapability()->disableIO(); m_resultVariableUiField.uiCapability()->setUiEditorTypeName( caf::PdmUiListEditor::uiEditorTypeName() ); @@ -115,7 +115,7 @@ RimGeoMechResultDefinition::RimGeoMechResultDefinition( void ) "", "", "" ); - CAF_PDM_InitField( &m_normalizationAirGap, "NormalizationAirGap", 0.0, "Air Gap", "", "", "" ); + CAF_PDM_InitField( &m_normalizationAirGap, "NormalizationAirGap", 0.0, "Air Gap" ); m_normalizationAirGap.uiCapability()->setUiEditorTypeName( caf::PdmUiDoubleValueEditor::uiEditorTypeName() ); CAF_PDM_InitField( &m_compactionRefLayerUiField, diff --git a/ApplicationLibCode/ProjectDataModel/GeoMech/RimGeoMechView.cpp b/ApplicationLibCode/ProjectDataModel/GeoMech/RimGeoMechView.cpp index c9c94b6228..6f2d318683 100644 --- a/ApplicationLibCode/ProjectDataModel/GeoMech/RimGeoMechView.cpp +++ b/ApplicationLibCode/ProjectDataModel/GeoMech/RimGeoMechView.cpp @@ -90,20 +90,20 @@ RimGeoMechView::RimGeoMechView( void ) cellResult = new RimGeoMechCellColors(); cellResult.uiCapability()->setUiTreeHidden( true ); - CAF_PDM_InitFieldNoDefault( &m_tensorResults, "TensorResults", "Tensor Results", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_tensorResults, "TensorResults", "Tensor Results" ); m_tensorResults = new RimTensorResults(); m_tensorResults.uiCapability()->setUiTreeHidden( true ); - CAF_PDM_InitFieldNoDefault( &m_propertyFilterCollection, "PropertyFilters", "Property Filters", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_propertyFilterCollection, "PropertyFilters", "Property Filters" ); m_propertyFilterCollection = new RimGeoMechPropertyFilterCollection(); m_propertyFilterCollection.uiCapability()->setUiTreeHidden( true ); - CAF_PDM_InitFieldNoDefault( &m_partsCollection, "Parts", "Parts", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_partsCollection, "Parts", "Parts" ); m_partsCollection = new RimGeoMechPartCollection(); m_partsCollection.uiCapability()->setUiTreeHidden( true ); - CAF_PDM_InitField( &m_showDisplacement, "ShowDisplacement", false, "Show Displacement", "", "", "" ); - CAF_PDM_InitField( &m_displacementScaling, "DisplacementScaling", 1.0, "Scaling Factor", "", "", "" ); + CAF_PDM_InitField( &m_showDisplacement, "ShowDisplacement", false, "Show Displacement" ); + CAF_PDM_InitField( &m_displacementScaling, "DisplacementScaling", 1.0, "Scaling Factor" ); m_scaleTransform = new cvf::Transform(); m_vizLogic = new RivGeoMechVizLogic( this ); diff --git a/ApplicationLibCode/ProjectDataModel/GridCrossPlots/CellFilters/RimPlotCellFilter.cpp b/ApplicationLibCode/ProjectDataModel/GridCrossPlots/CellFilters/RimPlotCellFilter.cpp index 8c726f2fe8..cda69b2991 100644 --- a/ApplicationLibCode/ProjectDataModel/GridCrossPlots/CellFilters/RimPlotCellFilter.cpp +++ b/ApplicationLibCode/ProjectDataModel/GridCrossPlots/CellFilters/RimPlotCellFilter.cpp @@ -36,7 +36,7 @@ CAF_PDM_ABSTRACT_SOURCE_INIT( RimPlotCellFilter, "RimPlotCellFilter" ); //-------------------------------------------------------------------------------------------------- RimPlotCellFilter::RimPlotCellFilter() { - CAF_PDM_InitFieldNoDefault( &m_filterMode, "FilterMode", "Filter Mode", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_filterMode, "FilterMode", "Filter Mode" ); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/ProjectDataModel/GridCrossPlots/CellFilters/RimPlotCellFilterCollection.cpp b/ApplicationLibCode/ProjectDataModel/GridCrossPlots/CellFilters/RimPlotCellFilterCollection.cpp index e0d44b0b8d..e6b1d1c52c 100644 --- a/ApplicationLibCode/ProjectDataModel/GridCrossPlots/CellFilters/RimPlotCellFilterCollection.cpp +++ b/ApplicationLibCode/ProjectDataModel/GridCrossPlots/CellFilters/RimPlotCellFilterCollection.cpp @@ -28,9 +28,9 @@ CAF_PDM_SOURCE_INIT( RimPlotCellFilterCollection, "RimPlotCellFilterCollection" //-------------------------------------------------------------------------------------------------- RimPlotCellFilterCollection::RimPlotCellFilterCollection() { - CAF_PDM_InitObject( "Plot Cell Filters", "", "", "" ); + CAF_PDM_InitObject( "Plot Cell Filters" ); - CAF_PDM_InitFieldNoDefault( &m_cellFilters, "CellFilters", "Cell Filters", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_cellFilters, "CellFilters", "Cell Filters" ); m_cellFilters.uiCapability()->setUiTreeHidden( true ); setName( "Filter Collection" ); diff --git a/ApplicationLibCode/ProjectDataModel/GridCrossPlots/CellFilters/RimPlotCellPropertyFilter.cpp b/ApplicationLibCode/ProjectDataModel/GridCrossPlots/CellFilters/RimPlotCellPropertyFilter.cpp index c4848cd2b1..d95393144f 100644 --- a/ApplicationLibCode/ProjectDataModel/GridCrossPlots/CellFilters/RimPlotCellPropertyFilter.cpp +++ b/ApplicationLibCode/ProjectDataModel/GridCrossPlots/CellFilters/RimPlotCellPropertyFilter.cpp @@ -39,19 +39,19 @@ CAF_PDM_SOURCE_INIT( RimPlotCellPropertyFilter, "RimPlotCellPropertyFilter" ); //-------------------------------------------------------------------------------------------------- RimPlotCellPropertyFilter::RimPlotCellPropertyFilter() { - CAF_PDM_InitObject( "Plot Cell Property Filter", "", "", "" ); + CAF_PDM_InitObject( "Plot Cell Property Filter" ); - CAF_PDM_InitFieldNoDefault( &m_resultDefinition, "ResultDefinition", "Result Definition", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_resultDefinition, "ResultDefinition", "Result Definition" ); // Set to hidden to avoid this item to been displayed as a child item // Fields in this object are displayed using defineUiOrdering() m_resultDefinition.uiCapability()->setUiTreeHidden( true ); m_resultDefinition.uiCapability()->setUiTreeChildrenHidden( true ); - CAF_PDM_InitField( &m_lowerBound, "LowerBound", 0.0, "Min", "", "", "" ); + CAF_PDM_InitField( &m_lowerBound, "LowerBound", 0.0, "Min" ); m_lowerBound.uiCapability()->setUiEditorTypeName( caf::PdmUiDoubleSliderEditor::uiEditorTypeName() ); - CAF_PDM_InitField( &m_upperBound, "UpperBound", 0.0, "Max", "", "", "" ); + CAF_PDM_InitField( &m_upperBound, "UpperBound", 0.0, "Max" ); m_upperBound.uiCapability()->setUiEditorTypeName( caf::PdmUiDoubleSliderEditor::uiEditorTypeName() ); } diff --git a/ApplicationLibCode/ProjectDataModel/GridCrossPlots/RimGridCrossPlot.cpp b/ApplicationLibCode/ProjectDataModel/GridCrossPlots/RimGridCrossPlot.cpp index c65369fcfa..204dda826c 100644 --- a/ApplicationLibCode/ProjectDataModel/GridCrossPlots/RimGridCrossPlot.cpp +++ b/ApplicationLibCode/ProjectDataModel/GridCrossPlots/RimGridCrossPlot.cpp @@ -54,20 +54,20 @@ RimGridCrossPlot::RimGridCrossPlot() { CAF_PDM_InitObject( "Grid Cross Plot", ":/SummaryXPlotLight16x16.png", "", "" ); - CAF_PDM_InitField( &m_showInfoBox, "ShowInfoBox", true, "Show Info Box", "", "", "" ); + CAF_PDM_InitField( &m_showInfoBox, "ShowInfoBox", true, "Show Info Box" ); - CAF_PDM_InitFieldNoDefault( &m_nameConfig, "NameConfig", "Name Config", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_nameConfig, "NameConfig", "Name Config" ); m_nameConfig.uiCapability()->setUiTreeHidden( true ); m_nameConfig.uiCapability()->setUiTreeChildrenHidden( true ); m_nameConfig = new RimGridCrossPlotNameConfig(); - CAF_PDM_InitFieldNoDefault( &m_xAxisProperties, "xAxisProperties", "X Axis", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_xAxisProperties, "xAxisProperties", "X Axis" ); m_xAxisProperties.uiCapability()->setUiTreeHidden( true ); m_xAxisProperties = new RimPlotAxisProperties; m_xAxisProperties->setNameAndAxis( "X-Axis", QwtPlot::xBottom ); m_xAxisProperties->setEnableTitleTextSettings( false ); - CAF_PDM_InitFieldNoDefault( &m_yAxisProperties, "yAxisProperties", "Y Axis", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_yAxisProperties, "yAxisProperties", "Y Axis" ); m_yAxisProperties.uiCapability()->setUiTreeHidden( true ); m_yAxisProperties = new RimPlotAxisProperties; m_yAxisProperties->setNameAndAxis( "Y-Axis", QwtPlot::yLeft ); @@ -76,7 +76,7 @@ RimGridCrossPlot::RimGridCrossPlot() connectAxisSignals( m_xAxisProperties() ); connectAxisSignals( m_yAxisProperties() ); - CAF_PDM_InitFieldNoDefault( &m_crossPlotDataSets, "CrossPlotCurve", "Cross Plot Data Set", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_crossPlotDataSets, "CrossPlotCurve", "Cross Plot Data Set" ); m_crossPlotDataSets.uiCapability()->setUiTreeHidden( true ); setDeletable( true ); @@ -1053,9 +1053,9 @@ CAF_PDM_SOURCE_INIT( RimGridCrossPlotNameConfig, "RimGridCrossPlotNameConfig" ); RimGridCrossPlotNameConfig::RimGridCrossPlotNameConfig() : RimNameConfig( "Cross Plot" ) { - CAF_PDM_InitObject( "Cross Plot Name Generator", "", "", "" ); + CAF_PDM_InitObject( "Cross Plot Name Generator" ); - CAF_PDM_InitField( &addDataSetNames, "AddDataSetNames", true, "Add Data Set Names", "", "", "" ); + CAF_PDM_InitField( &addDataSetNames, "AddDataSetNames", true, "Add Data Set Names" ); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/ProjectDataModel/GridCrossPlots/RimGridCrossPlotCollection.cpp b/ApplicationLibCode/ProjectDataModel/GridCrossPlots/RimGridCrossPlotCollection.cpp index 7543aa02fe..87f4f4548e 100644 --- a/ApplicationLibCode/ProjectDataModel/GridCrossPlots/RimGridCrossPlotCollection.cpp +++ b/ApplicationLibCode/ProjectDataModel/GridCrossPlots/RimGridCrossPlotCollection.cpp @@ -29,7 +29,7 @@ RimGridCrossPlotCollection::RimGridCrossPlotCollection() { CAF_PDM_InitObject( "Grid Cross Plots", ":/SummaryXPlotsLight16x16.png", "", "" ); - CAF_PDM_InitFieldNoDefault( &m_gridCrossPlots, "GridCrossPlots", "Grid Cross Plots", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_gridCrossPlots, "GridCrossPlots", "Grid Cross Plots" ); m_gridCrossPlots.uiCapability()->setUiTreeHidden( true ); } diff --git a/ApplicationLibCode/ProjectDataModel/GridCrossPlots/RimGridCrossPlotDataSet.cpp b/ApplicationLibCode/ProjectDataModel/GridCrossPlots/RimGridCrossPlotDataSet.cpp index cf1f73583a..7e726ea1fc 100644 --- a/ApplicationLibCode/ProjectDataModel/GridCrossPlots/RimGridCrossPlotDataSet.cpp +++ b/ApplicationLibCode/ProjectDataModel/GridCrossPlots/RimGridCrossPlotDataSet.cpp @@ -86,29 +86,29 @@ RimGridCrossPlotDataSet::RimGridCrossPlotDataSet() { CAF_PDM_InitObject( "Cross Plot Data Set", ":/WellLogCurve16x16.png", "", "" ); - CAF_PDM_InitFieldNoDefault( &m_case, "Case", "Case", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_case, "Case", "Case" ); m_case.uiCapability()->setUiTreeChildrenHidden( true ); - CAF_PDM_InitField( &m_timeStep, "TimeStep", -1, "Time Step", "", "", "" ); + CAF_PDM_InitField( &m_timeStep, "TimeStep", -1, "Time Step" ); m_timeStep.uiCapability()->setUiEditorTypeName( caf::PdmUiComboBoxEditor::uiEditorTypeName() ); - CAF_PDM_InitFieldNoDefault( &m_cellFilterView, "VisibleCellView", "Filter by 3d View Visibility", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_cellFilterView, "VisibleCellView", "Filter by 3d View Visibility" ); - CAF_PDM_InitFieldNoDefault( &m_grouping, "Grouping", "Group Data by", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_grouping, "Grouping", "Group Data by" ); - CAF_PDM_InitFieldNoDefault( &m_xAxisProperty, "XAxisProperty", "X-Axis Property", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_xAxisProperty, "XAxisProperty", "X-Axis Property" ); m_xAxisProperty = new RimEclipseResultDefinition( caf::PdmUiItemInfo::TOP ); m_xAxisProperty.uiCapability()->setUiTreeHidden( true ); m_xAxisProperty.uiCapability()->setUiTreeChildrenHidden( true ); m_xAxisProperty->setTernaryEnabled( false ); - CAF_PDM_InitFieldNoDefault( &m_yAxisProperty, "YAxisProperty", "Y-Axis Property", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_yAxisProperty, "YAxisProperty", "Y-Axis Property" ); m_yAxisProperty = new RimEclipseResultDefinition( caf::PdmUiItemInfo::TOP ); m_yAxisProperty.uiCapability()->setUiTreeHidden( true ); m_yAxisProperty.uiCapability()->setUiTreeChildrenHidden( true ); m_yAxisProperty->setTernaryEnabled( false ); - CAF_PDM_InitFieldNoDefault( &m_groupingProperty, "GroupingProperty", "Data Grouping Property", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_groupingProperty, "GroupingProperty", "Data Grouping Property" ); m_groupingProperty = new RimEclipseCellColors; m_groupingProperty->useDiscreteLogLevels( true ); m_groupingProperty.uiCapability()->setUiTreeHidden( true ); @@ -116,18 +116,18 @@ RimGridCrossPlotDataSet::RimGridCrossPlotDataSet() m_groupingProperty->legendConfig()->setMappingMode( RimRegularLegendConfig::MappingType::CATEGORY_INTEGER ); m_groupingProperty->setTernaryEnabled( false ); - CAF_PDM_InitFieldNoDefault( &m_nameConfig, "NameConfig", "Name", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_nameConfig, "NameConfig", "Name" ); m_nameConfig = new RimGridCrossPlotDataSetNameConfig(); m_nameConfig.uiCapability()->setUiTreeHidden( true ); m_nameConfig.uiCapability()->setUiTreeChildrenHidden( true ); - CAF_PDM_InitFieldNoDefault( &m_crossPlotCurves, "CrossPlotCurves", "Curves", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_crossPlotCurves, "CrossPlotCurves", "Curves" ); m_crossPlotCurves.uiCapability()->setUiTreeHidden( true ); - CAF_PDM_InitField( &m_useCustomColor, "UseCustomColor", false, "Use Custom Color", "", "", "" ); - CAF_PDM_InitField( &m_customColor, "CustomColor", cvf::Color3f( cvf::Color3f::BLACK ), "Custom Color", "", "", "" ); + CAF_PDM_InitField( &m_useCustomColor, "UseCustomColor", false, "Use Custom Color" ); + CAF_PDM_InitField( &m_customColor, "CustomColor", cvf::Color3f( cvf::Color3f::BLACK ), "Custom Color" ); - CAF_PDM_InitFieldNoDefault( &m_plotCellFilterCollection, "PlotCellFilterCollection", "Cell Filters", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_plotCellFilterCollection, "PlotCellFilterCollection", "Cell Filters" ); m_plotCellFilterCollection.uiCapability()->setUiTreeHidden( true ); m_plotCellFilterCollection.uiCapability()->setUiTreeChildrenHidden( true ); m_plotCellFilterCollection = new RimPlotCellFilterCollection; @@ -1422,12 +1422,12 @@ CAF_PDM_SOURCE_INIT( RimGridCrossPlotDataSetNameConfig, "RimGridCrossPlotCurveSe RimGridCrossPlotDataSetNameConfig::RimGridCrossPlotDataSetNameConfig() : RimNameConfig( "" ) { - CAF_PDM_InitObject( "Cross Plot Data Set NameGenerator", "", "", "" ); + CAF_PDM_InitObject( "Cross Plot Data Set NameGenerator" ); - CAF_PDM_InitField( &addCaseName, "AddCaseName", true, "Add Case Name", "", "", "" ); - CAF_PDM_InitField( &addAxisVariables, "AddAxisVariables", true, "Add Axis Variables", "", "", "" ); - CAF_PDM_InitField( &addTimestep, "AddTimeStep", true, "Add Time Step", "", "", "" ); - CAF_PDM_InitField( &addGrouping, "AddGrouping", true, "Add Data Group", "", "", "" ); + CAF_PDM_InitField( &addCaseName, "AddCaseName", true, "Add Case Name" ); + CAF_PDM_InitField( &addAxisVariables, "AddAxisVariables", true, "Add Axis Variables" ); + CAF_PDM_InitField( &addTimestep, "AddTimeStep", true, "Add Time Step" ); + CAF_PDM_InitField( &addGrouping, "AddGrouping", true, "Add Data Group" ); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/ProjectDataModel/GridCrossPlots/RimSaturationPressurePlotCollection.cpp b/ApplicationLibCode/ProjectDataModel/GridCrossPlots/RimSaturationPressurePlotCollection.cpp index 50349469b8..338b756ded 100644 --- a/ApplicationLibCode/ProjectDataModel/GridCrossPlots/RimSaturationPressurePlotCollection.cpp +++ b/ApplicationLibCode/ProjectDataModel/GridCrossPlots/RimSaturationPressurePlotCollection.cpp @@ -36,7 +36,7 @@ RimSaturationPressurePlotCollection::RimSaturationPressurePlotCollection() { CAF_PDM_InitObject( "Saturation Pressure Plots", ":/SummaryXPlotsLight16x16.png", "", "" ); - CAF_PDM_InitFieldNoDefault( &m_saturationPressurePlots, "SaturationPressurePlots", "Saturation Pressure Plots", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_saturationPressurePlots, "SaturationPressurePlots", "Saturation Pressure Plots" ); m_saturationPressurePlots.uiCapability()->setUiTreeHidden( true ); } diff --git a/ApplicationLibCode/ProjectDataModel/Intersections/RimBoxIntersection.cpp b/ApplicationLibCode/ProjectDataModel/Intersections/RimBoxIntersection.cpp index ea6c0bd8b0..0d2f999e8d 100644 --- a/ApplicationLibCode/ProjectDataModel/Intersections/RimBoxIntersection.cpp +++ b/ApplicationLibCode/ProjectDataModel/Intersections/RimBoxIntersection.cpp @@ -65,7 +65,7 @@ RimBoxIntersection::RimBoxIntersection() { CAF_PDM_InitObject( "Intersection Box", ":/IntersectionBox16x16.png", "", "" ); - CAF_PDM_InitField( &m_name, "UserDescription", QString( "Intersection Name" ), "Name", "", "", "" ); + CAF_PDM_InitField( &m_name, "UserDescription", QString( "Intersection Name" ), "Name" ); CAF_PDM_InitField( &m_singlePlaneState, "singlePlaneState", @@ -75,28 +75,28 @@ RimBoxIntersection::RimBoxIntersection() "", "" ); - CAF_PDM_InitField( &m_minXCoord, "MinXCoord", 0.0, "Min", "", "", "" ); + CAF_PDM_InitField( &m_minXCoord, "MinXCoord", 0.0, "Min" ); m_minXCoord.uiCapability()->setUiEditorTypeName( caf::PdmUiDoubleSliderEditor::uiEditorTypeName() ); - CAF_PDM_InitField( &m_maxXCoord, "MaxXCoord", 0.0, "Max", "", "", "" ); + CAF_PDM_InitField( &m_maxXCoord, "MaxXCoord", 0.0, "Max" ); m_maxXCoord.uiCapability()->setUiEditorTypeName( caf::PdmUiDoubleSliderEditor::uiEditorTypeName() ); - CAF_PDM_InitField( &m_minYCoord, "MinYCoord", 0.0, "Min", "", "", "" ); + CAF_PDM_InitField( &m_minYCoord, "MinYCoord", 0.0, "Min" ); m_minYCoord.uiCapability()->setUiEditorTypeName( caf::PdmUiDoubleSliderEditor::uiEditorTypeName() ); - CAF_PDM_InitField( &m_maxYCoord, "MaxYCoord", 0.0, "Max", "", "", "" ); + CAF_PDM_InitField( &m_maxYCoord, "MaxYCoord", 0.0, "Max" ); m_maxYCoord.uiCapability()->setUiEditorTypeName( caf::PdmUiDoubleSliderEditor::uiEditorTypeName() ); - CAF_PDM_InitField( &m_minDepth, "MinDepth", 0.0, "Min", "", "", "" ); + CAF_PDM_InitField( &m_minDepth, "MinDepth", 0.0, "Min" ); m_minDepth.uiCapability()->setUiEditorTypeName( caf::PdmUiDoubleSliderEditor::uiEditorTypeName() ); - CAF_PDM_InitField( &m_maxDepth, "MaxDepth", 0.0, "Max", "", "", "" ); + CAF_PDM_InitField( &m_maxDepth, "MaxDepth", 0.0, "Max" ); m_maxDepth.uiCapability()->setUiEditorTypeName( caf::PdmUiDoubleSliderEditor::uiEditorTypeName() ); - CAF_PDM_InitField( &m_xySliderStepSize, "xySliderStepSize", 1.0, "XY Slider Step Size", "", "", "" ); - CAF_PDM_InitField( &m_depthSliderStepSize, "DepthSliderStepSize", 0.5, "Depth Slider Step Size", "", "", "" ); + CAF_PDM_InitField( &m_xySliderStepSize, "xySliderStepSize", 1.0, "XY Slider Step Size" ); + CAF_PDM_InitField( &m_depthSliderStepSize, "DepthSliderStepSize", 0.5, "Depth Slider Step Size" ); - CAF_PDM_InitFieldNoDefault( &m_show3DManipulator, "show3DManipulator", "", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_show3DManipulator, "show3DManipulator", "" ); caf::PdmUiPushButtonEditor::configureEditorForField( &m_show3DManipulator ); m_show3DManipulator = false; diff --git a/ApplicationLibCode/ProjectDataModel/Intersections/RimExtrudedCurveIntersection.cpp b/ApplicationLibCode/ProjectDataModel/Intersections/RimExtrudedCurveIntersection.cpp index 06ce283e76..9ca5631d96 100644 --- a/ApplicationLibCode/ProjectDataModel/Intersections/RimExtrudedCurveIntersection.cpp +++ b/ApplicationLibCode/ProjectDataModel/Intersections/RimExtrudedCurveIntersection.cpp @@ -193,25 +193,25 @@ void RimExtrudedCurveIntersection::configureForAzimuthLine() RimExtrudedCurveIntersection::RimExtrudedCurveIntersection() { CAF_PDM_InitObject( "Intersection", ":/CrossSection16x16.png", "", "" ); - CAF_PDM_InitField( &m_name, "UserDescription", QString( "Intersection Name" ), "Name", "", "", "" ); + CAF_PDM_InitField( &m_name, "UserDescription", QString( "Intersection Name" ), "Name" ); - CAF_PDM_InitFieldNoDefault( &m_type, "Type", "Type", "", "", "" ); - CAF_PDM_InitFieldNoDefault( &m_direction, "Direction", "Direction", "", "", "" ); - CAF_PDM_InitFieldNoDefault( &m_wellPath, "WellPath", "Well Path ", "", "", "" ); - CAF_PDM_InitFieldNoDefault( &m_simulationWell, "SimulationWell", "Simulation Well", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_type, "Type", "Type" ); + CAF_PDM_InitFieldNoDefault( &m_direction, "Direction", "Direction" ); + CAF_PDM_InitFieldNoDefault( &m_wellPath, "WellPath", "Well Path " ); + CAF_PDM_InitFieldNoDefault( &m_simulationWell, "SimulationWell", "Simulation Well" ); CAF_PDM_InitFieldNoDefault( &m_userPolylineXyz, "Points", "Points", "", "Use Ctrl-C for copy and Ctrl-V for paste", "" ); CAF_PDM_InitFieldNoDefault( &m_userPolylineXydForUi, "PointsUi", "Points", "", "Use Ctrl-C for copy and Ctrl-V for paste", "" ); m_userPolylineXydForUi.registerSetMethod( this, &RimExtrudedCurveIntersection::setPointsFromXYD ); m_userPolylineXydForUi.registerGetMethod( this, &RimExtrudedCurveIntersection::pointsXYD ); - CAF_PDM_InitField( &m_azimuthAngle, "AzimuthAngle", 0.0, "Azimuth", "", "", "" ); + CAF_PDM_InitField( &m_azimuthAngle, "AzimuthAngle", 0.0, "Azimuth" ); m_azimuthAngle.uiCapability()->setUiEditorTypeName( caf::PdmUiDoubleSliderEditor::uiEditorTypeName() ); - CAF_PDM_InitField( &m_dipAngle, "DipAngle", 90.0, "Dip", "", "", "" ); + CAF_PDM_InitField( &m_dipAngle, "DipAngle", 90.0, "Dip" ); m_dipAngle.uiCapability()->setUiEditorTypeName( caf::PdmUiDoubleSliderEditor::uiEditorTypeName() ); - CAF_PDM_InitFieldNoDefault( &m_customExtrusionPoints, "CustomExtrusionPoints", "", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_customExtrusionPoints, "CustomExtrusionPoints", "" ); CAF_PDM_InitFieldNoDefault( &m_twoAzimuthPoints, "TwoAzimuthPoints", "Points", @@ -219,34 +219,24 @@ RimExtrudedCurveIntersection::RimExtrudedCurveIntersection() "Pick two points to define a line.\nUse Ctrl-C for copy and Ctrl-V for paste", "" ); - CAF_PDM_InitField( &m_branchIndex, "Branch", -1, "Branch", "", "", "" ); - CAF_PDM_InitField( &m_extentLength, "ExtentLength", 200.0, "Extent Length", "", "", "" ); - CAF_PDM_InitField( &m_lengthUp, "lengthUp", 1000.0, "Length Up", "", "", "" ); - CAF_PDM_InitField( &m_lengthDown, "lengthDown", 1000.0, "Length Down", "", "", "" ); + CAF_PDM_InitField( &m_branchIndex, "Branch", -1, "Branch" ); + CAF_PDM_InitField( &m_extentLength, "ExtentLength", 200.0, "Extent Length" ); + CAF_PDM_InitField( &m_lengthUp, "lengthUp", 1000.0, "Length Up" ); + CAF_PDM_InitField( &m_lengthDown, "lengthDown", 1000.0, "Length Down" ); - CAF_PDM_InitFieldNoDefault( &m_inputPolylineFromViewerEnabled, "m_activateUiAppendPointsCommand", "", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_inputPolylineFromViewerEnabled, "m_activateUiAppendPointsCommand", "" ); caf::PdmUiPushButtonEditor::configureEditorForField( &m_inputPolylineFromViewerEnabled ); m_inputPolylineFromViewerEnabled = false; - CAF_PDM_InitFieldNoDefault( &m_inputExtrusionPointsFromViewerEnabled, - "inputExtrusionPointsFromViewerEnabled", - "", - "", - "", - "" ); + CAF_PDM_InitFieldNoDefault( &m_inputExtrusionPointsFromViewerEnabled, "inputExtrusionPointsFromViewerEnabled", "" ); caf::PdmUiPushButtonEditor::configureEditorForField( &m_inputExtrusionPointsFromViewerEnabled ); m_inputExtrusionPointsFromViewerEnabled = false; - CAF_PDM_InitFieldNoDefault( &m_inputTwoAzimuthPointsFromViewerEnabled, - "inputTwoAzimuthPointsFromViewerEnabled", - "", - "", - "", - "" ); + CAF_PDM_InitFieldNoDefault( &m_inputTwoAzimuthPointsFromViewerEnabled, "inputTwoAzimuthPointsFromViewerEnabled", "" ); caf::PdmUiPushButtonEditor::configureEditorForField( &m_inputTwoAzimuthPointsFromViewerEnabled ); m_inputTwoAzimuthPointsFromViewerEnabled = false; - CAF_PDM_InitFieldNoDefault( &m_surfaceIntersections, "SurfaceIntersections", "Surface Intersections", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_surfaceIntersections, "SurfaceIntersections", "Surface Intersections" ); m_surfaceIntersections = new RimSurfaceIntersectionCollection; m_surfaceIntersections->objectChanged.connect( this, &RimExtrudedCurveIntersection::onSurfaceIntersectionsChanged ); diff --git a/ApplicationLibCode/ProjectDataModel/Intersections/RimIntersection.cpp b/ApplicationLibCode/ProjectDataModel/Intersections/RimIntersection.cpp index 78544f6fa7..7fe0da1f15 100644 --- a/ApplicationLibCode/ProjectDataModel/Intersections/RimIntersection.cpp +++ b/ApplicationLibCode/ProjectDataModel/Intersections/RimIntersection.cpp @@ -40,11 +40,11 @@ CAF_PDM_ABSTRACT_SOURCE_INIT( RimIntersection, "RimIntersectionHandle" ); //-------------------------------------------------------------------------------------------------- RimIntersection::RimIntersection() { - CAF_PDM_InitField( &m_isActive, "Active", true, "Active", "", "", "" ); + CAF_PDM_InitField( &m_isActive, "Active", true, "Active" ); m_isActive.uiCapability()->setUiHidden( true ); - CAF_PDM_InitField( &m_showInactiveCells, "ShowInactiveCells", false, "Show Inactive Cells", "", "", "" ); - CAF_PDM_InitField( &m_useSeparateDataSource, "UseSeparateIntersectionDataSource", true, "Enable", "", "", "" ); - CAF_PDM_InitFieldNoDefault( &m_separateDataSource, "SeparateIntersectionDataSource", "Source", "", "", "" ); + CAF_PDM_InitField( &m_showInactiveCells, "ShowInactiveCells", false, "Show Inactive Cells" ); + CAF_PDM_InitField( &m_useSeparateDataSource, "UseSeparateIntersectionDataSource", true, "Enable" ); + CAF_PDM_InitFieldNoDefault( &m_separateDataSource, "SeparateIntersectionDataSource", "Source" ); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/ProjectDataModel/Intersections/RimIntersectionCollection.cpp b/ApplicationLibCode/ProjectDataModel/Intersections/RimIntersectionCollection.cpp index f715e1a727..d81a1fe9f7 100644 --- a/ApplicationLibCode/ProjectDataModel/Intersections/RimIntersectionCollection.cpp +++ b/ApplicationLibCode/ProjectDataModel/Intersections/RimIntersectionCollection.cpp @@ -47,13 +47,13 @@ RimIntersectionCollection::RimIntersectionCollection() { CAF_PDM_InitObject( "Intersections", ":/CrossSections16x16.png", "", "" ); - CAF_PDM_InitFieldNoDefault( &m_intersections, "CrossSections", "Intersections", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_intersections, "CrossSections", "Intersections" ); m_intersections.uiCapability()->setUiTreeHidden( true ); - CAF_PDM_InitFieldNoDefault( &m_intersectionBoxes, "IntersectionBoxes", "IntersectionBoxes", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_intersectionBoxes, "IntersectionBoxes", "IntersectionBoxes" ); m_intersectionBoxes.uiCapability()->setUiTreeHidden( true ); - CAF_PDM_InitField( &isActive, "Active", true, "Active", "", "", "" ); + CAF_PDM_InitField( &isActive, "Active", true, "Active" ); isActive.uiCapability()->setUiHidden( true ); } diff --git a/ApplicationLibCode/ProjectDataModel/Intersections/RimIntersectionResultDefinition.cpp b/ApplicationLibCode/ProjectDataModel/Intersections/RimIntersectionResultDefinition.cpp index e4edc62bce..e83138aad3 100644 --- a/ApplicationLibCode/ProjectDataModel/Intersections/RimIntersectionResultDefinition.cpp +++ b/ApplicationLibCode/ProjectDataModel/Intersections/RimIntersectionResultDefinition.cpp @@ -44,34 +44,34 @@ RimIntersectionResultDefinition::RimIntersectionResultDefinition() { CAF_PDM_InitObject( "Intersection Result Definition", ":/CellResult.png", "", "" ); - CAF_PDM_InitField( &m_isActive, "IsActive", true, "Active", "", "", "" ); + CAF_PDM_InitField( &m_isActive, "IsActive", true, "Active" ); m_isActive.uiCapability()->setUiHidden( true ); - CAF_PDM_InitFieldNoDefault( &m_case, "Case", "Case", "", "", "" ); - CAF_PDM_InitField( &m_timeStep, "TimeStep", 0, "Time Step", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_case, "Case", "Case" ); + CAF_PDM_InitField( &m_timeStep, "TimeStep", 0, "Time Step" ); - CAF_PDM_InitFieldNoDefault( &m_autoName, "IntersectionResultDefinitionDescription", "Description", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_autoName, "IntersectionResultDefinitionDescription", "Description" ); m_autoName.registerGetMethod( this, &RimIntersectionResultDefinition::autoName ); m_autoName.uiCapability()->setUiHidden( true ); m_autoName.uiCapability()->setUiReadOnly( true ); m_autoName.xmlCapability()->setIOWritable( false ); - CAF_PDM_InitFieldNoDefault( &m_eclipseResultDefinition, "EclipseResultDef", "EclipseResultDef", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_eclipseResultDefinition, "EclipseResultDef", "EclipseResultDef" ); m_eclipseResultDefinition.uiCapability()->setUiTreeHidden( true ); m_eclipseResultDefinition.uiCapability()->setUiTreeChildrenHidden( true ); m_eclipseResultDefinition = new RimEclipseResultDefinition; - CAF_PDM_InitFieldNoDefault( &m_geomResultDefinition, "GeoMechResultDef", "GeoMechResultDef", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_geomResultDefinition, "GeoMechResultDef", "GeoMechResultDef" ); m_geomResultDefinition.uiCapability()->setUiTreeHidden( true ); m_geomResultDefinition.uiCapability()->setUiTreeChildrenHidden( true ); m_geomResultDefinition = new RimGeoMechResultDefinition; - CAF_PDM_InitFieldNoDefault( &m_legendConfig, "LegendConfig", "Legend", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_legendConfig, "LegendConfig", "Legend" ); m_legendConfig.uiCapability()->setUiTreeHidden( true ); m_legendConfig.uiCapability()->setUiTreeChildrenHidden( false ); m_legendConfig = new RimRegularLegendConfig; - CAF_PDM_InitFieldNoDefault( &m_ternaryLegendConfig, "TernaryLegendConfig", "Legend", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_ternaryLegendConfig, "TernaryLegendConfig", "Legend" ); m_ternaryLegendConfig.uiCapability()->setUiTreeHidden( true ); m_ternaryLegendConfig.uiCapability()->setUiTreeChildrenHidden( false ); m_ternaryLegendConfig = new RimTernaryLegendConfig; diff --git a/ApplicationLibCode/ProjectDataModel/Intersections/RimIntersectionResultsDefinitionCollection.cpp b/ApplicationLibCode/ProjectDataModel/Intersections/RimIntersectionResultsDefinitionCollection.cpp index 157b1b26b2..3af6d88be4 100644 --- a/ApplicationLibCode/ProjectDataModel/Intersections/RimIntersectionResultsDefinitionCollection.cpp +++ b/ApplicationLibCode/ProjectDataModel/Intersections/RimIntersectionResultsDefinitionCollection.cpp @@ -32,10 +32,10 @@ RimIntersectionResultsDefinitionCollection::RimIntersectionResultsDefinitionColl { CAF_PDM_InitObject( "Intersection Results", ":/CrossSections16x16.png", "", "" ); - CAF_PDM_InitField( &m_isActive, "isActive", false, "Active", "", "", "" ); + CAF_PDM_InitField( &m_isActive, "isActive", false, "Active" ); m_isActive.uiCapability()->setUiHidden( true ); - CAF_PDM_InitFieldNoDefault( &m_intersectionResultsDefs, "IntersectionResultDefinitions", "Data Sources", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_intersectionResultsDefs, "IntersectionResultDefinitions", "Data Sources" ); m_intersectionResultsDefs.uiCapability()->setUiTreeHidden( true ); m_intersectionResultsDefs.push_back( new RimIntersectionResultDefinition ); // Add the default result definition diff --git a/ApplicationLibCode/ProjectDataModel/Parameters/RimDoubleParameter.cpp b/ApplicationLibCode/ProjectDataModel/Parameters/RimDoubleParameter.cpp index b0d0fdbae8..9c74f2f12f 100644 --- a/ApplicationLibCode/ProjectDataModel/Parameters/RimDoubleParameter.cpp +++ b/ApplicationLibCode/ProjectDataModel/Parameters/RimDoubleParameter.cpp @@ -32,7 +32,7 @@ CAF_PDM_SOURCE_INIT( RimDoubleParameter, "DoubleParameter" ); //-------------------------------------------------------------------------------------------------- RimDoubleParameter::RimDoubleParameter() { - CAF_PDM_InitField( &m_value, "Value", 0.0, "Value", "", "", "" ); + CAF_PDM_InitField( &m_value, "Value", 0.0, "Value" ); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/ProjectDataModel/Parameters/RimGenericParameter.cpp b/ApplicationLibCode/ProjectDataModel/Parameters/RimGenericParameter.cpp index 91a24850fa..637c2608f0 100644 --- a/ApplicationLibCode/ProjectDataModel/Parameters/RimGenericParameter.cpp +++ b/ApplicationLibCode/ProjectDataModel/Parameters/RimGenericParameter.cpp @@ -36,23 +36,23 @@ RimGenericParameter::RimGenericParameter() { CAF_PDM_InitObject( "Parameter", ":/Bullet.png", "", "" ); - CAF_PDM_InitField( &m_name, "Name", QString(), "Name", "", "", "" ); + CAF_PDM_InitField( &m_name, "Name", QString(), "Name" ); m_name.uiCapability()->setUiReadOnly( true ); m_name.uiCapability()->setUiHidden( true ); - CAF_PDM_InitField( &m_label, "Label", QString(), "Name", "", "", "" ); + CAF_PDM_InitField( &m_label, "Label", QString(), "Name" ); m_label.uiCapability()->setUiReadOnly( true ); m_label.uiCapability()->setUiContentTextColor( RiuGuiTheme::getColorByVariableName( "textColor" ) ); - CAF_PDM_InitField( &m_description, "Description", QString(), "Description", "", "", "" ); + CAF_PDM_InitField( &m_description, "Description", QString(), "Description" ); m_description.uiCapability()->setUiReadOnly( true ); m_description.uiCapability()->setUiHidden( true ); - CAF_PDM_InitField( &m_advanced, "Advanced", false, "Advanced", "", "", "" ); + CAF_PDM_InitField( &m_advanced, "Advanced", false, "Advanced" ); m_advanced.uiCapability()->setUiReadOnly( true ); m_advanced.uiCapability()->setUiHidden( true ); - CAF_PDM_InitField( &m_valid, "Valid", false, "Valid", "", "", "" ); + CAF_PDM_InitField( &m_valid, "Valid", false, "Valid" ); m_valid.uiCapability()->setUiReadOnly( true ); m_valid.uiCapability()->setUiHidden( true ); } diff --git a/ApplicationLibCode/ProjectDataModel/Parameters/RimIntegerParameter.cpp b/ApplicationLibCode/ProjectDataModel/Parameters/RimIntegerParameter.cpp index 97c2dc1c84..90adaca711 100644 --- a/ApplicationLibCode/ProjectDataModel/Parameters/RimIntegerParameter.cpp +++ b/ApplicationLibCode/ProjectDataModel/Parameters/RimIntegerParameter.cpp @@ -32,7 +32,7 @@ CAF_PDM_SOURCE_INIT( RimIntegerParameter, "IntegerParameter" ); //-------------------------------------------------------------------------------------------------- RimIntegerParameter::RimIntegerParameter() { - CAF_PDM_InitField( &m_value, "Value", 0, "Value", "", "", "" ); + CAF_PDM_InitField( &m_value, "Value", 0, "Value" ); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/ProjectDataModel/Parameters/RimParameterGroup.cpp b/ApplicationLibCode/ProjectDataModel/Parameters/RimParameterGroup.cpp index feeaadc807..a388805598 100644 --- a/ApplicationLibCode/ProjectDataModel/Parameters/RimParameterGroup.cpp +++ b/ApplicationLibCode/ProjectDataModel/Parameters/RimParameterGroup.cpp @@ -41,30 +41,30 @@ RimParameterGroup::RimParameterGroup() CAF_PDM_InitObject( "Parameter Group", ":/Bullet.png", "", "" ); uiCapability()->setUiTreeChildrenHidden( true ); - CAF_PDM_InitFieldNoDefault( &m_parameters, "Parameters", "Parameters", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_parameters, "Parameters", "Parameters" ); m_parameters.uiCapability()->setUiEditorTypeName( caf::PdmUiTableViewEditor::uiEditorTypeName() ); m_parameters.uiCapability()->setUiLabelPosition( caf::PdmUiItemInfo::HIDDEN ); m_parameters.uiCapability()->setCustomContextMenuEnabled( true ); m_parameters.uiCapability()->setUiTreeChildrenHidden( true ); - CAF_PDM_InitFieldNoDefault( &m_name, "Name", "Name", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_name, "Name", "Name" ); m_name.uiCapability()->setUiHidden( true ); m_name.uiCapability()->setUiReadOnly( true ); - CAF_PDM_InitFieldNoDefault( &m_label, "Label", "Label", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_label, "Label", "Label" ); m_label.uiCapability()->setUiHidden( true ); m_label.uiCapability()->setUiReadOnly( true ); - CAF_PDM_InitFieldNoDefault( &m_comment, "Comment", "Comment", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_comment, "Comment", "Comment" ); m_comment.uiCapability()->setUiHidden( true ); m_comment.uiCapability()->setUiReadOnly( true ); m_comment.uiCapability()->setUiLabelPosition( caf::PdmUiItemInfo::HIDDEN ); - CAF_PDM_InitFieldNoDefault( &m_showExpanded, "Expanded", "Expanded", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_showExpanded, "Expanded", "Expanded" ); m_showExpanded.uiCapability()->setUiHidden( true ); m_showExpanded.uiCapability()->setUiReadOnly( true ); - CAF_PDM_InitFieldNoDefault( &m_labelProxy, "LabelProxy", "Label Proxy", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_labelProxy, "LabelProxy", "Label Proxy" ); m_labelProxy.registerGetMethod( this, &RimParameterGroup::labelOrName ); m_labelProxy.uiCapability()->setUiReadOnly( true ); m_labelProxy.uiCapability()->setUiHidden( true ); diff --git a/ApplicationLibCode/ProjectDataModel/Parameters/RimStringParameter.cpp b/ApplicationLibCode/ProjectDataModel/Parameters/RimStringParameter.cpp index cff206b900..5d7e1c90ea 100644 --- a/ApplicationLibCode/ProjectDataModel/Parameters/RimStringParameter.cpp +++ b/ApplicationLibCode/ProjectDataModel/Parameters/RimStringParameter.cpp @@ -32,7 +32,7 @@ CAF_PDM_SOURCE_INIT( RimStringParameter, "StringParameter" ); //-------------------------------------------------------------------------------------------------- RimStringParameter::RimStringParameter() { - CAF_PDM_InitField( &m_value, "Value", QString(), "Value", "", "", "" ); + CAF_PDM_InitField( &m_value, "Value", QString(), "Value" ); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/ProjectDataModel/PlotTemplates/RimPlotTemplateFileItem.cpp b/ApplicationLibCode/ProjectDataModel/PlotTemplates/RimPlotTemplateFileItem.cpp index 231249df9d..6f1d91aa42 100644 --- a/ApplicationLibCode/ProjectDataModel/PlotTemplates/RimPlotTemplateFileItem.cpp +++ b/ApplicationLibCode/ProjectDataModel/PlotTemplates/RimPlotTemplateFileItem.cpp @@ -35,7 +35,7 @@ RimPlotTemplateFileItem::RimPlotTemplateFileItem() { CAF_PDM_InitObject( "PlotTemplateFileItem", ":/SummaryTemplate16x16.png", "Plot Template", "" ); - CAF_PDM_InitField( &m_absoluteFileName, "AbsolutePath", QString(), "Location", "", "", "" ); + CAF_PDM_InitField( &m_absoluteFileName, "AbsolutePath", QString(), "Location" ); m_absoluteFileName.uiCapability()->setUiReadOnly( true ); } diff --git a/ApplicationLibCode/ProjectDataModel/PlotTemplates/RimPlotTemplateFolderItem.cpp b/ApplicationLibCode/ProjectDataModel/PlotTemplates/RimPlotTemplateFolderItem.cpp index a5811a5e6b..9defb5d883 100644 --- a/ApplicationLibCode/ProjectDataModel/PlotTemplates/RimPlotTemplateFolderItem.cpp +++ b/ApplicationLibCode/ProjectDataModel/PlotTemplates/RimPlotTemplateFolderItem.cpp @@ -37,10 +37,10 @@ RimPlotTemplateFolderItem::RimPlotTemplateFolderItem() { CAF_PDM_InitObject( "PlotTemplateCollection", ":/Folder.png", "", "" ); - CAF_PDM_InitFieldNoDefault( &m_folderName, "FolderName", "Folder", "", "", "" ); - CAF_PDM_InitFieldNoDefault( &m_fileNames, "FileNames", "", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_folderName, "FolderName", "Folder" ); + CAF_PDM_InitFieldNoDefault( &m_fileNames, "FileNames", "" ); m_fileNames.uiCapability()->setUiTreeHidden( true ); - CAF_PDM_InitFieldNoDefault( &m_subFolders, "SubFolders", "", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_subFolders, "SubFolders", "" ); m_subFolders.uiCapability()->setUiTreeHidden( true ); } diff --git a/ApplicationLibCode/ProjectDataModel/ProcessControl/RimProcess.cpp b/ApplicationLibCode/ProjectDataModel/ProcessControl/RimProcess.cpp index d5f6e93dd6..83aaeb7c39 100644 --- a/ApplicationLibCode/ProjectDataModel/ProcessControl/RimProcess.cpp +++ b/ApplicationLibCode/ProjectDataModel/ProcessControl/RimProcess.cpp @@ -39,13 +39,13 @@ RimProcess::RimProcess() CAF_PDM_InitObject( "ResInsight Process", ":/Erase.png", "", "" ); - CAF_PDM_InitFieldNoDefault( &m_command, "Command", "Command", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_command, "Command", "Command" ); m_command.uiCapability()->setUiReadOnly( true ); - CAF_PDM_InitFieldNoDefault( &m_description, "Description", "Description", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_description, "Description", "Description" ); m_description.uiCapability()->setUiReadOnly( true ); - CAF_PDM_InitField( &m_id, "ID", defId, "ID", "", "", "" ); + CAF_PDM_InitField( &m_id, "ID", defId, "ID" ); m_id.uiCapability()->setUiReadOnly( true ); } diff --git a/ApplicationLibCode/ProjectDataModel/Rim2dIntersectionView.cpp b/ApplicationLibCode/ProjectDataModel/Rim2dIntersectionView.cpp index e47e03910f..dc77670cd8 100644 --- a/ApplicationLibCode/ProjectDataModel/Rim2dIntersectionView.cpp +++ b/ApplicationLibCode/ProjectDataModel/Rim2dIntersectionView.cpp @@ -68,22 +68,22 @@ Rim2dIntersectionView::Rim2dIntersectionView( void ) CAF_PDM_InitFieldNoDefault( &m_intersection, "Intersection", "Intersection", ":/CrossSection16x16.png", "", "" ); m_intersection.uiCapability()->setUiHidden( true ); - CAF_PDM_InitFieldNoDefault( &m_legendConfig, "LegendDefinition", "Color Legend", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_legendConfig, "LegendDefinition", "Color Legend" ); m_legendConfig.uiCapability()->setUiTreeHidden( true ); m_legendConfig.uiCapability()->setUiTreeChildrenHidden( true ); m_legendConfig.xmlCapability()->disableIO(); m_legendConfig = new RimRegularLegendConfig(); - CAF_PDM_InitFieldNoDefault( &m_ternaryLegendConfig, "TernaryLegendDefinition", "Ternary Color Legend", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_ternaryLegendConfig, "TernaryLegendDefinition", "Ternary Color Legend" ); m_ternaryLegendConfig.uiCapability()->setUiTreeHidden( true ); m_ternaryLegendConfig.uiCapability()->setUiTreeChildrenHidden( true ); m_ternaryLegendConfig.xmlCapability()->disableIO(); m_ternaryLegendConfig = new RimTernaryLegendConfig(); - CAF_PDM_InitField( &m_showDefiningPoints, "ShowDefiningPoints", true, "Show Points", "", "", "" ); - CAF_PDM_InitField( &m_showAxisLines, "ShowAxisLines", false, "Show Axis Lines", "", "", "" ); + CAF_PDM_InitField( &m_showDefiningPoints, "ShowDefiningPoints", true, "Show Points" ); + CAF_PDM_InitField( &m_showAxisLines, "ShowAxisLines", false, "Show Axis Lines" ); - CAF_PDM_InitFieldNoDefault( &m_nameProxy, "NameProxy", "Name", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_nameProxy, "NameProxy", "Name" ); m_nameProxy.xmlCapability()->disableIO(); m_nameProxy.registerGetMethod( this, &Rim2dIntersectionView::getName ); m_nameProxy.registerSetMethod( this, &Rim2dIntersectionView::setName ); diff --git a/ApplicationLibCode/ProjectDataModel/Rim3dOverlayInfoConfig.cpp b/ApplicationLibCode/ProjectDataModel/Rim3dOverlayInfoConfig.cpp index c77c69eade..9120902919 100644 --- a/ApplicationLibCode/ProjectDataModel/Rim3dOverlayInfoConfig.cpp +++ b/ApplicationLibCode/ProjectDataModel/Rim3dOverlayInfoConfig.cpp @@ -78,24 +78,24 @@ Rim3dOverlayInfoConfig::Rim3dOverlayInfoConfig() { CAF_PDM_InitObject( "Info Box", ":/InfoBox16x16.png", "", "" ); - CAF_PDM_InitField( &m_active, "Active", true, "Active", "", "", "" ); + CAF_PDM_InitField( &m_active, "Active", true, "Active" ); m_active.uiCapability()->setUiHidden( true ); m_active = RiaPreferences::current()->showInfoBox(); - CAF_PDM_InitField( &m_showAnimProgress, "ShowAnimProgress", true, "Animation progress", "", "", "" ); - CAF_PDM_InitField( &m_showCaseInfo, "ShowInfoText", true, "Case Info", "", "", "" ); - CAF_PDM_InitField( &m_showResultInfo, "ShowResultInfo", true, "Result Info", "", "", "" ); - CAF_PDM_InitField( &m_showHistogram, "ShowHistogram", true, "Histogram", "", "", "" ); - CAF_PDM_InitField( &m_showVolumeWeightedMean, "ShowVolumeWeightedMean", true, "Mobile Volume Weighted Mean", "", "", "" ); - CAF_PDM_InitField( &m_showVersionInfo, "ShowVersionInfo", true, "Version Info", "", "", "" ); + CAF_PDM_InitField( &m_showAnimProgress, "ShowAnimProgress", true, "Animation progress" ); + CAF_PDM_InitField( &m_showCaseInfo, "ShowInfoText", true, "Case Info" ); + CAF_PDM_InitField( &m_showResultInfo, "ShowResultInfo", true, "Result Info" ); + CAF_PDM_InitField( &m_showHistogram, "ShowHistogram", true, "Histogram" ); + CAF_PDM_InitField( &m_showVolumeWeightedMean, "ShowVolumeWeightedMean", true, "Mobile Volume Weighted Mean" ); + CAF_PDM_InitField( &m_showVersionInfo, "ShowVersionInfo", true, "Version Info" ); caf::AppEnum defaultTimeRange = RimHistogramCalculator::StatisticsTimeRangeType::CURRENT_TIMESTEP; - CAF_PDM_InitField( &m_statisticsTimeRange, "StatisticsTimeRange", defaultTimeRange, "Statistics Time Range", "", "", "" ); + CAF_PDM_InitField( &m_statisticsTimeRange, "StatisticsTimeRange", defaultTimeRange, "Statistics Time Range" ); caf::AppEnum defaultCellRange = RimHistogramCalculator::StatisticsCellRangeType::VISIBLE_CELLS; - CAF_PDM_InitField( &m_statisticsCellRange, "StatisticsCellRange", defaultCellRange, "Statistics Cell Range", "", "", "" ); + CAF_PDM_InitField( &m_statisticsCellRange, "StatisticsCellRange", defaultCellRange, "Statistics Cell Range" ); m_histogramCalculator.reset( new RimHistogramCalculator ); } diff --git a/ApplicationLibCode/ProjectDataModel/Rim3dView.cpp b/ApplicationLibCode/ProjectDataModel/Rim3dView.cpp index bdf88964c9..1a8ca14ebb 100644 --- a/ApplicationLibCode/ProjectDataModel/Rim3dView.cpp +++ b/ApplicationLibCode/ProjectDataModel/Rim3dView.cpp @@ -94,25 +94,25 @@ Rim3dView::Rim3dView() RiaPreferences* preferences = RiaPreferences::current(); CVF_ASSERT( preferences ); - CAF_PDM_InitObject( "3d View", "", "", "" ); + CAF_PDM_InitObject( "3d View" ); - CAF_PDM_InitScriptableField( &m_id, "Id", -1, "View ID", "", "", "" ); + CAF_PDM_InitScriptableField( &m_id, "Id", -1, "View ID" ); m_id.registerKeywordAlias( "ViewId" ); m_id.uiCapability()->setUiReadOnly( true ); m_id.uiCapability()->setUiHidden( true ); m_id.capability()->setIOWriteable( false ); m_id.xmlCapability()->setCopyable( false ); - CAF_PDM_InitFieldNoDefault( &m_nameConfig, "NameConfig", "", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_nameConfig, "NameConfig", "" ); m_nameConfig = new RimViewNameConfig(); - CAF_PDM_InitField( &m_cameraPosition, "CameraPosition", cvf::Mat4d::IDENTITY, "", "", "", "" ); + CAF_PDM_InitField( &m_cameraPosition, "CameraPosition", cvf::Mat4d::IDENTITY, "" ); m_cameraPosition.uiCapability()->setUiHidden( true ); - CAF_PDM_InitField( &m_cameraPointOfInterest, "CameraPointOfInterest", cvf::Vec3d::ZERO, "", "", "", "" ); + CAF_PDM_InitField( &m_cameraPointOfInterest, "CameraPointOfInterest", cvf::Vec3d::ZERO, "" ); m_cameraPointOfInterest.uiCapability()->setUiHidden( true ); - CAF_PDM_InitScriptableField( &isPerspectiveView, "PerspectiveProjection", true, "Perspective Projection", "", "", "" ); + CAF_PDM_InitScriptableField( &isPerspectiveView, "PerspectiveProjection", true, "Perspective Projection" ); double defaultScaleFactor = preferences->defaultScaleFactorZ(); CAF_PDM_InitScriptableField( &scaleZ, @@ -124,18 +124,18 @@ Rim3dView::Rim3dView() "" ); cvf::Color3f defBackgColor = preferences->defaultViewerBackgroundColor(); - CAF_PDM_InitScriptableField( &m_backgroundColor, "BackgroundColor", defBackgColor, "Background", "", "", "" ); + CAF_PDM_InitScriptableField( &m_backgroundColor, "BackgroundColor", defBackgColor, "Background" ); m_backgroundColor.registerKeywordAlias( "ViewBackgroundColor" ); - CAF_PDM_InitField( &maximumFrameRate, "MaximumFrameRate", 10, "Maximum Frame Rate", "", "", "" ); + CAF_PDM_InitField( &maximumFrameRate, "MaximumFrameRate", 10, "Maximum Frame Rate" ); maximumFrameRate.uiCapability()->setUiHidden( true ); - CAF_PDM_InitScriptableField( &m_currentTimeStep, "CurrentTimeStep", 0, "Current Time Step", "", "", "" ); + CAF_PDM_InitScriptableField( &m_currentTimeStep, "CurrentTimeStep", 0, "Current Time Step" ); m_currentTimeStep.uiCapability()->setUiHidden( true ); caf::AppEnum defaultMeshType = preferences->defaultMeshModeType(); - CAF_PDM_InitField( &meshMode, "MeshMode", defaultMeshType, "Grid Lines", "", "", "" ); - CAF_PDM_InitFieldNoDefault( &surfaceMode, "SurfaceMode", "Grid Surface", "", "", "" ); + CAF_PDM_InitField( &meshMode, "MeshMode", defaultMeshType, "Grid Lines" ); + CAF_PDM_InitFieldNoDefault( &surfaceMode, "SurfaceMode", "Grid Surface" ); CAF_PDM_InitScriptableField( &m_showGridBox, "ShowGridBox", @@ -153,11 +153,11 @@ Rim3dView::Rim3dView() "Disable light model for scalar result colors", "" ); - CAF_PDM_InitScriptableField( &m_showZScaleLabel, "ShowZScale", true, "Show Z Scale Label", "", "", "" ); + CAF_PDM_InitScriptableField( &m_showZScaleLabel, "ShowZScale", true, "Show Z Scale Label" ); - CAF_PDM_InitFieldNoDefault( &m_comparisonView, "ComparisonView", "Comparison View", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_comparisonView, "ComparisonView", "Comparison View" ); - CAF_PDM_InitFieldNoDefault( &m_fontSize, "FontSize", "Font Size", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_fontSize, "FontSize", "Font Size" ); m_intersectionVizModel = new cvf::ModelBasicList; m_intersectionVizModel->setName( "CrossSectionModel" ); diff --git a/ApplicationLibCode/ProjectDataModel/RimAdvancedSnapshotExportDefinition.cpp b/ApplicationLibCode/ProjectDataModel/RimAdvancedSnapshotExportDefinition.cpp index 17d7dc7729..5982ea3e88 100644 --- a/ApplicationLibCode/ProjectDataModel/RimAdvancedSnapshotExportDefinition.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimAdvancedSnapshotExportDefinition.cpp @@ -41,17 +41,17 @@ CAF_PDM_SOURCE_INIT( RimAdvancedSnapshotExportDefinition, "MultiSnapshotDefiniti RimAdvancedSnapshotExportDefinition::RimAdvancedSnapshotExportDefinition() { // CAF_PDM_InitObject("MultiSnapshotDefinition", ":/Well.svg", "", ""); - CAF_PDM_InitObject( "MultiSnapshotDefinition", "", "", "" ); + CAF_PDM_InitObject( "MultiSnapshotDefinition" ); - CAF_PDM_InitField( &isActive, "IsActive", true, "Active", "", "", "" ); + CAF_PDM_InitField( &isActive, "IsActive", true, "Active" ); - CAF_PDM_InitFieldNoDefault( &view, "View", "View", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &view, "View", "View" ); - CAF_PDM_InitFieldNoDefault( &eclipseResultType, "EclipseResultType", "Result Type", "", "", "" ); - CAF_PDM_InitFieldNoDefault( &selectedEclipseResults, "SelectedEclipseResults", "Properties", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &eclipseResultType, "EclipseResultType", "Result Type" ); + CAF_PDM_InitFieldNoDefault( &selectedEclipseResults, "SelectedEclipseResults", "Properties" ); - CAF_PDM_InitField( &timeStepStart, "TimeStepStart", 0, "Start Time", "", "", "" ); - CAF_PDM_InitField( &timeStepEnd, "TimeStepEnd", 0, "End Time", "", "", "" ); + CAF_PDM_InitField( &timeStepStart, "TimeStepStart", 0, "Start Time" ); + CAF_PDM_InitField( &timeStepEnd, "TimeStepEnd", 0, "End Time" ); CAF_PDM_InitField( &sliceDirection, "SnapShotDirection", @@ -61,10 +61,10 @@ RimAdvancedSnapshotExportDefinition::RimAdvancedSnapshotExportDefinition() "", "" ); - CAF_PDM_InitField( &startSliceIndex, "RangeFilterStart", 1, "Range Start", "", "", "" ); - CAF_PDM_InitField( &endSliceIndex, "RangeFilterEnd", 1, "Range End", "", "", "" ); + CAF_PDM_InitField( &startSliceIndex, "RangeFilterStart", 1, "Range Start" ); + CAF_PDM_InitField( &endSliceIndex, "RangeFilterEnd", 1, "Range End" ); - CAF_PDM_InitFieldNoDefault( &additionalCases, "AdditionalCases", "Cases", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &additionalCases, "AdditionalCases", "Cases" ); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/ProjectDataModel/RimBinaryExportSettings.cpp b/ApplicationLibCode/ProjectDataModel/RimBinaryExportSettings.cpp index 6c84bf4f5f..cdcde94ed8 100644 --- a/ApplicationLibCode/ProjectDataModel/RimBinaryExportSettings.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimBinaryExportSettings.cpp @@ -26,12 +26,12 @@ CAF_PDM_SOURCE_INIT( RimBinaryExportSettings, "RimBinaryExportSettings" ); //-------------------------------------------------------------------------------------------------- RimBinaryExportSettings::RimBinaryExportSettings() { - CAF_PDM_InitObject( "RimBinaryExportSettings", "", "", "" ); + CAF_PDM_InitObject( "RimBinaryExportSettings" ); - CAF_PDM_InitFieldNoDefault( &fileName, "Filename", "Export Filename", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &fileName, "Filename", "Export Filename" ); fileName.uiCapability()->setUiEditorTypeName( caf::PdmUiFilePathEditor::uiEditorTypeName() ); - CAF_PDM_InitFieldNoDefault( &eclipseKeyword, "EclipseKeyword", "Eclipse Keyword", "", "", "" ); - CAF_PDM_InitField( &undefinedValue, "UndefinedValue", 0.0, "Undefined Value", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &eclipseKeyword, "EclipseKeyword", "Eclipse Keyword" ); + CAF_PDM_InitField( &undefinedValue, "UndefinedValue", 0.0, "Undefined Value" ); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/ProjectDataModel/RimCalcScript.cpp b/ApplicationLibCode/ProjectDataModel/RimCalcScript.cpp index d87393d9ae..5e44977b2a 100644 --- a/ApplicationLibCode/ProjectDataModel/RimCalcScript.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimCalcScript.cpp @@ -36,7 +36,7 @@ RimCalcScript::RimCalcScript() { CAF_PDM_InitObject( "CalcScript", ":/OctaveScriptFile16x16.png", "Calc Script", "" ); - CAF_PDM_InitField( &absoluteFileName, "AbsolutePath", QString(), "Location", "", "", "" ); + CAF_PDM_InitField( &absoluteFileName, "AbsolutePath", QString(), "Location" ); absoluteFileName.uiCapability()->setUiEditorTypeName( caf::PdmUiFilePathEditor::uiEditorTypeName() ); } diff --git a/ApplicationLibCode/ProjectDataModel/RimCase.cpp b/ApplicationLibCode/ProjectDataModel/RimCase.cpp index 138d6b0e21..ffc79c349a 100644 --- a/ApplicationLibCode/ProjectDataModel/RimCase.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimCase.cpp @@ -49,24 +49,24 @@ RimCase::RimCase() { CAF_PDM_InitScriptableObjectWithNameAndComment( "Case", ":/Case48x48.png", "", "", "Case", "The ResInsight base class for Cases" ); - CAF_PDM_InitScriptableField( &caseUserDescription, "Name", QString(), "Case Name", "", "", "" ); + CAF_PDM_InitScriptableField( &caseUserDescription, "Name", QString(), "Case Name" ); caseUserDescription.registerKeywordAlias( "CaseUserDescription" ); - CAF_PDM_InitScriptableFieldNoDefault( &m_displayNameOption, "NameSetting", "Name Setting", "", "", "" ); + CAF_PDM_InitScriptableFieldNoDefault( &m_displayNameOption, "NameSetting", "Name Setting" ); - CAF_PDM_InitScriptableField( &caseId, "Id", -1, "Case ID", "", "", "" ); + CAF_PDM_InitScriptableField( &caseId, "Id", -1, "Case ID" ); caseId.registerKeywordAlias( "CaseId" ); caseId.uiCapability()->setUiReadOnly( true ); caseId.capability()->setIOWriteable( false ); - CAF_PDM_InitScriptableFieldNoDefault( &m_caseFileName, "FilePath", "Case File Name", "", "", "" ); + CAF_PDM_InitScriptableFieldNoDefault( &m_caseFileName, "FilePath", "Case File Name" ); m_caseFileName.registerKeywordAlias( "CaseFileName" ); m_caseFileName.registerKeywordAlias( "GridFileName" ); m_caseFileName.uiCapability()->setUiReadOnly( true ); - CAF_PDM_InitFieldNoDefault( &m_activeFormationNames, "DefaultFormationNames", "Formation Names File", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_activeFormationNames, "DefaultFormationNames", "Formation Names File" ); - CAF_PDM_InitFieldNoDefault( &m_timeStepFilter, "TimeStepFilter", "Time Step Filter", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_timeStepFilter, "TimeStepFilter", "Time Step Filter" ); m_timeStepFilter.uiCapability()->setUiTreeHidden( true ); m_timeStepFilter.uiCapability()->setUiTreeChildrenHidden( true ); m_timeStepFilter = new RimTimeStepFilter; diff --git a/ApplicationLibCode/ProjectDataModel/RimCaseCollection.cpp b/ApplicationLibCode/ProjectDataModel/RimCaseCollection.cpp index 954e08c5a5..2cf42c7fbe 100644 --- a/ApplicationLibCode/ProjectDataModel/RimCaseCollection.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimCaseCollection.cpp @@ -30,9 +30,9 @@ CAF_PDM_SOURCE_INIT( RimCaseCollection, "RimCaseCollection" ); //-------------------------------------------------------------------------------------------------- RimCaseCollection::RimCaseCollection() { - CAF_PDM_InitObject( "Derived Statistics", "", "", "" ); + CAF_PDM_InitObject( "Derived Statistics" ); - CAF_PDM_InitFieldNoDefault( &reservoirs, "Reservoirs", "Reservoirs ChildArrayField", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &reservoirs, "Reservoirs", "Reservoirs ChildArrayField" ); reservoirs.uiCapability()->setUiTreeHidden( true ); } diff --git a/ApplicationLibCode/ProjectDataModel/RimCellEdgeColors.cpp b/ApplicationLibCode/ProjectDataModel/RimCellEdgeColors.cpp index 3abba416ec..9423ce05ac 100644 --- a/ApplicationLibCode/ProjectDataModel/RimCellEdgeColors.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimCellEdgeColors.cpp @@ -54,14 +54,14 @@ RimCellEdgeColors::RimCellEdgeColors() { CAF_PDM_InitObject( "Cell Edge Result", ":/EdgeResult_1.png", "", "" ); - CAF_PDM_InitField( &m_enableCellEdgeColors, "EnableCellEdgeColors", true, "Enable Cell Edge Results", "", "", "" ); + CAF_PDM_InitField( &m_enableCellEdgeColors, "EnableCellEdgeColors", true, "Enable Cell Edge Results" ); - CAF_PDM_InitFieldNoDefault( &m_propertyType, "propertyType", "Property Type", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_propertyType, "propertyType", "Property Type" ); - CAF_PDM_InitFieldNoDefault( &m_resultVariable, "CellEdgeVariable", "Result property", "", "", "" ); - CAF_PDM_InitField( &useXVariable, "UseXVariable", true, "Use X Values", "", "", "" ); - CAF_PDM_InitField( &useYVariable, "UseYVariable", true, "Use Y Values", "", "", "" ); - CAF_PDM_InitField( &useZVariable, "UseZVariable", true, "Use Z Values", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_resultVariable, "CellEdgeVariable", "Result property" ); + CAF_PDM_InitField( &useXVariable, "UseXVariable", true, "Use X Values" ); + CAF_PDM_InitField( &useYVariable, "UseYVariable", true, "Use Y Values" ); + CAF_PDM_InitField( &useZVariable, "UseZVariable", true, "Use Z Values" ); CAF_PDM_InitFieldNoDefault( &m_legendConfig, "LegendDefinition", "Color Legend", ":/Legend.png", "", "" ); diff --git a/ApplicationLibCode/ProjectDataModel/RimCheckableNamedObject.cpp b/ApplicationLibCode/ProjectDataModel/RimCheckableNamedObject.cpp index f1afe25100..367ae92fb7 100644 --- a/ApplicationLibCode/ProjectDataModel/RimCheckableNamedObject.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimCheckableNamedObject.cpp @@ -28,8 +28,8 @@ CAF_PDM_XML_ABSTRACT_SOURCE_INIT( RimCheckableNamedObject, "CheckableNamedObject //-------------------------------------------------------------------------------------------------- RimCheckableNamedObject::RimCheckableNamedObject( void ) { - CAF_PDM_InitScriptableObject( "Checkable object", "", "", "" ); - CAF_PDM_InitScriptableField( &m_isChecked, "IsChecked", true, "Active", "", "", "" ); + CAF_PDM_InitScriptableObject( "Checkable object" ); + CAF_PDM_InitScriptableField( &m_isChecked, "IsChecked", true, "Active" ); m_isChecked.uiCapability()->setUiHidden( true ); } diff --git a/ApplicationLibCode/ProjectDataModel/RimCheckableObject.cpp b/ApplicationLibCode/ProjectDataModel/RimCheckableObject.cpp index c3b90cca31..ec2f6a17f7 100644 --- a/ApplicationLibCode/ProjectDataModel/RimCheckableObject.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimCheckableObject.cpp @@ -25,7 +25,7 @@ CAF_PDM_XML_ABSTRACT_SOURCE_INIT( RimCheckableObject, "RimCheckableObject" ); // //-------------------------------------------------------------------------------------------------- RimCheckableObject::RimCheckableObject( void ) { - CAF_PDM_InitField( &m_isChecked, "IsChecked", true, "Active", "", "", "" ); + CAF_PDM_InitField( &m_isChecked, "IsChecked", true, "Active" ); m_isChecked.uiCapability()->setUiHidden( true ); } diff --git a/ApplicationLibCode/ProjectDataModel/RimColorLegend.cpp b/ApplicationLibCode/ProjectDataModel/RimColorLegend.cpp index 004ef242b8..7942f13521 100644 --- a/ApplicationLibCode/ProjectDataModel/RimColorLegend.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimColorLegend.cpp @@ -36,9 +36,9 @@ RimColorLegend::RimColorLegend() { CAF_PDM_InitObject( "ColorLegend", ":/Legend.png", "", "" ); - CAF_PDM_InitField( &m_colorLegendName, "ColorLegendName", QString( "" ), "Color Legend Name", "", "", "" ); + CAF_PDM_InitField( &m_colorLegendName, "ColorLegendName", QString( "" ), "Color Legend Name" ); - CAF_PDM_InitFieldNoDefault( &m_colorLegendItems, "ColorLegendItems", "", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_colorLegendItems, "ColorLegendItems", "" ); m_colorLegendItems.uiCapability()->setUiTreeHidden( true ); setDeletable( true ); diff --git a/ApplicationLibCode/ProjectDataModel/RimColorLegendItem.cpp b/ApplicationLibCode/ProjectDataModel/RimColorLegendItem.cpp index f49a4692cc..c736bc89e5 100644 --- a/ApplicationLibCode/ProjectDataModel/RimColorLegendItem.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimColorLegendItem.cpp @@ -33,17 +33,17 @@ CAF_PDM_SOURCE_INIT( RimColorLegendItem, "ColorLegendItem" ); //-------------------------------------------------------------------------------------------------- RimColorLegendItem::RimColorLegendItem() { - CAF_PDM_InitObject( "ColorLegendItem", "", "", "" ); + CAF_PDM_InitObject( "ColorLegendItem" ); - CAF_PDM_InitFieldNoDefault( &m_color, "Color", "Color", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_color, "Color", "Color" ); m_color = cvf::Color3f( cvf::Color3::ColorIdent::BLACK ); - CAF_PDM_InitField( &m_categoryValue, "CategoryValue", 0, "Category Number", "", "", "" ); + CAF_PDM_InitField( &m_categoryValue, "CategoryValue", 0, "Category Number" ); m_categoryValue.uiCapability()->setUiEditorTypeName( caf::PdmUiSliderEditor::uiEditorTypeName() ); - CAF_PDM_InitField( &m_categoryName, "CategoryName", QString( "" ), "Category Name", "", "", "" ); + CAF_PDM_InitField( &m_categoryName, "CategoryName", QString( "" ), "Category Name" ); - CAF_PDM_InitFieldNoDefault( &m_nameProxy, "NameProxy", "Name Proxy", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_nameProxy, "NameProxy", "Name Proxy" ); m_nameProxy.registerGetMethod( this, &RimColorLegendItem::itemName ); m_nameProxy.uiCapability()->setUiHidden( true ); m_nameProxy.xmlCapability()->disableIO(); diff --git a/ApplicationLibCode/ProjectDataModel/RimCommandObject.cpp b/ApplicationLibCode/ProjectDataModel/RimCommandObject.cpp index c2d6a5ad3e..a9c0284551 100644 --- a/ApplicationLibCode/ProjectDataModel/RimCommandObject.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimCommandObject.cpp @@ -55,14 +55,14 @@ RimCommandObject::~RimCommandObject() //-------------------------------------------------------------------------------------------------- RimCommandExecuteScript::RimCommandExecuteScript() { - CAF_PDM_InitFieldNoDefault( &name, "Name", "Name", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &name, "Name", "Name" ); - CAF_PDM_InitField( &scriptText, "ScriptText", QString(), "Script Text", "", "", "" ); + CAF_PDM_InitField( &scriptText, "ScriptText", QString(), "Script Text" ); scriptText.uiCapability()->setUiEditorTypeName( caf::PdmUiTextEditor::uiEditorTypeName() ); - CAF_PDM_InitField( &isEnabled, "IsEnabled", true, "Enabled ", "", "", "" ); + CAF_PDM_InitField( &isEnabled, "IsEnabled", true, "Enabled " ); - CAF_PDM_InitField( &execute, "Execute", true, "Execute", "", "", "" ); + CAF_PDM_InitField( &execute, "Execute", true, "Execute" ); execute.xmlCapability()->disableIO(); execute.uiCapability()->setUiEditorTypeName( caf::PdmUiPushButtonEditor::uiEditorTypeName() ); execute.uiCapability()->setUiLabelPosition( caf::PdmUiItemInfo::HIDDEN ); @@ -193,11 +193,11 @@ void RimCommandFactory::createCommandObjects( const caf::PdmObjectGroup& se //-------------------------------------------------------------------------------------------------- RimCommandIssueFieldChanged::RimCommandIssueFieldChanged() { - CAF_PDM_InitFieldNoDefault( &commandName, "CommandName", "CommandName", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &commandName, "CommandName", "CommandName" ); - CAF_PDM_InitField( &objectName, "ObjectName", QString(), "ObjectName", "", "", "" ); - CAF_PDM_InitField( &fieldName, "FieldName", QString(), "FieldName", "", "", "" ); - CAF_PDM_InitField( &fieldValueToApply, "FieldValueToApply", QString(), "FieldValueToApply", "", "", "" ); + CAF_PDM_InitField( &objectName, "ObjectName", QString(), "ObjectName" ); + CAF_PDM_InitField( &fieldName, "FieldName", QString(), "FieldName" ); + CAF_PDM_InitField( &fieldValueToApply, "FieldValueToApply", QString(), "FieldValueToApply" ); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/ProjectDataModel/RimContourMapProjection.cpp b/ApplicationLibCode/ProjectDataModel/RimContourMapProjection.cpp index 3dbdb1ec68..2057cb11ab 100644 --- a/ApplicationLibCode/ProjectDataModel/RimContourMapProjection.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimContourMapProjection.cpp @@ -85,14 +85,14 @@ RimContourMapProjection::RimContourMapProjection() { CAF_PDM_InitObject( "RimContourMapProjection", ":/2DMapProjection16x16.png", "", "" ); - CAF_PDM_InitField( &m_relativeSampleSpacing, "SampleSpacing", 0.9, "Sample Spacing Factor", "", "", "" ); + CAF_PDM_InitField( &m_relativeSampleSpacing, "SampleSpacing", 0.9, "Sample Spacing Factor" ); m_relativeSampleSpacing.uiCapability()->setUiEditorTypeName( caf::PdmUiDoubleSliderEditor::uiEditorTypeName() ); - CAF_PDM_InitFieldNoDefault( &m_resultAggregation, "ResultAggregation", "Result Aggregation", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_resultAggregation, "ResultAggregation", "Result Aggregation" ); - CAF_PDM_InitField( &m_showContourLines, "ContourLines", true, "Show Contour Lines", "", "", "" ); - CAF_PDM_InitField( &m_showContourLabels, "ContourLabels", true, "Show Contour Labels", "", "", "" ); - CAF_PDM_InitField( &m_smoothContourLines, "SmoothContourLines", true, "Smooth Contour Lines", "", "", "" ); + CAF_PDM_InitField( &m_showContourLines, "ContourLines", true, "Show Contour Lines" ); + CAF_PDM_InitField( &m_showContourLabels, "ContourLabels", true, "Show Contour Labels" ); + CAF_PDM_InitField( &m_smoothContourLines, "SmoothContourLines", true, "Smooth Contour Lines" ); setName( "Map Projection" ); nameField()->uiCapability()->setUiReadOnly( true ); diff --git a/ApplicationLibCode/ProjectDataModel/RimCustomObjectiveFunction.cpp b/ApplicationLibCode/ProjectDataModel/RimCustomObjectiveFunction.cpp index 89c44328f5..11a00f1b61 100644 --- a/ApplicationLibCode/ProjectDataModel/RimCustomObjectiveFunction.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimCustomObjectiveFunction.cpp @@ -37,15 +37,15 @@ RimCustomObjectiveFunction::RimCustomObjectiveFunction() { CAF_PDM_InitObject( "Objective Function", ":/ObjectiveFunction.svg", "", "" ); - CAF_PDM_InitFieldNoDefault( &m_functionTitle, "FunctionTitle", "Title", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_functionTitle, "FunctionTitle", "Title" ); m_functionTitle.registerGetMethod( this, &RimCustomObjectiveFunction::title ); m_functionTitle.uiCapability()->setUiHidden( true ); - CAF_PDM_InitFieldNoDefault( &m_customFunctionTitle, "CustomFunctionTitle", "Title", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_customFunctionTitle, "CustomFunctionTitle", "Title" ); - CAF_PDM_InitFieldNoDefault( &m_weights, "Weights", "", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_weights, "Weights", "" ); - CAF_PDM_InitFieldNoDefault( &m_objectiveFunctions, "ObjectiveFunctions", "Objective Functions", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_objectiveFunctions, "ObjectiveFunctions", "Objective Functions" ); { auto objFunc1 = new RimObjectiveFunction(); diff --git a/ApplicationLibCode/ProjectDataModel/RimCustomObjectiveFunctionCollection.cpp b/ApplicationLibCode/ProjectDataModel/RimCustomObjectiveFunctionCollection.cpp index c782de6794..64b672e7a6 100644 --- a/ApplicationLibCode/ProjectDataModel/RimCustomObjectiveFunctionCollection.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimCustomObjectiveFunctionCollection.cpp @@ -32,7 +32,7 @@ RimCustomObjectiveFunctionCollection::RimCustomObjectiveFunctionCollection() { CAF_PDM_InitObject( "Custom Objective Functions", ":/ObjectiveFunctionCollection.svg", "", "" ); - CAF_PDM_InitFieldNoDefault( &m_objectiveFunctions, "ObjectiveFunctions", "", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_objectiveFunctions, "ObjectiveFunctions", "" ); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/ProjectDataModel/RimCustomObjectiveFunctionWeight.cpp b/ApplicationLibCode/ProjectDataModel/RimCustomObjectiveFunctionWeight.cpp index a08f6e2fdf..cd6caca6b8 100644 --- a/ApplicationLibCode/ProjectDataModel/RimCustomObjectiveFunctionWeight.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimCustomObjectiveFunctionWeight.cpp @@ -42,31 +42,26 @@ RimCustomObjectiveFunctionWeight::RimCustomObjectiveFunctionWeight() { CAF_PDM_InitObject( "Custom Objective Function Weight", ":/ObjectiveFunctionWeight.svg", "", "" ); - CAF_PDM_InitFieldNoDefault( &m_title, "WeightTitle", "Title", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_title, "WeightTitle", "Title" ); m_title.registerGetMethod( this, &RimCustomObjectiveFunctionWeight::title ); - CAF_PDM_InitFieldNoDefault( &m_objectiveValuesSummaryAddressesUiField, "SelectedObjectiveSummaryVar", "Vector", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_objectiveValuesSummaryAddressesUiField, "SelectedObjectiveSummaryVar", "Vector" ); m_objectiveValuesSummaryAddressesUiField.xmlCapability()->disableIO(); m_objectiveValuesSummaryAddressesUiField.uiCapability()->setUiEditorTypeName( caf::PdmUiLineEditor::uiEditorTypeName() ); - CAF_PDM_InitFieldNoDefault( &m_objectiveValuesSummaryAddresses, "ObjectiveSummaryAddress", "Summary Address", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_objectiveValuesSummaryAddresses, "ObjectiveSummaryAddress", "Summary Address" ); m_objectiveValuesSummaryAddresses.uiCapability()->setUiTreeHidden( true ); m_objectiveValuesSummaryAddresses.uiCapability()->setUiTreeChildrenHidden( true ); - CAF_PDM_InitFieldNoDefault( &m_objectiveValuesSelectSummaryAddressPushButton, - "SelectObjectiveSummaryAddress", - "", - "", - "", - "" ); + CAF_PDM_InitFieldNoDefault( &m_objectiveValuesSelectSummaryAddressPushButton, "SelectObjectiveSummaryAddress", "" ); caf::PdmUiPushButtonEditor::configureEditorForField( &m_objectiveValuesSelectSummaryAddressPushButton ); m_objectiveValuesSelectSummaryAddressPushButton.uiCapability()->setUiLabelPosition( caf::PdmUiItemInfo::HIDDEN ); m_objectiveValuesSelectSummaryAddressPushButton = false; - CAF_PDM_InitField( &m_weightValue, "WeightValue", 1.0, "Weight", "", "", "" ); + CAF_PDM_InitField( &m_weightValue, "WeightValue", 1.0, "Weight" ); m_weightValue.uiCapability()->setUiEditorTypeName( caf::PdmUiLineEditor::uiEditorTypeName() ); - CAF_PDM_InitFieldNoDefault( &m_objectiveFunction, "ObjectiveFunction", "Objective Function", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_objectiveFunction, "ObjectiveFunction", "Objective Function" ); m_objectiveFunction.uiCapability()->setUiEditorTypeName( caf::PdmUiListEditor::uiEditorTypeName() ); setDeletable( true ); diff --git a/ApplicationLibCode/ProjectDataModel/RimDepthTrackPlot.cpp b/ApplicationLibCode/ProjectDataModel/RimDepthTrackPlot.cpp index ef46fdc3a1..df5e36e92a 100644 --- a/ApplicationLibCode/ProjectDataModel/RimDepthTrackPlot.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimDepthTrackPlot.cpp @@ -96,37 +96,37 @@ RimDepthTrackPlot::RimDepthTrackPlot() m_commonDataSource.xmlCapability()->disableIO(); m_commonDataSource = new RimWellLogCurveCommonDataSource; - CAF_PDM_InitField( &m_plotWindowTitle, "PlotDescription", QString( "" ), "Name", "", "", "" ); + CAF_PDM_InitField( &m_plotWindowTitle, "PlotDescription", QString( "" ), "Name" ); m_plotWindowTitle.xmlCapability()->setIOWritable( false ); caf::AppEnum depthType = RiaDefines::DepthTypeEnum::MEASURED_DEPTH; - CAF_PDM_InitScriptableField( &m_depthType, "DepthType", depthType, "Type", "", "", "" ); + CAF_PDM_InitScriptableField( &m_depthType, "DepthType", depthType, "Type" ); caf::AppEnum depthUnit = RiaDefines::DepthUnitType::UNIT_METER; - CAF_PDM_InitScriptableField( &m_depthUnit, "DepthUnit", depthUnit, "Unit", "", "", "" ); + CAF_PDM_InitScriptableField( &m_depthUnit, "DepthUnit", depthUnit, "Unit" ); - CAF_PDM_InitScriptableField( &m_minVisibleDepth, "MinimumDepth", 0.0, "Min", "", "", "" ); - CAF_PDM_InitScriptableField( &m_maxVisibleDepth, "MaximumDepth", 1000.0, "Max", "", "", "" ); + CAF_PDM_InitScriptableField( &m_minVisibleDepth, "MinimumDepth", 0.0, "Min" ); + CAF_PDM_InitScriptableField( &m_maxVisibleDepth, "MaximumDepth", 1000.0, "Max" ); m_minVisibleDepth.uiCapability()->setUiEditorTypeName( caf::PdmUiDoubleValueEditor::uiEditorTypeName() ); m_maxVisibleDepth.uiCapability()->setUiEditorTypeName( caf::PdmUiDoubleValueEditor::uiEditorTypeName() ); - CAF_PDM_InitScriptableFieldNoDefault( &m_depthAxisGridVisibility, "ShowDepthGridLines", "Show Grid Lines", "", "", "" ); - CAF_PDM_InitScriptableField( &m_isAutoScaleDepthEnabled, "AutoScaleDepthEnabled", true, "Auto Scale", "", "", "" ); + CAF_PDM_InitScriptableFieldNoDefault( &m_depthAxisGridVisibility, "ShowDepthGridLines", "Show Grid Lines" ); + CAF_PDM_InitScriptableField( &m_isAutoScaleDepthEnabled, "AutoScaleDepthEnabled", true, "Auto Scale" ); m_isAutoScaleDepthEnabled.uiCapability()->setUiHidden( true ); - CAF_PDM_InitScriptableFieldNoDefault( &m_subTitleFontSize, "SubTitleFontSize", "Track Title Font Size", "", "", "" ); - CAF_PDM_InitScriptableFieldNoDefault( &m_axisTitleFontSize, "AxisTitleFontSize", "Axis Title Font Size", "", "", "" ); - CAF_PDM_InitScriptableFieldNoDefault( &m_axisValueFontSize, "AxisValueFontSize", "Axis Value Font Size", "", "", "" ); + CAF_PDM_InitScriptableFieldNoDefault( &m_subTitleFontSize, "SubTitleFontSize", "Track Title Font Size" ); + CAF_PDM_InitScriptableFieldNoDefault( &m_axisTitleFontSize, "AxisTitleFontSize", "Axis Title Font Size" ); + CAF_PDM_InitScriptableFieldNoDefault( &m_axisValueFontSize, "AxisValueFontSize", "Axis Value Font Size" ); - CAF_PDM_InitFieldNoDefault( &m_nameConfig, "NameConfig", "", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_nameConfig, "NameConfig", "" ); m_nameConfig.uiCapability()->setUiTreeHidden( true ); m_nameConfig.uiCapability()->setUiTreeChildrenHidden( true ); m_nameConfig = new RimWellLogPlotNameConfig(); - CAF_PDM_InitFieldNoDefault( &m_ensembleCurveSet, "FilterEnsembleCurveSet", "Filter by Ensemble Curve Set", "", "", "" ); - CAF_PDM_InitFieldNoDefault( &m_depthEqualization, "DepthEqualization", "Depth Equalization", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_ensembleCurveSet, "FilterEnsembleCurveSet", "Filter by Ensemble Curve Set" ); + CAF_PDM_InitFieldNoDefault( &m_depthEqualization, "DepthEqualization", "Depth Equalization" ); - CAF_PDM_InitFieldNoDefault( &m_plots, "Tracks", "", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_plots, "Tracks", "" ); m_plots.uiCapability()->setUiTreeHidden( true ); auto reorderability = caf::PdmFieldReorderCapability::addToField( &m_plots ); reorderability->orderChanged.connect( this, &RimDepthTrackPlot::onPlotsReordered ); diff --git a/ApplicationLibCode/ProjectDataModel/RimDialogData.cpp b/ApplicationLibCode/ProjectDataModel/RimDialogData.cpp index 9a6d6b2f05..ff9154f9e6 100644 --- a/ApplicationLibCode/ProjectDataModel/RimDialogData.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimDialogData.cpp @@ -37,41 +37,38 @@ CAF_PDM_SOURCE_INIT( RimDialogData, "RimDialogData" ); //-------------------------------------------------------------------------------------------------- RimDialogData::RimDialogData() { - CAF_PDM_InitObject( "Dialog Data", "", "", "" ); + CAF_PDM_InitObject( "Dialog Data" ); - CAF_PDM_InitFieldNoDefault( &m_exportCarfin, "ExportCarfin", "Export Carfin", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_exportCarfin, "ExportCarfin", "Export Carfin" ); m_exportCarfin = new RicExportCarfinUi; - CAF_PDM_InitFieldNoDefault( &m_exportCompletionData, "ExportCompletionData", "Export Completion Data", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_exportCompletionData, "ExportCompletionData", "Export Completion Data" ); m_exportCompletionData = new RicExportCompletionDataSettingsUi(); - CAF_PDM_InitFieldNoDefault( &m_multipleFractionsData, "MultipleFractionsData", "Multiple Fractures Data", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_multipleFractionsData, "MultipleFractionsData", "Multiple Fractures Data" ); m_multipleFractionsData = new RiuCreateMultipleFractionsUi(); CAF_PDM_InitFieldNoDefault( &m_holoLenseExportToFolderData, "HoloLenseExportToFolderData", - "Holo Lens Export To Folder Data", - "", - "", - "" ); + "Holo Lens Export To Folder Data" ); m_holoLenseExportToFolderData = new RicHoloLensExportToFolderUi(); - CAF_PDM_InitFieldNoDefault( &m_exportWellPathsData, "ExportwellPathsData", "Export Well Paths Data", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_exportWellPathsData, "ExportwellPathsData", "Export Well Paths Data" ); m_exportWellPathsData = new RicExportWellPathsUi(); - CAF_PDM_InitFieldNoDefault( &m_exportLgrData, "ExportLgr", "LGR Export", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_exportLgrData, "ExportLgr", "LGR Export" ); m_exportLgrData = new RicExportLgrUi(); - CAF_PDM_InitFieldNoDefault( &m_exportSectorModelData, "ExportSectorModel", "Export Sector Model", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_exportSectorModelData, "ExportSectorModel", "Export Sector Model" ); m_exportSectorModelData = new RicExportEclipseSectorModelUi(); - CAF_PDM_InitFieldNoDefault( &m_mockModelSettings, "MockModelSettings", "Mock Model Settings", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_mockModelSettings, "MockModelSettings", "Mock Model Settings" ); m_mockModelSettings = new RimMockModelSettings(); - CAF_PDM_InitFieldNoDefault( &m_createEnsembleSurfaceUi, "CreateEnsembleSurfaceUi", "Create Ensmeble Surface Ui", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_createEnsembleSurfaceUi, "CreateEnsembleSurfaceUi", "Create Ensmeble Surface Ui" ); m_createEnsembleSurfaceUi = new RicCreateEnsembleSurfaceUi(); - CAF_PDM_InitFieldNoDefault( &m_createEnsembleWellLogUi, "CreateEnsembleWellLogUi", "Create Ensemble Well Log Ui", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_createEnsembleWellLogUi, "CreateEnsembleWellLogUi", "Create Ensemble Well Log Ui" ); m_createEnsembleWellLogUi = new RicCreateEnsembleWellLogUi(); } diff --git a/ApplicationLibCode/ProjectDataModel/RimEclipseCase.cpp b/ApplicationLibCode/ProjectDataModel/RimEclipseCase.cpp index a9d962c6f5..5d0e147aa6 100644 --- a/ApplicationLibCode/ProjectDataModel/RimEclipseCase.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimEclipseCase.cpp @@ -98,23 +98,23 @@ RimEclipseCase::RimEclipseCase() "All Eclipse Views in the case" ); reservoirViews.uiCapability()->setUiTreeHidden( true ); - CAF_PDM_InitFieldNoDefault( &m_matrixModelResults, "MatrixModelResults", "", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_matrixModelResults, "MatrixModelResults", "" ); m_matrixModelResults.uiCapability()->setUiTreeHidden( true ); - CAF_PDM_InitFieldNoDefault( &m_fractureModelResults, "FractureModelResults", "", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_fractureModelResults, "FractureModelResults", "" ); m_fractureModelResults.uiCapability()->setUiTreeHidden( true ); - CAF_PDM_InitField( &m_flipXAxis, "FlipXAxis", false, "Flip X Axis", "", "", "" ); - CAF_PDM_InitField( &m_flipYAxis, "FlipYAxis", false, "Flip Y Axis", "", "", "" ); + CAF_PDM_InitField( &m_flipXAxis, "FlipXAxis", false, "Flip X Axis" ); + CAF_PDM_InitField( &m_flipYAxis, "FlipYAxis", false, "Flip Y Axis" ); - CAF_PDM_InitFieldNoDefault( &m_filesContainingFaults_OBSOLETE, "CachedFileNamesContainingFaults", "", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_filesContainingFaults_OBSOLETE, "CachedFileNamesContainingFaults", "" ); m_filesContainingFaults_OBSOLETE.uiCapability()->setUiHidden( true ); m_filesContainingFaults_OBSOLETE.xmlCapability()->disableIO(); - CAF_PDM_InitFieldNoDefault( &m_contourMapCollection, "ContourMaps", "2d Contour Maps", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_contourMapCollection, "ContourMaps", "2d Contour Maps" ); m_contourMapCollection = new RimEclipseContourMapViewCollection; m_contourMapCollection.uiCapability()->setUiTreeHidden( true ); - CAF_PDM_InitFieldNoDefault( &m_inputPropertyCollection, "InputPropertyCollection", "", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_inputPropertyCollection, "InputPropertyCollection", "" ); m_inputPropertyCollection = new RimEclipseInputPropertyCollection; m_inputPropertyCollection->parentField()->uiCapability()->setUiTreeHidden( true ); diff --git a/ApplicationLibCode/ProjectDataModel/RimEclipseCaseCollection.cpp b/ApplicationLibCode/ProjectDataModel/RimEclipseCaseCollection.cpp index 524c453aec..ec80a5ba81 100644 --- a/ApplicationLibCode/ProjectDataModel/RimEclipseCaseCollection.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimEclipseCaseCollection.cpp @@ -43,10 +43,10 @@ RimEclipseCaseCollection::RimEclipseCaseCollection( void ) { CAF_PDM_InitObject( "Grid Models", ":/Cases16x16.png", "", "" ); - CAF_PDM_InitFieldNoDefault( &cases, "Reservoirs", "", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &cases, "Reservoirs", "" ); cases.uiCapability()->setUiTreeHidden( true ); - CAF_PDM_InitFieldNoDefault( &caseGroups, "CaseGroups", "", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &caseGroups, "CaseGroups", "" ); caseGroups.uiCapability()->setUiTreeHidden( true ); m_gridCollection = new RigGridManager; diff --git a/ApplicationLibCode/ProjectDataModel/RimEclipseCellColors.cpp b/ApplicationLibCode/ProjectDataModel/RimEclipseCellColors.cpp index 2073a237ae..ab85e59058 100644 --- a/ApplicationLibCode/ProjectDataModel/RimEclipseCellColors.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimEclipseCellColors.cpp @@ -58,15 +58,15 @@ RimEclipseCellColors::RimEclipseCellColors() "CellColors", "Eclipse Cell Colors class" ); - CAF_PDM_InitFieldNoDefault( &obsoleteField_legendConfig, "LegendDefinition", "Color Legend", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &obsoleteField_legendConfig, "LegendDefinition", "Color Legend" ); this->obsoleteField_legendConfig.xmlCapability()->setIOWritable( false ); - CAF_PDM_InitFieldNoDefault( &m_legendConfigData, "ResultVarLegendDefinitionList", "", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_legendConfigData, "ResultVarLegendDefinitionList", "" ); - CAF_PDM_InitFieldNoDefault( &m_ternaryLegendConfig, "TernaryLegendDefinition", "Ternary Color Legend", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_ternaryLegendConfig, "TernaryLegendDefinition", "Ternary Color Legend" ); this->m_ternaryLegendConfig = new RimTernaryLegendConfig(); - CAF_PDM_InitFieldNoDefault( &m_legendConfigPtrField, "LegendDefinitionPtrField", "Color Legend PtrField", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_legendConfigPtrField, "LegendDefinitionPtrField", "Color Legend PtrField" ); // Make sure we have a created legend for the default/undefined result variable changeLegendConfig( this->resultVariable() ); diff --git a/ApplicationLibCode/ProjectDataModel/RimEclipseContourMapProjection.cpp b/ApplicationLibCode/ProjectDataModel/RimEclipseContourMapProjection.cpp index 4bda551d92..0be76957e9 100644 --- a/ApplicationLibCode/ProjectDataModel/RimEclipseContourMapProjection.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimEclipseContourMapProjection.cpp @@ -64,8 +64,8 @@ RimEclipseContourMapProjection::RimEclipseContourMapProjection() { CAF_PDM_InitObject( "RimEclipseContourMapProjection", ":/2DMapProjection16x16.png", "", "" ); - CAF_PDM_InitField( &m_weightByParameter, "WeightByParameter", false, "Weight by Result Parameter", "", "", "" ); - CAF_PDM_InitFieldNoDefault( &m_weightingResult, "WeightingResult", "", "", "", "" ); + CAF_PDM_InitField( &m_weightByParameter, "WeightByParameter", false, "Weight by Result Parameter" ); + CAF_PDM_InitFieldNoDefault( &m_weightingResult, "WeightingResult", "" ); m_weightingResult.uiCapability()->setUiTreeHidden( true ); m_weightingResult.uiCapability()->setUiTreeChildrenHidden( true ); m_weightingResult = new RimEclipseResultDefinition; diff --git a/ApplicationLibCode/ProjectDataModel/RimEclipseContourMapView.cpp b/ApplicationLibCode/ProjectDataModel/RimEclipseContourMapView.cpp index 6078b25b71..e15e27a133 100644 --- a/ApplicationLibCode/ProjectDataModel/RimEclipseContourMapView.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimEclipseContourMapView.cpp @@ -60,11 +60,11 @@ RimEclipseContourMapView::RimEclipseContourMapView() "EclipseContourMap", "A contour map for Eclipse cases" ); - CAF_PDM_InitFieldNoDefault( &m_contourMapProjection, "ContourMapProjection", "Contour Map Projection", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_contourMapProjection, "ContourMapProjection", "Contour Map Projection" ); m_contourMapProjection = new RimEclipseContourMapProjection(); - CAF_PDM_InitField( &m_showAxisLines, "ShowAxisLines", true, "Show Axis Lines", "", "", "" ); - CAF_PDM_InitField( &m_showScaleLegend, "ShowScaleLegend", true, "Show Scale Legend", "", "", "" ); + CAF_PDM_InitField( &m_showAxisLines, "ShowAxisLines", true, "Show Axis Lines" ); + CAF_PDM_InitField( &m_showScaleLegend, "ShowScaleLegend", true, "Show Scale Legend" ); setFaultVisParameters(); diff --git a/ApplicationLibCode/ProjectDataModel/RimEclipseFaultColors.cpp b/ApplicationLibCode/ProjectDataModel/RimEclipseFaultColors.cpp index 5659ef0dcd..2723a57297 100644 --- a/ApplicationLibCode/ProjectDataModel/RimEclipseFaultColors.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimEclipseFaultColors.cpp @@ -37,7 +37,7 @@ RimEclipseFaultColors::RimEclipseFaultColors() { CAF_PDM_InitObject( "Fault Result", ":/draw_style_faults_24x24.png", "", "" ); - CAF_PDM_InitField( &showCustomFaultResult, "ShowCustomFaultResult", false, "Show Custom Fault Result", "", "", "" ); + CAF_PDM_InitField( &showCustomFaultResult, "ShowCustomFaultResult", false, "Show Custom Fault Result" ); showCustomFaultResult.uiCapability()->setUiHidden( true ); CAF_PDM_InitFieldNoDefault( &m_customFaultResultColors, diff --git a/ApplicationLibCode/ProjectDataModel/RimEclipseGeometrySelectionItem.cpp b/ApplicationLibCode/ProjectDataModel/RimEclipseGeometrySelectionItem.cpp index 10390aa13f..eaf7f83c60 100644 --- a/ApplicationLibCode/ProjectDataModel/RimEclipseGeometrySelectionItem.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimEclipseGeometrySelectionItem.cpp @@ -35,17 +35,12 @@ CAF_PDM_SOURCE_INIT( RimEclipseGeometrySelectionItem, "EclipseGeometrySelectionI //-------------------------------------------------------------------------------------------------- RimEclipseGeometrySelectionItem::RimEclipseGeometrySelectionItem() { - CAF_PDM_InitObject( "Eclipse Geometry Selection Item", "", "", "" ); + CAF_PDM_InitObject( "Eclipse Geometry Selection Item" ); - CAF_PDM_InitFieldNoDefault( &m_eclipseCase, "EclipseCase", "Eclipse Case", "", "", "" ); - CAF_PDM_InitFieldNoDefault( &m_gridIndex, "GridIndex", "Grid Index", "", "", "" ); - CAF_PDM_InitFieldNoDefault( &m_cellIndex, "CellIndex", "Cell Index", "", "", "" ); - CAF_PDM_InitFieldNoDefault( &m_localIntersectionPointInDisplay, - "LocalIntersectionPoint", - "local Intersection Point", - "", - "", - "" ); + CAF_PDM_InitFieldNoDefault( &m_eclipseCase, "EclipseCase", "Eclipse Case" ); + CAF_PDM_InitFieldNoDefault( &m_gridIndex, "GridIndex", "Grid Index" ); + CAF_PDM_InitFieldNoDefault( &m_cellIndex, "CellIndex", "Cell Index" ); + CAF_PDM_InitFieldNoDefault( &m_localIntersectionPointInDisplay, "LocalIntersectionPoint", "local Intersection Point" ); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/ProjectDataModel/RimEclipseInputCase.cpp b/ApplicationLibCode/ProjectDataModel/RimEclipseInputCase.cpp index 5641d7641c..3c445e9082 100644 --- a/ApplicationLibCode/ProjectDataModel/RimEclipseInputCase.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimEclipseInputCase.cpp @@ -56,7 +56,7 @@ RimEclipseInputCase::RimEclipseInputCase() { CAF_PDM_InitObject( "RimInputCase", ":/EclipseInput48x48.png", "", "" ); - CAF_PDM_InitFieldNoDefault( &m_additionalFiles, "AdditionalFileNamesProxy", "Additional Files", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_additionalFiles, "AdditionalFileNamesProxy", "Additional Files" ); m_additionalFiles.registerGetMethod( this, &RimEclipseInputCase::additionalFiles ); m_additionalFiles.uiCapability()->setUiReadOnly( true ); m_additionalFiles.xmlCapability()->setIOWritable( false ); diff --git a/ApplicationLibCode/ProjectDataModel/RimEclipseInputProperty.cpp b/ApplicationLibCode/ProjectDataModel/RimEclipseInputProperty.cpp index cd1d110948..e7ae7311cd 100644 --- a/ApplicationLibCode/ProjectDataModel/RimEclipseInputProperty.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimEclipseInputProperty.cpp @@ -54,10 +54,10 @@ RimEclipseInputProperty::RimEclipseInputProperty() { CAF_PDM_InitObject( "Input Property", ":/EclipseInput48x48.png", "", "" ); - CAF_PDM_InitField( &resultName, "ResultName", QString(), "Result Name", "", "", "" ); - CAF_PDM_InitField( &eclipseKeyword, "EclipseKeyword", QString(), "Eclipse Keyword", "", "", "" ); - CAF_PDM_InitFieldNoDefault( &fileName, "FileName", "Filename", "", "", "" ); - CAF_PDM_InitField( &resolvedState, "ResolvedState", (ResolveStateEnum)UNKNOWN, "Data State", "", "", "" ); + CAF_PDM_InitField( &resultName, "ResultName", QString(), "Result Name" ); + CAF_PDM_InitField( &eclipseKeyword, "EclipseKeyword", QString(), "Eclipse Keyword" ); + CAF_PDM_InitFieldNoDefault( &fileName, "FileName", "Filename" ); + CAF_PDM_InitField( &resolvedState, "ResolvedState", (ResolveStateEnum)UNKNOWN, "Data State" ); resolvedState.uiCapability()->setUiReadOnly( true ); resolvedState.xmlCapability()->disableIO(); diff --git a/ApplicationLibCode/ProjectDataModel/RimEclipseInputPropertyCollection.cpp b/ApplicationLibCode/ProjectDataModel/RimEclipseInputPropertyCollection.cpp index 97d19a2db1..f8de3814e1 100644 --- a/ApplicationLibCode/ProjectDataModel/RimEclipseInputPropertyCollection.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimEclipseInputPropertyCollection.cpp @@ -33,7 +33,7 @@ RimEclipseInputPropertyCollection::RimEclipseInputPropertyCollection() { CAF_PDM_InitObject( "Input Properties", ":/EclipseInput48x48.png", "", "" ); - CAF_PDM_InitFieldNoDefault( &inputProperties, "InputProperties", "", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &inputProperties, "InputProperties", "" ); inputProperties.uiCapability()->setUiTreeHidden( true ); } diff --git a/ApplicationLibCode/ProjectDataModel/RimEclipseResultCase.cpp b/ApplicationLibCode/ProjectDataModel/RimEclipseResultCase.cpp index 47ddd6a334..5e9c980bb6 100644 --- a/ApplicationLibCode/ProjectDataModel/RimEclipseResultCase.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimEclipseResultCase.cpp @@ -72,11 +72,11 @@ RimEclipseResultCase::RimEclipseResultCase() { CAF_PDM_InitScriptableObject( "Eclipse Case", ":/Case48x48.png", "", "The Regular Eclipse Results Case" ); - CAF_PDM_InitFieldNoDefault( &m_unitSystem, "UnitSystem", "Unit System", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_unitSystem, "UnitSystem", "Unit System" ); m_unitSystem.registerGetMethod( RimProject::current(), &RimProject::commonUnitSystemForAllCases ); m_unitSystem.uiCapability()->setUiReadOnly( true ); - CAF_PDM_InitFieldNoDefault( &m_flowDiagSolutions, "FlowDiagSolutions", "Flow Diagnostics Solutions", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_flowDiagSolutions, "FlowDiagSolutions", "Flow Diagnostics Solutions" ); m_flowDiagSolutions.uiCapability()->setUiTreeHidden( true ); m_flowDiagSolutions.uiCapability()->setUiTreeChildrenHidden( true ); @@ -85,7 +85,7 @@ RimEclipseResultCase::RimEclipseResultCase() m_flipYAxis.xmlCapability()->setIOWritable( true ); // flipYAxis.uiCapability()->setUiHidden(true); - CAF_PDM_InitFieldNoDefault( &m_sourSimFileName, "SourSimFileName", "SourSim File Name", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_sourSimFileName, "SourSimFileName", "SourSim File Name" ); m_sourSimFileName.uiCapability()->setUiEditorTypeName( caf::PdmUiFilePathEditor::uiEditorTypeName() ); #ifndef USE_HDF5 m_sourSimFileName.uiCapability()->setUiHidden( true ); diff --git a/ApplicationLibCode/ProjectDataModel/RimEclipseResultDefinition.cpp b/ApplicationLibCode/ProjectDataModel/RimEclipseResultDefinition.cpp index ae47bac7df..de59e690e3 100644 --- a/ApplicationLibCode/ProjectDataModel/RimEclipseResultDefinition.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimEclipseResultDefinition.cpp @@ -108,10 +108,10 @@ RimEclipseResultDefinition::RimEclipseResultDefinition( caf::PdmUiItemInfo::Labe { CAF_PDM_InitScriptableObjectWithNameAndComment( "Result Definition", "", "", "", "EclipseResult", "An eclipse result definition" ); - CAF_PDM_InitScriptableFieldNoDefault( &m_resultType, "ResultType", "Type", "", "", "" ); + CAF_PDM_InitScriptableFieldNoDefault( &m_resultType, "ResultType", "Type" ); m_resultType.uiCapability()->setUiHidden( true ); - CAF_PDM_InitScriptableFieldNoDefault( &m_porosityModel, "PorosityModelType", "Porosity", "", "", "" ); + CAF_PDM_InitScriptableFieldNoDefault( &m_porosityModel, "PorosityModelType", "Porosity" ); m_porosityModel.uiCapability()->setUiHidden( true ); CAF_PDM_InitScriptableField( &m_resultVariable, @@ -123,7 +123,7 @@ RimEclipseResultDefinition::RimEclipseResultDefinition( caf::PdmUiItemInfo::Labe "" ); m_resultVariable.uiCapability()->setUiHidden( true ); - CAF_PDM_InitFieldNoDefault( &m_flowSolution, "FlowDiagSolution", "Solution", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_flowSolution, "FlowDiagSolution", "Solution" ); m_flowSolution.uiCapability()->setUiHidden( true ); CAF_PDM_InitField( &m_timeLapseBaseTimestep, @@ -134,21 +134,21 @@ RimEclipseResultDefinition::RimEclipseResultDefinition( caf::PdmUiItemInfo::Labe "", "" ); - CAF_PDM_InitFieldNoDefault( &m_differenceCase, "DifferenceCase", "Difference Case", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_differenceCase, "DifferenceCase", "Difference Case" ); - CAF_PDM_InitField( &m_divideByCellFaceArea, "DivideByCellFaceArea", false, "Divide By Area", "", "", "" ); + CAF_PDM_InitField( &m_divideByCellFaceArea, "DivideByCellFaceArea", false, "Divide By Area" ); - CAF_PDM_InitScriptableFieldNoDefault( &m_selectedInjectorTracers, "SelectedInjectorTracers", "Injector Tracers", "", "", "" ); + CAF_PDM_InitScriptableFieldNoDefault( &m_selectedInjectorTracers, "SelectedInjectorTracers", "Injector Tracers" ); m_selectedInjectorTracers.uiCapability()->setUiHidden( true ); - CAF_PDM_InitScriptableFieldNoDefault( &m_selectedProducerTracers, "SelectedProducerTracers", "Producer Tracers", "", "", "" ); + CAF_PDM_InitScriptableFieldNoDefault( &m_selectedProducerTracers, "SelectedProducerTracers", "Producer Tracers" ); m_selectedProducerTracers.uiCapability()->setUiHidden( true ); - CAF_PDM_InitScriptableFieldNoDefault( &m_selectedSouringTracers, "SelectedSouringTracers", "Tracers", "", "", "" ); + CAF_PDM_InitScriptableFieldNoDefault( &m_selectedSouringTracers, "SelectedSouringTracers", "Tracers" ); m_selectedSouringTracers.uiCapability()->setUiHidden( true ); - CAF_PDM_InitScriptableFieldNoDefault( &m_flowTracerSelectionMode, "FlowTracerSelectionMode", "Tracers", "", "", "" ); - CAF_PDM_InitScriptableFieldNoDefault( &m_phaseSelection, "PhaseSelection", "Phases", "", "", "" ); + CAF_PDM_InitScriptableFieldNoDefault( &m_flowTracerSelectionMode, "FlowTracerSelectionMode", "Tracers" ); + CAF_PDM_InitScriptableFieldNoDefault( &m_phaseSelection, "PhaseSelection", "Phases" ); m_phaseSelection.uiCapability()->setUiLabelPosition( m_labelPosition ); CAF_PDM_InitScriptableField( &m_showOnlyVisibleCategoriesInLegend, @@ -161,11 +161,11 @@ RimEclipseResultDefinition::RimEclipseResultDefinition( caf::PdmUiItemInfo::Labe // Ui only fields - CAF_PDM_InitFieldNoDefault( &m_resultTypeUiField, "MResultType", "Type", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_resultTypeUiField, "MResultType", "Type" ); m_resultTypeUiField.xmlCapability()->disableIO(); m_resultTypeUiField.uiCapability()->setUiLabelPosition( m_labelPosition ); - CAF_PDM_InitFieldNoDefault( &m_porosityModelUiField, "MPorosityModelType", "Porosity", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_porosityModelUiField, "MPorosityModelType", "Porosity" ); m_porosityModelUiField.xmlCapability()->disableIO(); m_porosityModelUiField.uiCapability()->setUiLabelPosition( m_labelPosition ); @@ -180,33 +180,33 @@ RimEclipseResultDefinition::RimEclipseResultDefinition( caf::PdmUiItemInfo::Labe m_resultVariableUiField.uiCapability()->setUiEditorTypeName( caf::PdmUiListEditor::uiEditorTypeName() ); m_resultVariableUiField.uiCapability()->setUiLabelPosition( m_labelPosition ); - CAF_PDM_InitFieldNoDefault( &m_inputPropertyFileName, "InputPropertyFileName", "File Name", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_inputPropertyFileName, "InputPropertyFileName", "File Name" ); m_inputPropertyFileName.xmlCapability()->disableIO(); m_inputPropertyFileName.uiCapability()->setUiReadOnly( true ); - CAF_PDM_InitFieldNoDefault( &m_flowSolutionUiField, "MFlowDiagSolution", "Solution", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_flowSolutionUiField, "MFlowDiagSolution", "Solution" ); m_flowSolutionUiField.xmlCapability()->disableIO(); m_flowSolutionUiField.uiCapability()->setUiHidden( true ); // For now since there are only one to choose from - CAF_PDM_InitField( &m_syncInjectorToProducerSelection, "MSyncSelectedInjProd", false, "Add Communicators ->", "", "", "" ); + CAF_PDM_InitField( &m_syncInjectorToProducerSelection, "MSyncSelectedInjProd", false, "Add Communicators ->" ); m_syncInjectorToProducerSelection.uiCapability()->setUiEditorTypeName( caf::PdmUiToolButtonEditor::uiEditorTypeName() ); - CAF_PDM_InitField( &m_syncProducerToInjectorSelection, "MSyncSelectedProdInj", false, "<- Add Communicators", "", "", "" ); + CAF_PDM_InitField( &m_syncProducerToInjectorSelection, "MSyncSelectedProdInj", false, "<- Add Communicators" ); m_syncProducerToInjectorSelection.uiCapability()->setUiEditorTypeName( caf::PdmUiToolButtonEditor::uiEditorTypeName() ); - CAF_PDM_InitFieldNoDefault( &m_selectedInjectorTracersUiField, "MSelectedInjectorTracers", "Injector Tracers", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_selectedInjectorTracersUiField, "MSelectedInjectorTracers", "Injector Tracers" ); m_selectedInjectorTracersUiField.xmlCapability()->disableIO(); m_selectedInjectorTracersUiField.uiCapability()->setUiEditorTypeName( caf::PdmUiTreeSelectionEditor::uiEditorTypeName() ); m_selectedInjectorTracersUiField.uiCapability()->setUiLabelPosition( caf::PdmUiItemInfo::HIDDEN ); - CAF_PDM_InitFieldNoDefault( &m_selectedProducerTracersUiField, "MSelectedProducerTracers", "Producer Tracers", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_selectedProducerTracersUiField, "MSelectedProducerTracers", "Producer Tracers" ); m_selectedProducerTracersUiField.xmlCapability()->disableIO(); m_selectedProducerTracersUiField.uiCapability()->setUiEditorTypeName( caf::PdmUiTreeSelectionEditor::uiEditorTypeName() ); m_selectedProducerTracersUiField.uiCapability()->setUiLabelPosition( caf::PdmUiItemInfo::HIDDEN ); - CAF_PDM_InitFieldNoDefault( &m_selectedSouringTracersUiField, "MSelectedSouringTracers", "Tracers", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_selectedSouringTracersUiField, "MSelectedSouringTracers", "Tracers" ); m_selectedSouringTracersUiField.xmlCapability()->disableIO(); m_selectedSouringTracersUiField.uiCapability()->setUiEditorTypeName( caf::PdmUiListEditor::uiEditorTypeName() ); m_selectedSouringTracersUiField.uiCapability()->setUiLabelPosition( m_labelPosition ); diff --git a/ApplicationLibCode/ProjectDataModel/RimEclipseStatisticsCase.cpp b/ApplicationLibCode/ProjectDataModel/RimEclipseStatisticsCase.cpp index d908c7ce37..64751f2e67 100644 --- a/ApplicationLibCode/ProjectDataModel/RimEclipseStatisticsCase.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimEclipseStatisticsCase.cpp @@ -67,25 +67,25 @@ RimEclipseStatisticsCase::RimEclipseStatisticsCase() { CAF_PDM_InitObject( "Case Group Statistics", ":/Histogram16x16.png", "", "" ); - CAF_PDM_InitFieldNoDefault( &m_calculateEditCommand, "m_editingAllowed", "", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_calculateEditCommand, "m_editingAllowed", "" ); caf::PdmUiPushButtonEditor::configureEditorForField( &m_calculateEditCommand ); m_calculateEditCommand = false; - CAF_PDM_InitField( &m_selectionSummary, "SelectionSummary", QString( "" ), "Summary of Calculation Setup", "", "", "" ); + CAF_PDM_InitField( &m_selectionSummary, "SelectionSummary", QString( "" ), "Summary of Calculation Setup" ); m_selectionSummary.xmlCapability()->disableIO(); m_selectionSummary.uiCapability()->setUiReadOnly( true ); m_selectionSummary.uiCapability()->setUiEditorTypeName( caf::PdmUiTextEditor::uiEditorTypeName() ); m_selectionSummary.uiCapability()->setUiLabelPosition( caf::PdmUiItemInfo::HIDDEN ); - CAF_PDM_InitScriptableFieldNoDefault( &m_resultType, "ResultType", "Result Type", "", "", "" ); + CAF_PDM_InitScriptableFieldNoDefault( &m_resultType, "ResultType", "Result Type" ); m_resultType.xmlCapability()->setIOWritable( false ); - CAF_PDM_InitScriptableFieldNoDefault( &m_porosityModel, "PorosityModel", "Porosity Model", "", "", "" ); + CAF_PDM_InitScriptableFieldNoDefault( &m_porosityModel, "PorosityModel", "Porosity Model" ); m_porosityModel.xmlCapability()->setIOWritable( false ); - CAF_PDM_InitScriptableFieldNoDefault( &m_selectedDynamicProperties, "DynamicPropertiesToCalculate", "Dyn Prop", "", "", "" ); - CAF_PDM_InitScriptableFieldNoDefault( &m_selectedStaticProperties, "StaticPropertiesToCalculate", "Stat Prop", "", "", "" ); - CAF_PDM_InitScriptableFieldNoDefault( &m_selectedGeneratedProperties, "GeneratedPropertiesToCalculate", "", "", "", "" ); - CAF_PDM_InitScriptableFieldNoDefault( &m_selectedInputProperties, "InputPropertiesToCalculate", "", "", "", "" ); + CAF_PDM_InitScriptableFieldNoDefault( &m_selectedDynamicProperties, "DynamicPropertiesToCalculate", "Dyn Prop" ); + CAF_PDM_InitScriptableFieldNoDefault( &m_selectedStaticProperties, "StaticPropertiesToCalculate", "Stat Prop" ); + CAF_PDM_InitScriptableFieldNoDefault( &m_selectedGeneratedProperties, "GeneratedPropertiesToCalculate", "" ); + CAF_PDM_InitScriptableFieldNoDefault( &m_selectedInputProperties, "InputPropertiesToCalculate", "" ); CAF_PDM_InitScriptableFieldNoDefault( &m_selectedFractureDynamicProperties, "FractureDynamicPropertiesToCalculate", @@ -122,12 +122,12 @@ RimEclipseStatisticsCase::RimEclipseStatisticsCase() m_selectedFractureGeneratedProperties.uiCapability()->setUiLabelPosition( caf::PdmUiItemInfo::HIDDEN ); m_selectedFractureInputProperties.uiCapability()->setUiLabelPosition( caf::PdmUiItemInfo::HIDDEN ); - CAF_PDM_InitScriptableField( &m_calculatePercentiles, "CalculatePercentiles", true, "Calculate Percentiles", "", "", "" ); - CAF_PDM_InitScriptableFieldNoDefault( &m_percentileCalculationType, "PercentileCalculationType", "Method", "", "", "" ); + CAF_PDM_InitScriptableField( &m_calculatePercentiles, "CalculatePercentiles", true, "Calculate Percentiles" ); + CAF_PDM_InitScriptableFieldNoDefault( &m_percentileCalculationType, "PercentileCalculationType", "Method" ); - CAF_PDM_InitScriptableField( &m_lowPercentile, "LowPercentile", 10.0, "Low", "", "", "" ); - CAF_PDM_InitScriptableField( &m_midPercentile, "MidPercentile", 50.0, "Mid", "", "", "" ); - CAF_PDM_InitScriptableField( &m_highPercentile, "HighPercentile", 90.0, "High", "", "", "" ); + CAF_PDM_InitScriptableField( &m_lowPercentile, "LowPercentile", 10.0, "Low" ); + CAF_PDM_InitScriptableField( &m_midPercentile, "MidPercentile", 50.0, "Mid" ); + CAF_PDM_InitScriptableField( &m_highPercentile, "HighPercentile", 90.0, "High" ); CAF_PDM_InitScriptableField( &m_wellDataSourceCase, "WellDataSourceCase", diff --git a/ApplicationLibCode/ProjectDataModel/RimEclipseStatisticsCaseCollection.cpp b/ApplicationLibCode/ProjectDataModel/RimEclipseStatisticsCaseCollection.cpp index 6281cac4cb..f414b44cf1 100644 --- a/ApplicationLibCode/ProjectDataModel/RimEclipseStatisticsCaseCollection.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimEclipseStatisticsCaseCollection.cpp @@ -31,9 +31,9 @@ CAF_PDM_SOURCE_INIT( RimEclipseStatisticsCaseCollection, "RimStatisticalCollecti RimEclipseStatisticsCaseCollection::RimEclipseStatisticsCaseCollection() : PdmObject() { - CAF_PDM_InitObject( "Derived Statistics", "", "", "" ); + CAF_PDM_InitObject( "Derived Statistics" ); - CAF_PDM_InitFieldNoDefault( &cases, "Reservoirs", "", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &cases, "Reservoirs", "" ); cases.uiCapability()->setUiTreeHidden( true ); } diff --git a/ApplicationLibCode/ProjectDataModel/RimEclipseView.cpp b/ApplicationLibCode/ProjectDataModel/RimEclipseView.cpp index 1f4b3cf70e..12fbbd1a25 100644 --- a/ApplicationLibCode/ProjectDataModel/RimEclipseView.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimEclipseView.cpp @@ -159,41 +159,41 @@ RimEclipseView::RimEclipseView() m_elementVectorResult = new RimElementVectorResult; m_elementVectorResult.uiCapability()->setUiTreeHidden( true ); - CAF_PDM_InitFieldNoDefault( &m_faultResultSettings, "FaultResultSettings", "Fault Result", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_faultResultSettings, "FaultResultSettings", "Fault Result" ); m_faultResultSettings = new RimEclipseFaultColors(); m_faultResultSettings.uiCapability()->setUiTreeHidden( true ); - CAF_PDM_InitFieldNoDefault( &m_fractureColors, "StimPlanColors", "Fracture", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_fractureColors, "StimPlanColors", "Fracture" ); m_fractureColors = new RimStimPlanColors(); m_fractureColors.uiCapability()->setUiTreeHidden( true ); - CAF_PDM_InitFieldNoDefault( &m_virtualPerforationResult, "VirtualPerforationResult", "", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_virtualPerforationResult, "VirtualPerforationResult", "" ); m_virtualPerforationResult = new RimVirtualPerforationResults(); m_virtualPerforationResult.uiCapability()->setUiTreeHidden( true ); - CAF_PDM_InitFieldNoDefault( &m_wellCollection, "WellCollection", "Simulation Wells", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_wellCollection, "WellCollection", "Simulation Wells" ); m_wellCollection = new RimSimWellInViewCollection; m_wellCollection.uiCapability()->setUiTreeHidden( true ); - CAF_PDM_InitFieldNoDefault( &m_faultCollection, "FaultCollection", "Faults", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_faultCollection, "FaultCollection", "Faults" ); m_faultCollection = new RimFaultInViewCollection; m_faultCollection.uiCapability()->setUiTreeHidden( true ); - CAF_PDM_InitFieldNoDefault( &m_annotationCollection, "AnnotationCollection", "Annotations", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_annotationCollection, "AnnotationCollection", "Annotations" ); m_annotationCollection = new RimAnnotationInViewCollection; m_annotationCollection.uiCapability()->setUiTreeHidden( true ); - CAF_PDM_InitFieldNoDefault( &m_streamlineCollection, "StreamlineCollection", "Streamlines", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_streamlineCollection, "StreamlineCollection", "Streamlines" ); m_streamlineCollection = new RimStreamlineInViewCollection(); m_streamlineCollection.uiCapability()->setUiTreeHidden( true ); - CAF_PDM_InitFieldNoDefault( &m_propertyFilterCollection, "PropertyFilters", "Property Filters", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_propertyFilterCollection, "PropertyFilters", "Property Filters" ); m_propertyFilterCollection = new RimEclipsePropertyFilterCollection(); m_propertyFilterCollection.uiCapability()->setUiTreeHidden( true ); // Visualization fields - CAF_PDM_InitField( &m_showInactiveCells, "ShowInactiveCells", false, "Show Inactive Cells", "", "", "" ); - CAF_PDM_InitField( &m_showInvalidCells, "ShowInvalidCells", false, "Show Invalid Cells", "", "", "" ); + CAF_PDM_InitField( &m_showInactiveCells, "ShowInactiveCells", false, "Show Inactive Cells" ); + CAF_PDM_InitField( &m_showInvalidCells, "ShowInvalidCells", false, "Show Invalid Cells" ); CAF_PDM_InitScriptableFieldNoDefault( &m_cellResultData, "CellResultData", "", "", "", "Current Eclipse Cell Result" ); m_cellResultData.xmlCapability()->disableIO(); diff --git a/ApplicationLibCode/ProjectDataModel/RimElementVectorResult.cpp b/ApplicationLibCode/ProjectDataModel/RimElementVectorResult.cpp index bdc6c455f8..b2694ad0c2 100644 --- a/ApplicationLibCode/ProjectDataModel/RimElementVectorResult.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimElementVectorResult.cpp @@ -72,38 +72,35 @@ RimElementVectorResult::RimElementVectorResult() { CAF_PDM_InitObject( "Flow Vector Result", ":/CellResult.png", "", "" ); - CAF_PDM_InitFieldNoDefault( &m_legendConfig, "LegendDefinition", "Color Legend", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_legendConfig, "LegendDefinition", "Color Legend" ); m_legendConfig = new RimRegularLegendConfig(); m_legendConfig.uiCapability()->setUiTreeHidden( true ); - CAF_PDM_InitField( &m_showOil, "ShowOil", true, "Oil", "", "", "" ); - CAF_PDM_InitField( &m_showGas, "ShowGas", true, "Gas", "", "", "" ); - CAF_PDM_InitField( &m_showWater, "ShowWater", true, "Water", "", "", "" ); + CAF_PDM_InitField( &m_showOil, "ShowOil", true, "Oil" ); + CAF_PDM_InitField( &m_showGas, "ShowGas", true, "Gas" ); + CAF_PDM_InitField( &m_showWater, "ShowWater", true, "Water" ); - CAF_PDM_InitField( &m_showResult, "ShowResult", false, "", "", "", "" ); + CAF_PDM_InitField( &m_showResult, "ShowResult", false, "" ); - CAF_PDM_InitFieldNoDefault( &m_vectorView, "VectorView", "View Vectors", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_vectorView, "VectorView", "View Vectors" ); CAF_PDM_InitFieldNoDefault( &m_vectorSurfaceCrossingLocation, "VectorSurfaceCrossingLocation", - "Vectors Touching Surface", - "", - "", - "" ); + "Vectors Touching Surface" ); m_vectorSurfaceCrossingLocation.uiCapability()->setUiReadOnly( m_vectorView() == RimElementVectorResult::VectorView::CELL_CENTER_TOTAL ); - CAF_PDM_InitField( &m_showVectorI, "ShowVectorI", true, "I", "", "", "" ); - CAF_PDM_InitField( &m_showVectorJ, "ShowVectorJ", true, "J", "", "", "" ); - CAF_PDM_InitField( &m_showVectorK, "ShowVectorK", true, "K", "", "", "" ); - CAF_PDM_InitField( &m_showNncData, "ShowNncData", true, "Show NNC Data", "", "", "" ); - CAF_PDM_InitField( &m_threshold, "Threshold", 0.0f, "Threshold", "", "", "" ); + CAF_PDM_InitField( &m_showVectorI, "ShowVectorI", true, "I" ); + CAF_PDM_InitField( &m_showVectorJ, "ShowVectorJ", true, "J" ); + CAF_PDM_InitField( &m_showVectorK, "ShowVectorK", true, "K" ); + CAF_PDM_InitField( &m_showNncData, "ShowNncData", true, "Show NNC Data" ); + CAF_PDM_InitField( &m_threshold, "Threshold", 0.0f, "Threshold" ); - CAF_PDM_InitFieldNoDefault( &m_vectorColor, "VectorColor", "Color", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_vectorColor, "VectorColor", "Color" ); cvf::Color3f defaultUniformColor = cvf::Color3f::BLACK; - CAF_PDM_InitField( &m_uniformVectorColor, "UniformVectorColor", defaultUniformColor, "Uniform Vector Color", "", "", "" ); + CAF_PDM_InitField( &m_uniformVectorColor, "UniformVectorColor", defaultUniformColor, "Uniform Vector Color" ); - CAF_PDM_InitField( &m_sizeScale, "SizeScale", 1.0f, "Size Scale", "", "", "" ); + CAF_PDM_InitField( &m_sizeScale, "SizeScale", 1.0f, "Size Scale" ); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/ProjectDataModel/RimEnsembleFractureStatisticsPlot.cpp b/ApplicationLibCode/ProjectDataModel/RimEnsembleFractureStatisticsPlot.cpp index 9fa5af8421..8e3417b78c 100644 --- a/ApplicationLibCode/ProjectDataModel/RimEnsembleFractureStatisticsPlot.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimEnsembleFractureStatisticsPlot.cpp @@ -42,15 +42,10 @@ RimEnsembleFractureStatisticsPlot::RimEnsembleFractureStatisticsPlot() { CAF_PDM_InitObject( "Ensemble Fracture Statistics Plot", "", "", "A Plot of Ensemble Fracture Statistics" ); - CAF_PDM_InitFieldNoDefault( &m_ensembleFractureStatistics, - "EnsembleFractureStatistics", - "Ensemble Fracture Statistics", - "", - "", - "" ); + CAF_PDM_InitFieldNoDefault( &m_ensembleFractureStatistics, "EnsembleFractureStatistics", "Ensemble Fracture Statistics" ); m_ensembleFractureStatistics.uiCapability()->setUiTreeChildrenHidden( true ); - CAF_PDM_InitFieldNoDefault( &m_property, "Property", "Property", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_property, "Property", "Property" ); m_plotLegendsHorizontal.uiCapability()->setUiHidden( true ); diff --git a/ApplicationLibCode/ProjectDataModel/RimEnsembleFractureStatisticsPlotCollection.cpp b/ApplicationLibCode/ProjectDataModel/RimEnsembleFractureStatisticsPlotCollection.cpp index 2d251988c2..46d758e729 100644 --- a/ApplicationLibCode/ProjectDataModel/RimEnsembleFractureStatisticsPlotCollection.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimEnsembleFractureStatisticsPlotCollection.cpp @@ -32,7 +32,7 @@ RimEnsembleFractureStatisticsPlotCollection::RimEnsembleFractureStatisticsPlotCo { CAF_PDM_InitObject( "Ensemble Fracture Statistics Plots", ":/WellLogPlots16x16.png", "", "" ); - CAF_PDM_InitFieldNoDefault( &m_ensembleFractureStatisticsPlots, "EnsembleFractureStatisticsPlots", "", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_ensembleFractureStatisticsPlots, "EnsembleFractureStatisticsPlots", "" ); m_ensembleFractureStatisticsPlots.uiCapability()->setUiTreeHidden( true ); } diff --git a/ApplicationLibCode/ProjectDataModel/RimEquilibriumAxisAnnotation.cpp b/ApplicationLibCode/ProjectDataModel/RimEquilibriumAxisAnnotation.cpp index ff71169aa7..14a879e0c8 100644 --- a/ApplicationLibCode/ProjectDataModel/RimEquilibriumAxisAnnotation.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimEquilibriumAxisAnnotation.cpp @@ -54,10 +54,10 @@ RimEquilibriumAxisAnnotation::RimEquilibriumAxisAnnotation() { CAF_PDM_InitObject( "Equilibrium Annotation", ":/LeftAxis16x16.png", "", "" ); - CAF_PDM_InitFieldNoDefault( &m_annotationType, "AnnotationType", "AnnotationType", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_annotationType, "AnnotationType", "AnnotationType" ); - CAF_PDM_InitFieldNoDefault( &m_sourceCase, "Associated3DCase", "Eclipse Case", "", "", "" ); - CAF_PDM_InitFieldNoDefault( &m_equilNum, "m_equilNum", "equil Num", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_sourceCase, "Associated3DCase", "Eclipse Case" ); + CAF_PDM_InitFieldNoDefault( &m_equilNum, "m_equilNum", "equil Num" ); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/ProjectDataModel/RimExportInputPropertySettings.cpp b/ApplicationLibCode/ProjectDataModel/RimExportInputPropertySettings.cpp index 5cebce1788..92f3445004 100644 --- a/ApplicationLibCode/ProjectDataModel/RimExportInputPropertySettings.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimExportInputPropertySettings.cpp @@ -26,11 +26,11 @@ CAF_PDM_SOURCE_INIT( RimExportInputSettings, "RimExportInputSettings" ); //-------------------------------------------------------------------------------------------------- RimExportInputSettings::RimExportInputSettings() { - CAF_PDM_InitObject( "RimExportInputSettings", "", "", "" ); + CAF_PDM_InitObject( "RimExportInputSettings" ); - CAF_PDM_InitFieldNoDefault( &fileName, "Filename", "Export Filename", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &fileName, "Filename", "Export Filename" ); fileName.uiCapability()->setUiEditorTypeName( caf::PdmUiFilePathEditor::uiEditorTypeName() ); - CAF_PDM_InitFieldNoDefault( &eclipseKeyword, "Keyword", "Eclipse Keyword", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &eclipseKeyword, "Keyword", "Eclipse Keyword" ); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/ProjectDataModel/RimFormationNames.cpp b/ApplicationLibCode/ProjectDataModel/RimFormationNames.cpp index 3b7aa49e9c..32f475f099 100644 --- a/ApplicationLibCode/ProjectDataModel/RimFormationNames.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimFormationNames.cpp @@ -44,7 +44,7 @@ RimFormationNames::RimFormationNames() { CAF_PDM_InitObject( "Formation Names", ":/Formations16x16.png", "", "" ); - CAF_PDM_InitFieldNoDefault( &m_formationNamesFileName, "FormationNamesFileName", "File Name", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_formationNamesFileName, "FormationNamesFileName", "File Name" ); m_formationNamesFileName.uiCapability()->setUiEditorTypeName( caf::PdmUiFilePathEditor::uiEditorTypeName() ); diff --git a/ApplicationLibCode/ProjectDataModel/RimFormationNamesCollection.cpp b/ApplicationLibCode/ProjectDataModel/RimFormationNamesCollection.cpp index c9b7f26609..dea907a06f 100644 --- a/ApplicationLibCode/ProjectDataModel/RimFormationNamesCollection.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimFormationNamesCollection.cpp @@ -31,7 +31,7 @@ RimFormationNamesCollection::RimFormationNamesCollection() { CAF_PDM_InitObject( "Formations", ":/FormationCollection16x16.png", "", "" ); - CAF_PDM_InitFieldNoDefault( &m_formationNamesList, "FormationNamesList", "Formations", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_formationNamesList, "FormationNamesList", "Formations" ); m_formationNamesList.uiCapability()->setUiTreeHidden( true ); setDeletable( true ); diff --git a/ApplicationLibCode/ProjectDataModel/RimGridCollection.cpp b/ApplicationLibCode/ProjectDataModel/RimGridCollection.cpp index 0e3c4bfe9d..5a3b44f868 100644 --- a/ApplicationLibCode/ProjectDataModel/RimGridCollection.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimGridCollection.cpp @@ -49,11 +49,11 @@ RimGridInfo::RimGridInfo() { CAF_PDM_InitObject( "GridInfo", ":/draw_style_meshlines_24x24.png", "", "" ); - CAF_PDM_InitField( &m_isActive, "IsActive", true, "Show Grid Cells", "", "", "" ); - CAF_PDM_InitField( &m_gridName, "GridName", QString(), "Grid Name", "", "", "" ); + CAF_PDM_InitField( &m_isActive, "IsActive", true, "Show Grid Cells" ); + CAF_PDM_InitField( &m_gridName, "GridName", QString(), "Grid Name" ); m_gridName.uiCapability()->setUiReadOnly( true ); - CAF_PDM_InitField( &m_eclipseGridIndex, "GridIndex", 0, "Grid Index", "", "", "" ); + CAF_PDM_InitField( &m_eclipseGridIndex, "GridIndex", 0, "Grid Index" ); m_eclipseGridIndex.uiCapability()->setUiReadOnly( true ); } @@ -153,10 +153,10 @@ RimGridInfoCollection::RimGridInfoCollection() { CAF_PDM_InitObject( "GridInfoCollection", ":/draw_style_meshlines_24x24.png", "", "" ); - CAF_PDM_InitField( &m_isActive, "IsActive", true, "Show Grid Cells", "", "", "" ); + CAF_PDM_InitField( &m_isActive, "IsActive", true, "Show Grid Cells" ); m_isActive.uiCapability()->setUiHidden( true ); - CAF_PDM_InitFieldNoDefault( &m_gridInfos, "GridInfos", "Grid Infos", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_gridInfos, "GridInfos", "Grid Infos" ); m_gridInfos.uiCapability()->setUiTreeHidden( true ); } @@ -252,21 +252,21 @@ RimGridCollection::RimGridCollection() { CAF_PDM_InitObject( "Grids", ":/draw_style_meshlines_24x24.png", "", "" ); - CAF_PDM_InitField( &m_isActive, "IsActive", true, "Show Grid Cells", "", "", "" ); + CAF_PDM_InitField( &m_isActive, "IsActive", true, "Show Grid Cells" ); m_isActive.uiCapability()->setUiHidden( true ); - CAF_PDM_InitFieldNoDefault( &m_mainGrid, "MainGrid", "Main Grid", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_mainGrid, "MainGrid", "Main Grid" ); m_mainGrid = new RimGridInfo(); m_mainGrid->setUiName( "Main Grid" ); m_mainGrid->uiCapability()->setUiTreeHidden( true ); m_mainGrid->setUiIconFromResourceString( ":/MainGrid16x16.png" ); - CAF_PDM_InitFieldNoDefault( &m_persistentLgrs, "PersistentLgrs", "Persistent LGRs", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_persistentLgrs, "PersistentLgrs", "Persistent LGRs" ); m_persistentLgrs = new RimGridInfoCollection(); m_persistentLgrs->setUiName( persistentGridUiName() ); m_persistentLgrs->setUiIconFromResourceString( ":/LGR16x16.png" ); - CAF_PDM_InitFieldNoDefault( &m_temporaryLgrs, "TemporaryLgrs", "Temporary LGRs", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_temporaryLgrs, "TemporaryLgrs", "Temporary LGRs" ); m_temporaryLgrs.xmlCapability()->disableIO(); m_temporaryLgrs = new RimGridInfoCollection(); m_temporaryLgrs->setUiName( temporaryGridUiName() ); diff --git a/ApplicationLibCode/ProjectDataModel/RimGridStatisticsPlot.cpp b/ApplicationLibCode/ProjectDataModel/RimGridStatisticsPlot.cpp index 13a9ea8672..7195f826ba 100644 --- a/ApplicationLibCode/ProjectDataModel/RimGridStatisticsPlot.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimGridStatisticsPlot.cpp @@ -53,14 +53,14 @@ RimGridStatisticsPlot::RimGridStatisticsPlot() { CAF_PDM_InitObject( "Grid Statistics Plot", ":/statistics.png", "", "A Plot of Grid Statistics" ); - CAF_PDM_InitFieldNoDefault( &m_case, "Case", "Case", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_case, "Case", "Case" ); m_case.uiCapability()->setUiTreeChildrenHidden( true ); - CAF_PDM_InitField( &m_timeStep, "TimeStep", -1, "Time Step", "", "", "" ); + CAF_PDM_InitField( &m_timeStep, "TimeStep", -1, "Time Step" ); m_timeStep.uiCapability()->setUiEditorTypeName( caf::PdmUiComboBoxEditor::uiEditorTypeName() ); - CAF_PDM_InitFieldNoDefault( &m_cellFilterView, "VisibleCellView", "Filter by 3d View Visibility", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_cellFilterView, "VisibleCellView", "Filter by 3d View Visibility" ); - CAF_PDM_InitFieldNoDefault( &m_property, "Property", "Property", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_property, "Property", "Property" ); m_property = new RimEclipseResultDefinition( caf::PdmUiItemInfo::TOP ); m_property.uiCapability()->setUiTreeHidden( true ); m_property.uiCapability()->setUiTreeChildrenHidden( true ); diff --git a/ApplicationLibCode/ProjectDataModel/RimGridStatisticsPlotCollection.cpp b/ApplicationLibCode/ProjectDataModel/RimGridStatisticsPlotCollection.cpp index 189289375e..789e447d76 100644 --- a/ApplicationLibCode/ProjectDataModel/RimGridStatisticsPlotCollection.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimGridStatisticsPlotCollection.cpp @@ -32,7 +32,7 @@ RimGridStatisticsPlotCollection::RimGridStatisticsPlotCollection() { CAF_PDM_InitObject( "Grid Statistics Plots", ":/WellLogPlots16x16.png", "", "" ); - CAF_PDM_InitFieldNoDefault( &m_gridStatisticsPlots, "GridStatisticsPlots", "", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_gridStatisticsPlots, "GridStatisticsPlots", "" ); m_gridStatisticsPlots.uiCapability()->setUiTreeHidden( true ); } diff --git a/ApplicationLibCode/ProjectDataModel/RimGridTimeHistoryCurve.cpp b/ApplicationLibCode/ProjectDataModel/RimGridTimeHistoryCurve.cpp index a60e1bd5cc..8ff9fda4c0 100644 --- a/ApplicationLibCode/ProjectDataModel/RimGridTimeHistoryCurve.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimGridTimeHistoryCurve.cpp @@ -54,19 +54,19 @@ RimGridTimeHistoryCurve::RimGridTimeHistoryCurve() { CAF_PDM_InitObject( "Grid Time History Curve", ":/SummaryCurve16x16.png", "", "" ); - CAF_PDM_InitFieldNoDefault( &m_geometrySelectionText, "GeometrySelectionText", "Cell Reference", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_geometrySelectionText, "GeometrySelectionText", "Cell Reference" ); m_geometrySelectionText.registerGetMethod( this, &RimGridTimeHistoryCurve::geometrySelectionText ); m_geometrySelectionText.uiCapability()->setUiReadOnly( true ); - CAF_PDM_InitFieldNoDefault( &m_eclipseResultDefinition, "EclipseResultDefinition", "Eclipse Result Definition", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_eclipseResultDefinition, "EclipseResultDefinition", "Eclipse Result Definition" ); m_eclipseResultDefinition.uiCapability()->setUiTreeHidden( true ); m_eclipseResultDefinition.uiCapability()->setUiTreeChildrenHidden( true ); - CAF_PDM_InitFieldNoDefault( &m_geoMechResultDefinition, "GeoMechResultDefinition", "GeoMech Result Definition", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_geoMechResultDefinition, "GeoMechResultDefinition", "GeoMech Result Definition" ); m_geoMechResultDefinition.uiCapability()->setUiTreeHidden( true ); m_geoMechResultDefinition.uiCapability()->setUiTreeChildrenHidden( true ); - CAF_PDM_InitFieldNoDefault( &m_geometrySelectionItem, "GeometrySelectionItem", "Geometry Selection", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_geometrySelectionItem, "GeometrySelectionItem", "Geometry Selection" ); m_geometrySelectionItem.uiCapability()->setUiTreeHidden( true ); m_geometrySelectionItem.uiCapability()->setUiTreeChildrenHidden( true ); diff --git a/ApplicationLibCode/ProjectDataModel/RimGridView.cpp b/ApplicationLibCode/ProjectDataModel/RimGridView.cpp index 3ee1080ac2..8f51d95cb9 100644 --- a/ApplicationLibCode/ProjectDataModel/RimGridView.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimGridView.cpp @@ -66,53 +66,43 @@ CAF_PDM_XML_ABSTRACT_SOURCE_INIT( RimGridView, "GenericGridView" ); // Do not us //-------------------------------------------------------------------------------------------------- RimGridView::RimGridView() { - CAF_PDM_InitFieldNoDefault( &m_overrideCellFilterCollection, - "CellFiltersControlled", - "Cell Filters (controlled)", - "", - "", - "" ); + CAF_PDM_InitFieldNoDefault( &m_overrideCellFilterCollection, "CellFiltersControlled", "Cell Filters (controlled)" ); m_overrideCellFilterCollection.uiCapability()->setUiTreeHidden( true ); m_overrideCellFilterCollection.xmlCapability()->disableIO(); - CAF_PDM_InitFieldNoDefault( &m_intersectionCollection, "CrossSections", "Intersections", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_intersectionCollection, "CrossSections", "Intersections" ); m_intersectionCollection.uiCapability()->setUiTreeHidden( true ); m_intersectionCollection = new RimIntersectionCollection(); - CAF_PDM_InitFieldNoDefault( &m_intersectionResultDefCollection, - "IntersectionResultDefColl", - "Intersection Results", - "", - "", - "" ); + CAF_PDM_InitFieldNoDefault( &m_intersectionResultDefCollection, "IntersectionResultDefColl", "Intersection Results" ); m_intersectionResultDefCollection.uiCapability()->setUiTreeHidden( true ); m_intersectionResultDefCollection = new RimIntersectionResultsDefinitionCollection; - CAF_PDM_InitFieldNoDefault( &m_surfaceResultDefCollection, "ReservoirSurfaceResultDefColl", "Surface Results", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_surfaceResultDefCollection, "ReservoirSurfaceResultDefColl", "Surface Results" ); m_surfaceResultDefCollection.uiCapability()->setUiTreeHidden( true ); m_surfaceResultDefCollection = new RimIntersectionResultsDefinitionCollection; m_surfaceResultDefCollection->uiCapability()->setUiName( "Surface Results" ); m_surfaceResultDefCollection->uiCapability()->setUiIcon( caf::IconProvider( ":/ReservoirSurface16x16.png" ) ); - CAF_PDM_InitFieldNoDefault( &m_gridCollection, "GridCollection", "GridCollection", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_gridCollection, "GridCollection", "GridCollection" ); m_gridCollection.uiCapability()->setUiTreeHidden( true ); m_gridCollection = new RimGridCollection(); m_previousGridModeMeshLinesWasFaults = false; - CAF_PDM_InitFieldNoDefault( &m_overlayInfoConfig, "OverlayInfoConfig", "Info Box", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_overlayInfoConfig, "OverlayInfoConfig", "Info Box" ); m_overlayInfoConfig = new Rim3dOverlayInfoConfig(); m_overlayInfoConfig->setReservoirView( this ); m_overlayInfoConfig.uiCapability()->setUiTreeHidden( true ); - CAF_PDM_InitFieldNoDefault( &m_wellMeasurementCollection, "WellMeasurements", "Well Measurements", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_wellMeasurementCollection, "WellMeasurements", "Well Measurements" ); m_wellMeasurementCollection = new RimWellMeasurementInViewCollection; m_wellMeasurementCollection.uiCapability()->setUiTreeHidden( true ); - CAF_PDM_InitFieldNoDefault( &m_surfaceCollection, "SurfaceInViewCollection", "Surface Collection Field", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_surfaceCollection, "SurfaceInViewCollection", "Surface Collection Field" ); m_surfaceCollection.uiCapability()->setUiTreeHidden( true ); - CAF_PDM_InitFieldNoDefault( &m_cellFilterCollection, "RangeFilters", "Cell Filter Collection Field", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_cellFilterCollection, "RangeFilters", "Cell Filter Collection Field" ); m_cellFilterCollection = new RimCellFilterCollection(); m_cellFilterCollection.uiCapability()->setUiTreeHidden( true ); diff --git a/ApplicationLibCode/ProjectDataModel/RimIdenticalGridCaseGroup.cpp b/ApplicationLibCode/ProjectDataModel/RimIdenticalGridCaseGroup.cpp index f497df464d..800d2b53c0 100644 --- a/ApplicationLibCode/ProjectDataModel/RimIdenticalGridCaseGroup.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimIdenticalGridCaseGroup.cpp @@ -61,21 +61,18 @@ RimIdenticalGridCaseGroup::RimIdenticalGridCaseGroup() "GridCaseGroup", "A statistics case group" ); - CAF_PDM_InitScriptableField( &name, "UserDescription", QString( "Grid Case Group" ), "Name", "", "", "" ); + CAF_PDM_InitScriptableField( &name, "UserDescription", QString( "Grid Case Group" ), "Name" ); - CAF_PDM_InitScriptableField( &groupId, "GroupId", -1, "Case Group ID", "", "", "" ); + CAF_PDM_InitScriptableField( &groupId, "GroupId", -1, "Case Group ID" ); groupId.uiCapability()->setUiReadOnly( true ); groupId.capability()->setIOWriteable( false ); CAF_PDM_InitFieldNoDefault( &statisticsCaseCollection, "StatisticsCaseCollection", - "statisticsCaseCollection ChildArrayField", - "", - "", - "" ); + "statisticsCaseCollection ChildArrayField" ); statisticsCaseCollection.uiCapability()->setUiTreeHidden( true ); - CAF_PDM_InitFieldNoDefault( &caseCollection, "CaseCollection", "Source Cases ChildArrayField", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &caseCollection, "CaseCollection", "Source Cases ChildArrayField" ); caseCollection.uiCapability()->setUiTreeHidden( true ); caseCollection = new RimCaseCollection; diff --git a/ApplicationLibCode/ProjectDataModel/RimMainPlotCollection.cpp b/ApplicationLibCode/ProjectDataModel/RimMainPlotCollection.cpp index b7362f57ad..33959f1883 100644 --- a/ApplicationLibCode/ProjectDataModel/RimMainPlotCollection.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimMainPlotCollection.cpp @@ -65,64 +65,56 @@ CAF_PDM_SOURCE_INIT( RimMainPlotCollection, "MainPlotCollection" ); //-------------------------------------------------------------------------------------------------- RimMainPlotCollection::RimMainPlotCollection() { - CAF_PDM_InitObject( "Plots", "", "", "" ); + CAF_PDM_InitObject( "Plots" ); - CAF_PDM_InitField( &m_show, "Show", true, "Show 2D Plot Window", "", "", "" ); + CAF_PDM_InitField( &m_show, "Show", true, "Show 2D Plot Window" ); m_show.uiCapability()->setUiHidden( true ); - CAF_PDM_InitFieldNoDefault( &m_wellLogPlotCollection, "WellLogPlotCollection", "", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_wellLogPlotCollection, "WellLogPlotCollection", "" ); m_wellLogPlotCollection.uiCapability()->setUiTreeHidden( true ); - CAF_PDM_InitFieldNoDefault( &m_rftPlotCollection, "RftPlotCollection", "", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_rftPlotCollection, "RftPlotCollection", "" ); m_rftPlotCollection.uiCapability()->setUiTreeHidden( true ); - CAF_PDM_InitFieldNoDefault( &m_pltPlotCollection, "PltPlotCollection", "", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_pltPlotCollection, "PltPlotCollection", "" ); m_pltPlotCollection.uiCapability()->setUiTreeHidden( true ); - CAF_PDM_InitFieldNoDefault( &m_summaryPlotCollection, "SummaryPlotCollection", "Summary Plots", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_summaryPlotCollection, "SummaryPlotCollection", "Summary Plots" ); m_summaryPlotCollection.uiCapability()->setUiTreeHidden( true ); - CAF_PDM_InitFieldNoDefault( &m_analysisPlotCollection, "AnalysisPlotCollection", "Analysis Plots", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_analysisPlotCollection, "AnalysisPlotCollection", "Analysis Plots" ); m_analysisPlotCollection.uiCapability()->setUiTreeHidden( true ); - CAF_PDM_InitFieldNoDefault( &m_correlationPlotCollection, "CorrelationPlotCollection", "Correlation Plots", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_correlationPlotCollection, "CorrelationPlotCollection", "Correlation Plots" ); m_correlationPlotCollection.uiCapability()->setUiTreeHidden( true ); - CAF_PDM_InitFieldNoDefault( &m_summaryCrossPlotCollection, "SummaryCrossPlotCollection", "Summary Cross Plots", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_summaryCrossPlotCollection, "SummaryCrossPlotCollection", "Summary Cross Plots" ); m_summaryCrossPlotCollection.uiCapability()->setUiTreeHidden( true ); - CAF_PDM_InitFieldNoDefault( &m_flowPlotCollection, "FlowPlotCollection", "Flow Diagnostics Plots", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_flowPlotCollection, "FlowPlotCollection", "Flow Diagnostics Plots" ); m_flowPlotCollection.uiCapability()->setUiTreeHidden( true ); - CAF_PDM_InitFieldNoDefault( &m_gridCrossPlotCollection, "Rim3dCrossPlotCollection", "3d Cross Plots", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_gridCrossPlotCollection, "Rim3dCrossPlotCollection", "3d Cross Plots" ); m_gridCrossPlotCollection.uiCapability()->setUiTreeHidden( true ); CAF_PDM_InitFieldNoDefault( &m_saturationPressurePlotCollection, "RimSaturationPressurePlotCollection", - "Saturation Pressure Plots", - "", - "", - "" ); + "Saturation Pressure Plots" ); m_saturationPressurePlotCollection.uiCapability()->setUiTreeHidden( true ); - CAF_PDM_InitFieldNoDefault( &m_multiPlotCollection, "RimMultiPlotCollection", "Multi Plots", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_multiPlotCollection, "RimMultiPlotCollection", "Multi Plots" ); m_multiPlotCollection.uiCapability()->setUiTreeHidden( true ); - CAF_PDM_InitFieldNoDefault( &m_stimPlanModelPlotCollection, "StimPlanModelPlotCollection", "", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_stimPlanModelPlotCollection, "StimPlanModelPlotCollection", "" ); m_stimPlanModelPlotCollection.uiCapability()->setUiTreeHidden( true ); - CAF_PDM_InitFieldNoDefault( &m_vfpPlotCollection, "VfpPlotCollection", "", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_vfpPlotCollection, "VfpPlotCollection", "" ); m_vfpPlotCollection.uiCapability()->setUiTreeHidden( true ); #ifdef USE_QTCHARTS - CAF_PDM_InitFieldNoDefault( &m_gridStatisticsPlotCollection, "GridStatisticsPlotCollection", "", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_gridStatisticsPlotCollection, "GridStatisticsPlotCollection", "" ); m_gridStatisticsPlotCollection.uiCapability()->setUiTreeHidden( true ); - CAF_PDM_InitFieldNoDefault( &m_ensembleFractureStatisticsPlotCollection, - "EnsembleFractureStatisticsPlotCollection", - "", - "", - "", - "" ); + CAF_PDM_InitFieldNoDefault( &m_ensembleFractureStatisticsPlotCollection, "EnsembleFractureStatisticsPlotCollection", "" ); m_ensembleFractureStatisticsPlotCollection.uiCapability()->setUiTreeHidden( true ); #endif diff --git a/ApplicationLibCode/ProjectDataModel/RimMdiWindowController.cpp b/ApplicationLibCode/ProjectDataModel/RimMdiWindowController.cpp index 1f17416736..3bd71ad6ff 100644 --- a/ApplicationLibCode/ProjectDataModel/RimMdiWindowController.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimMdiWindowController.cpp @@ -32,12 +32,12 @@ CAF_PDM_XML_SOURCE_INIT( RimMdiWindowController, "MdiWindowController" ); //-------------------------------------------------------------------------------------------------- RimMdiWindowController::RimMdiWindowController() { - CAF_PDM_InitField( &m_mainWindowID, "MainWindowID", -1, "", "", "", "" ); - CAF_PDM_InitField( &m_x, "xPos", -1, "", "", "", "" ); - CAF_PDM_InitField( &m_y, "yPos", -1, "", "", "", "" ); - CAF_PDM_InitField( &m_width, "Width", -1, "", "", "", "" ); - CAF_PDM_InitField( &m_height, "Height", -1, "", "", "", "" ); - CAF_PDM_InitField( &m_isMaximized, "IsMaximized", false, "", "", "", "" ); + CAF_PDM_InitField( &m_mainWindowID, "MainWindowID", -1, "" ); + CAF_PDM_InitField( &m_x, "xPos", -1, "" ); + CAF_PDM_InitField( &m_y, "yPos", -1, "" ); + CAF_PDM_InitField( &m_width, "Width", -1, "" ); + CAF_PDM_InitField( &m_height, "Height", -1, "" ); + CAF_PDM_InitField( &m_isMaximized, "IsMaximized", false, "" ); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/ProjectDataModel/RimMockModelSettings.cpp b/ApplicationLibCode/ProjectDataModel/RimMockModelSettings.cpp index c49bae505a..3c91978278 100644 --- a/ApplicationLibCode/ProjectDataModel/RimMockModelSettings.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimMockModelSettings.cpp @@ -26,17 +26,17 @@ CAF_PDM_SOURCE_INIT( RimMockModelSettings, "MockModelSettings" ); //-------------------------------------------------------------------------------------------------- RimMockModelSettings::RimMockModelSettings() { - CAF_PDM_InitObject( "Mock Model Settings", "", "", "" ); + CAF_PDM_InitObject( "Mock Model Settings" ); - CAF_PDM_InitField( &cellCountX, "CellCountX", quint64( 100 ), "Cell Count X", "", "", "" ); - CAF_PDM_InitField( &cellCountY, "CellCountY", quint64( 100 ), "Cell Count Y", "", "", "" ); - CAF_PDM_InitField( &cellCountZ, "CellCountZ", quint64( 10 ), "Cell Count Z", "", "", "" ); + CAF_PDM_InitField( &cellCountX, "CellCountX", quint64( 100 ), "Cell Count X" ); + CAF_PDM_InitField( &cellCountY, "CellCountY", quint64( 100 ), "Cell Count Y" ); + CAF_PDM_InitField( &cellCountZ, "CellCountZ", quint64( 10 ), "Cell Count Z" ); - CAF_PDM_InitFieldNoDefault( &totalCellCount, "TotalCellCount", "Total Cell Count", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &totalCellCount, "TotalCellCount", "Total Cell Count" ); totalCellCount.uiCapability()->setUiReadOnly( true ); - CAF_PDM_InitField( &resultCount, "ResultCount", quint64( 3 ), "Result Count", "", "", "" ); - CAF_PDM_InitField( &timeStepCount, "TimeStepCount", quint64( 10 ), "Time Step Count", "", "", "" ); + CAF_PDM_InitField( &resultCount, "ResultCount", quint64( 3 ), "Result Count" ); + CAF_PDM_InitField( &timeStepCount, "TimeStepCount", quint64( 10 ), "Time Step Count" ); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/ProjectDataModel/RimMudWeightWindowParameters.cpp b/ApplicationLibCode/ProjectDataModel/RimMudWeightWindowParameters.cpp index b0f29e0d6a..259aab97f6 100644 --- a/ApplicationLibCode/ProjectDataModel/RimMudWeightWindowParameters.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimMudWeightWindowParameters.cpp @@ -115,47 +115,47 @@ RimMudWeightWindowParameters::RimMudWeightWindowParameters( void ) caf::AppEnum defaultSourceType = RimMudWeightWindowParameters::SourceType::FIXED; - CAF_PDM_InitField( &m_wellDeviationType, "WellDeviationSourceType", defaultSourceType, "Well Deviation", "", "", "" ); - CAF_PDM_InitField( &m_wellDeviationFixed, "WellDeviationFixed", 0.0, "Fixed Well Deviation", "", "", "" ); + CAF_PDM_InitField( &m_wellDeviationType, "WellDeviationSourceType", defaultSourceType, "Well Deviation" ); + CAF_PDM_InitField( &m_wellDeviationFixed, "WellDeviationFixed", 0.0, "Fixed Well Deviation" ); m_wellDeviationFixed.uiCapability()->setUiEditorTypeName( caf::PdmUiDoubleValueEditor::uiEditorTypeName() ); - CAF_PDM_InitField( &m_wellDeviationAddress, "WellDeviationAddress", QString( "" ), "Value", "", "", "" ); + CAF_PDM_InitField( &m_wellDeviationAddress, "WellDeviationAddress", QString( "" ), "Value" ); m_wellDeviationAddress.uiCapability()->setUiEditorTypeName( caf::PdmUiListEditor::uiEditorTypeName() ); - CAF_PDM_InitField( &m_wellAzimuthType, "WellAzimuthSourceType", defaultSourceType, "Well Azimuth", "", "", "" ); - CAF_PDM_InitField( &m_wellAzimuthFixed, "WellAzimuthFixed", 0.0, "Fixed Well Azimuth", "", "", "" ); + CAF_PDM_InitField( &m_wellAzimuthType, "WellAzimuthSourceType", defaultSourceType, "Well Azimuth" ); + CAF_PDM_InitField( &m_wellAzimuthFixed, "WellAzimuthFixed", 0.0, "Fixed Well Azimuth" ); m_wellAzimuthFixed.uiCapability()->setUiEditorTypeName( caf::PdmUiDoubleValueEditor::uiEditorTypeName() ); - CAF_PDM_InitField( &m_wellAzimuthAddress, "WellAzimuthAddress", QString( "" ), "Value", "", "", "" ); + CAF_PDM_InitField( &m_wellAzimuthAddress, "WellAzimuthAddress", QString( "" ), "Value" ); m_wellAzimuthAddress.uiCapability()->setUiEditorTypeName( caf::PdmUiListEditor::uiEditorTypeName() ); - CAF_PDM_InitField( &m_UCSType, "UCSSourceType", defaultSourceType, "UCS [Bar]", "", "", "" ); - CAF_PDM_InitField( &m_UCSFixed, "UCSFixed", 100.0, "Fixed UCS [Bar]", "", "", "" ); + CAF_PDM_InitField( &m_UCSType, "UCSSourceType", defaultSourceType, "UCS [Bar]" ); + CAF_PDM_InitField( &m_UCSFixed, "UCSFixed", 100.0, "Fixed UCS [Bar]" ); m_UCSFixed.uiCapability()->setUiEditorTypeName( caf::PdmUiDoubleValueEditor::uiEditorTypeName() ); - CAF_PDM_InitField( &m_UCSAddress, "UCSAddress", QString( "" ), "Value", "", "", "" ); + CAF_PDM_InitField( &m_UCSAddress, "UCSAddress", QString( "" ), "Value" ); m_UCSAddress.uiCapability()->setUiEditorTypeName( caf::PdmUiListEditor::uiEditorTypeName() ); - CAF_PDM_InitField( &m_poissonsRatioType, "PoissonsRatioSourceType", defaultSourceType, "Poisson's Ratio", "", "", "" ); - CAF_PDM_InitField( &m_poissonsRatioFixed, "PoissonsRatioFixed", 0.35, "Fixed Possion's Ratio", "", "", "" ); + CAF_PDM_InitField( &m_poissonsRatioType, "PoissonsRatioSourceType", defaultSourceType, "Poisson's Ratio" ); + CAF_PDM_InitField( &m_poissonsRatioFixed, "PoissonsRatioFixed", 0.35, "Fixed Possion's Ratio" ); m_poissonsRatioFixed.uiCapability()->setUiEditorTypeName( caf::PdmUiDoubleValueEditor::uiEditorTypeName() ); - CAF_PDM_InitField( &m_poissonsRatioAddress, "PoissonsRatioAddress", QString( "" ), "Value", "", "", "" ); + CAF_PDM_InitField( &m_poissonsRatioAddress, "PoissonsRatioAddress", QString( "" ), "Value" ); m_poissonsRatioAddress.uiCapability()->setUiEditorTypeName( caf::PdmUiListEditor::uiEditorTypeName() ); - CAF_PDM_InitField( &m_K0_FGType, "K0_FGSourceType", defaultSourceType, "K0 FG", "", "", "" ); - CAF_PDM_InitField( &m_K0_FGFixed, "K0_FGFixed", 0.75, "Fixed K0_FG", "", "", "" ); + CAF_PDM_InitField( &m_K0_FGType, "K0_FGSourceType", defaultSourceType, "K0 FG" ); + CAF_PDM_InitField( &m_K0_FGFixed, "K0_FGFixed", 0.75, "Fixed K0_FG" ); m_K0_FGFixed.uiCapability()->setUiEditorTypeName( caf::PdmUiDoubleValueEditor::uiEditorTypeName() ); - CAF_PDM_InitField( &m_K0_FGAddress, "K0_FGAddress", QString( "" ), "Value", "", "", "" ); + CAF_PDM_InitField( &m_K0_FGAddress, "K0_FGAddress", QString( "" ), "Value" ); m_K0_FGAddress.uiCapability()->setUiEditorTypeName( caf::PdmUiListEditor::uiEditorTypeName() ); caf::AppEnum defaultOBG0SourceType = RimMudWeightWindowParameters::SourceType::GRID; - CAF_PDM_InitField( &m_obg0Type, "obg0SourceType", defaultOBG0SourceType, "Initial Overburden Gradient", "", "", "" ); - CAF_PDM_InitField( &m_obg0Fixed, "obg0Fixed", 0.75, "Fixed Initial Overburden Gradient", "", "", "" ); + CAF_PDM_InitField( &m_obg0Type, "obg0SourceType", defaultOBG0SourceType, "Initial Overburden Gradient" ); + CAF_PDM_InitField( &m_obg0Fixed, "obg0Fixed", 0.75, "Fixed Initial Overburden Gradient" ); m_obg0Fixed.uiCapability()->setUiEditorTypeName( caf::PdmUiDoubleValueEditor::uiEditorTypeName() ); - CAF_PDM_InitField( &m_obg0Address, "obg0Address", QString( "" ), "Value", "", "", "" ); + CAF_PDM_InitField( &m_obg0Address, "obg0Address", QString( "" ), "Value" ); m_obg0Address.uiCapability()->setUiEditorTypeName( caf::PdmUiListEditor::uiEditorTypeName() ); m_parameterFields[RimMudWeightWindowParameters::ParameterType::WELL_DEVIATION] = @@ -171,16 +171,16 @@ RimMudWeightWindowParameters::RimMudWeightWindowParameters( void ) m_parameterFields[RimMudWeightWindowParameters::ParameterType::OBG0] = std::make_tuple( &m_obg0Type, &m_obg0Fixed, &m_obg0Address ); - CAF_PDM_InitField( &m_airGap, "AirGap", 0.0, "Air Gap", "", "", "" ); + CAF_PDM_InitField( &m_airGap, "AirGap", 0.0, "Air Gap" ); - CAF_PDM_InitField( &m_shMultiplier, "SHMultiplier", 1.05, "SH Multplier for FG in Shale", "", "", "" ); + CAF_PDM_InitField( &m_shMultiplier, "SHMultiplier", 1.05, "SH Multplier for FG in Shale" ); caf::AppEnum defaultUpperLimitType = RimMudWeightWindowParameters::UpperLimitType::FG; - CAF_PDM_InitField( &m_upperLimitType, "UpperLimitType", defaultUpperLimitType, "Upper Limit Type", "", "", "" ); + CAF_PDM_InitField( &m_upperLimitType, "UpperLimitType", defaultUpperLimitType, "Upper Limit Type" ); caf::AppEnum defaultLowerLimitType = RimMudWeightWindowParameters::LowerLimitType::MAX_OF_PORE_PRESSURE_AND_SFG; - CAF_PDM_InitField( &m_lowerLimitType, "LowerLimitType", defaultLowerLimitType, "Lower Limit Type", "", "", "" ); + CAF_PDM_InitField( &m_lowerLimitType, "LowerLimitType", defaultLowerLimitType, "Lower Limit Type" ); caf::AppEnum defaultFractureGradientCalculationType = RimMudWeightWindowParameters::FractureGradientCalculationType::DERIVED_FROM_K0FG; @@ -201,11 +201,11 @@ RimMudWeightWindowParameters::RimMudWeightWindowParameters( void ) "", "Data source for Non-Reservoir Pore Pressure", "" ); - CAF_PDM_InitField( &m_userDefinedPPNonReservoir, "UserPPNonReservoir", 1.0, " Multiplier of hydrostatic PP", "", "", "" ); - CAF_PDM_InitField( &m_porePressureNonReservoirAddress, "PPNonReservoirAddress", QString( "" ), "Value", "", "", "" ); + CAF_PDM_InitField( &m_userDefinedPPNonReservoir, "UserPPNonReservoir", 1.0, " Multiplier of hydrostatic PP" ); + CAF_PDM_InitField( &m_porePressureNonReservoirAddress, "PPNonReservoirAddress", QString( "" ), "Value" ); m_porePressureNonReservoirAddress.uiCapability()->setUiEditorTypeName( caf::PdmUiListEditor::uiEditorTypeName() ); - CAF_PDM_InitField( &m_referenceLayer, "ReferenceLayer", -1, "Reference Layer", "", "", "" ); + CAF_PDM_InitField( &m_referenceLayer, "ReferenceLayer", -1, "Reference Layer" ); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/ProjectDataModel/RimMultiPlot.cpp b/ApplicationLibCode/ProjectDataModel/RimMultiPlot.cpp index 385a7fd703..9c7c479420 100644 --- a/ApplicationLibCode/ProjectDataModel/RimMultiPlot.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimMultiPlot.cpp @@ -70,24 +70,24 @@ RimMultiPlot::RimMultiPlot() { CAF_PDM_InitObject( "Multi Plot", ":/MultiPlot16x16.png", "", "" ); - CAF_PDM_InitField( &m_showPlotWindowTitle, "ShowTitleInPlot", true, "Show Title", "", "", "" ); - CAF_PDM_InitField( &m_plotWindowTitle, "PlotDescription", QString( "" ), "Name", "", "", "" ); + CAF_PDM_InitField( &m_showPlotWindowTitle, "ShowTitleInPlot", true, "Show Title" ); + CAF_PDM_InitField( &m_plotWindowTitle, "PlotDescription", QString( "" ), "Name" ); - CAF_PDM_InitFieldNoDefault( &m_plots, "Plots", "", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_plots, "Plots", "" ); m_plots.uiCapability()->setUiTreeHidden( true ); auto reorderability = caf::PdmFieldReorderCapability::addToField( &m_plots ); reorderability->orderChanged.connect( this, &RimMultiPlot::onPlotsReordered ); - CAF_PDM_InitFieldNoDefault( &m_columnCount, "NumberOfColumns", "Number of Columns", "", "", "" ); - CAF_PDM_InitFieldNoDefault( &m_rowsPerPage, "RowsPerPage", "Rows per Page", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_columnCount, "NumberOfColumns", "Number of Columns" ); + CAF_PDM_InitFieldNoDefault( &m_rowsPerPage, "RowsPerPage", "Rows per Page" ); - CAF_PDM_InitField( &m_showIndividualPlotTitles, "ShowPlotTitles", true, "Show Sub Plot Titles", "", "", "" ); - CAF_PDM_InitFieldNoDefault( &m_majorTickmarkCount, "MajorTickmarkCount", "Major Tickmark Count", "", "", "" ); + CAF_PDM_InitField( &m_showIndividualPlotTitles, "ShowPlotTitles", true, "Show Sub Plot Titles" ); + CAF_PDM_InitFieldNoDefault( &m_majorTickmarkCount, "MajorTickmarkCount", "Major Tickmark Count" ); - CAF_PDM_InitFieldNoDefault( &m_subTitleFontSize, "SubTitleFontSize", "Sub Plot Title Font Size", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_subTitleFontSize, "SubTitleFontSize", "Sub Plot Title Font Size" ); m_subTitleFontSize = caf::FontTools::RelativeSize::Large; - CAF_PDM_InitField( &m_pagePreviewMode, "PagePreviewMode", false, "Page Preview Mode", "", "", "" ); + CAF_PDM_InitField( &m_pagePreviewMode, "PagePreviewMode", false, "Page Preview Mode" ); m_pagePreviewMode.uiCapability()->setUiEditorTypeName( caf::PdmUiToolButtonEditor::uiEditorTypeName() ); m_pagePreviewMode.uiCapability()->setUiIconFromResourceString( ":/PagePreview16x16.png" ); m_viewer = nullptr; diff --git a/ApplicationLibCode/ProjectDataModel/RimMultiPlotCollection.cpp b/ApplicationLibCode/ProjectDataModel/RimMultiPlotCollection.cpp index 100a35af56..c4142cd122 100644 --- a/ApplicationLibCode/ProjectDataModel/RimMultiPlotCollection.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimMultiPlotCollection.cpp @@ -31,7 +31,7 @@ RimMultiPlotCollection::RimMultiPlotCollection() { CAF_PDM_InitObject( "Multi Plots", ":/MultiPlot16x16.png", "", "" ); - CAF_PDM_InitFieldNoDefault( &m_multiPlots, "MultiPlots", "Plots Reports", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_multiPlots, "MultiPlots", "Plots Reports" ); m_multiPlots.uiCapability()->setUiTreeHidden( true ); caf::PdmFieldReorderCapability::addToField( &m_multiPlots ); } diff --git a/ApplicationLibCode/ProjectDataModel/RimMultipleLocations.cpp b/ApplicationLibCode/ProjectDataModel/RimMultipleLocations.cpp index add52a678a..b963fe023a 100644 --- a/ApplicationLibCode/ProjectDataModel/RimMultipleLocations.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimMultipleLocations.cpp @@ -51,18 +51,18 @@ RimMultipleLocations::RimMultipleLocations() "", "", "" ); - CAF_PDM_InitField( &m_rangeStart, "RangeStart", 100.0, "Start MD", "", "", "" ); + CAF_PDM_InitField( &m_rangeStart, "RangeStart", 100.0, "Start MD" ); m_rangeStart.uiCapability()->setUiEditorTypeName( caf::PdmUiDoubleValueEditor::uiEditorTypeName() ); - CAF_PDM_InitField( &m_rangeEnd, "RangeEnd", 250.0, "End MD", "", "", "" ); + CAF_PDM_InitField( &m_rangeEnd, "RangeEnd", 250.0, "End MD" ); m_rangeEnd.uiCapability()->setUiEditorTypeName( caf::PdmUiDoubleValueEditor::uiEditorTypeName() ); - CAF_PDM_InitFieldNoDefault( &m_rangeSpacing, "Spacing", "Spacing", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_rangeSpacing, "Spacing", "Spacing" ); m_rangeSpacing.uiCapability()->setUiEditorTypeName( caf::PdmUiDoubleValueEditor::uiEditorTypeName() ); - CAF_PDM_InitField( &m_rangeCount, "RangeValveCount", 10, "Number of Items", "", "", "" ); + CAF_PDM_InitField( &m_rangeCount, "RangeValveCount", 10, "Number of Items" ); - CAF_PDM_InitFieldNoDefault( &m_locations, "Locations", "Measured Depths", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_locations, "Locations", "Measured Depths" ); m_locations.uiCapability()->setUiEditorTypeName( caf::PdmUiListEditor::uiEditorTypeName() ); } diff --git a/ApplicationLibCode/ProjectDataModel/RimNameConfig.cpp b/ApplicationLibCode/ProjectDataModel/RimNameConfig.cpp index 81808817f8..fd8baa7bcf 100644 --- a/ApplicationLibCode/ProjectDataModel/RimNameConfig.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimNameConfig.cpp @@ -33,10 +33,10 @@ CAF_PDM_ABSTRACT_SOURCE_INIT( RimNameConfig, "RimCurveNameConfig" ); //-------------------------------------------------------------------------------------------------- RimNameConfig::RimNameConfig( const QString& customName ) { - CAF_PDM_InitObject( "Curve Name Generator", "", "", "" ); + CAF_PDM_InitObject( "Curve Name Generator" ); - CAF_PDM_InitFieldNoDefault( &m_customName, "CustomCurveName", "Custom Name Part", "", "", "" ); - CAF_PDM_InitFieldNoDefault( &m_autoName, "AutoCurveName", "Full Name", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_customName, "CustomCurveName", "Custom Name Part" ); + CAF_PDM_InitFieldNoDefault( &m_autoName, "AutoCurveName", "Full Name" ); m_autoName.registerGetMethod( this, &RimNameConfig::autoName ); m_autoName.xmlCapability()->disableIO(); m_autoName.uiCapability()->setUiReadOnly( true ); diff --git a/ApplicationLibCode/ProjectDataModel/RimNamedObject.cpp b/ApplicationLibCode/ProjectDataModel/RimNamedObject.cpp index e3d06db636..46819d1939 100644 --- a/ApplicationLibCode/ProjectDataModel/RimNamedObject.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimNamedObject.cpp @@ -28,8 +28,8 @@ CAF_PDM_XML_ABSTRACT_SOURCE_INIT( RimNamedObject, "NamedObject" ); // Do not use //-------------------------------------------------------------------------------------------------- RimNamedObject::RimNamedObject( void ) { - CAF_PDM_InitScriptableObject( "Named object", "", "", "" ); - CAF_PDM_InitScriptableField( &m_name, "Name", QString(), "Name", "", "", "" ); + CAF_PDM_InitScriptableObject( "Named object" ); + CAF_PDM_InitScriptableField( &m_name, "Name", QString(), "Name" ); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/ProjectDataModel/RimObservedDataCollection.cpp b/ApplicationLibCode/ProjectDataModel/RimObservedDataCollection.cpp index cad394446a..0fe12ed048 100644 --- a/ApplicationLibCode/ProjectDataModel/RimObservedDataCollection.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimObservedDataCollection.cpp @@ -50,8 +50,8 @@ RimObservedDataCollection::RimObservedDataCollection() { CAF_PDM_InitObject( "Observed Data", ":/Folder.png", "", "" ); - CAF_PDM_InitFieldNoDefault( &m_observedDataArray, "ObservedDataArray", "", "", "", "" ); - CAF_PDM_InitFieldNoDefault( &m_observedFmuRftArray, "ObservedFmuRftDataArray", "", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_observedDataArray, "ObservedDataArray", "" ); + CAF_PDM_InitFieldNoDefault( &m_observedFmuRftArray, "ObservedFmuRftDataArray", "" ); m_observedDataArray.uiCapability()->setUiTreeHidden( true ); m_observedFmuRftArray.uiCapability()->setUiTreeHidden( true ); } diff --git a/ApplicationLibCode/ProjectDataModel/RimObservedFmuRftData.cpp b/ApplicationLibCode/ProjectDataModel/RimObservedFmuRftData.cpp index 05682de84c..3b96dde244 100644 --- a/ApplicationLibCode/ProjectDataModel/RimObservedFmuRftData.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimObservedFmuRftData.cpp @@ -30,10 +30,10 @@ CAF_PDM_SOURCE_INIT( RimObservedFmuRftData, "ObservedFmuRftData" ); RimObservedFmuRftData::RimObservedFmuRftData() { CAF_PDM_InitObject( "Observed FMU Data", ":/ObservedRFTDataFile16x16.png", "", "" ); - CAF_PDM_InitFieldNoDefault( &m_directoryPath, "Directory", "Directory", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_directoryPath, "Directory", "Directory" ); m_directoryPath.uiCapability()->setUiReadOnly( true ); - CAF_PDM_InitFieldNoDefault( &m_wells, "Wells", "Wells", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_wells, "Wells", "Wells" ); m_wells.xmlCapability()->disableIO(); m_wells.uiCapability()->setUiReadOnly( true ); m_wells.registerGetMethod( this, &RimObservedFmuRftData::wells ); diff --git a/ApplicationLibCode/ProjectDataModel/RimOilField.cpp b/ApplicationLibCode/ProjectDataModel/RimOilField.cpp index 73ac144baf..28671a5c03 100644 --- a/ApplicationLibCode/ProjectDataModel/RimOilField.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimOilField.cpp @@ -39,33 +39,30 @@ CAF_PDM_SOURCE_INIT( RimOilField, "ResInsightOilField" ); //-------------------------------------------------------------------------------------------------- RimOilField::RimOilField( void ) { - CAF_PDM_InitObject( "Oil Field", "", "", "" ); + CAF_PDM_InitObject( "Oil Field" ); CAF_PDM_InitFieldNoDefault( &analysisModels, "AnalysisModels", "Grid Models", ":/GridModels.png", "", "" ); CAF_PDM_InitFieldNoDefault( &geoMechModels, "GeoMechModels", "Geo Mech Models", ":/GridModels.png", "", "" ); CAF_PDM_InitFieldNoDefault( &wellPathCollection, "WellPathCollection", "Well Paths", ":/WellCollection.png", "", "" ); - CAF_PDM_InitFieldNoDefault( &completionTemplateCollection, "CompletionTemplateCollection", "", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &completionTemplateCollection, "CompletionTemplateCollection", "" ); CAF_PDM_InitFieldNoDefault( &summaryCaseMainCollection, "SummaryCaseCollection", "Summary Cases", ":/GridModels.png", "", "" ); - CAF_PDM_InitFieldNoDefault( &formationNamesCollection, "FormationNamesCollection", "Formations", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &formationNamesCollection, "FormationNamesCollection", "Formations" ); CAF_PDM_InitFieldNoDefault( &observedDataCollection, "ObservedDataCollection", "Observed Data", ":/Cases16x16.png", "", "" ); - CAF_PDM_InitFieldNoDefault( &annotationCollection, "AnnotationCollection", "Annotations", "", "", "" ); - CAF_PDM_InitFieldNoDefault( &ensembleWellLogsCollection, "EnsembleWellLogsCollection", "Ensemble Well Logs", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &annotationCollection, "AnnotationCollection", "Annotations" ); + CAF_PDM_InitFieldNoDefault( &ensembleWellLogsCollection, "EnsembleWellLogsCollection", "Ensemble Well Logs" ); CAF_PDM_InitFieldNoDefault( &m_fractureTemplateCollection_OBSOLETE, "FractureDefinitionCollection", - "Defenition of Fractures", - "", - "", - "" ); + "Defenition of Fractures" ); - CAF_PDM_InitFieldNoDefault( &measurement, "Measurement", "Measurement", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &measurement, "Measurement", "Measurement" ); measurement = new RimMeasurement(); measurement.xmlCapability()->disableIO(); - CAF_PDM_InitFieldNoDefault( &surfaceCollection, "SurfaceCollection", "Surfaces", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &surfaceCollection, "SurfaceCollection", "Surfaces" ); surfaceCollection = new RimSurfaceCollection(); surfaceCollection->setAsTopmostFolder(); diff --git a/ApplicationLibCode/ProjectDataModel/RimPlot.cpp b/ApplicationLibCode/ProjectDataModel/RimPlot.cpp index f581360da8..2407194abe 100644 --- a/ApplicationLibCode/ProjectDataModel/RimPlot.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimPlot.cpp @@ -57,8 +57,8 @@ RimPlot::RimPlot() { CAF_PDM_InitScriptableObjectWithNameAndComment( "Plot", "", "", "", "Plot", "The Abstract Base Class for all Plot Objects" ); - CAF_PDM_InitFieldNoDefault( &m_rowSpan, "RowSpan", "Row Span", "", "", "" ); - CAF_PDM_InitFieldNoDefault( &m_colSpan, "ColSpan", "Col Span", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_rowSpan, "RowSpan", "Row Span" ); + CAF_PDM_InitFieldNoDefault( &m_colSpan, "ColSpan", "Col Span" ); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/ProjectDataModel/RimPlotAxisAnnotation.cpp b/ApplicationLibCode/ProjectDataModel/RimPlotAxisAnnotation.cpp index 1fc49e0e27..394a08ec60 100644 --- a/ApplicationLibCode/ProjectDataModel/RimPlotAxisAnnotation.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimPlotAxisAnnotation.cpp @@ -38,14 +38,14 @@ RimPlotAxisAnnotation::RimPlotAxisAnnotation() m_annotationType = AnnotationType::LINE; CAF_PDM_InitObject( "Plot Axis Annotation", ":/LeftAxis16x16.png", "", "" ); - CAF_PDM_InitField( &m_isActive, "Active", true, "Active", "", "", "" ); + CAF_PDM_InitField( &m_isActive, "Active", true, "Active" ); m_isActive.uiCapability()->setUiHidden( true ); - CAF_PDM_InitFieldNoDefault( &m_name, "Name", "Name", "", "", "" ); - CAF_PDM_InitFieldNoDefault( &m_value, "Value", "Value", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_name, "Name", "Name" ); + CAF_PDM_InitFieldNoDefault( &m_value, "Value", "Value" ); - CAF_PDM_InitFieldNoDefault( &m_rangeStart, "RangeStart", "Range Start", "", "", "" ); - CAF_PDM_InitFieldNoDefault( &m_rangeEnd, "RangeEnd", "Range End", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_rangeStart, "RangeStart", "Range Start" ); + CAF_PDM_InitFieldNoDefault( &m_rangeEnd, "RangeEnd", "Range End" ); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/ProjectDataModel/RimPlotCurve.cpp b/ApplicationLibCode/ProjectDataModel/RimPlotCurve.cpp index 1956fceb95..ecd19337be 100644 --- a/ApplicationLibCode/ProjectDataModel/RimPlotCurve.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimPlotCurve.cpp @@ -62,40 +62,40 @@ RimPlotCurve::RimPlotCurve() { CAF_PDM_InitObject( "Curve", ":/WellLogCurve16x16.png", "", "" ); - CAF_PDM_InitField( &m_showCurve, "Show", true, "Show curve", "", "", "" ); + CAF_PDM_InitField( &m_showCurve, "Show", true, "Show curve" ); m_showCurve.uiCapability()->setUiHidden( true ); - CAF_PDM_InitFieldNoDefault( &m_curveName, "CurveName", "Curve Name", "", "", "" ); - CAF_PDM_InitFieldNoDefault( &m_customCurveName, "CurveDescription", "Custom Name", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_curveName, "CurveName", "Curve Name" ); + CAF_PDM_InitFieldNoDefault( &m_customCurveName, "CurveDescription", "Custom Name" ); m_customCurveName.uiCapability()->setUiHidden( true ); - CAF_PDM_InitFieldNoDefault( &m_legendEntryText, "LegendDescription", "Legend Name", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_legendEntryText, "LegendDescription", "Legend Name" ); m_legendEntryText.uiCapability()->setUiHidden( true ); - CAF_PDM_InitField( &m_isUsingAutoName, "AutoName", true, "Auto Name", "", "", "" ); - CAF_PDM_InitField( &m_showLegend, "ShowLegend", true, "Contribute To Legend", "", "", "" ); - CAF_PDM_InitField( &m_showErrorBars, "ShowErrorBars", true, "Show Error Bars", "", "", "" ); + CAF_PDM_InitField( &m_isUsingAutoName, "AutoName", true, "Auto Name" ); + CAF_PDM_InitField( &m_showLegend, "ShowLegend", true, "Contribute To Legend" ); + CAF_PDM_InitField( &m_showErrorBars, "ShowErrorBars", true, "Show Error Bars" ); // Obsolete field: appearance configuration is moved to RimPlotCurveAppearance - CAF_PDM_InitField( &m_curveColor_OBSOLETE, "Color", RiaColorTools::textColor3f(), "Color", "", "", "" ); + CAF_PDM_InitField( &m_curveColor_OBSOLETE, "Color", RiaColorTools::textColor3f(), "Color" ); m_curveColor_OBSOLETE.xmlCapability()->setIOWritable( false ); - CAF_PDM_InitField( &m_fillColor_OBSOLETE, "FillColor", cvf::Color3f( -1.0, -1.0, -1.0 ), "Fill Color", "", "", "" ); + CAF_PDM_InitField( &m_fillColor_OBSOLETE, "FillColor", cvf::Color3f( -1.0, -1.0, -1.0 ), "Fill Color" ); m_fillColor_OBSOLETE.xmlCapability()->setIOWritable( false ); - CAF_PDM_InitField( &m_curveThickness_OBSOLETE, "Thickness", 1, "Line Thickness", "", "", "" ); + CAF_PDM_InitField( &m_curveThickness_OBSOLETE, "Thickness", 1, "Line Thickness" ); m_curveThickness_OBSOLETE.xmlCapability()->setIOWritable( false ); - CAF_PDM_InitFieldNoDefault( &m_curveInterpolation_OBSOLETE, "CurveInterpolation", "Interpolation", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_curveInterpolation_OBSOLETE, "CurveInterpolation", "Interpolation" ); m_curveInterpolation_OBSOLETE.xmlCapability()->setIOWritable( false ); - CAF_PDM_InitFieldNoDefault( &m_lineStyle_OBSOLETE, "LineStyle", "Line Style", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_lineStyle_OBSOLETE, "LineStyle", "Line Style" ); m_lineStyle_OBSOLETE.xmlCapability()->setIOWritable( false ); - CAF_PDM_InitFieldNoDefault( &m_fillStyle_OBSOLETE, "FillStyle", "Area Fill Style", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_fillStyle_OBSOLETE, "FillStyle", "Area Fill Style" ); m_fillStyle_OBSOLETE.xmlCapability()->setIOWritable( false ); - CAF_PDM_InitFieldNoDefault( &m_pointSymbol_OBSOLETE, "PointSymbol", "Symbol", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_pointSymbol_OBSOLETE, "PointSymbol", "Symbol" ); m_pointSymbol_OBSOLETE.xmlCapability()->setIOWritable( false ); CAF_PDM_InitField( &m_symbolEdgeColor_OBSOLETE, @@ -116,16 +116,16 @@ RimPlotCurve::RimPlotCurve() "" ); m_symbolSkipPixelDistance_OBSOLETE.xmlCapability()->setIOWritable( false ); - CAF_PDM_InitFieldNoDefault( &m_symbolLabel_OBSOLETE, "SymbolLabel", "Symbol Label", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_symbolLabel_OBSOLETE, "SymbolLabel", "Symbol Label" ); m_symbolLabel_OBSOLETE.xmlCapability()->setIOWritable( false ); - CAF_PDM_InitField( &m_symbolSize_OBSOLETE, "SymbolSize", 6, "Symbol Size", "", "", "" ); + CAF_PDM_InitField( &m_symbolSize_OBSOLETE, "SymbolSize", 6, "Symbol Size" ); m_symbolSize_OBSOLETE.xmlCapability()->setIOWritable( false ); - CAF_PDM_InitFieldNoDefault( &m_symbolLabelPosition_OBSOLETE, "SymbolLabelPosition", "Symbol Label Position", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_symbolLabelPosition_OBSOLETE, "SymbolLabelPosition", "Symbol Label Position" ); m_symbolLabelPosition_OBSOLETE.xmlCapability()->setIOWritable( false ); - CAF_PDM_InitFieldNoDefault( &m_curveAppearance, "PlotCurveAppearance", "PlotCurveAppearance", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_curveAppearance, "PlotCurveAppearance", "PlotCurveAppearance" ); m_curveAppearance = new RimPlotCurveAppearance; m_curveAppearance.uiCapability()->setUiTreeHidden( true ); m_curveAppearance.uiCapability()->setUiTreeChildrenHidden( true ); diff --git a/ApplicationLibCode/ProjectDataModel/RimPlotCurveAppearance.cpp b/ApplicationLibCode/ProjectDataModel/RimPlotCurveAppearance.cpp index 104c9165fa..2739bb1186 100644 --- a/ApplicationLibCode/ProjectDataModel/RimPlotCurveAppearance.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimPlotCurveAppearance.cpp @@ -83,19 +83,19 @@ RimPlotCurveAppearance::RimPlotCurveAppearance() , m_interpolationVisible( true ) , m_fillOptionsVisible( true ) { - CAF_PDM_InitObject( "Curve Apperance", "", "", "" ); + CAF_PDM_InitObject( "Curve Apperance" ); - CAF_PDM_InitField( &m_curveColor, "Color", RiaColorTools::textColor3f(), "Color", "", "", "" ); - CAF_PDM_InitField( &m_fillColor, "FillColor", cvf::Color3f( -1.0, -1.0, -1.0 ), "Fill Color", "", "", "" ); + CAF_PDM_InitField( &m_curveColor, "Color", RiaColorTools::textColor3f(), "Color" ); + CAF_PDM_InitField( &m_fillColor, "FillColor", cvf::Color3f( -1.0, -1.0, -1.0 ), "Fill Color" ); - CAF_PDM_InitField( &m_curveThickness, "Thickness", 1, "Line Thickness", "", "", "" ); + CAF_PDM_InitField( &m_curveThickness, "Thickness", 1, "Line Thickness" ); m_curveThickness.uiCapability()->setUiEditorTypeName( caf::PdmUiComboBoxEditor::uiEditorTypeName() ); - CAF_PDM_InitFieldNoDefault( &m_curveInterpolation, "CurveInterpolation", "Interpolation", "", "", "" ); - CAF_PDM_InitFieldNoDefault( &m_lineStyle, "LineStyle", "Line Style", "", "", "" ); - CAF_PDM_InitFieldNoDefault( &m_fillStyle, "FillStyle", "Area Fill Style", "", "", "" ); - CAF_PDM_InitFieldNoDefault( &m_pointSymbol, "PointSymbol", "Symbol", "", "", "" ); - CAF_PDM_InitField( &m_symbolEdgeColor, "SymbolEdgeColor", RiaColorTools::textColor3f(), "Symbol Edge Color", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_curveInterpolation, "CurveInterpolation", "Interpolation" ); + CAF_PDM_InitFieldNoDefault( &m_lineStyle, "LineStyle", "Line Style" ); + CAF_PDM_InitFieldNoDefault( &m_fillStyle, "FillStyle", "Area Fill Style" ); + CAF_PDM_InitFieldNoDefault( &m_pointSymbol, "PointSymbol", "Symbol" ); + CAF_PDM_InitField( &m_symbolEdgeColor, "SymbolEdgeColor", RiaColorTools::textColor3f(), "Symbol Edge Color" ); CAF_PDM_InitField( &m_symbolSkipPixelDistance, "SymbolSkipPxDist", @@ -105,10 +105,10 @@ RimPlotCurveAppearance::RimPlotCurveAppearance() "Minimum pixel distance between symbols", "" ); - CAF_PDM_InitFieldNoDefault( &m_symbolLabel, "SymbolLabel", "Symbol Label", "", "", "" ); - CAF_PDM_InitField( &m_symbolSize, "SymbolSize", 6, "Symbol Size", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_symbolLabel, "SymbolLabel", "Symbol Label" ); + CAF_PDM_InitField( &m_symbolSize, "SymbolSize", 6, "Symbol Size" ); - CAF_PDM_InitFieldNoDefault( &m_symbolLabelPosition, "SymbolLabelPosition", "Symbol Label Position", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_symbolLabelPosition, "SymbolLabelPosition", "Symbol Label Position" ); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/ProjectDataModel/RimPlotWindow.cpp b/ApplicationLibCode/ProjectDataModel/RimPlotWindow.cpp index 6eac612696..5b2fdac363 100644 --- a/ApplicationLibCode/ProjectDataModel/RimPlotWindow.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimPlotWindow.cpp @@ -45,20 +45,20 @@ RimPlotWindow::RimPlotWindow() "PlotWindow", "The Abstract base class for all MDI Windows in the Plot Window" ); - CAF_PDM_InitScriptableField( &m_id, "Id", -1, "View ID", "", "", "" ); + CAF_PDM_InitScriptableField( &m_id, "Id", -1, "View ID" ); m_id.registerKeywordAlias( "ViewId" ); m_id.uiCapability()->setUiReadOnly( true ); m_id.uiCapability()->setUiHidden( true ); m_id.capability()->setIOWriteable( false ); m_id.xmlCapability()->setCopyable( false ); - CAF_PDM_InitField( &m_showPlotTitle, "ShowPlotTitle", true, "Show Plot Title", "", "", "" ); - CAF_PDM_InitField( &m_showPlotLegends, "ShowTrackLegends", true, "Show Legends", "", "", "" ); - CAF_PDM_InitField( &m_plotLegendsHorizontal, "TrackLegendsHorizontal", true, "Legend Orientation", "", "", "" ); + CAF_PDM_InitField( &m_showPlotTitle, "ShowPlotTitle", true, "Show Plot Title" ); + CAF_PDM_InitField( &m_showPlotLegends, "ShowTrackLegends", true, "Show Legends" ); + CAF_PDM_InitField( &m_plotLegendsHorizontal, "TrackLegendsHorizontal", true, "Legend Orientation" ); m_plotLegendsHorizontal.uiCapability()->setUiEditorTypeName( caf::PdmUiComboBoxEditor::uiEditorTypeName() ); - CAF_PDM_InitFieldNoDefault( &m_titleFontSize, "TitleFontSize", "Title Font Size", "", "", "" ); - CAF_PDM_InitFieldNoDefault( &m_legendFontSize, "LegendDeltaFontSize", "Legend Font Size", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_titleFontSize, "TitleFontSize", "Title Font Size" ); + CAF_PDM_InitFieldNoDefault( &m_legendFontSize, "LegendDeltaFontSize", "Legend Font Size" ); m_titleFontSize = caf::FontTools::RelativeSize::XXLarge; m_legendFontSize = caf::FontTools::RelativeSize::Large; diff --git a/ApplicationLibCode/ProjectDataModel/RimPltPlotCollection.cpp b/ApplicationLibCode/ProjectDataModel/RimPltPlotCollection.cpp index 83e1a32c62..00f0a50efa 100644 --- a/ApplicationLibCode/ProjectDataModel/RimPltPlotCollection.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimPltPlotCollection.cpp @@ -41,7 +41,7 @@ RimPltPlotCollection::RimPltPlotCollection() { CAF_PDM_InitObject( "PLT Plots", ":/WellAllocPlots16x16.png", "", "" ); - CAF_PDM_InitFieldNoDefault( &m_pltPlots, "PltPlots", "", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_pltPlots, "PltPlots", "" ); m_pltPlots.uiCapability()->setUiTreeHidden( true ); } diff --git a/ApplicationLibCode/ProjectDataModel/RimProject.cpp b/ApplicationLibCode/ProjectDataModel/RimProject.cpp index f664695598..21b9252e69 100644 --- a/ApplicationLibCode/ProjectDataModel/RimProject.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimProject.cpp @@ -131,16 +131,16 @@ RimProject::RimProject( void ) { CAF_PDM_InitScriptableObjectWithNameAndComment( "Project", "", "", "", "Project", "The ResInsight Project" ); - CAF_PDM_InitField( &m_projectFileVersionString, "ProjectFileVersionString", QString( STRPRODUCTVER ), "", "", "", "" ); + CAF_PDM_InitField( &m_projectFileVersionString, "ProjectFileVersionString", QString( STRPRODUCTVER ), "" ); m_projectFileVersionString.uiCapability()->setUiHidden( true ); - CAF_PDM_InitFieldNoDefault( &m_globalPathList, "ReferencedExternalFiles", "", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_globalPathList, "ReferencedExternalFiles", "" ); m_globalPathList.uiCapability()->setUiHidden( true ); - CAF_PDM_InitFieldNoDefault( &oilFields, "OilFields", "Oil Fields", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &oilFields, "OilFields", "Oil Fields" ); oilFields.uiCapability()->setUiTreeHidden( true ); - CAF_PDM_InitFieldNoDefault( &colorLegendCollection, "ColorLegendCollection", "Color Legend Collection", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &colorLegendCollection, "ColorLegendCollection", "Color Legend Collection" ); colorLegendCollection = new RimColorLegendCollection(); colorLegendCollection->createStandardColorLegends(); @@ -148,12 +148,12 @@ RimProject::RimProject( void ) scriptCollection.uiCapability()->setUiTreeHidden( true ); scriptCollection.xmlCapability()->disableIO(); - CAF_PDM_InitFieldNoDefault( &wellPathImport, "WellPathImport", "WellPathImport", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &wellPathImport, "WellPathImport", "WellPathImport" ); wellPathImport = new RimWellPathImport(); wellPathImport.uiCapability()->setUiTreeHidden( true ); wellPathImport.uiCapability()->setUiTreeChildrenHidden( true ); - CAF_PDM_InitFieldNoDefault( &mainPlotCollection, "MainPlotCollection", "Plots", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &mainPlotCollection, "MainPlotCollection", "Plots" ); mainPlotCollection.uiCapability()->setUiTreeHidden( true ); CAF_PDM_InitFieldNoDefault( &viewLinkerCollection, @@ -165,46 +165,46 @@ RimProject::RimProject( void ) viewLinkerCollection.uiCapability()->setUiTreeHidden( true ); viewLinkerCollection = new RimViewLinkerCollection; - CAF_PDM_InitFieldNoDefault( &calculationCollection, "CalculationCollection", "Calculation Collection", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &calculationCollection, "CalculationCollection", "Calculation Collection" ); calculationCollection = new RimSummaryCalculationCollection; - CAF_PDM_InitFieldNoDefault( &commandObjects, "CommandObjects", "Command Objects", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &commandObjects, "CommandObjects", "Command Objects" ); // wellPathImport.uiCapability()->setUiHidden(true); - CAF_PDM_InitFieldNoDefault( &multiSnapshotDefinitions, "MultiSnapshotDefinitions", "Multi Snapshot Definitions", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &multiSnapshotDefinitions, "MultiSnapshotDefinitions", "Multi Snapshot Definitions" ); - CAF_PDM_InitFieldNoDefault( &mainWindowTreeViewState, "TreeViewState", "", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &mainWindowTreeViewState, "TreeViewState", "" ); mainWindowTreeViewState.uiCapability()->setUiHidden( true ); - CAF_PDM_InitFieldNoDefault( &mainWindowCurrentModelIndexPath, "TreeViewCurrentModelIndexPath", "", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &mainWindowCurrentModelIndexPath, "TreeViewCurrentModelIndexPath", "" ); mainWindowCurrentModelIndexPath.uiCapability()->setUiHidden( true ); - CAF_PDM_InitFieldNoDefault( &plotWindowTreeViewState, "PlotWindowTreeViewState", "", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &plotWindowTreeViewState, "PlotWindowTreeViewState", "" ); plotWindowTreeViewState.uiCapability()->setUiHidden( true ); - CAF_PDM_InitFieldNoDefault( &plotWindowCurrentModelIndexPath, "PlotWindowTreeViewCurrentModelIndexPath", "", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &plotWindowCurrentModelIndexPath, "PlotWindowTreeViewCurrentModelIndexPath", "" ); plotWindowCurrentModelIndexPath.uiCapability()->setUiHidden( true ); - CAF_PDM_InitField( &m_show3DWindow, "show3DWindow", true, "Show 3D Window", "", "", "" ); + CAF_PDM_InitField( &m_show3DWindow, "show3DWindow", true, "Show 3D Window" ); m_show3DWindow.uiCapability()->setUiHidden( true ); - CAF_PDM_InitField( &m_showPlotWindow, "showPlotWindow", false, "Show Plot Window", "", "", "" ); + CAF_PDM_InitField( &m_showPlotWindow, "showPlotWindow", false, "Show Plot Window" ); m_showPlotWindow.uiCapability()->setUiHidden( true ); - CAF_PDM_InitField( &m_subWindowsTiled3DWindow, "tiled3DWindow", false, "Tile 3D Window", "", "", "" ); + CAF_PDM_InitField( &m_subWindowsTiled3DWindow, "tiled3DWindow", false, "Tile 3D Window" ); m_subWindowsTiled3DWindow.uiCapability()->setUiHidden( true ); - CAF_PDM_InitField( &m_subWindowsTiledPlotWindow, "tiledPlotWindow", false, "Tile Plot Window", "", "", "" ); + CAF_PDM_InitField( &m_subWindowsTiledPlotWindow, "tiledPlotWindow", false, "Tile Plot Window" ); m_subWindowsTiledPlotWindow.uiCapability()->setUiHidden( true ); - CAF_PDM_InitFieldNoDefault( &m_dialogData, "DialogData", "DialogData", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_dialogData, "DialogData", "DialogData" ); m_dialogData = new RimDialogData(); m_dialogData.uiCapability()->setUiTreeHidden( true ); m_dialogData.uiCapability()->setUiTreeChildrenHidden( true ); // Obsolete fields. The content is moved to OilFields and friends - CAF_PDM_InitFieldNoDefault( &casesObsolete, "Reservoirs", "", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &casesObsolete, "Reservoirs", "" ); RiaFieldhandleTools::disableWriteAndSetFieldHidden( &casesObsolete ); - CAF_PDM_InitFieldNoDefault( &caseGroupsObsolete, "CaseGroups", "", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &caseGroupsObsolete, "CaseGroups", "" ); RiaFieldhandleTools::disableWriteAndSetFieldHidden( &caseGroupsObsolete ); // Initialization @@ -216,7 +216,7 @@ RimProject::RimProject( void ) mainPlotCollection = new RimMainPlotCollection(); - CAF_PDM_InitFieldNoDefault( &m_plotTemplateFolderItem, "PlotTemplateCollection", "Plot Templates", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_plotTemplateFolderItem, "PlotTemplateCollection", "Plot Templates" ); m_plotTemplateFolderItem = new RimPlotTemplateFolderItem(); m_plotTemplateFolderItem.xmlCapability()->disableIO(); diff --git a/ApplicationLibCode/ProjectDataModel/RimRegularLegendConfig.cpp b/ApplicationLibCode/ProjectDataModel/RimRegularLegendConfig.cpp index d4d2d722a4..ad7161e60e 100644 --- a/ApplicationLibCode/ProjectDataModel/RimRegularLegendConfig.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimRegularLegendConfig.cpp @@ -146,7 +146,7 @@ RimRegularLegendConfig::RimRegularLegendConfig() , m_resetUserDefinedValues( false ) { CAF_PDM_InitObject( "Color Legend", ":/Legend.png", "", "" ); - CAF_PDM_InitField( &m_showLegend, "ShowLegend", true, "Show Legend", "", "", "" ); + CAF_PDM_InitField( &m_showLegend, "ShowLegend", true, "Show Legend" ); m_showLegend.uiCapability()->setUiHidden( true ); CAF_PDM_InitField( &m_numLevels, "NumberOfLevels", 8, "Number of Levels", "", "A hint on how many tick marks you whish.", "" ); CAF_PDM_InitField( &m_precision, @@ -175,14 +175,14 @@ RimRegularLegendConfig::RimRegularLegendConfig() m_colorRangeMode_OBSOLETE.uiCapability()->setUiHidden( true ); m_colorRangeMode_OBSOLETE.xmlCapability()->setIOWritable( false ); - CAF_PDM_InitFieldNoDefault( &m_colorLegend, "ColorLegend", "Colors", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_colorLegend, "ColorLegend", "Colors" ); m_colorLegend = mapToColorLegend( ColorRangeEnum( ColorRangesType::NORMAL ) ); - CAF_PDM_InitField( &m_selectColorLegendButton, "selectColorLegendButton", false, "Edit", "", "", "" ); + CAF_PDM_InitField( &m_selectColorLegendButton, "selectColorLegendButton", false, "Edit" ); m_selectColorLegendButton.uiCapability()->setUiEditorTypeName( caf::PdmUiToolButtonEditor::uiEditorTypeName() ); m_selectColorLegendButton.uiCapability()->setUiLabelPosition( caf::PdmUiItemInfo::HIDDEN ); m_selectColorLegendButton.xmlCapability()->disableIO(); - CAF_PDM_InitField( &m_mappingMode, "MappingMode", MappingEnum( MappingType::LINEAR_CONTINUOUS ), "Mapping", "", "", "" ); + CAF_PDM_InitField( &m_mappingMode, "MappingMode", MappingEnum( MappingType::LINEAR_CONTINUOUS ), "Mapping" ); CAF_PDM_InitField( &m_rangeMode, "RangeType", RangeModeEnum( RangeModeType::AUTOMATIC_ALLTIMESTEPS ), @@ -199,9 +199,9 @@ RimRegularLegendConfig::RimRegularLegendConfig() "Min value of the legend (if mapping is logarithmic only positive values are valid)", "" ); - CAF_PDM_InitFieldNoDefault( &m_categoryColorMode, "CategoryColorMode", "Category Mode", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_categoryColorMode, "CategoryColorMode", "Category Mode" ); - CAF_PDM_InitField( &resultVariableName, "ResultVariableUsage", QString( "" ), "", "", "", "" ); + CAF_PDM_InitField( &resultVariableName, "ResultVariableUsage", QString( "" ), "" ); resultVariableName.uiCapability()->setUiHidden( true ); m_linDiscreteScalarMapper = new cvf::ScalarMapperDiscreteLinear; @@ -217,7 +217,7 @@ RimRegularLegendConfig::RimRegularLegendConfig() m_scalarMapperLegend = new caf::OverlayScalarMapperLegend( standardFont ); m_categoryLegend = new caf::CategoryLegend( standardFont, m_categoryMapper.p() ); - CAF_PDM_InitField( &m_resetUserDefinedValuesButton, "ResetDefaultValues", false, "Reset Default Values", "", "", "" ); + CAF_PDM_InitField( &m_resetUserDefinedValuesButton, "ResetDefaultValues", false, "Reset Default Values" ); m_resetUserDefinedValuesButton.uiCapability()->setUiEditorTypeName( caf::PdmUiPushButtonEditor::uiEditorTypeName() ); m_resetUserDefinedValuesButton.uiCapability()->setUiLabelPosition( caf::PdmUiItemInfo::HIDDEN ); diff --git a/ApplicationLibCode/ProjectDataModel/RimReservoirCellResultsStorage.cpp b/ApplicationLibCode/ProjectDataModel/RimReservoirCellResultsStorage.cpp index e323ea17f7..2309ac1bdb 100644 --- a/ApplicationLibCode/ProjectDataModel/RimReservoirCellResultsStorage.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimReservoirCellResultsStorage.cpp @@ -51,11 +51,11 @@ CAF_PDM_SOURCE_INIT( RimReservoirCellResultsStorage, "ReservoirCellResultStorage RimReservoirCellResultsStorage::RimReservoirCellResultsStorage() : m_cellResults( nullptr ) { - CAF_PDM_InitObject( "Cacher", "", "", "" ); + CAF_PDM_InitObject( "Cacher" ); - CAF_PDM_InitField( &m_resultCacheFileName, "ResultCacheFileName", QString(), "UiDummyname", "", "", "" ); + CAF_PDM_InitField( &m_resultCacheFileName, "ResultCacheFileName", QString(), "UiDummyname" ); m_resultCacheFileName.uiCapability()->setUiHidden( true ); - CAF_PDM_InitFieldNoDefault( &m_resultCacheMetaData, "ResultCacheEntries", "UiDummyname", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_resultCacheMetaData, "ResultCacheEntries", "UiDummyname" ); m_resultCacheMetaData.uiCapability()->setUiTreeHidden( true ); } @@ -317,7 +317,7 @@ CAF_PDM_SOURCE_INIT( RimReservoirCellResultsStorageEntryInfo, "ResultStorageEntr //-------------------------------------------------------------------------------------------------- RimReservoirCellResultsStorageEntryInfo::RimReservoirCellResultsStorageEntryInfo() { - CAF_PDM_InitObject( "Cache Entry", "", "", "" ); + CAF_PDM_InitObject( "Cache Entry" ); CAF_PDM_InitField( &m_resultType, "ResultType", @@ -326,10 +326,10 @@ RimReservoirCellResultsStorageEntryInfo::RimReservoirCellResultsStorageEntryInfo "", "", "" ); - CAF_PDM_InitField( &m_resultName, "ResultName", QString(), "ResultName", "", "", "" ); - CAF_PDM_InitFieldNoDefault( &m_timeStepDates, "TimeSteps", "TimeSteps", "", "", "" ); - CAF_PDM_InitFieldNoDefault( &m_daysSinceSimulationStart, "DaysSinceSimulationStart", "DaysSinceSimulationStart", "", "", "" ); - CAF_PDM_InitField( &m_filePosition, "FilePositionDataStart", qint64( -1 ), "FilePositionDataStart", "", "", "" ); + CAF_PDM_InitField( &m_resultName, "ResultName", QString(), "ResultName" ); + CAF_PDM_InitFieldNoDefault( &m_timeStepDates, "TimeSteps", "TimeSteps" ); + CAF_PDM_InitFieldNoDefault( &m_daysSinceSimulationStart, "DaysSinceSimulationStart", "DaysSinceSimulationStart" ); + CAF_PDM_InitField( &m_filePosition, "FilePositionDataStart", qint64( -1 ), "FilePositionDataStart" ); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/ProjectDataModel/RimRftPlotCollection.cpp b/ApplicationLibCode/ProjectDataModel/RimRftPlotCollection.cpp index 4031611248..ee2abc3244 100644 --- a/ApplicationLibCode/ProjectDataModel/RimRftPlotCollection.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimRftPlotCollection.cpp @@ -41,7 +41,7 @@ RimRftPlotCollection::RimRftPlotCollection() { CAF_PDM_InitObject( "RFT Plots", ":/RFTPlots16x16.png", "", "" ); - CAF_PDM_InitFieldNoDefault( &m_rftPlots, "RftPlots", "", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_rftPlots, "RftPlots", "" ); m_rftPlots.uiCapability()->setUiTreeHidden( true ); } diff --git a/ApplicationLibCode/ProjectDataModel/RimScriptCollection.cpp b/ApplicationLibCode/ProjectDataModel/RimScriptCollection.cpp index 12d1f15695..9ba2ef9435 100644 --- a/ApplicationLibCode/ProjectDataModel/RimScriptCollection.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimScriptCollection.cpp @@ -37,13 +37,13 @@ RimScriptCollection::RimScriptCollection() { CAF_PDM_InitObject( "ScriptLocation", ":/Folder.png", "", "" ); - CAF_PDM_InitFieldNoDefault( &directory, "ScriptDirectory", "Folder", "", "", "" ); - CAF_PDM_InitFieldNoDefault( &calcScripts, "CalcScripts", "", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &directory, "ScriptDirectory", "Folder" ); + CAF_PDM_InitFieldNoDefault( &calcScripts, "CalcScripts", "" ); calcScripts.uiCapability()->setUiTreeHidden( true ); - CAF_PDM_InitFieldNoDefault( &subDirectories, "SubDirectories", "", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &subDirectories, "SubDirectories", "" ); subDirectories.uiCapability()->setUiTreeHidden( true ); - CAF_PDM_InitField( &m_searchSubFolders, "SearchSubFolders", false, "Add Subfolders", "", "", "" ); + CAF_PDM_InitField( &m_searchSubFolders, "SearchSubFolders", false, "Add Subfolders" ); directory.uiCapability()->setUiEditorTypeName( caf::PdmUiFilePathEditor::uiEditorTypeName() ); } diff --git a/ApplicationLibCode/ProjectDataModel/RimSimWellInView.cpp b/ApplicationLibCode/ProjectDataModel/RimSimWellInView.cpp index 6e4305cdc9..caa6eda0aa 100644 --- a/ApplicationLibCode/ProjectDataModel/RimSimWellInView.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimSimWellInView.cpp @@ -70,28 +70,28 @@ RimSimWellInView::RimSimWellInView() "SimulationWell", "An Eclipse Simulation Well" ); - CAF_PDM_InitScriptableFieldNoDefault( &name, "Name", "Name", "", "", "" ); + CAF_PDM_InitScriptableFieldNoDefault( &name, "Name", "Name" ); name.registerKeywordAlias( "WellName" ); - CAF_PDM_InitField( &showWell, "ShowWell", true, "Show well ", "", "", "" ); + CAF_PDM_InitField( &showWell, "ShowWell", true, "Show well " ); - CAF_PDM_InitField( &showWellLabel, "ShowWellLabel", true, "Label", "", "", "" ); - CAF_PDM_InitField( &showWellHead, "ShowWellHead", true, "Well Head", "", "", "" ); - CAF_PDM_InitField( &showWellPipe, "ShowWellPipe", true, "Pipe", "", "", "" ); - CAF_PDM_InitField( &showWellSpheres, "ShowWellSpheres", false, "Spheres", "", "", "" ); - CAF_PDM_InitField( &showWellDisks, "ShowWellDisks", false, "Disks", "", "", "" ); + CAF_PDM_InitField( &showWellLabel, "ShowWellLabel", true, "Label" ); + CAF_PDM_InitField( &showWellHead, "ShowWellHead", true, "Well Head" ); + CAF_PDM_InitField( &showWellPipe, "ShowWellPipe", true, "Pipe" ); + CAF_PDM_InitField( &showWellSpheres, "ShowWellSpheres", false, "Spheres" ); + CAF_PDM_InitField( &showWellDisks, "ShowWellDisks", false, "Disks" ); - CAF_PDM_InitField( &wellHeadScaleFactor, "WellHeadScaleFactor", 1.0, "Well Head Scale", "", "", "" ); - CAF_PDM_InitField( &pipeScaleFactor, "WellPipeRadiusScale", 1.0, "Pipe Radius Scale", "", "", "" ); - CAF_PDM_InitField( &wellPipeColor, "WellPipeColor", cvf::Color3f( 0.588f, 0.588f, 0.804f ), "Pipe Color", "", "", "" ); + CAF_PDM_InitField( &wellHeadScaleFactor, "WellHeadScaleFactor", 1.0, "Well Head Scale" ); + CAF_PDM_InitField( &pipeScaleFactor, "WellPipeRadiusScale", 1.0, "Pipe Radius Scale" ); + CAF_PDM_InitField( &wellPipeColor, "WellPipeColor", cvf::Color3f( 0.588f, 0.588f, 0.804f ), "Pipe Color" ); cvf::Color3f defaultWellDiskColor = cvf::Color3::OLIVE; - CAF_PDM_InitField( &wellDiskColor, "WellDiskColor", defaultWellDiskColor, "Disk Color", "", "", "" ); + CAF_PDM_InitField( &wellDiskColor, "WellDiskColor", defaultWellDiskColor, "Disk Color" ); - CAF_PDM_InitField( &showWellCells, "ShowWellCells", false, "Well Cells", "", "", "" ); - CAF_PDM_InitField( &showWellCellFence, "ShowWellCellFence", false, "Well Cell Fence", "", "", "" ); + CAF_PDM_InitField( &showWellCells, "ShowWellCells", false, "Well Cells" ); + CAF_PDM_InitField( &showWellCellFence, "ShowWellCellFence", false, "Well Cell Fence" ); - CAF_PDM_InitFieldNoDefault( &simwellFractureCollection, "FractureCollection", "Fractures", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &simwellFractureCollection, "FractureCollection", "Fractures" ); name.uiCapability()->setUiHidden( true ); name.uiCapability()->setUiReadOnly( true ); diff --git a/ApplicationLibCode/ProjectDataModel/RimSimWellInViewCollection.cpp b/ApplicationLibCode/ProjectDataModel/RimSimWellInViewCollection.cpp index 86b01ca493..a1be64ed8b 100644 --- a/ApplicationLibCode/ProjectDataModel/RimSimWellInViewCollection.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimSimWellInViewCollection.cpp @@ -140,7 +140,7 @@ RimSimWellInViewCollection::RimSimWellInViewCollection() { CAF_PDM_InitObject( "Simulation Wells", ":/WellCollection.png", "", "" ); - CAF_PDM_InitField( &isActive, "Active", true, "Active", "", "", "" ); + CAF_PDM_InitField( &isActive, "Active", true, "Active" ); isActive.uiCapability()->setUiHidden( true ); // CAF_PDM_InitField(&showWellsIntersectingVisibleCells, "ShowWellsIntersectingVisibleCells", false, "Hide Wells Not @@ -156,11 +156,11 @@ RimSimWellInViewCollection::RimSimWellInViewCollection() // Missing Visible Cells", "", "", ""); // Appearance - CAF_PDM_InitFieldNoDefault( &m_showWellHead, "ShowWellHeadTristate", "Well Head", "", "", "" ); - CAF_PDM_InitFieldNoDefault( &m_showWellLabel, "ShowWellLabelTristate", "Label", "", "", "" ); - CAF_PDM_InitFieldNoDefault( &m_showWellPipe, "ShowWellPipe", "Pipe", "", "", "" ); - CAF_PDM_InitFieldNoDefault( &m_showWellSpheres, "ShowWellSpheres", "Spheres", "", "", "" ); - CAF_PDM_InitFieldNoDefault( &m_showWellDisks, "ShowWellDisks", "Disks", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_showWellHead, "ShowWellHeadTristate", "Well Head" ); + CAF_PDM_InitFieldNoDefault( &m_showWellLabel, "ShowWellLabelTristate", "Label" ); + CAF_PDM_InitFieldNoDefault( &m_showWellPipe, "ShowWellPipe", "Pipe" ); + CAF_PDM_InitFieldNoDefault( &m_showWellSpheres, "ShowWellSpheres", "Spheres" ); + CAF_PDM_InitFieldNoDefault( &m_showWellDisks, "ShowWellDisks", "Disks" ); m_showWellHead.uiCapability()->setUiEditorTypeName( caf::PdmUiCheckBoxTristateEditor::uiEditorTypeName() ); m_showWellHead.xmlCapability()->disableIO(); @@ -178,25 +178,25 @@ RimSimWellInViewCollection::RimSimWellInViewCollection() m_showWellDisks.xmlCapability()->disableIO(); // Scaling - CAF_PDM_InitField( &wellHeadScaleFactor, "WellHeadScale", 1.0, "Well Head Scale", "", "", "" ); - CAF_PDM_InitField( &pipeScaleFactor, "WellPipeRadiusScale", 0.1, "Pipe Radius Scale ", "", "", "" ); - CAF_PDM_InitField( &spheresScaleFactor, "CellCenterSphereScale", 0.2, "Sphere Radius Scale", "", "", "" ); + CAF_PDM_InitField( &wellHeadScaleFactor, "WellHeadScale", 1.0, "Well Head Scale" ); + CAF_PDM_InitField( &pipeScaleFactor, "WellPipeRadiusScale", 0.1, "Pipe Radius Scale " ); + CAF_PDM_InitField( &spheresScaleFactor, "CellCenterSphereScale", 0.2, "Sphere Radius Scale" ); // Color cvf::Color3f defWellLabelColor = RiaPreferences::current()->defaultWellLabelColor(); - CAF_PDM_InitField( &wellLabelColor, "WellLabelColor", defWellLabelColor, "Label Color", "", "", "" ); + CAF_PDM_InitField( &wellLabelColor, "WellLabelColor", defWellLabelColor, "Label Color" ); - CAF_PDM_InitField( &showConnectionStatusColors, "ShowConnectionStatusColors", true, "Color Pipe Connections", "", "", "" ); + CAF_PDM_InitField( &showConnectionStatusColors, "ShowConnectionStatusColors", true, "Color Pipe Connections" ); cvf::Color3f defaultApplyColor = cvf::Color3f::YELLOW; - CAF_PDM_InitField( &m_defaultWellPipeColor, "WellColorForApply", defaultApplyColor, "Uniform Well Color", "", "", "" ); - CAF_PDM_InitFieldNoDefault( &m_wellPipeColors, "WellPipeColors", "Individual Pipe Colors", "", "", "" ); + CAF_PDM_InitField( &m_defaultWellPipeColor, "WellColorForApply", defaultApplyColor, "Uniform Well Color" ); + CAF_PDM_InitFieldNoDefault( &m_wellPipeColors, "WellPipeColors", "Individual Pipe Colors" ); - CAF_PDM_InitField( &pipeCrossSectionVertexCount, "WellPipeVertexCount", 12, "Pipe Vertex Count", "", "", "" ); + CAF_PDM_InitField( &pipeCrossSectionVertexCount, "WellPipeVertexCount", 12, "Pipe Vertex Count" ); pipeCrossSectionVertexCount.uiCapability()->setUiHidden( true ); - CAF_PDM_InitField( &wellPipeCoordType, "WellPipeCoordType", WellPipeCoordEnum( WELLPIPE_INTERPOLATED ), "Type", "", "", "" ); + CAF_PDM_InitField( &wellPipeCoordType, "WellPipeCoordType", WellPipeCoordEnum( WELLPIPE_INTERPOLATED ), "Type" ); - CAF_PDM_InitFieldNoDefault( &m_showWellCells, "ShowWellCellsTristate", "Show Well Cells", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_showWellCells, "ShowWellCellsTristate", "Show Well Cells" ); m_showWellCells.uiCapability()->setUiEditorTypeName( caf::PdmUiCheckBoxTristateEditor::uiEditorTypeName() ); m_showWellCells.xmlCapability()->disableIO(); @@ -208,7 +208,7 @@ RimSimWellInViewCollection::RimSimWellInViewCollection() "", "" ); - CAF_PDM_InitField( &wellCellTransparencyLevel, "WellCellTransparency", 0.5, "Well Cell Transparency", "", "", "" ); + CAF_PDM_InitField( &wellCellTransparencyLevel, "WellCellTransparency", 0.5, "Well Cell Transparency" ); CAF_PDM_InitField( &isAutoDetectingBranches, "IsAutoDetectingBranches", true, @@ -225,23 +225,23 @@ RimSimWellInViewCollection::RimSimWellInViewCollection() "", "" ); - CAF_PDM_InitFieldNoDefault( &wells, "Wells", "Wells", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &wells, "Wells", "Wells" ); wells.uiCapability()->setUiTreeHidden( true ); - CAF_PDM_InitFieldNoDefault( &m_showWellCellFence, "ShowWellCellFenceTristate", "Show Well Cell Fence", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_showWellCellFence, "ShowWellCellFenceTristate", "Show Well Cell Fence" ); m_showWellCellFence.uiCapability()->setUiEditorTypeName( caf::PdmUiCheckBoxTristateEditor::uiEditorTypeName() ); m_showWellCellFence.xmlCapability()->disableIO(); - CAF_PDM_InitFieldNoDefault( &m_wellDiskSummaryCase, "WellDiskSummaryCase", "Summary Case", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_wellDiskSummaryCase, "WellDiskSummaryCase", "Summary Case" ); - CAF_PDM_InitField( &m_wellDiskQuantity, "WellDiskQuantity", QString( "WOPT" ), "Disk Quantity", "", "", "" ); + CAF_PDM_InitField( &m_wellDiskQuantity, "WellDiskQuantity", QString( "WOPT" ), "Disk Quantity" ); m_wellDiskQuantity.uiCapability()->setUiEditorTypeName( caf::PdmUiListEditor::uiEditorTypeName() ); m_wellDiskQuantity.uiCapability()->setAutoAddingOptionFromValue( false ); - CAF_PDM_InitFieldNoDefault( &m_wellDiskPropertyType, "WellDiskPropertyType", "Property Type", "", "", "" ); - CAF_PDM_InitFieldNoDefault( &m_wellDiskPropertyConfigType, "WellDiskPropertyConfigType", "Property Config Type", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_wellDiskPropertyType, "WellDiskPropertyType", "Property Type" ); + CAF_PDM_InitFieldNoDefault( &m_wellDiskPropertyConfigType, "WellDiskPropertyConfigType", "Property Config Type" ); - CAF_PDM_InitField( &m_wellDiskShowQuantityLabels, "WellDiskShowQuantityLabels", true, "Show Quantity Labels", "", "", "" ); + CAF_PDM_InitField( &m_wellDiskShowQuantityLabels, "WellDiskShowQuantityLabels", true, "Show Quantity Labels" ); CAF_PDM_InitField( &m_wellDiskshowLabelsBackground, "WellDiskShowLabelsBackground", false, @@ -249,11 +249,11 @@ RimSimWellInViewCollection::RimSimWellInViewCollection() "", "", "" ); - CAF_PDM_InitField( &m_wellDiskScaleFactor, "WellDiskScaleFactor", 1.0, "Scale Factor", "", "", "" ); + CAF_PDM_InitField( &m_wellDiskScaleFactor, "WellDiskScaleFactor", 1.0, "Scale Factor" ); cvf::Color3f defaultWellDiskColor = cvf::Color3::OLIVE; - CAF_PDM_InitField( &wellDiskColor, "WellDiskColor", defaultWellDiskColor, "Well Disk Color", "", "", "" ); + CAF_PDM_InitField( &wellDiskColor, "WellDiskColor", defaultWellDiskColor, "Well Disk Color" ); - CAF_PDM_InitField( &m_showWellCommunicationLines, "ShowWellCommunicationLines", false, "Communication Lines", "", "", "" ); + CAF_PDM_InitField( &m_showWellCommunicationLines, "ShowWellCommunicationLines", false, "Communication Lines" ); m_reservoirView = nullptr; } diff --git a/ApplicationLibCode/ProjectDataModel/RimStackablePlotCurve.cpp b/ApplicationLibCode/ProjectDataModel/RimStackablePlotCurve.cpp index c63229c8fe..ca893d5786 100644 --- a/ApplicationLibCode/ProjectDataModel/RimStackablePlotCurve.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimStackablePlotCurve.cpp @@ -30,8 +30,8 @@ RimStackablePlotCurve::RimStackablePlotCurve() { CAF_PDM_InitObject( "StackableCurve", ":/WellLogCurve16x16.png", "", "" ); - CAF_PDM_InitField( &m_isStacked, "StackCurve", false, "Stack Curve", "", "", "" ); - CAF_PDM_InitField( &m_isStackedWithPhaseColors, "StackPhaseColors", false, " with Phase Colors", "", "", "" ); + CAF_PDM_InitField( &m_isStacked, "StackCurve", false, "Stack Curve" ); + CAF_PDM_InitField( &m_isStackedWithPhaseColors, "StackPhaseColors", false, " with Phase Colors" ); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/ProjectDataModel/RimStatisticsPlot.cpp b/ApplicationLibCode/ProjectDataModel/RimStatisticsPlot.cpp index 2092f656dd..88b51cec62 100644 --- a/ApplicationLibCode/ProjectDataModel/RimStatisticsPlot.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimStatisticsPlot.cpp @@ -80,18 +80,18 @@ CAF_PDM_ABSTRACT_SOURCE_INIT( RimStatisticsPlot, "StatisticsPlot" ); //-------------------------------------------------------------------------------------------------- RimStatisticsPlot::RimStatisticsPlot() { - CAF_PDM_InitField( &m_plotWindowTitle, "PlotDescription", QString( "" ), "Name", "", "", "" ); + CAF_PDM_InitField( &m_plotWindowTitle, "PlotDescription", QString( "" ), "Name" ); m_plotWindowTitle.xmlCapability()->setIOWritable( false ); - CAF_PDM_InitField( &m_numHistogramBins, "NumHistogramBins", 50, "Number of Bins", "", "", "" ); + CAF_PDM_InitField( &m_numHistogramBins, "NumHistogramBins", 50, "Number of Bins" ); m_numHistogramBins.uiCapability()->setUiEditorTypeName( caf::PdmUiLineEditor::uiEditorTypeName() ); - CAF_PDM_InitField( &m_histogramBarColor, "HistogramBarColor", cvf::Color3f( cvf::Color3f::SKY_BLUE ), "Color", "", "", "" ); + CAF_PDM_InitField( &m_histogramBarColor, "HistogramBarColor", cvf::Color3f( cvf::Color3f::SKY_BLUE ), "Color" ); - CAF_PDM_InitField( &m_histogramGapWidth, "HistogramGapWidth", 0.0, "Gap Width [%]", "", "", "" ); + CAF_PDM_InitField( &m_histogramGapWidth, "HistogramGapWidth", 0.0, "Gap Width [%]" ); m_histogramGapWidth.uiCapability()->setUiEditorTypeName( caf::PdmUiDoubleSliderEditor::uiEditorTypeName() ); - CAF_PDM_InitFieldNoDefault( &m_histogramFrequencyType, "HistogramFrequencyType", "Frequency", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_histogramFrequencyType, "HistogramFrequencyType", "Frequency" ); CAF_PDM_InitField( &m_precision, "Precision", @@ -108,7 +108,7 @@ RimStatisticsPlot::RimStatisticsPlot() "", "" ); - CAF_PDM_InitFieldNoDefault( &m_graphType, "GraphType", "Graph Type", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_graphType, "GraphType", "Graph Type" ); m_plotLegendsHorizontal.uiCapability()->setUiHidden( true ); diff --git a/ApplicationLibCode/ProjectDataModel/RimStimPlanColors.cpp b/ApplicationLibCode/ProjectDataModel/RimStimPlanColors.cpp index 848eb4d79e..65f9cd87a6 100644 --- a/ApplicationLibCode/ProjectDataModel/RimStimPlanColors.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimStimPlanColors.cpp @@ -64,16 +64,16 @@ RimStimPlanColors::RimStimPlanColors() { CAF_PDM_InitObject( "Fractures", ":/FractureSymbol16x16.png", "", "" ); - CAF_PDM_InitField( &m_resultNameAndUnit, "ResultName", QString( "" ), "Result Variable", "", "", "" ); + CAF_PDM_InitField( &m_resultNameAndUnit, "ResultName", QString( "" ), "Result Variable" ); - CAF_PDM_InitField( &m_defaultColor, "DefaultColor", cvf::Color3f( cvf::Color3::BROWN ), "Default Color", "", "", "" ); + CAF_PDM_InitField( &m_defaultColor, "DefaultColor", cvf::Color3f( cvf::Color3::BROWN ), "Default Color" ); - CAF_PDM_InitFieldNoDefault( &m_legendConfigurations, "LegendConfigurations", "", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_legendConfigurations, "LegendConfigurations", "" ); m_legendConfigurations.uiCapability()->setUiTreeHidden( true ); - CAF_PDM_InitField( &m_showStimPlanMesh, "ShowStimPlanMesh", true, "Show Mesh", "", "", "" ); + CAF_PDM_InitField( &m_showStimPlanMesh, "ShowStimPlanMesh", true, "Show Mesh" ); - CAF_PDM_InitFieldNoDefault( &m_stimPlanCellVizMode, "StimPlanCellVizMode", "Color Interpolation", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_stimPlanCellVizMode, "StimPlanCellVizMode", "Color Interpolation" ); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/ProjectDataModel/RimStimPlanLegendConfig.cpp b/ApplicationLibCode/ProjectDataModel/RimStimPlanLegendConfig.cpp index 147c683c91..ee7f8ab13e 100644 --- a/ApplicationLibCode/ProjectDataModel/RimStimPlanLegendConfig.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimStimPlanLegendConfig.cpp @@ -32,10 +32,10 @@ RimStimPlanLegendConfig::RimStimPlanLegendConfig() { CAF_PDM_InitObject( "StimPlan Color Legend", ":/Legend.png", "", "" ); - CAF_PDM_InitField( &m_name, "Name", QString( "StimPlan Legend" ), "Name", "", "", "" ); + CAF_PDM_InitField( &m_name, "Name", QString( "StimPlan Legend" ), "Name" ); m_name.uiCapability()->setUiReadOnly( true ); - CAF_PDM_InitFieldNoDefault( &m_legend, "Legend", "Legend", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_legend, "Legend", "Legend" ); m_legend = new RimRegularLegendConfig; } diff --git a/ApplicationLibCode/ProjectDataModel/RimSummaryCalculation.cpp b/ApplicationLibCode/ProjectDataModel/RimSummaryCalculation.cpp index 9f0ff3c035..629ff23e71 100644 --- a/ApplicationLibCode/ProjectDataModel/RimSummaryCalculation.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimSummaryCalculation.cpp @@ -49,20 +49,20 @@ RimSummaryCalculation::RimSummaryCalculation() { CAF_PDM_InitObject( "RimSummaryCalculation", ":/octave.png", "Calculation", "" ); - CAF_PDM_InitFieldNoDefault( &m_description, "Description", "Description", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_description, "Description", "Description" ); m_description.uiCapability()->setUiReadOnly( true ); - CAF_PDM_InitField( &m_expression, "Expression", QString( "" ), "Expression", "", "", "" ); + CAF_PDM_InitField( &m_expression, "Expression", QString( "" ), "Expression" ); m_expression.uiCapability()->setUiEditorTypeName( caf::PdmUiTextEditor::uiEditorTypeName() ); - CAF_PDM_InitField( &m_unit, "Unit", QString( "" ), "Unit", "", "", "" ); + CAF_PDM_InitField( &m_unit, "Unit", QString( "" ), "Unit" ); m_unit.uiCapability()->setUiEditorTypeName( caf::PdmUiLineEditor::uiEditorTypeName() ); - CAF_PDM_InitFieldNoDefault( &m_variables, "Variables", "Variables", "", "", "" ); - CAF_PDM_InitFieldNoDefault( &m_calculatedValues, "CalculatedValues", "Calculated Values", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_variables, "Variables", "Variables" ); + CAF_PDM_InitFieldNoDefault( &m_calculatedValues, "CalculatedValues", "Calculated Values" ); - CAF_PDM_InitFieldNoDefault( &m_timesteps, "TimeSteps", "Time Steps", "", "", "" ); - CAF_PDM_InitField( &m_id, "Id", -1, "Id", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_timesteps, "TimeSteps", "Time Steps" ); + CAF_PDM_InitField( &m_id, "Id", -1, "Id" ); m_id.uiCapability()->setUiHidden( true ); m_exprContextMenuMgr = std::unique_ptr( new RiuExpressionContextMenuManager() ); diff --git a/ApplicationLibCode/ProjectDataModel/RimSummaryCalculationCollection.cpp b/ApplicationLibCode/ProjectDataModel/RimSummaryCalculationCollection.cpp index 9eea83a04d..a5da0c5009 100644 --- a/ApplicationLibCode/ProjectDataModel/RimSummaryCalculationCollection.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimSummaryCalculationCollection.cpp @@ -33,10 +33,10 @@ RimSummaryCalculationCollection::RimSummaryCalculationCollection() { CAF_PDM_InitObject( "Calculation Collection", ":/chain.png", "", "" ); - CAF_PDM_InitFieldNoDefault( &m_calculations, "Calculations", "Calculations", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_calculations, "Calculations", "Calculations" ); m_calculations.uiCapability()->setUiEditorTypeName( caf::PdmUiTreeSelectionEditor::uiEditorTypeName() ); - CAF_PDM_InitFieldNoDefault( &m_calcuationSummaryCase, "CalculationsSummaryCase", "Calculations Summary Case", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_calcuationSummaryCase, "CalculationsSummaryCase", "Calculations Summary Case" ); m_calcuationSummaryCase.xmlCapability()->disableIO(); m_calcuationSummaryCase = new RimCalculatedSummaryCase; } diff --git a/ApplicationLibCode/ProjectDataModel/RimSummaryCalculationVariable.cpp b/ApplicationLibCode/ProjectDataModel/RimSummaryCalculationVariable.cpp index 4edc08575e..f780bdc06a 100644 --- a/ApplicationLibCode/ProjectDataModel/RimSummaryCalculationVariable.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimSummaryCalculationVariable.cpp @@ -43,20 +43,20 @@ RimSummaryCalculationVariable::RimSummaryCalculationVariable() { CAF_PDM_InitObject( "RimSummaryCalculationVariable", ":/octave.png", "", "" ); - CAF_PDM_InitFieldNoDefault( &m_name, "VariableName", "Variable Name", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_name, "VariableName", "Variable Name" ); m_name.uiCapability()->setUiReadOnly( true ); - CAF_PDM_InitFieldNoDefault( &m_button, "PushButton", "", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_button, "PushButton", "" ); m_button.uiCapability()->setUiEditorTypeName( caf::PdmUiPushButtonEditor::uiEditorTypeName() ); m_button.xmlCapability()->disableIO(); - CAF_PDM_InitFieldNoDefault( &m_summaryAddressUi, "SummaryAddressUi", "Summary Address", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_summaryAddressUi, "SummaryAddressUi", "Summary Address" ); m_summaryAddressUi.registerGetMethod( this, &RimSummaryCalculationVariable::summaryAddressDisplayString ); m_summaryAddressUi.xmlCapability()->disableIO(); m_summaryAddressUi.uiCapability()->setUiReadOnly( true ); - CAF_PDM_InitFieldNoDefault( &m_case, "SummaryCase", "Summary Case", "", "", "" ); - CAF_PDM_InitFieldNoDefault( &m_summaryAddress, "SummaryAddress", "Summary Address", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_case, "SummaryCase", "Summary Case" ); + CAF_PDM_InitFieldNoDefault( &m_summaryAddress, "SummaryAddress", "Summary Address" ); m_summaryAddress = new RimSummaryAddress; } diff --git a/ApplicationLibCode/ProjectDataModel/RimSurfaceIntersectionBand.cpp b/ApplicationLibCode/ProjectDataModel/RimSurfaceIntersectionBand.cpp index 9aea996cff..4deb4e8a1b 100644 --- a/ApplicationLibCode/ProjectDataModel/RimSurfaceIntersectionBand.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimSurfaceIntersectionBand.cpp @@ -46,13 +46,13 @@ RimSurfaceIntersectionBand::RimSurfaceIntersectionBand() { CAF_PDM_InitObject( "SurfaceIntersectionBand", ":/ReservoirSurface16x16.png", "", "" ); - CAF_PDM_InitFieldNoDefault( &m_lineAppearance, "LineAppearance", "Line Appearance", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_lineAppearance, "LineAppearance", "Line Appearance" ); m_lineAppearance = new RimAnnotationLineAppearance; m_lineAppearance->objectChanged.connect( this, &RimSurfaceIntersectionBand::onObjectChanged ); uiCapability()->setUiTreeChildrenHidden( true ); - CAF_PDM_InitField( &m_bandColor, "BandColor", cvf::Color3f( cvf::Color3f::BLACK ), "Band Color", "", "", "" ); - CAF_PDM_InitField( &m_bandOpacity, "BandOpacity", 0.8, "Band Opacity", "", "", "" ); + CAF_PDM_InitField( &m_bandColor, "BandColor", cvf::Color3f( cvf::Color3f::BLACK ), "Band Color" ); + CAF_PDM_InitField( &m_bandOpacity, "BandOpacity", 0.8, "Band Opacity" ); m_bandOpacity.uiCapability()->setUiEditorTypeName( caf::PdmUiDoubleSliderEditor::uiEditorTypeName() ); CAF_PDM_InitField( &m_bandPolygonOffsetUnit, @@ -64,10 +64,10 @@ RimSurfaceIntersectionBand::RimSurfaceIntersectionBand() "" ); m_bandPolygonOffsetUnit.uiCapability()->setUiEditorTypeName( caf::PdmUiDoubleSliderEditor::uiEditorTypeName() ); - CAF_PDM_InitFieldNoDefault( &m_surfaces, "Surfaces", "Band Surfaces", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_surfaces, "Surfaces", "Band Surfaces" ); m_surfaces.uiCapability()->setUiEditorTypeName( caf::PdmUiTreeSelectionEditor::uiEditorTypeName() ); - CAF_PDM_InitFieldNoDefault( &m_nameProxy, "NameProxy", "Name", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_nameProxy, "NameProxy", "Name" ); m_nameProxy.registerGetMethod( this, &RimSurfaceIntersectionBand::objectName ); m_nameProxy.uiCapability()->setUiHidden( true ); diff --git a/ApplicationLibCode/ProjectDataModel/RimSurfaceIntersectionCollection.cpp b/ApplicationLibCode/ProjectDataModel/RimSurfaceIntersectionCollection.cpp index a81d302369..87f2c06d56 100644 --- a/ApplicationLibCode/ProjectDataModel/RimSurfaceIntersectionCollection.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimSurfaceIntersectionCollection.cpp @@ -29,10 +29,10 @@ CAF_PDM_SOURCE_INIT( RimSurfaceIntersectionCollection, "RimSurfaceIntersectionCo RimSurfaceIntersectionCollection::RimSurfaceIntersectionCollection() : objectChanged( this ) { - CAF_PDM_InitObject( "SurfaceIntersectionCollection_msj", "", "", "" ); + CAF_PDM_InitObject( "SurfaceIntersectionCollection_msj" ); - CAF_PDM_InitFieldNoDefault( &m_intersectionBands, "IntersectionBands", "Intersection Bands", "", "", "" ); - CAF_PDM_InitFieldNoDefault( &m_intersectionCurves, "IntersectionCurves", "Intersection Curves", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_intersectionBands, "IntersectionBands", "Intersection Bands" ); + CAF_PDM_InitFieldNoDefault( &m_intersectionCurves, "IntersectionCurves", "Intersection Curves" ); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/ProjectDataModel/RimSurfaceIntersectionCurve.cpp b/ApplicationLibCode/ProjectDataModel/RimSurfaceIntersectionCurve.cpp index b9e9b1db83..7ba8174bdf 100644 --- a/ApplicationLibCode/ProjectDataModel/RimSurfaceIntersectionCurve.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimSurfaceIntersectionCurve.cpp @@ -37,15 +37,15 @@ RimSurfaceIntersectionCurve::RimSurfaceIntersectionCurve() { CAF_PDM_InitObject( "SurfaceIntersectionCurve", ":/SummaryCurve16x16.png", "", "" ); - CAF_PDM_InitFieldNoDefault( &m_lineAppearance, "LineAppearance", "Line Appearance", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_lineAppearance, "LineAppearance", "Line Appearance" ); m_lineAppearance = new RimAnnotationLineAppearance; m_lineAppearance->objectChanged.connect( this, &RimSurfaceIntersectionCurve::onObjectChanged ); uiCapability()->setUiTreeChildrenHidden( true ); - CAF_PDM_InitFieldNoDefault( &m_surface1, "Surface1", "Surface 1", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_surface1, "Surface1", "Surface 1" ); m_surface1.uiCapability()->setUiEditorTypeName( caf::PdmUiTreeSelectionEditor::uiEditorTypeName() ); - CAF_PDM_InitFieldNoDefault( &m_nameProxy, "NameProxy", "Name", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_nameProxy, "NameProxy", "Name" ); m_nameProxy.registerGetMethod( this, &RimSurfaceIntersectionCurve::objectName ); m_nameProxy.uiCapability()->setUiHidden( true ); diff --git a/ApplicationLibCode/ProjectDataModel/RimTensorResults.cpp b/ApplicationLibCode/ProjectDataModel/RimTensorResults.cpp index b03276b12d..6ada731680 100644 --- a/ApplicationLibCode/ProjectDataModel/RimTensorResults.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimTensorResults.cpp @@ -62,27 +62,27 @@ RimTensorResults::RimTensorResults() { CAF_PDM_InitObject( "Element Tensor Results", ":/CellResult.png", "", "" ); - CAF_PDM_InitFieldNoDefault( &arrowColorLegendConfig, "LegendDefinition", "Color Legend", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &arrowColorLegendConfig, "LegendDefinition", "Color Legend" ); this->arrowColorLegendConfig = new RimRegularLegendConfig(); arrowColorLegendConfig.uiCapability()->setUiTreeHidden( true ); - CAF_PDM_InitField( &m_resultFieldName, "ResultVariable", QString( "ST" ), "Value", "", "", "" ); + CAF_PDM_InitField( &m_resultFieldName, "ResultVariable", QString( "ST" ), "Value" ); m_resultFieldName.uiCapability()->setUiHidden( true ); - CAF_PDM_InitField( &m_resultFieldNameUiField, "ResultVariableUI", QString( "ST" ), "Value", "", "", "" ); + CAF_PDM_InitField( &m_resultFieldNameUiField, "ResultVariableUI", QString( "ST" ), "Value" ); m_resultFieldNameUiField.xmlCapability()->disableIO(); - CAF_PDM_InitField( &m_showTensors, "ShowTensors", false, "", "", "", "" ); + CAF_PDM_InitField( &m_showTensors, "ShowTensors", false, "" ); - CAF_PDM_InitField( &m_principal1, "Principal1", true, "Principal 1", "", "", "" ); - CAF_PDM_InitField( &m_principal2, "Principal2", true, "Principal 2", "", "", "" ); - CAF_PDM_InitField( &m_principal3, "Principal3", true, "Principal 3", "", "", "" ); + CAF_PDM_InitField( &m_principal1, "Principal1", true, "Principal 1" ); + CAF_PDM_InitField( &m_principal2, "Principal2", true, "Principal 2" ); + CAF_PDM_InitField( &m_principal3, "Principal3", true, "Principal 3" ); - CAF_PDM_InitField( &m_threshold, "Threshold", 0.0f, "Threshold", "", "", "" ); + CAF_PDM_InitField( &m_threshold, "Threshold", 0.0f, "Threshold" ); - CAF_PDM_InitFieldNoDefault( &m_vectorColor, "VectorColor", "Color", "", "", "" ); - CAF_PDM_InitFieldNoDefault( &m_scaleMethod, "ScaleMethod", "Scale Method", "", "", "" ); - CAF_PDM_InitField( &m_sizeScale, "SizeScale", 1.0f, "Size Scale", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_vectorColor, "VectorColor", "Color" ); + CAF_PDM_InitFieldNoDefault( &m_scaleMethod, "ScaleMethod", "Scale Method" ); + CAF_PDM_InitField( &m_sizeScale, "SizeScale", 1.0f, "Size Scale" ); CAF_PDM_InitField( &m_rangeMode, "RangeType", RimRegularLegendConfig::RangeModeEnum( RimRegularLegendConfig::RangeModeType::AUTOMATIC_ALLTIMESTEPS ), diff --git a/ApplicationLibCode/ProjectDataModel/RimTernaryLegendConfig.cpp b/ApplicationLibCode/ProjectDataModel/RimTernaryLegendConfig.cpp index 029c394caf..95610246ea 100644 --- a/ApplicationLibCode/ProjectDataModel/RimTernaryLegendConfig.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimTernaryLegendConfig.cpp @@ -45,7 +45,7 @@ CAF_PDM_SOURCE_INIT( RimTernaryLegendConfig, "RimTernaryLegendConfig" ); RimTernaryLegendConfig::RimTernaryLegendConfig() { CAF_PDM_InitObject( "Ternary Color Legend", ":/Legend.png", "", "" ); - CAF_PDM_InitField( &m_showLegend, "ShowTernaryLegend", true, "Show Ternary Legend", "", "", "" ); + CAF_PDM_InitField( &m_showLegend, "ShowTernaryLegend", true, "Show Ternary Legend" ); m_showLegend.uiCapability()->setUiHidden( true ); CAF_PDM_InitField( &precision, "Precision", @@ -62,19 +62,19 @@ RimTernaryLegendConfig::RimTernaryLegendConfig() "Switches between automatic and user defined range on the legend", "" ); - CAF_PDM_InitFieldNoDefault( &applyLocalMinMax, "m_applyLocalMinMax", "", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &applyLocalMinMax, "m_applyLocalMinMax", "" ); caf::PdmUiPushButtonEditor::configureEditorForField( &applyLocalMinMax ); applyLocalMinMax = false; - CAF_PDM_InitFieldNoDefault( &applyGlobalMinMax, "m_applyGlobalMinMax", "", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &applyGlobalMinMax, "m_applyGlobalMinMax", "" ); caf::PdmUiPushButtonEditor::configureEditorForField( &applyGlobalMinMax ); applyGlobalMinMax = false; - CAF_PDM_InitFieldNoDefault( &applyFullRangeMinMax, "m_applyFullRangeMinMax", "", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &applyFullRangeMinMax, "m_applyFullRangeMinMax", "" ); caf::PdmUiPushButtonEditor::configureEditorForField( &applyFullRangeMinMax ); applyFullRangeMinMax = false; - CAF_PDM_InitFieldNoDefault( &ternaryRangeSummary, "ternaryRangeSummary", "Range summary", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &ternaryRangeSummary, "ternaryRangeSummary", "Range summary" ); ternaryRangeSummary.uiCapability()->setUiEditorTypeName( caf::PdmUiTextEditor::uiEditorTypeName() ); ternaryRangeSummary.uiCapability()->setUiLabelPosition( caf::PdmUiItemInfo::TOP ); diff --git a/ApplicationLibCode/ProjectDataModel/RimTimeStepFilter.cpp b/ApplicationLibCode/ProjectDataModel/RimTimeStepFilter.cpp index de724c9923..43cb02e531 100644 --- a/ApplicationLibCode/ProjectDataModel/RimTimeStepFilter.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimTimeStepFilter.cpp @@ -61,30 +61,30 @@ CAF_PDM_SOURCE_INIT( RimTimeStepFilter, "RimTimeStepFilter" ); //-------------------------------------------------------------------------------------------------- RimTimeStepFilter::RimTimeStepFilter() { - CAF_PDM_InitObject( "Time Step Filter", "", "", "" ); + CAF_PDM_InitObject( "Time Step Filter" ); caf::AppEnum filterType = TS_ALL; - CAF_PDM_InitField( &m_filterType, "FilterType", filterType, "Filter Type", "", "", "" ); + CAF_PDM_InitField( &m_filterType, "FilterType", filterType, "Filter Type" ); - CAF_PDM_InitField( &m_firstTimeStep, "FirstTimeStep", 0, "First Time Step", "", "", "" ); - CAF_PDM_InitField( &m_lastTimeStep, "LastTimeStep", 0, "Last Time Step", "", "", "" ); + CAF_PDM_InitField( &m_firstTimeStep, "FirstTimeStep", 0, "First Time Step" ); + CAF_PDM_InitField( &m_lastTimeStep, "LastTimeStep", 0, "Last Time Step" ); - CAF_PDM_InitField( &m_interval, "Interval", 1, "Interval", "", "", "" ); + CAF_PDM_InitField( &m_interval, "Interval", 1, "Interval" ); m_interval.uiCapability()->setUiEditorTypeName( caf::PdmUiLineEditor::uiEditorTypeName() ); - CAF_PDM_InitField( &m_timeStepNamesFromFile, "TimeStepsFromFile", std::vector(), "TimeSteps From File", "", "", "" ); + CAF_PDM_InitField( &m_timeStepNamesFromFile, "TimeStepsFromFile", std::vector(), "TimeSteps From File" ); m_timeStepNamesFromFile.xmlCapability()->disableIO(); - CAF_PDM_InitField( &m_dateFormat, "DateFormat", QString( "yyyy-MM-dd" ), "Date Format", "", "", "" ); + CAF_PDM_InitField( &m_dateFormat, "DateFormat", QString( "yyyy-MM-dd" ), "Date Format" ); - CAF_PDM_InitFieldNoDefault( &m_filteredTimeSteps, "TimeStepIndicesToImport", "Select From Time Steps", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_filteredTimeSteps, "TimeStepIndicesToImport", "Select From Time Steps" ); m_filteredTimeSteps.uiCapability()->setUiReadOnly( true ); - CAF_PDM_InitFieldNoDefault( &m_filteredTimeStepsUi, "TimeStepIndicesUi", "Select From TimeSteps", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_filteredTimeStepsUi, "TimeStepIndicesUi", "Select From TimeSteps" ); m_filteredTimeStepsUi.uiCapability()->setUiLabelPosition( caf::PdmUiItemInfo::TOP ); m_filteredTimeStepsUi.uiCapability()->setUiEditorTypeName( caf::PdmUiListEditor::uiEditorTypeName() ); m_filteredTimeStepsUi.xmlCapability()->disableIO(); - CAF_PDM_InitFieldNoDefault( &m_applyReloadOfCase, "ApplyReloadOfCase", "", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_applyReloadOfCase, "ApplyReloadOfCase", "" ); caf::PdmUiPushButtonEditor::configureEditorForField( &m_applyReloadOfCase ); } diff --git a/ApplicationLibCode/ProjectDataModel/RimVfpPlot.cpp b/ApplicationLibCode/ProjectDataModel/RimVfpPlot.cpp index 224324052c..75f146d85f 100644 --- a/ApplicationLibCode/ProjectDataModel/RimVfpPlot.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimVfpPlot.cpp @@ -90,29 +90,29 @@ RimVfpPlot::RimVfpPlot() // TODO: add icon CAF_PDM_InitObject( "VFP Plot", ":/VfpPlot.svg", "", "" ); - CAF_PDM_InitField( &m_plotTitle, "PlotTitle", QString( "VFP Plot" ), "Plot Title", "", "", "" ); + CAF_PDM_InitField( &m_plotTitle, "PlotTitle", QString( "VFP Plot" ), "Plot Title" ); m_plotTitle.uiCapability()->setUiHidden( true ); - CAF_PDM_InitFieldNoDefault( &m_filePath, "FilePath", "File Path", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_filePath, "FilePath", "File Path" ); caf::AppEnum defaultTableType = RimVfpDefines::TableType::INJECTION; - CAF_PDM_InitField( &m_tableType, "TableType", defaultTableType, "Table Type", "", "", "" ); + CAF_PDM_InitField( &m_tableType, "TableType", defaultTableType, "Table Type" ); m_tableType.uiCapability()->setUiReadOnly( true ); - CAF_PDM_InitField( &m_tableNumber, "TableNumber", -1, "Table Number", "", "", "" ); + CAF_PDM_InitField( &m_tableNumber, "TableNumber", -1, "Table Number" ); m_tableNumber.uiCapability()->setUiReadOnly( true ); - CAF_PDM_InitField( &m_referenceDepth, "ReferenceDepth", 0.0, "Reference Depth", "", "", "" ); + CAF_PDM_InitField( &m_referenceDepth, "ReferenceDepth", 0.0, "Reference Depth" ); m_referenceDepth.uiCapability()->setUiReadOnly( true ); caf::AppEnum defaultFlowingPhase = RimVfpDefines::FlowingPhaseType::WATER; - CAF_PDM_InitField( &m_flowingPhase, "FlowingPhase", defaultFlowingPhase, "Flowing Phase", "", "", "" ); + CAF_PDM_InitField( &m_flowingPhase, "FlowingPhase", defaultFlowingPhase, "Flowing Phase" ); m_flowingPhase.uiCapability()->setUiReadOnly( true ); - CAF_PDM_InitFieldNoDefault( &m_flowingWaterFraction, "FlowingWaterFraction", "Flowing Water Fraction", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_flowingWaterFraction, "FlowingWaterFraction", "Flowing Water Fraction" ); m_flowingWaterFraction.uiCapability()->setUiReadOnly( true ); - CAF_PDM_InitFieldNoDefault( &m_flowingGasFraction, "FlowingGasFraction", "Flowing Gas Fraction", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_flowingGasFraction, "FlowingGasFraction", "Flowing Gas Fraction" ); m_flowingGasFraction.uiCapability()->setUiReadOnly( true ); caf::AppEnum defaultInterpolatedVariable = @@ -127,24 +127,24 @@ RimVfpPlot::RimVfpPlot() caf::AppEnum defaultPrimaryVariable = RimVfpDefines::ProductionVariableType::LIQUID_FLOW_RATE; - CAF_PDM_InitField( &m_primaryVariable, "PrimaryVariable", defaultPrimaryVariable, "Primary Variable", "", "", "" ); + CAF_PDM_InitField( &m_primaryVariable, "PrimaryVariable", defaultPrimaryVariable, "Primary Variable" ); caf::AppEnum defaultFamilyVariable = RimVfpDefines::ProductionVariableType::THP; - CAF_PDM_InitField( &m_familyVariable, "FamilyVariable", defaultFamilyVariable, "Family Variable", "", "", "" ); + CAF_PDM_InitField( &m_familyVariable, "FamilyVariable", defaultFamilyVariable, "Family Variable" ); - CAF_PDM_InitField( &m_liquidFlowRateIdx, "LiquidFlowRateIdx", 0, "Liquid Flow Rate", "", "", "" ); + CAF_PDM_InitField( &m_liquidFlowRateIdx, "LiquidFlowRateIdx", 0, "Liquid Flow Rate" ); m_liquidFlowRateIdx.uiCapability()->setUiEditorTypeName( caf::PdmUiComboBoxEditor::uiEditorTypeName() ); - CAF_PDM_InitField( &m_thpIdx, "THPIdx", 0, "THP", "", "", "" ); + CAF_PDM_InitField( &m_thpIdx, "THPIdx", 0, "THP" ); m_thpIdx.uiCapability()->setUiEditorTypeName( caf::PdmUiComboBoxEditor::uiEditorTypeName() ); - CAF_PDM_InitField( &m_articifialLiftQuantityIdx, "ArtificialLiftQuantityIdx", 0, "Artificial Lift Quantity", "", "", "" ); + CAF_PDM_InitField( &m_articifialLiftQuantityIdx, "ArtificialLiftQuantityIdx", 0, "Artificial Lift Quantity" ); m_articifialLiftQuantityIdx.uiCapability()->setUiEditorTypeName( caf::PdmUiComboBoxEditor::uiEditorTypeName() ); - CAF_PDM_InitField( &m_waterCutIdx, "WaterCutIdx", 0, "Water Cut", "", "", "" ); + CAF_PDM_InitField( &m_waterCutIdx, "WaterCutIdx", 0, "Water Cut" ); m_waterCutIdx.uiCapability()->setUiEditorTypeName( caf::PdmUiComboBoxEditor::uiEditorTypeName() ); - CAF_PDM_InitField( &m_gasLiquidRatioIdx, "GasLiquidRatioIdx", 0, "Gas Liquid Ratio", "", "", "" ); + CAF_PDM_InitField( &m_gasLiquidRatioIdx, "GasLiquidRatioIdx", 0, "Gas Liquid Ratio" ); m_gasLiquidRatioIdx.uiCapability()->setUiEditorTypeName( caf::PdmUiComboBoxEditor::uiEditorTypeName() ); m_showWindow = true; diff --git a/ApplicationLibCode/ProjectDataModel/RimVfpPlotCollection.cpp b/ApplicationLibCode/ProjectDataModel/RimVfpPlotCollection.cpp index aa01154ee4..dd58369952 100644 --- a/ApplicationLibCode/ProjectDataModel/RimVfpPlotCollection.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimVfpPlotCollection.cpp @@ -38,7 +38,7 @@ RimVfpPlotCollection::RimVfpPlotCollection() { CAF_PDM_InitObject( "VFP Plots", ":/VfpPlotCollection.svg", "", "" ); - CAF_PDM_InitFieldNoDefault( &m_vfpPlots, "VfpPlots", "Vertical Flow Performance Plots", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_vfpPlots, "VfpPlots", "Vertical Flow Performance Plots" ); m_vfpPlots.uiCapability()->setUiTreeHidden( true ); } diff --git a/ApplicationLibCode/ProjectDataModel/RimViewLinkerCollection.cpp b/ApplicationLibCode/ProjectDataModel/RimViewLinkerCollection.cpp index 4996ab89ba..4323f0c0c7 100644 --- a/ApplicationLibCode/ProjectDataModel/RimViewLinkerCollection.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimViewLinkerCollection.cpp @@ -33,10 +33,10 @@ RimViewLinkerCollection::RimViewLinkerCollection( void ) { CAF_PDM_InitObject( "Linked Views", ":/LinkView16x16.png", "", "" ); - CAF_PDM_InitField( &isActive, "Active", true, "Active", "", "", "" ); + CAF_PDM_InitField( &isActive, "Active", true, "Active" ); isActive.uiCapability()->setUiHidden( true ); - CAF_PDM_InitFieldNoDefault( &viewLinker, "ViewLinkers", "View Linkers", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &viewLinker, "ViewLinkers", "View Linkers" ); viewLinker.uiCapability()->setUiTreeHidden( true ); } diff --git a/ApplicationLibCode/ProjectDataModel/RimViewNameConfig.cpp b/ApplicationLibCode/ProjectDataModel/RimViewNameConfig.cpp index b3f7378496..3b0b97fae0 100644 --- a/ApplicationLibCode/ProjectDataModel/RimViewNameConfig.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimViewNameConfig.cpp @@ -35,12 +35,12 @@ RimViewNameConfig::RimViewNameConfig() , m_hidePropertyField( false ) , m_hideSampleSpacingField( false ) { - CAF_PDM_InitObject( "View Name Generator", "", "", "" ); + CAF_PDM_InitObject( "View Name Generator" ); - CAF_PDM_InitField( &m_addCaseName, "AddCaseName", false, "Add Case Name", "", "", "" ); - CAF_PDM_InitField( &m_addAggregationType, "AddAggregationType", true, "Add Aggregation Type", "", "", "" ); - CAF_PDM_InitField( &m_addProperty, "AddProperty", true, "Add Property Type", "", "", "" ); - CAF_PDM_InitField( &m_addSampleSpacing, "AddSampleSpacing", false, "Add Sample Spacing", "", "", "" ); + CAF_PDM_InitField( &m_addCaseName, "AddCaseName", false, "Add Case Name" ); + CAF_PDM_InitField( &m_addAggregationType, "AddAggregationType", true, "Add Aggregation Type" ); + CAF_PDM_InitField( &m_addProperty, "AddProperty", true, "Add Property Type" ); + CAF_PDM_InitField( &m_addSampleSpacing, "AddSampleSpacing", false, "Add Sample Spacing" ); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/ProjectDataModel/RimViewWindow.cpp b/ApplicationLibCode/ProjectDataModel/RimViewWindow.cpp index d0c05bb239..1c6e03d842 100644 --- a/ApplicationLibCode/ProjectDataModel/RimViewWindow.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimViewWindow.cpp @@ -48,15 +48,15 @@ RimViewWindow::RimViewWindow( void ) "ViewWindow", "The Base Class for all Views and Plots in ResInsight" ); - CAF_PDM_InitFieldNoDefault( &m_windowController, "WindowController", "", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_windowController, "WindowController", "" ); m_windowController.uiCapability()->setUiTreeHidden( true ); m_windowController.uiCapability()->setUiTreeChildrenHidden( true ); - CAF_PDM_InitField( &m_showWindow, "ShowWindow", true, "Show Window", "", "", "" ); + CAF_PDM_InitField( &m_showWindow, "ShowWindow", true, "Show Window" ); m_showWindow.uiCapability()->setUiHidden( true ); // Obsolete field - CAF_PDM_InitFieldNoDefault( &obsoleteField_windowGeometry, "WindowGeometry", "", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &obsoleteField_windowGeometry, "WindowGeometry", "" ); RiaFieldhandleTools::disableWriteAndSetFieldHidden( &obsoleteField_windowGeometry ); } diff --git a/ApplicationLibCode/ProjectDataModel/RimVirtualPerforationResults.cpp b/ApplicationLibCode/ProjectDataModel/RimVirtualPerforationResults.cpp index b1f4499e98..a9f70fabcd 100644 --- a/ApplicationLibCode/ProjectDataModel/RimVirtualPerforationResults.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimVirtualPerforationResults.cpp @@ -31,11 +31,11 @@ RimVirtualPerforationResults::RimVirtualPerforationResults() { CAF_PDM_InitObject( "Well Connection Factors", ":/WellCF16x16.png", "", "" ); - CAF_PDM_InitField( &m_isActive, "ShowConnectionFactors", false, "", "", "", "" ); - CAF_PDM_InitField( &m_showClosedConnections, "ShowClosedConnections", true, "Show On Closed Connections", "", "", "" ); - CAF_PDM_InitField( &m_geometryScaleFactor, "GeometryScaleFactor", 2.0, "Geometry Scale Factor", "", "", "" ); + CAF_PDM_InitField( &m_isActive, "ShowConnectionFactors", false, "" ); + CAF_PDM_InitField( &m_showClosedConnections, "ShowClosedConnections", true, "Show On Closed Connections" ); + CAF_PDM_InitField( &m_geometryScaleFactor, "GeometryScaleFactor", 2.0, "Geometry Scale Factor" ); - CAF_PDM_InitFieldNoDefault( &m_legendConfig, "LegendDefinition", "Color Legend", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_legendConfig, "LegendDefinition", "Color Legend" ); m_legendConfig.uiCapability()->setUiTreeHidden( true ); m_legendConfig = new RimRegularLegendConfig(); diff --git a/ApplicationLibCode/ProjectDataModel/RimWbsParameters.cpp b/ApplicationLibCode/ProjectDataModel/RimWbsParameters.cpp index c3d5097ef1..4db3e8934f 100644 --- a/ApplicationLibCode/ProjectDataModel/RimWbsParameters.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimWbsParameters.cpp @@ -50,7 +50,7 @@ RimWbsParameters::RimWbsParameters() "", "Data source for Non-Reservoir Pore Pressure", "" ); - CAF_PDM_InitScriptableField( &m_userDefinedPPShale, "UserPPNonReservoir", 1.0, " Multiplier of hydrostatic PP", "", "", "" ); + CAF_PDM_InitScriptableField( &m_userDefinedPPShale, "UserPPNonReservoir", 1.0, " Multiplier of hydrostatic PP" ); CAF_PDM_InitScriptableFieldNoDefault( &m_poissonRatioSource, "PoissionRatioSource", @@ -88,7 +88,7 @@ RimWbsParameters::RimWbsParameters() "(SH - PP)/(OBG-PP)", "" ); - CAF_PDM_InitScriptableFieldNoDefault( &m_FGShaleSource, "FGShaleSource", "FG in Shale Calculation", "", "", "" ); + CAF_PDM_InitScriptableFieldNoDefault( &m_FGShaleSource, "FGShaleSource", "FG in Shale Calculation" ); CAF_PDM_InitScriptableFieldNoDefault( &m_K0FGSource, "K0FGSource", "K0_FG", @@ -96,7 +96,7 @@ RimWbsParameters::RimWbsParameters() "FG in shale = K0_FG * (OBG0-PP0)\nK0_FG = (FG-PP)/(OBG-PP)", "" ); - CAF_PDM_InitFieldNoDefault( &m_waterDensitySource, "WaterDensitySource", "Water Density", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_waterDensitySource, "WaterDensitySource", "Water Density" ); m_waterDensitySource.uiCapability()->setUiHidden( true ); CAF_PDM_InitScriptableField( &m_userDefinedPoissionRatio, @@ -111,8 +111,8 @@ RimWbsParameters::RimWbsParameters() CAF_PDM_InitScriptableField( &m_userDefinedUcs, "UserUcs", 100.0, "User Defined UCS [bar]", "", "User Defined UCS [bar]", "" ); CAF_PDM_InitScriptableField( &m_userDefinedDF, "UserDF", 0.7, "User Defined DF", "", "User Defined Depletion Factor", "" ); - CAF_PDM_InitScriptableField( &m_userDefinedK0FG, "UserK0FG", 0.75, "User Defined K0_FG", "", "", "" ); - CAF_PDM_InitScriptableField( &m_userDefinedK0SH, "UserK0SH", 0.65, "User Defined K0_SH", "", "", "" ); + CAF_PDM_InitScriptableField( &m_userDefinedK0FG, "UserK0FG", 0.75, "User Defined K0_FG" ); + CAF_PDM_InitScriptableField( &m_userDefinedK0SH, "UserK0SH", 0.65, "User Defined K0_SH" ); CAF_PDM_InitScriptableField( &m_FGShaleMultiplier, "FGMultiplier", 1.05, @@ -129,11 +129,11 @@ RimWbsParameters::RimWbsParameters() "Units: g/cm^3", "" ); - CAF_PDM_InitFieldNoDefault( &m_geoMechCase, "GeoMechCase", "GeoMechCase", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_geoMechCase, "GeoMechCase", "GeoMechCase" ); m_geoMechCase.uiCapability()->setUiHidden( true ); - CAF_PDM_InitFieldNoDefault( &m_wellPath, "WellPath", "WellPath", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_wellPath, "WellPath", "WellPath" ); m_wellPath.uiCapability()->setUiHidden( true ); - CAF_PDM_InitField( &m_timeStep, "TimeStep", -1, "TimeStep", "", "", "" ); + CAF_PDM_InitField( &m_timeStep, "TimeStep", -1, "TimeStep" ); m_timeStep.uiCapability()->setUiHidden( true ); m_parameterSourceFields = { { RigWbsParameter::PP_Reservoir(), &m_porePressureSource }, diff --git a/ApplicationLibCode/ProjectDataModel/StimPlanModel/RimElasticProperties.cpp b/ApplicationLibCode/ProjectDataModel/StimPlanModel/RimElasticProperties.cpp index 7c4699e2b7..f465226a80 100644 --- a/ApplicationLibCode/ProjectDataModel/StimPlanModel/RimElasticProperties.cpp +++ b/ApplicationLibCode/ProjectDataModel/StimPlanModel/RimElasticProperties.cpp @@ -36,21 +36,21 @@ CAF_PDM_SOURCE_INIT( RimElasticProperties, "ElasticProperties" ); RimElasticProperties::RimElasticProperties() : changed( this ) { - CAF_PDM_InitScriptableObject( "RimElasticProperties", "", "", "" ); + CAF_PDM_InitScriptableObject( "RimElasticProperties" ); - CAF_PDM_InitScriptableFieldNoDefault( &m_filePath, "FilePath", "File Path", "", "", "" ); + CAF_PDM_InitScriptableFieldNoDefault( &m_filePath, "FilePath", "File Path" ); m_filePath.uiCapability()->setUiReadOnly( true ); m_filePath.uiCapability()->setUiEditorTypeName( caf::PdmUiLineEditor::uiEditorTypeName() ); - CAF_PDM_InitScriptableFieldNoDefault( &m_propertiesTable, "PropertiesTable", "Properties Table", "", "", "" ); + CAF_PDM_InitScriptableFieldNoDefault( &m_propertiesTable, "PropertiesTable", "Properties Table" ); m_propertiesTable.uiCapability()->setUiEditorTypeName( caf::PdmUiTextEditor::uiEditorTypeName() ); m_propertiesTable.uiCapability()->setUiLabelPosition( caf::PdmUiItemInfo::HIDDEN ); m_propertiesTable.uiCapability()->setUiReadOnly( true ); m_propertiesTable.xmlCapability()->disableIO(); - CAF_PDM_InitScriptableField( &m_showScaledProperties, "ShowScaledProperties", true, "Show Scaled Properties", "", "", "" ); + CAF_PDM_InitScriptableField( &m_showScaledProperties, "ShowScaledProperties", true, "Show Scaled Properties" ); - CAF_PDM_InitScriptableFieldNoDefault( &m_scalings, "PropertyScalingCollection", "PropertyScalingCollection", "", "", "" ); + CAF_PDM_InitScriptableFieldNoDefault( &m_scalings, "PropertyScalingCollection", "PropertyScalingCollection" ); m_scalings.uiCapability()->setUiTreeHidden( true ); m_scalings = new RimElasticPropertyScalingCollection; m_scalings->changed.connect( this, &RimElasticProperties::elasticPropertyScalingCollectionChanged ); diff --git a/ApplicationLibCode/ProjectDataModel/StimPlanModel/RimElasticPropertyScaling.cpp b/ApplicationLibCode/ProjectDataModel/StimPlanModel/RimElasticPropertyScaling.cpp index ffcca93033..3559a49c40 100644 --- a/ApplicationLibCode/ProjectDataModel/StimPlanModel/RimElasticPropertyScaling.cpp +++ b/ApplicationLibCode/ProjectDataModel/StimPlanModel/RimElasticPropertyScaling.cpp @@ -40,13 +40,13 @@ CAF_PDM_SOURCE_INIT( RimElasticPropertyScaling, "ElasticPropertyScaling" ); RimElasticPropertyScaling::RimElasticPropertyScaling() : changed( this ) { - CAF_PDM_InitScriptableObject( "ElasticPropertyScaling", "", "", "" ); + CAF_PDM_InitScriptableObject( "ElasticPropertyScaling" ); - CAF_PDM_InitScriptableFieldNoDefault( &m_formation, "Formation", "Formation", "", "", "" ); - CAF_PDM_InitScriptableFieldNoDefault( &m_facies, "Facies", "Facies", "", "", "" ); + CAF_PDM_InitScriptableFieldNoDefault( &m_formation, "Formation", "Formation" ); + CAF_PDM_InitScriptableFieldNoDefault( &m_facies, "Facies", "Facies" ); caf::AppEnum defaultProperty = RiaDefines::CurveProperty::YOUNGS_MODULUS; - CAF_PDM_InitScriptableField( &m_property, "Property", defaultProperty, "Property", "", "", "" ); - CAF_PDM_InitScriptableField( &m_scale, "Scale", 1.0, "Scale", "", "", "" ); + CAF_PDM_InitScriptableField( &m_property, "Property", defaultProperty, "Property" ); + CAF_PDM_InitScriptableField( &m_scale, "Scale", 1.0, "Scale" ); nameField()->uiCapability()->setUiReadOnly( true ); diff --git a/ApplicationLibCode/ProjectDataModel/StimPlanModel/RimElasticPropertyScalingCollection.cpp b/ApplicationLibCode/ProjectDataModel/StimPlanModel/RimElasticPropertyScalingCollection.cpp index 0a01f64e6d..6907fb0c2d 100644 --- a/ApplicationLibCode/ProjectDataModel/StimPlanModel/RimElasticPropertyScalingCollection.cpp +++ b/ApplicationLibCode/ProjectDataModel/StimPlanModel/RimElasticPropertyScalingCollection.cpp @@ -32,7 +32,7 @@ CAF_PDM_SOURCE_INIT( RimElasticPropertyScalingCollection, "ElasticPropertyScalin RimElasticPropertyScalingCollection::RimElasticPropertyScalingCollection() : changed( this ) { - CAF_PDM_InitScriptableObject( "Elastic Property Scalings", "", "", "" ); + CAF_PDM_InitScriptableObject( "Elastic Property Scalings" ); CAF_PDM_InitScriptableFieldNoDefault( &m_elasticPropertyScalings, "ElasticPropertyScalings", diff --git a/ApplicationLibCode/ProjectDataModel/StimPlanModel/RimFaciesInitialPressureConfig.cpp b/ApplicationLibCode/ProjectDataModel/StimPlanModel/RimFaciesInitialPressureConfig.cpp index 2e509aaed8..c61850f65b 100644 --- a/ApplicationLibCode/ProjectDataModel/StimPlanModel/RimFaciesInitialPressureConfig.cpp +++ b/ApplicationLibCode/ProjectDataModel/StimPlanModel/RimFaciesInitialPressureConfig.cpp @@ -31,14 +31,14 @@ CAF_PDM_SOURCE_INIT( RimFaciesInitialPressureConfig, "FaciesInitialPressureConfi RimFaciesInitialPressureConfig::RimFaciesInitialPressureConfig() : changed( this ) { - CAF_PDM_InitScriptableObject( "Facies Initial Pressure Config", "", "", "" ); + CAF_PDM_InitScriptableObject( "Facies Initial Pressure Config" ); m_isChecked.uiCapability()->setUiHidden( false ); - CAF_PDM_InitScriptableFieldNoDefault( &m_faciesName, "FaciesName", "Facies", "", "", "" ); + CAF_PDM_InitScriptableFieldNoDefault( &m_faciesName, "FaciesName", "Facies" ); m_faciesName.uiCapability()->setUiReadOnly( true ); - CAF_PDM_InitScriptableField( &m_faciesValue, "FaciesValue", -1, "Value", "", "", "" ); + CAF_PDM_InitScriptableField( &m_faciesValue, "FaciesValue", -1, "Value" ); m_faciesValue.uiCapability()->setUiHidden( true ); // Use unicode for delta letter @@ -48,7 +48,7 @@ RimFaciesInitialPressureConfig::RimFaciesInitialPressureConfig() QString deltaPressureFractionString = QString::fromUtf8( "\u0394 Pressure Fraction" ); #endif - CAF_PDM_InitScriptableField( &m_fraction, "Fraction", 0.0, deltaPressureFractionString, "", "", "" ); + CAF_PDM_InitScriptableField( &m_fraction, "Fraction", 0.0, deltaPressureFractionString ); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/ProjectDataModel/StimPlanModel/RimFaciesProperties.cpp b/ApplicationLibCode/ProjectDataModel/StimPlanModel/RimFaciesProperties.cpp index 36aa36aad8..c0b6c79107 100644 --- a/ApplicationLibCode/ProjectDataModel/StimPlanModel/RimFaciesProperties.cpp +++ b/ApplicationLibCode/ProjectDataModel/StimPlanModel/RimFaciesProperties.cpp @@ -40,25 +40,25 @@ CAF_PDM_SOURCE_INIT( RimFaciesProperties, "FaciesProperties" ); RimFaciesProperties::RimFaciesProperties() : changed( this ) { - CAF_PDM_InitScriptableObject( "RimFaciesProperties", "", "", "" ); + CAF_PDM_InitScriptableObject( "RimFaciesProperties" ); - CAF_PDM_InitScriptableFieldNoDefault( &m_filePath, "FilePath", "File Path", "", "", "" ); + CAF_PDM_InitScriptableFieldNoDefault( &m_filePath, "FilePath", "File Path" ); m_filePath.uiCapability()->setUiReadOnly( true ); m_filePath.uiCapability()->setUiEditorTypeName( caf::PdmUiLineEditor::uiEditorTypeName() ); - CAF_PDM_InitScriptableFieldNoDefault( &m_propertiesTable, "PropertiesTable", "Properties Table", "", "", "" ); + CAF_PDM_InitScriptableFieldNoDefault( &m_propertiesTable, "PropertiesTable", "Properties Table" ); m_propertiesTable.uiCapability()->setUiEditorTypeName( caf::PdmUiTextEditor::uiEditorTypeName() ); m_propertiesTable.uiCapability()->setUiLabelPosition( caf::PdmUiItemInfo::HIDDEN ); m_propertiesTable.uiCapability()->setUiReadOnly( true ); m_propertiesTable.xmlCapability()->disableIO(); - CAF_PDM_InitScriptableFieldNoDefault( &m_faciesDefinition, "FaciesDefinition", "", "", "", "" ); + CAF_PDM_InitScriptableFieldNoDefault( &m_faciesDefinition, "FaciesDefinition", "" ); m_faciesDefinition.uiCapability()->setUiTreeHidden( true ); m_faciesDefinition.uiCapability()->setUiTreeChildrenHidden( true ); m_faciesDefinition = new RimEclipseResultDefinition; m_faciesDefinition->findField( "MResultType" )->uiCapability()->setUiName( "Facies Definiton" ); - CAF_PDM_InitScriptableFieldNoDefault( &m_colorLegend, "ColorLegend", "Colors", "", "", "" ); + CAF_PDM_InitScriptableFieldNoDefault( &m_colorLegend, "ColorLegend", "Colors" ); m_colorLegend = RimRegularLegendConfig::mapToColorLegend( RimRegularLegendConfig::ColorRangesType::NORMAL ); setUiName( "Facies Properties" ); diff --git a/ApplicationLibCode/ProjectDataModel/StimPlanModel/RimNonNetLayers.cpp b/ApplicationLibCode/ProjectDataModel/StimPlanModel/RimNonNetLayers.cpp index 2b6f89982a..206a266e1a 100644 --- a/ApplicationLibCode/ProjectDataModel/StimPlanModel/RimNonNetLayers.cpp +++ b/ApplicationLibCode/ProjectDataModel/StimPlanModel/RimNonNetLayers.cpp @@ -42,14 +42,14 @@ CAF_PDM_SOURCE_INIT( RimNonNetLayers, "NonNetLayers" ); RimNonNetLayers::RimNonNetLayers() : changed( this ) { - CAF_PDM_InitScriptableObject( "RimNonNetLayers", "", "", "" ); + CAF_PDM_InitScriptableObject( "RimNonNetLayers" ); - CAF_PDM_InitScriptableField( &m_cutOff, "Cutoff", 0.0, "Cutoff", "", "", "" ); + CAF_PDM_InitScriptableField( &m_cutOff, "Cutoff", 0.0, "Cutoff" ); m_cutOff.uiCapability()->setUiEditorTypeName( caf::PdmUiDoubleValueEditor::uiEditorTypeName() ); - CAF_PDM_InitScriptableFieldNoDefault( &m_facies, "Facies", "Facies", "", "", "" ); + CAF_PDM_InitScriptableFieldNoDefault( &m_facies, "Facies", "Facies" ); - CAF_PDM_InitScriptableFieldNoDefault( &m_resultDefinition, "FaciesDefinition", "", "", "", "" ); + CAF_PDM_InitScriptableFieldNoDefault( &m_resultDefinition, "FaciesDefinition", "" ); m_resultDefinition.uiCapability()->setUiTreeHidden( true ); m_resultDefinition.uiCapability()->setUiTreeChildrenHidden( true ); m_resultDefinition = new RimEclipseResultDefinition; diff --git a/ApplicationLibCode/ProjectDataModel/StimPlanModel/RimPressureTable.cpp b/ApplicationLibCode/ProjectDataModel/StimPlanModel/RimPressureTable.cpp index af8a836048..cac250edf3 100644 --- a/ApplicationLibCode/ProjectDataModel/StimPlanModel/RimPressureTable.cpp +++ b/ApplicationLibCode/ProjectDataModel/StimPlanModel/RimPressureTable.cpp @@ -34,14 +34,14 @@ CAF_PDM_SOURCE_INIT( RimPressureTable, "PressureTable" ); RimPressureTable::RimPressureTable() : changed( this ) { - CAF_PDM_InitScriptableObject( "Pressure Table", "", "", "" ); + CAF_PDM_InitScriptableObject( "Pressure Table" ); - CAF_PDM_InitScriptableFieldNoDefault( &m_pressureTableItems, "Items", "Pressure Table Items", "", "", "" ); + CAF_PDM_InitScriptableFieldNoDefault( &m_pressureTableItems, "Items", "Pressure Table Items" ); m_pressureTableItems.uiCapability()->setUiEditorTypeName( caf::PdmUiTableViewEditor::uiEditorTypeName() ); m_pressureTableItems.uiCapability()->setUiLabelPosition( caf::PdmUiItemInfo::HIDDEN ); m_pressureTableItems.uiCapability()->setCustomContextMenuEnabled( true ); - CAF_PDM_InitScriptableFieldNoDefault( &m_pressureDate, "PressureDate", "Pressure Date", "", "", "" ); + CAF_PDM_InitScriptableFieldNoDefault( &m_pressureDate, "PressureDate", "Pressure Date" ); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/ProjectDataModel/StimPlanModel/RimPressureTableItem.cpp b/ApplicationLibCode/ProjectDataModel/StimPlanModel/RimPressureTableItem.cpp index 7b7b3ca71b..4dfaace373 100644 --- a/ApplicationLibCode/ProjectDataModel/StimPlanModel/RimPressureTableItem.cpp +++ b/ApplicationLibCode/ProjectDataModel/StimPlanModel/RimPressureTableItem.cpp @@ -31,11 +31,11 @@ CAF_PDM_SOURCE_INIT( RimPressureTableItem, "PressureTableItem" ); RimPressureTableItem::RimPressureTableItem() : changed( this ) { - CAF_PDM_InitScriptableObject( "Pressure Table Item", "", "", "" ); + CAF_PDM_InitScriptableObject( "Pressure Table Item" ); - CAF_PDM_InitScriptableField( &m_depth, "Depth", 0.0, "Depth TVDMSL [m]", "", "", "" ); - CAF_PDM_InitScriptableField( &m_initialPressure, "InitialPressure", 0.0, "Initial Pressure [Bar]", "", "", "" ); - CAF_PDM_InitScriptableField( &m_pressure, "Pressure", 0.0, "Pressure [Bar]", "", "", "" ); + CAF_PDM_InitScriptableField( &m_depth, "Depth", 0.0, "Depth TVDMSL [m]" ); + CAF_PDM_InitScriptableField( &m_initialPressure, "InitialPressure", 0.0, "Initial Pressure [Bar]" ); + CAF_PDM_InitScriptableField( &m_pressure, "Pressure", 0.0, "Pressure [Bar]" ); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/ProjectDataModel/StimPlanModel/RimStimPlanModel.cpp b/ApplicationLibCode/ProjectDataModel/StimPlanModel/RimStimPlanModel.cpp index 9e2607eae4..0aa3100640 100644 --- a/ApplicationLibCode/ProjectDataModel/StimPlanModel/RimStimPlanModel.cpp +++ b/ApplicationLibCode/ProjectDataModel/StimPlanModel/RimStimPlanModel.cpp @@ -134,17 +134,17 @@ void caf::AppEnum::setUp() //-------------------------------------------------------------------------------------------------- RimStimPlanModel::RimStimPlanModel() { - CAF_PDM_InitScriptableObject( "StimPlanModel", "", "", "" ); + CAF_PDM_InitScriptableObject( "StimPlanModel" ); - CAF_PDM_InitFieldNoDefault( &m_stimPlanModelTemplate, "StimPlanModelTemplate", "StimPlan Model Template", "", "", "" ); - CAF_PDM_InitField( &m_editStimPlanModelTemplate, "EditModelTemplate", false, "Edit", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_stimPlanModelTemplate, "StimPlanModelTemplate", "StimPlan Model Template" ); + CAF_PDM_InitField( &m_editStimPlanModelTemplate, "EditModelTemplate", false, "Edit" ); m_editStimPlanModelTemplate.uiCapability()->setUiEditorTypeName( caf::PdmUiToolButtonEditor::uiEditorTypeName() ); m_editStimPlanModelTemplate.uiCapability()->setUiLabelPosition( caf::PdmUiItemInfo::HIDDEN ); - CAF_PDM_InitScriptableFieldNoDefault( &m_eclipseCase, "EclipseCase", "Dynamic Case", "", "", "" ); + CAF_PDM_InitScriptableFieldNoDefault( &m_eclipseCase, "EclipseCase", "Dynamic Case" ); m_eclipseCase.uiCapability()->setUiReadOnly( true ); - CAF_PDM_InitScriptableField( &m_timeStep, "TimeStep", 0, "Time Step", "", "", "" ); + CAF_PDM_InitScriptableField( &m_timeStep, "TimeStep", 0, "Time Step" ); m_timeStep.uiCapability()->setUiReadOnly( true ); CAF_PDM_InitScriptableFieldNoDefault( &m_initialPressureEclipseCase, @@ -155,23 +155,23 @@ RimStimPlanModel::RimStimPlanModel() "" ); m_initialPressureEclipseCase.uiCapability()->setUiReadOnly( true ); - CAF_PDM_InitScriptableFieldNoDefault( &m_staticEclipseCase, "StaticEclipseCase", "Static Case", "", "", "" ); + CAF_PDM_InitScriptableFieldNoDefault( &m_staticEclipseCase, "StaticEclipseCase", "Static Case" ); m_staticEclipseCase.uiCapability()->setUiReadOnly( true ); - CAF_PDM_InitScriptableField( &m_MD, "MeasuredDepth", 0.0, "Measured Depth", "", "", "" ); + CAF_PDM_InitScriptableField( &m_MD, "MeasuredDepth", 0.0, "Measured Depth" ); m_MD.uiCapability()->setUiEditorTypeName( caf::PdmUiDoubleSliderEditor::uiEditorTypeName() ); - CAF_PDM_InitScriptableField( &m_extractionOffsetTop, "ExtractionOffsetTop", -1.0, "Top Offset", "", "", "" ); + CAF_PDM_InitScriptableField( &m_extractionOffsetTop, "ExtractionOffsetTop", -1.0, "Top Offset" ); m_extractionOffsetTop.uiCapability()->setUiEditorTypeName( caf::PdmUiDoubleValueEditor::uiEditorTypeName() ); - CAF_PDM_InitScriptableField( &m_extractionOffsetBottom, "ExtractionOffsetBottom", -1.0, "Bottom Offset", "", "", "" ); + CAF_PDM_InitScriptableField( &m_extractionOffsetBottom, "ExtractionOffsetBottom", -1.0, "Bottom Offset" ); m_extractionOffsetBottom.uiCapability()->setUiEditorTypeName( caf::PdmUiDoubleValueEditor::uiEditorTypeName() ); - CAF_PDM_InitScriptableField( &m_extractionDepthTop, "ExtractionDepthTop", -1.0, "Depth", "", "", "" ); + CAF_PDM_InitScriptableField( &m_extractionDepthTop, "ExtractionDepthTop", -1.0, "Depth" ); m_extractionDepthTop.uiCapability()->setUiEditorTypeName( caf::PdmUiDoubleValueEditor::uiEditorTypeName() ); m_extractionDepthTop.uiCapability()->setUiReadOnly( true ); - CAF_PDM_InitScriptableField( &m_extractionDepthBottom, "ExtractionDepthBottom", -1.0, "Depth", "", "", "" ); + CAF_PDM_InitScriptableField( &m_extractionDepthBottom, "ExtractionDepthBottom", -1.0, "Depth" ); m_extractionDepthBottom.uiCapability()->setUiEditorTypeName( caf::PdmUiDoubleValueEditor::uiEditorTypeName() ); m_extractionDepthBottom.uiCapability()->setUiReadOnly( true ); @@ -183,16 +183,16 @@ RimStimPlanModel::RimStimPlanModel() "", "" ); - CAF_PDM_InitScriptableFieldNoDefault( &m_anchorPosition, "AnchorPosition", "Anchor Position", "", "", "" ); + CAF_PDM_InitScriptableFieldNoDefault( &m_anchorPosition, "AnchorPosition", "Anchor Position" ); m_anchorPosition.uiCapability()->setUiReadOnly( true ); m_anchorPosition.xmlCapability()->disableIO(); - CAF_PDM_InitFieldNoDefault( &m_anchorPositionForUi, "AnchorPositionForUi", "Anchor Position", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_anchorPositionForUi, "AnchorPositionForUi", "Anchor Position" ); m_anchorPositionForUi.registerGetMethod( this, &RimStimPlanModel::anchorPositionForUi ); m_anchorPositionForUi.uiCapability()->setUiReadOnly( true ); m_anchorPositionForUi.xmlCapability()->disableIO(); - CAF_PDM_InitScriptableFieldNoDefault( &m_thicknessDirection, "ThicknessDirection", "Thickness Direction", "", "", "" ); + CAF_PDM_InitScriptableFieldNoDefault( &m_thicknessDirection, "ThicknessDirection", "Thickness Direction" ); m_thicknessDirection.uiCapability()->setUiReadOnly( true ); m_thicknessDirection.xmlCapability()->disableIO(); @@ -203,10 +203,10 @@ RimStimPlanModel::RimStimPlanModel() "", "" ); - CAF_PDM_InitScriptableField( &m_boundingBoxHorizontal, "BoundingBoxHorizontal", 50.0, "Bounding Box Horizontal", "", "", "" ); - CAF_PDM_InitScriptableField( &m_boundingBoxVertical, "BoundingBoxVertical", 100.0, "Bounding Box Vertical", "", "", "" ); + CAF_PDM_InitScriptableField( &m_boundingBoxHorizontal, "BoundingBoxHorizontal", 50.0, "Bounding Box Horizontal" ); + CAF_PDM_InitScriptableField( &m_boundingBoxVertical, "BoundingBoxVertical", 100.0, "Bounding Box Vertical" ); - CAF_PDM_InitScriptableField( &m_useDetailedFluidLoss, "UseDetailedFluidLoss", true, "Use Detailed Fluid Loss", "", "", "" ); + CAF_PDM_InitScriptableField( &m_useDetailedFluidLoss, "UseDetailedFluidLoss", true, "Use Detailed Fluid Loss" ); CAF_PDM_InitScriptableField( &m_relativePermeabilityFactorDefault, "RelativePermeabilityFactor", @@ -215,7 +215,7 @@ RimStimPlanModel::RimStimPlanModel() "", "", "" ); - CAF_PDM_InitScriptableField( &m_poroElasticConstantDefault, "PoroElasticConstant", 0.0, "Poro-Elastic Constant", "", "", "" ); + CAF_PDM_InitScriptableField( &m_poroElasticConstantDefault, "PoroElasticConstant", 0.0, "Poro-Elastic Constant" ); CAF_PDM_InitScriptableField( &m_thermalExpansionCoeffientDefault, "ThermalExpansionCoefficient", 0.0, @@ -224,7 +224,7 @@ RimStimPlanModel::RimStimPlanModel() "", "" ); - CAF_PDM_InitScriptableField( &m_perforationLength, "PerforationLength", 10.0, "Perforation Length [m]", "", "", "" ); + CAF_PDM_InitScriptableField( &m_perforationLength, "PerforationLength", 10.0, "Perforation Length [m]" ); CAF_PDM_InitScriptableField( &m_fractureOrientation, "FractureOrientation", caf::AppEnum( FractureOrientation::ALONG_WELL_PATH ), @@ -232,29 +232,29 @@ RimStimPlanModel::RimStimPlanModel() "", "", "" ); - CAF_PDM_InitScriptableField( &m_azimuthAngle, "AzimuthAngle", 0.0, "Azimuth Angle", "", "", "" ); + CAF_PDM_InitScriptableField( &m_azimuthAngle, "AzimuthAngle", 0.0, "Azimuth Angle" ); - CAF_PDM_InitScriptableField( &m_formationDip, "FormationDip", 0.0, "Formation Dip", "", "", "" ); + CAF_PDM_InitScriptableField( &m_formationDip, "FormationDip", 0.0, "Formation Dip" ); m_formationDip.uiCapability()->setUiReadOnly( true ); m_formationDip.uiCapability()->setUiEditorTypeName( caf::PdmUiDoubleValueEditor::uiEditorTypeName() ); - CAF_PDM_InitScriptableField( &m_autoComputeBarrier, "AutoComputeBarrier", true, "Auto Compute Barrier", "", "", "" ); - CAF_PDM_InitScriptableField( &m_hasBarrier, "Barrier", true, "Barrier", "", "", "" ); - CAF_PDM_InitScriptableField( &m_distanceToBarrier, "DistanceToBarrier", 0.0, "Distance To Barrier [m]", "", "", "" ); + CAF_PDM_InitScriptableField( &m_autoComputeBarrier, "AutoComputeBarrier", true, "Auto Compute Barrier" ); + CAF_PDM_InitScriptableField( &m_hasBarrier, "Barrier", true, "Barrier" ); + CAF_PDM_InitScriptableField( &m_distanceToBarrier, "DistanceToBarrier", 0.0, "Distance To Barrier [m]" ); m_distanceToBarrier.uiCapability()->setUiEditorTypeName( caf::PdmUiDoubleValueEditor::uiEditorTypeName() ); m_distanceToBarrier.uiCapability()->setUiReadOnly( true ); - CAF_PDM_InitScriptableField( &m_barrierDip, "BarrierDip", 0.0, "Barrier Dip", "", "", "" ); + CAF_PDM_InitScriptableField( &m_barrierDip, "BarrierDip", 0.0, "Barrier Dip" ); m_barrierDip.uiCapability()->setUiEditorTypeName( caf::PdmUiDoubleValueEditor::uiEditorTypeName() ); m_barrierDip.uiCapability()->setUiReadOnly( true ); - CAF_PDM_InitScriptableField( &m_wellPenetrationLayer, "WellPenetrationLayer", 2, "Well Penetration Layer", "", "", "" ); + CAF_PDM_InitScriptableField( &m_wellPenetrationLayer, "WellPenetrationLayer", 2, "Well Penetration Layer" ); - CAF_PDM_InitScriptableField( &m_showOnlyBarrierFault, "ShowOnlyBarrierFault", false, "Show Only Barrier Fault", "", "", "" ); - CAF_PDM_InitScriptableField( &m_showAllFaults, "ShowAllFaults", false, "Show All Faults", "", "", "" ); + CAF_PDM_InitScriptableField( &m_showOnlyBarrierFault, "ShowOnlyBarrierFault", false, "Show Only Barrier Fault" ); + CAF_PDM_InitScriptableField( &m_showAllFaults, "ShowAllFaults", false, "Show All Faults" ); m_showAllFaults.uiCapability()->setUiEditorTypeName( caf::PdmUiToolButtonEditor::uiEditorTypeName() ); m_showAllFaults.uiCapability()->setUiLabelPosition( caf::PdmUiItemInfo::HIDDEN ); - CAF_PDM_InitScriptableField( &m_barrierFaultName, "BarrierFaultName", QString( "" ), "Barrier Fault", "", "", "" ); + CAF_PDM_InitScriptableField( &m_barrierFaultName, "BarrierFaultName", QString( "" ), "Barrier Fault" ); m_barrierFaultName.uiCapability()->setUiReadOnly( true ); CAF_PDM_InitScriptableFieldNoDefault( &m_barrierTextAnnotation, @@ -264,7 +264,7 @@ RimStimPlanModel::RimStimPlanModel() "", "" ); - CAF_PDM_InitScriptableFieldNoDefault( &m_perforationInterval, "PerforationInterval", "Perforation Interval", "", "", "" ); + CAF_PDM_InitScriptableFieldNoDefault( &m_perforationInterval, "PerforationInterval", "Perforation Interval" ); m_calculator = std::shared_ptr( new RimStimPlanModelCalculator ); m_calculator->setStimPlanModel( this ); diff --git a/ApplicationLibCode/ProjectDataModel/StimPlanModel/RimStimPlanModelCollection.cpp b/ApplicationLibCode/ProjectDataModel/StimPlanModel/RimStimPlanModelCollection.cpp index e45625c461..742bfdf81b 100644 --- a/ApplicationLibCode/ProjectDataModel/StimPlanModel/RimStimPlanModelCollection.cpp +++ b/ApplicationLibCode/ProjectDataModel/StimPlanModel/RimStimPlanModelCollection.cpp @@ -32,9 +32,9 @@ CAF_PDM_SOURCE_INIT( RimStimPlanModelCollection, "StimPlanModelCollection" ); //-------------------------------------------------------------------------------------------------- RimStimPlanModelCollection::RimStimPlanModelCollection( void ) { - CAF_PDM_InitScriptableObject( "StimPlan Models", "", "", "" ); + CAF_PDM_InitScriptableObject( "StimPlan Models" ); - CAF_PDM_InitScriptableFieldNoDefault( &m_stimPlanModels, "StimPlanModels", "", "", "", "" ); + CAF_PDM_InitScriptableFieldNoDefault( &m_stimPlanModels, "StimPlanModels", "" ); m_stimPlanModels.uiCapability()->setUiTreeHidden( true ); setName( "StimPlan Models" ); diff --git a/ApplicationLibCode/ProjectDataModel/StimPlanModel/RimStimPlanModelCurve.cpp b/ApplicationLibCode/ProjectDataModel/StimPlanModel/RimStimPlanModelCurve.cpp index e73891f001..0ed60b1d52 100644 --- a/ApplicationLibCode/ProjectDataModel/StimPlanModel/RimStimPlanModelCurve.cpp +++ b/ApplicationLibCode/ProjectDataModel/StimPlanModel/RimStimPlanModelCurve.cpp @@ -46,13 +46,13 @@ CAF_PDM_SOURCE_INIT( RimStimPlanModelCurve, "StimPlanModelCurve" ); //-------------------------------------------------------------------------------------------------- RimStimPlanModelCurve::RimStimPlanModelCurve() { - CAF_PDM_InitObject( "StimPlan Model Curve", "", "", "" ); + CAF_PDM_InitObject( "StimPlan Model Curve" ); - CAF_PDM_InitFieldNoDefault( &m_stimPlanModel, "StimPlanModel", "StimPlan Model", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_stimPlanModel, "StimPlanModel", "StimPlan Model" ); m_stimPlanModel.uiCapability()->setUiTreeChildrenHidden( true ); m_stimPlanModel.uiCapability()->setUiHidden( true ); - CAF_PDM_InitFieldNoDefault( &m_curveProperty, "CurveProperty", "Curve Property", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_curveProperty, "CurveProperty", "Curve Property" ); m_curveProperty.uiCapability()->setUiHidden( true ); m_wellPath = nullptr; diff --git a/ApplicationLibCode/ProjectDataModel/StimPlanModel/RimStimPlanModelPlot.cpp b/ApplicationLibCode/ProjectDataModel/StimPlanModel/RimStimPlanModelPlot.cpp index 8dd6551cef..f1e809631f 100644 --- a/ApplicationLibCode/ProjectDataModel/StimPlanModel/RimStimPlanModelPlot.cpp +++ b/ApplicationLibCode/ProjectDataModel/StimPlanModel/RimStimPlanModelPlot.cpp @@ -45,15 +45,15 @@ RimStimPlanModelPlot::RimStimPlanModelPlot() { CAF_PDM_InitScriptableObject( "StimPlan Model Plot", "", "", "A fracture model plot" ); - CAF_PDM_InitScriptableFieldNoDefault( &m_stimPlanModel, "StimPlanModel", "StimPlan Model", "", "", "" ); + CAF_PDM_InitScriptableFieldNoDefault( &m_stimPlanModel, "StimPlanModel", "StimPlan Model" ); m_stimPlanModel.uiCapability()->setUiReadOnly( true ); - CAF_PDM_InitField( &m_editStimPlanModel, "EditModel", false, "Edit", "", "", "" ); + CAF_PDM_InitField( &m_editStimPlanModel, "EditModel", false, "Edit" ); m_editStimPlanModel.uiCapability()->setUiEditorTypeName( caf::PdmUiToolButtonEditor::uiEditorTypeName() ); m_editStimPlanModel.uiCapability()->setUiLabelPosition( caf::PdmUiItemInfo::HIDDEN ); - CAF_PDM_InitScriptableFieldNoDefault( &m_eclipseCase, "EclipseCase", "Case", "", "", "" ); - CAF_PDM_InitScriptableField( &m_timeStep, "TimeStep", 0, "Time Step", "", "", "" ); + CAF_PDM_InitScriptableFieldNoDefault( &m_eclipseCase, "EclipseCase", "Case" ); + CAF_PDM_InitScriptableField( &m_timeStep, "TimeStep", 0, "Time Step" ); setLegendsVisible( true ); setDeletable( true ); diff --git a/ApplicationLibCode/ProjectDataModel/StimPlanModel/RimStimPlanModelPlotCollection.cpp b/ApplicationLibCode/ProjectDataModel/StimPlanModel/RimStimPlanModelPlotCollection.cpp index ed7db855b1..e4b4838d68 100644 --- a/ApplicationLibCode/ProjectDataModel/StimPlanModel/RimStimPlanModelPlotCollection.cpp +++ b/ApplicationLibCode/ProjectDataModel/StimPlanModel/RimStimPlanModelPlotCollection.cpp @@ -32,7 +32,7 @@ RimStimPlanModelPlotCollection::RimStimPlanModelPlotCollection() { CAF_PDM_InitScriptableObject( "StimPlan Model Plots", ":/WellLogPlots16x16.png", "", "" ); - CAF_PDM_InitScriptableFieldNoDefault( &m_stimPlanModelPlots, "StimPlanModelPlots", "", "", "", "" ); + CAF_PDM_InitScriptableFieldNoDefault( &m_stimPlanModelPlots, "StimPlanModelPlots", "" ); m_stimPlanModelPlots.uiCapability()->setUiTreeHidden( true ); } diff --git a/ApplicationLibCode/ProjectDataModel/StimPlanModel/RimStimPlanModelTemplate.cpp b/ApplicationLibCode/ProjectDataModel/StimPlanModel/RimStimPlanModelTemplate.cpp index 31ef5343b6..3fb05ca736 100644 --- a/ApplicationLibCode/ProjectDataModel/StimPlanModel/RimStimPlanModelTemplate.cpp +++ b/ApplicationLibCode/ProjectDataModel/StimPlanModel/RimStimPlanModelTemplate.cpp @@ -67,13 +67,13 @@ CAF_PDM_SOURCE_INIT( RimStimPlanModelTemplate, "StimPlanModelTemplate" ); RimStimPlanModelTemplate::RimStimPlanModelTemplate() : changed( this ) { - CAF_PDM_InitScriptableObject( "StimPlanModelTemplate", "", "", "" ); + CAF_PDM_InitScriptableObject( "StimPlanModelTemplate" ); - CAF_PDM_InitScriptableField( &m_id, "Id", -1, "ID", "", "", "" ); + CAF_PDM_InitScriptableField( &m_id, "Id", -1, "ID" ); m_id.uiCapability()->setUiReadOnly( true ); - CAF_PDM_InitScriptableFieldNoDefault( &m_dynamicEclipseCase, "DynamicEclipseCase", "Dynamic Case", "", "", "" ); - CAF_PDM_InitScriptableField( &m_timeStep, "TimeStep", 0, "Time Step", "", "", "" ); + CAF_PDM_InitScriptableFieldNoDefault( &m_dynamicEclipseCase, "DynamicEclipseCase", "Dynamic Case" ); + CAF_PDM_InitScriptableField( &m_timeStep, "TimeStep", 0, "Time Step" ); CAF_PDM_InitScriptableFieldNoDefault( &m_initialPressureEclipseCase, "InitialPressureEclipseCase", @@ -88,12 +88,12 @@ RimStimPlanModelTemplate::RimStimPlanModelTemplate() "", "", "" ); - CAF_PDM_InitField( &m_useTableForPressure, "UseForPressure", false, "Use Pressure Table For Pressure", "", "", "" ); - CAF_PDM_InitField( &m_editPressureTable, "EditPressureTable", false, "Edit", "", "", "" ); + CAF_PDM_InitField( &m_useTableForPressure, "UseForPressure", false, "Use Pressure Table For Pressure" ); + CAF_PDM_InitField( &m_editPressureTable, "EditPressureTable", false, "Edit" ); m_editPressureTable.uiCapability()->setUiEditorTypeName( caf::PdmUiToolButtonEditor::uiEditorTypeName() ); m_editPressureTable.uiCapability()->setUiLabelPosition( caf::PdmUiItemInfo::HIDDEN ); - CAF_PDM_InitScriptableFieldNoDefault( &m_staticEclipseCase, "StaticEclipseCase", "Static Case", "", "", "" ); + CAF_PDM_InitScriptableFieldNoDefault( &m_staticEclipseCase, "StaticEclipseCase", "Static Case" ); CAF_PDM_InitField( &m_useEqlnumForPressureInterpolation, "UseEqlNumForPressureInterpolation", @@ -125,7 +125,7 @@ RimStimPlanModelTemplate::RimStimPlanModelTemplate() double defaultStressDepth = computeDefaultStressDepth(); double defaultStress = defaultStressDepth * defaultStressGradient; - CAF_PDM_InitScriptableField( &m_verticalStress, "VerticalStress", defaultStress, "Vertical Stress", "", "", "" ); + CAF_PDM_InitScriptableField( &m_verticalStress, "VerticalStress", defaultStress, "Vertical Stress" ); m_verticalStress.uiCapability()->setUiEditorTypeName( caf::PdmUiDoubleValueEditor::uiEditorTypeName() ); CAF_PDM_InitScriptableField( &m_verticalStressGradient, "VerticalStressGradient", @@ -134,10 +134,10 @@ RimStimPlanModelTemplate::RimStimPlanModelTemplate() "", "", "" ); - CAF_PDM_InitScriptableField( &m_stressDepth, "StressDepth", defaultStressDepth, "Stress Depth", "", "", "" ); + CAF_PDM_InitScriptableField( &m_stressDepth, "StressDepth", defaultStressDepth, "Stress Depth" ); m_stressDepth.uiCapability()->setUiEditorTypeName( caf::PdmUiDoubleValueEditor::uiEditorTypeName() ); - CAF_PDM_InitScriptableField( &m_referenceTemperature, "ReferenceTemperature", 70.0, "Temperature [C]", "", "", "" ); + CAF_PDM_InitScriptableField( &m_referenceTemperature, "ReferenceTemperature", 70.0, "Temperature [C]" ); CAF_PDM_InitScriptableField( &m_referenceTemperatureGradient, "ReferenceTemperatureGradient", 0.025, @@ -153,10 +153,10 @@ RimStimPlanModelTemplate::RimStimPlanModelTemplate() "", "" ); - CAF_PDM_InitScriptableField( &m_overburdenHeight, "OverburdenHeight", 50.0, "Overburden Height", "", "", "" ); - CAF_PDM_InitScriptableFieldNoDefault( &m_overburdenFormation, "OverburdenFormation", "Overburden Formation", "", "", "" ); - CAF_PDM_InitScriptableFieldNoDefault( &m_overburdenFacies, "OverburdenFacies", "Overburden Facies", "", "", "" ); - CAF_PDM_InitScriptableField( &m_overburdenPorosity, "OverburdenPorosity", 0.0, "Overburden Porosity", "", "", "" ); + CAF_PDM_InitScriptableField( &m_overburdenHeight, "OverburdenHeight", 50.0, "Overburden Height" ); + CAF_PDM_InitScriptableFieldNoDefault( &m_overburdenFormation, "OverburdenFormation", "Overburden Formation" ); + CAF_PDM_InitScriptableFieldNoDefault( &m_overburdenFacies, "OverburdenFacies", "Overburden Facies" ); + CAF_PDM_InitScriptableField( &m_overburdenPorosity, "OverburdenPorosity", 0.0, "Overburden Porosity" ); CAF_PDM_InitScriptableField( &m_overburdenPermeability, "OverburdenPermeability", 10.0e-6, @@ -172,10 +172,10 @@ RimStimPlanModelTemplate::RimStimPlanModelTemplate() "", "" ); - CAF_PDM_InitScriptableField( &m_underburdenHeight, "UnderburdenHeight", 50.0, "Underburden Height", "", "", "" ); - CAF_PDM_InitScriptableFieldNoDefault( &m_underburdenFormation, "UnderburdenFormation", "Underburden Formation", "", "", "" ); - CAF_PDM_InitScriptableFieldNoDefault( &m_underburdenFacies, "UnderburdenFacies", "Underburden Facies", "", "", "" ); - CAF_PDM_InitScriptableField( &m_underburdenPorosity, "UnderburdenPorosity", 0.0, "Underburden Porosity", "", "", "" ); + CAF_PDM_InitScriptableField( &m_underburdenHeight, "UnderburdenHeight", 50.0, "Underburden Height" ); + CAF_PDM_InitScriptableFieldNoDefault( &m_underburdenFormation, "UnderburdenFormation", "Underburden Formation" ); + CAF_PDM_InitScriptableFieldNoDefault( &m_underburdenFacies, "UnderburdenFacies", "Underburden Facies" ); + CAF_PDM_InitScriptableField( &m_underburdenPorosity, "UnderburdenPorosity", 0.0, "Underburden Porosity" ); CAF_PDM_InitScriptableField( &m_underburdenPermeability, "UnderburdenPermeability", 10.0e-6, @@ -201,17 +201,17 @@ RimStimPlanModelTemplate::RimStimPlanModelTemplate() m_faciesInitialPressureConfigs.uiCapability()->setUiLabelPosition( caf::PdmUiItemInfo::HIDDEN ); m_faciesInitialPressureConfigs.uiCapability()->setUiTreeChildrenHidden( true ); - CAF_PDM_InitScriptableFieldNoDefault( &m_pressureTable, "PressureTable", "Pressure Table", "", "", "" ); + CAF_PDM_InitScriptableFieldNoDefault( &m_pressureTable, "PressureTable", "Pressure Table" ); m_pressureTable.uiCapability()->setUiTreeHidden( true ); setPressureTable( new RimPressureTable ); - CAF_PDM_InitScriptableFieldNoDefault( &m_elasticProperties, "ElasticProperties", "Elastic Properties", "", "", "" ); + CAF_PDM_InitScriptableFieldNoDefault( &m_elasticProperties, "ElasticProperties", "Elastic Properties" ); m_elasticProperties.uiCapability()->setUiTreeHidden( true ); - CAF_PDM_InitScriptableFieldNoDefault( &m_faciesProperties, "FaciesProperties", "Facies Properties", "", "", "" ); + CAF_PDM_InitScriptableFieldNoDefault( &m_faciesProperties, "FaciesProperties", "Facies Properties" ); m_faciesProperties.uiCapability()->setUiTreeHidden( true ); - CAF_PDM_InitScriptableFieldNoDefault( &m_nonNetLayers, "NonNetLayers", "Non-Net Layers", "", "", "" ); + CAF_PDM_InitScriptableFieldNoDefault( &m_nonNetLayers, "NonNetLayers", "Non-Net Layers" ); m_nonNetLayers.uiCapability()->setUiTreeHidden( true ); setNonNetLayers( new RimNonNetLayers ); diff --git a/ApplicationLibCode/ProjectDataModel/StimPlanModel/RimStimPlanModelTemplateCollection.cpp b/ApplicationLibCode/ProjectDataModel/StimPlanModel/RimStimPlanModelTemplateCollection.cpp index b2d24160aa..97ca077151 100644 --- a/ApplicationLibCode/ProjectDataModel/StimPlanModel/RimStimPlanModelTemplateCollection.cpp +++ b/ApplicationLibCode/ProjectDataModel/StimPlanModel/RimStimPlanModelTemplateCollection.cpp @@ -46,7 +46,7 @@ RimStimPlanModelTemplateCollection::RimStimPlanModelTemplateCollection() "" ); m_stimPlanModelTemplates.uiCapability()->setUiTreeHidden( true ); - CAF_PDM_InitField( &m_nextValidId, "NextValidId", 0, "", "", "", "" ); + CAF_PDM_InitField( &m_nextValidId, "NextValidId", 0, "" ); m_nextValidId.uiCapability()->setUiHidden( true ); } diff --git a/ApplicationLibCode/ProjectDataModel/Streamlines/RimStreamline.cpp b/ApplicationLibCode/ProjectDataModel/Streamlines/RimStreamline.cpp index 0bb14ef628..03ac48398f 100644 --- a/ApplicationLibCode/ProjectDataModel/Streamlines/RimStreamline.cpp +++ b/ApplicationLibCode/ProjectDataModel/Streamlines/RimStreamline.cpp @@ -30,7 +30,7 @@ RimStreamline::RimStreamline( QString simWellName ) { CAF_PDM_InitScriptableObject( "Streamline", ":/Erase.png", "", "" ); - CAF_PDM_InitScriptableField( &m_simWellName, "Name", simWellName, "Name", "", "", "" ); + CAF_PDM_InitScriptableField( &m_simWellName, "Name", simWellName, "Name" ); m_simWellName.uiCapability()->setUiReadOnly( true ); m_simWellName.uiCapability()->setUiHidden( true ); diff --git a/ApplicationLibCode/ProjectDataModel/Streamlines/RimStreamlineInViewCollection.cpp b/ApplicationLibCode/ProjectDataModel/Streamlines/RimStreamlineInViewCollection.cpp index 90f7a1b382..ba5ed584b4 100644 --- a/ApplicationLibCode/ProjectDataModel/Streamlines/RimStreamlineInViewCollection.cpp +++ b/ApplicationLibCode/ProjectDataModel/Streamlines/RimStreamlineInViewCollection.cpp @@ -97,59 +97,59 @@ RimStreamlineInViewCollection::RimStreamlineInViewCollection() { CAF_PDM_InitObject( "Streamlines", ":/Erase.png", "", "" ); - CAF_PDM_InitFieldNoDefault( &m_legendConfig, "LegendDefinition", "Color Legend", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_legendConfig, "LegendDefinition", "Color Legend" ); m_legendConfig = new RimRegularLegendConfig(); m_legendConfig->setMappingMode( RimRegularLegendConfig::MappingType::LOG10_CONTINUOUS ); m_legendConfig.uiCapability()->setUiTreeHidden( true ); - CAF_PDM_InitFieldNoDefault( &m_collectionName, "Name", "Name", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_collectionName, "Name", "Name" ); m_collectionName = "Streamlines"; m_collectionName.uiCapability()->setUiReadOnly( true ); - CAF_PDM_InitFieldNoDefault( &m_flowThreshold, "FlowThreshold", "Flow Threshold [m/day]", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_flowThreshold, "FlowThreshold", "Flow Threshold [m/day]" ); m_flowThreshold = 0.01; - CAF_PDM_InitFieldNoDefault( &m_lengthThreshold, "LengthThreshold", "Minimum Length [m]", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_lengthThreshold, "LengthThreshold", "Minimum Length [m]" ); m_lengthThreshold = 100.0; - CAF_PDM_InitFieldNoDefault( &m_resolution, "Resolution", "Resolution [days]", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_resolution, "Resolution", "Resolution [days]" ); m_resolution = 20.0; - CAF_PDM_InitFieldNoDefault( &m_maxDays, "MaxDays", "Max Days", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_maxDays, "MaxDays", "Max Days" ); m_maxDays = 5000; - CAF_PDM_InitFieldNoDefault( &m_useProducers, "UseProducers", "Producer Wells", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_useProducers, "UseProducers", "Producer Wells" ); m_useProducers = true; - CAF_PDM_InitFieldNoDefault( &m_useInjectors, "UseInjectors", "Injector Wells", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_useInjectors, "UseInjectors", "Injector Wells" ); m_useInjectors = true; - CAF_PDM_InitFieldNoDefault( &m_phases, "Phase", "Phase", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_phases, "Phase", "Phase" ); - CAF_PDM_InitField( &m_isActive, "isActive", false, "Active", "", "", "" ); + CAF_PDM_InitField( &m_isActive, "isActive", false, "Active" ); m_isActive.uiCapability()->setUiHidden( true ); - CAF_PDM_InitFieldNoDefault( &m_visualizationMode, "VisualizationMode", "Visualization Mode", "", "", "" ); - CAF_PDM_InitFieldNoDefault( &m_colorMode, "ColorMode", "Colors", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_visualizationMode, "VisualizationMode", "Visualization Mode" ); + CAF_PDM_InitFieldNoDefault( &m_colorMode, "ColorMode", "Colors" ); - CAF_PDM_InitFieldNoDefault( &m_animationSpeed, "AnimationSpeed", "Animation Speed", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_animationSpeed, "AnimationSpeed", "Animation Speed" ); m_animationSpeed.uiCapability()->setUiEditorTypeName( caf::PdmUiSliderEditor::uiEditorTypeName() ); m_animationSpeed = 10; - CAF_PDM_InitFieldNoDefault( &m_animationIndex, "AnimationIndex", "Animation Index", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_animationIndex, "AnimationIndex", "Animation Index" ); m_animationIndex.uiCapability()->setUiEditorTypeName( caf::PdmUiSliderEditor::uiEditorTypeName() ); m_animationIndex = 0; m_maxAnimationIndex = 0; - CAF_PDM_InitFieldNoDefault( &m_scaleFactor, "ScaleFactor", "Scale Factor", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_scaleFactor, "ScaleFactor", "Scale Factor" ); m_scaleFactor.uiCapability()->setUiEditorTypeName( caf::PdmUiDoubleSliderEditor::uiEditorTypeName() ); m_scaleFactor = 100.0; - CAF_PDM_InitFieldNoDefault( &m_tracerLength, "TracerLength", "Tracer Length", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_tracerLength, "TracerLength", "Tracer Length" ); m_tracerLength.uiCapability()->setUiEditorTypeName( caf::PdmUiSliderEditor::uiEditorTypeName() ); m_tracerLength = 100; - CAF_PDM_InitFieldNoDefault( &m_streamlines, "Streamlines", "Streamlines", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_streamlines, "Streamlines", "Streamlines" ); m_streamlines.uiCapability()->setUiTreeHidden( true ); m_streamlines.xmlCapability()->disableIO(); diff --git a/ApplicationLibCode/ProjectDataModel/Summary/RimAsciiDataCurve.cpp b/ApplicationLibCode/ProjectDataModel/Summary/RimAsciiDataCurve.cpp index e54a0d5c3b..1c5e3e36a7 100644 --- a/ApplicationLibCode/ProjectDataModel/Summary/RimAsciiDataCurve.cpp +++ b/ApplicationLibCode/ProjectDataModel/Summary/RimAsciiDataCurve.cpp @@ -44,10 +44,10 @@ RimAsciiDataCurve::RimAsciiDataCurve() { CAF_PDM_InitObject( "ASCII Data Curve", ":/SummaryCurve16x16.png", "", "" ); - CAF_PDM_InitFieldNoDefault( &m_plotAxis, "PlotAxis", "Axis", "", "", "" ); - CAF_PDM_InitFieldNoDefault( &m_timeSteps, "TimeSteps", "Time Steps", "", "", "" ); - CAF_PDM_InitFieldNoDefault( &m_values, "Values", "Values", "", "", "" ); - CAF_PDM_InitFieldNoDefault( &m_title, "Title", "Title", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_plotAxis, "PlotAxis", "Axis" ); + CAF_PDM_InitFieldNoDefault( &m_timeSteps, "TimeSteps", "Time Steps" ); + CAF_PDM_InitFieldNoDefault( &m_values, "Values", "Values" ); + CAF_PDM_InitFieldNoDefault( &m_title, "Title", "Title" ); setSymbolSkipDistance( 10.0f ); setLineThickness( 2 ); diff --git a/ApplicationLibCode/ProjectDataModel/Summary/RimCsvUserData.cpp b/ApplicationLibCode/ProjectDataModel/Summary/RimCsvUserData.cpp index 3e20111ae2..56a5e2831c 100644 --- a/ApplicationLibCode/ProjectDataModel/Summary/RimCsvUserData.cpp +++ b/ApplicationLibCode/ProjectDataModel/Summary/RimCsvUserData.cpp @@ -39,7 +39,7 @@ RimCsvUserData::RimCsvUserData() CAF_PDM_InitObject( "Observed CSV Data File", ":/ObservedCSVDataFile16x16.png", "", "" ); m_summaryHeaderFilename.uiCapability()->setUiName( "File" ); - CAF_PDM_InitFieldNoDefault( &m_parseOptions, "ParseOptions", "", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_parseOptions, "ParseOptions", "" ); m_parseOptions = new RicPasteAsciiDataToSummaryPlotFeatureUi(); m_parseOptions.uiCapability()->setUiTreeChildrenHidden( true ); m_parseOptions.uiCapability()->setUiTreeHidden( true ); diff --git a/ApplicationLibCode/ProjectDataModel/Summary/RimDerivedEnsembleCaseCollection.cpp b/ApplicationLibCode/ProjectDataModel/Summary/RimDerivedEnsembleCaseCollection.cpp index bbdf392470..9612b1ab75 100644 --- a/ApplicationLibCode/ProjectDataModel/Summary/RimDerivedEnsembleCaseCollection.cpp +++ b/ApplicationLibCode/ProjectDataModel/Summary/RimDerivedEnsembleCaseCollection.cpp @@ -58,28 +58,28 @@ RimDerivedEnsembleCaseCollection::RimDerivedEnsembleCaseCollection() { CAF_PDM_InitObject( "Delta Ensemble", ":/SummaryEnsemble.svg", "", "" ); - CAF_PDM_InitFieldNoDefault( &m_ensemble1, "Ensemble1", "Ensemble 1", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_ensemble1, "Ensemble1", "Ensemble 1" ); m_ensemble1.uiCapability()->setUiTreeChildrenHidden( true ); m_ensemble1.uiCapability()->setAutoAddingOptionFromValue( false ); - CAF_PDM_InitFieldNoDefault( &m_ensemble2, "Ensemble2", "Ensemble 2", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_ensemble2, "Ensemble2", "Ensemble 2" ); m_ensemble1.uiCapability()->setUiTreeChildrenHidden( true ); m_ensemble2.uiCapability()->setAutoAddingOptionFromValue( false ); - CAF_PDM_InitFieldNoDefault( &m_operator, "Operator", "Operator", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_operator, "Operator", "Operator" ); - CAF_PDM_InitField( &m_swapEnsemblesButton, "SwapEnsembles", false, "SwapEnsembles", "", "", "" ); + CAF_PDM_InitField( &m_swapEnsemblesButton, "SwapEnsembles", false, "SwapEnsembles" ); m_swapEnsemblesButton.uiCapability()->setUiEditorTypeName( caf::PdmUiPushButtonEditor::uiEditorTypeName() ); m_swapEnsemblesButton.uiCapability()->setUiLabelPosition( caf::PdmUiItemInfo::HIDDEN ); m_swapEnsemblesButton.xmlCapability()->disableIO(); - CAF_PDM_InitField( &m_caseCount, "CaseCount", QString( "" ), "Matching Cases", "", "", "" ); + CAF_PDM_InitField( &m_caseCount, "CaseCount", QString( "" ), "Matching Cases" ); m_caseCount.uiCapability()->setUiReadOnly( true ); - CAF_PDM_InitField( &m_matchOnParameters, "MatchOnParameters", false, "Match On Parameters", "", "", "" ); + CAF_PDM_InitField( &m_matchOnParameters, "MatchOnParameters", false, "Match On Parameters" ); - CAF_PDM_InitFieldNoDefault( &m_useFixedTimeStep, "UseFixedTimeStep", "Use Fixed Time Step", "", "", "" ); - CAF_PDM_InitField( &m_fixedTimeStepIndex, "FixedTimeStepIndex", 0, "Time Step", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_useFixedTimeStep, "UseFixedTimeStep", "Use Fixed Time Step" ); + CAF_PDM_InitField( &m_fixedTimeStepIndex, "FixedTimeStepIndex", 0, "Time Step" ); m_fixedTimeStepIndex.uiCapability()->setUiEditorTypeName( caf::PdmUiTreeSelectionEditor::uiEditorTypeName() ); m_fixedTimeStepIndex.uiCapability()->setUiLabelPosition( caf::PdmUiItemInfo::HIDDEN ); diff --git a/ApplicationLibCode/ProjectDataModel/Summary/RimDerivedSummaryCase.cpp b/ApplicationLibCode/ProjectDataModel/Summary/RimDerivedSummaryCase.cpp index e64cab9f84..9594e74a6b 100644 --- a/ApplicationLibCode/ProjectDataModel/Summary/RimDerivedSummaryCase.cpp +++ b/ApplicationLibCode/ProjectDataModel/Summary/RimDerivedSummaryCase.cpp @@ -63,15 +63,15 @@ RimDerivedSummaryCase::RimDerivedSummaryCase() , m_summaryCase2( nullptr ) { CAF_PDM_InitObject( "Summary Case", ":/SummaryCase.svg", "", "" ); - CAF_PDM_InitFieldNoDefault( &m_summaryCase1, "SummaryCase1", "Summary Case 1", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_summaryCase1, "SummaryCase1", "Summary Case 1" ); - CAF_PDM_InitFieldNoDefault( &m_operator, "Operator", "Operator", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_operator, "Operator", "Operator" ); - CAF_PDM_InitFieldNoDefault( &m_summaryCase2, "SummaryCase2", "Summary Case 2", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_summaryCase2, "SummaryCase2", "Summary Case 2" ); - CAF_PDM_InitFieldNoDefault( &m_useFixedTimeStep, "UseFixedTimeStep", "Use Fixed Time Step", "", "", "" ); - CAF_PDM_InitField( &m_fixedTimeStepIndex, "FixedTimeStepIndex", 0, "Time Step", "", "", "" ); - CAF_PDM_InitField( &m_inUse, "InUse", false, "In Use", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_useFixedTimeStep, "UseFixedTimeStep", "Use Fixed Time Step" ); + CAF_PDM_InitField( &m_fixedTimeStepIndex, "FixedTimeStepIndex", 0, "Time Step" ); + CAF_PDM_InitField( &m_inUse, "InUse", false, "In Use" ); m_fixedTimeStepIndex.uiCapability()->setUiEditorTypeName( caf::PdmUiTreeSelectionEditor::uiEditorTypeName() ); m_fixedTimeStepIndex.uiCapability()->setUiLabelPosition( caf::PdmUiItemInfo::HIDDEN ); } diff --git a/ApplicationLibCode/ProjectDataModel/Summary/RimEnsembleCurveFilter.cpp b/ApplicationLibCode/ProjectDataModel/Summary/RimEnsembleCurveFilter.cpp index 629eae46db..08344993cc 100644 --- a/ApplicationLibCode/ProjectDataModel/Summary/RimEnsembleCurveFilter.cpp +++ b/ApplicationLibCode/ProjectDataModel/Summary/RimEnsembleCurveFilter.cpp @@ -68,52 +68,47 @@ RimEnsembleCurveFilter::RimEnsembleCurveFilter() { CAF_PDM_InitObject( "Ensemble Curve Filter", ":/Filter.svg", "", "" ); - CAF_PDM_InitFieldNoDefault( &m_filterTitle, "FilterTitle", "Title", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_filterTitle, "FilterTitle", "Title" ); m_filterTitle.registerGetMethod( this, &RimEnsembleCurveFilter::description ); m_filterTitle.uiCapability()->setUiReadOnly( true ); - CAF_PDM_InitFieldNoDefault( &m_active, "Active", "Active", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_active, "Active", "Active" ); m_active = true; - CAF_PDM_InitFieldNoDefault( &m_filterMode, "FilterMode", "Filter Mode", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_filterMode, "FilterMode", "Filter Mode" ); - CAF_PDM_InitFieldNoDefault( &m_ensembleParameterName, "EnsembleParameter", "Ensemble Parameter", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_ensembleParameterName, "EnsembleParameter", "Ensemble Parameter" ); m_ensembleParameterName.uiCapability()->setUiEditorTypeName( caf::PdmUiListEditor::uiEditorTypeName() ); - CAF_PDM_InitFieldNoDefault( &m_objectiveValuesSummaryAddressesUiField, "SelectedObjectiveSummaryVar", "Vector", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_objectiveValuesSummaryAddressesUiField, "SelectedObjectiveSummaryVar", "Vector" ); m_objectiveValuesSummaryAddressesUiField.xmlCapability()->disableIO(); m_objectiveValuesSummaryAddressesUiField.uiCapability()->setUiEditorTypeName( caf::PdmUiLineEditor::uiEditorTypeName() ); - CAF_PDM_InitFieldNoDefault( &m_objectiveValuesSummaryAddresses, "ObjectiveSummaryAddress", "Summary Address", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_objectiveValuesSummaryAddresses, "ObjectiveSummaryAddress", "Summary Address" ); m_objectiveValuesSummaryAddresses.uiCapability()->setUiTreeHidden( true ); m_objectiveValuesSummaryAddresses.uiCapability()->setUiTreeChildrenHidden( true ); - CAF_PDM_InitFieldNoDefault( &m_objectiveValuesSelectSummaryAddressPushButton, - "SelectObjectiveSummaryAddress", - "", - "", - "", - "" ); + CAF_PDM_InitFieldNoDefault( &m_objectiveValuesSelectSummaryAddressPushButton, "SelectObjectiveSummaryAddress", "" ); caf::PdmUiPushButtonEditor::configureEditorForField( &m_objectiveValuesSelectSummaryAddressPushButton ); m_objectiveValuesSelectSummaryAddressPushButton.uiCapability()->setUiLabelPosition( caf::PdmUiItemInfo::HIDDEN ); m_objectiveValuesSelectSummaryAddressPushButton = false; - CAF_PDM_InitFieldNoDefault( &m_objectiveFunction, "ObjectiveFunction", "Objective Function", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_objectiveFunction, "ObjectiveFunction", "Objective Function" ); m_objectiveFunction = new RimObjectiveFunction(); m_objectiveFunction.uiCapability()->setUiTreeHidden( true ); m_objectiveFunction.uiCapability()->setUiTreeChildrenHidden( true ); m_objectiveFunction->changed.connect( this, &RimEnsembleCurveFilter::onObjectionFunctionChanged ); - CAF_PDM_InitFieldNoDefault( &m_customObjectiveFunction, "CustomObjectiveFunction", "Custom Objective Function", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_customObjectiveFunction, "CustomObjectiveFunction", "Custom Objective Function" ); m_customObjectiveFunction.uiCapability()->setUiEditorTypeName( caf::PdmUiListEditor::uiEditorTypeName() ); - CAF_PDM_InitField( &m_minValue, "MinValue", m_lowerLimit, "Min", "", "", "" ); + CAF_PDM_InitField( &m_minValue, "MinValue", m_lowerLimit, "Min" ); m_minValue.uiCapability()->setUiEditorTypeName( caf::PdmUiDoubleSliderEditor::uiEditorTypeName() ); - CAF_PDM_InitField( &m_maxValue, "MaxValue", m_upperLimit, "Max", "", "", "" ); + CAF_PDM_InitField( &m_maxValue, "MaxValue", m_upperLimit, "Max" ); m_maxValue.uiCapability()->setUiEditorTypeName( caf::PdmUiDoubleSliderEditor::uiEditorTypeName() ); - CAF_PDM_InitFieldNoDefault( &m_categories, "Categories", "Categories", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_categories, "Categories", "Categories" ); setDeletable( true ); } diff --git a/ApplicationLibCode/ProjectDataModel/Summary/RimEnsembleCurveFilterCollection.cpp b/ApplicationLibCode/ProjectDataModel/Summary/RimEnsembleCurveFilterCollection.cpp index 4fe1d65411..f508796dfe 100644 --- a/ApplicationLibCode/ProjectDataModel/Summary/RimEnsembleCurveFilterCollection.cpp +++ b/ApplicationLibCode/ProjectDataModel/Summary/RimEnsembleCurveFilterCollection.cpp @@ -39,14 +39,14 @@ RimEnsembleCurveFilterCollection::RimEnsembleCurveFilterCollection() { CAF_PDM_InitObject( "Curve Filters", ":/FilterCollection.svg", "", "" ); - CAF_PDM_InitField( &m_active, "Active", true, "Active", "", "", "" ); + CAF_PDM_InitField( &m_active, "Active", true, "Active" ); - CAF_PDM_InitFieldNoDefault( &m_filters, "CurveFilters", "", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_filters, "CurveFilters", "" ); m_filters.uiCapability()->setUiTreeChildrenHidden( true ); // m_filters.uiCapability()->setUiEditorTypeName(caf::PdmUiTableViewEditor::uiEditorTypeName()); m_filters.uiCapability()->setUiLabelPosition( caf::PdmUiItemInfo::HIDDEN ); - CAF_PDM_InitFieldNoDefault( &m_newFilterButton, "NewEnsembleFilter", "New Filter", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_newFilterButton, "NewEnsembleFilter", "New Filter" ); m_newFilterButton = false; m_newFilterButton.uiCapability()->setUiEditorTypeName( caf::PdmUiPushButtonEditor::uiEditorTypeName() ); m_newFilterButton.uiCapability()->setUiLabelPosition( caf::PdmUiItemInfo::HIDDEN ); diff --git a/ApplicationLibCode/ProjectDataModel/Summary/RimEnsembleCurveSet.cpp b/ApplicationLibCode/ProjectDataModel/Summary/RimEnsembleCurveSet.cpp index 0b7d7573e8..308dcdc0dc 100644 --- a/ApplicationLibCode/ProjectDataModel/Summary/RimEnsembleCurveSet.cpp +++ b/ApplicationLibCode/ProjectDataModel/Summary/RimEnsembleCurveSet.cpp @@ -100,122 +100,112 @@ RimEnsembleCurveSet::RimEnsembleCurveSet() { CAF_PDM_InitObject( "Ensemble Curve Set", ":/EnsembleCurveSet16x16.png", "", "" ); - CAF_PDM_InitFieldNoDefault( &m_curves, "EnsembleCurveSet", "Ensemble Curve Set", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_curves, "EnsembleCurveSet", "Ensemble Curve Set" ); m_curves.uiCapability()->setUiTreeHidden( true ); m_curves.uiCapability()->setUiTreeChildrenHidden( false ); - CAF_PDM_InitField( &m_showCurves, "IsActive", true, "Show Curves", "", "", "" ); + CAF_PDM_InitField( &m_showCurves, "IsActive", true, "Show Curves" ); m_showCurves.uiCapability()->setUiHidden( true ); // Y Values - CAF_PDM_InitFieldNoDefault( &m_yValuesSummaryCaseCollection, "SummaryGroup", "Ensemble", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_yValuesSummaryCaseCollection, "SummaryGroup", "Ensemble" ); m_yValuesSummaryCaseCollection.uiCapability()->setUiTreeChildrenHidden( true ); m_yValuesSummaryCaseCollection.uiCapability()->setAutoAddingOptionFromValue( false ); - CAF_PDM_InitFieldNoDefault( &m_yValuesSummaryAddressUiField, "SelectedVariableDisplayVar", "Vector", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_yValuesSummaryAddressUiField, "SelectedVariableDisplayVar", "Vector" ); m_yValuesSummaryAddressUiField.xmlCapability()->disableIO(); m_yValuesSummaryAddressUiField.uiCapability()->setUiEditorTypeName( caf::PdmUiLineEditor::uiEditorTypeName() ); - CAF_PDM_InitFieldNoDefault( &m_yValuesSummaryAddress, "SummaryAddress", "Summary Address", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_yValuesSummaryAddress, "SummaryAddress", "Summary Address" ); m_yValuesSummaryAddress.uiCapability()->setUiTreeHidden( true ); m_yValuesSummaryAddress.uiCapability()->setUiTreeChildrenHidden( true ); m_yValuesSummaryAddress = new RimSummaryAddress; - CAF_PDM_InitFieldNoDefault( &m_yPushButtonSelectSummaryAddress, "SelectAddress", "", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_yPushButtonSelectSummaryAddress, "SelectAddress", "" ); caf::PdmUiPushButtonEditor::configureEditorForField( &m_yPushButtonSelectSummaryAddress ); m_yPushButtonSelectSummaryAddress.uiCapability()->setUiLabelPosition( caf::PdmUiItemInfo::HIDDEN ); m_yPushButtonSelectSummaryAddress = false; - CAF_PDM_InitFieldNoDefault( &m_resampling, "Resampling", "Resampling", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_resampling, "Resampling", "Resampling" ); - CAF_PDM_InitField( &m_colorMode, "ColorMode", caf::AppEnum( ColorMode::SINGLE_COLOR ), "Coloring Mode", "", "", "" ); + CAF_PDM_InitField( &m_colorMode, "ColorMode", caf::AppEnum( ColorMode::SINGLE_COLOR ), "Coloring Mode" ); - CAF_PDM_InitField( &m_color, "Color", RiaColorTools::textColor3f(), "Color", "", "", "" ); + CAF_PDM_InitField( &m_color, "Color", RiaColorTools::textColor3f(), "Color" ); - CAF_PDM_InitField( &m_ensembleParameter, "EnsembleParameter", QString( "" ), "Ensemble Parameter", "", "", "" ); + CAF_PDM_InitField( &m_ensembleParameter, "EnsembleParameter", QString( "" ), "Ensemble Parameter" ); m_ensembleParameter.uiCapability()->setUiEditorTypeName( caf::PdmUiListEditor::uiEditorTypeName() ); - CAF_PDM_InitFieldNoDefault( &m_objectiveValuesSummaryAddressesUiField, "SelectedObjectiveSummaryVar", "Vector", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_objectiveValuesSummaryAddressesUiField, "SelectedObjectiveSummaryVar", "Vector" ); m_objectiveValuesSummaryAddressesUiField.xmlCapability()->disableIO(); m_objectiveValuesSummaryAddressesUiField.uiCapability()->setUiEditorTypeName( caf::PdmUiLineEditor::uiEditorTypeName() ); - CAF_PDM_InitFieldNoDefault( &m_objectiveValuesSummaryAddresses, "ObjectiveSummaryAddress", "Summary Address", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_objectiveValuesSummaryAddresses, "ObjectiveSummaryAddress", "Summary Address" ); m_objectiveValuesSummaryAddresses.uiCapability()->setUiTreeHidden( true ); m_objectiveValuesSummaryAddresses.uiCapability()->setUiTreeChildrenHidden( true ); - CAF_PDM_InitFieldNoDefault( &m_objectiveValuesSelectSummaryAddressPushButton, - "SelectObjectiveSummaryAddress", - "", - "", - "", - "" ); + CAF_PDM_InitFieldNoDefault( &m_objectiveValuesSelectSummaryAddressPushButton, "SelectObjectiveSummaryAddress", "" ); caf::PdmUiPushButtonEditor::configureEditorForField( &m_objectiveValuesSelectSummaryAddressPushButton ); m_objectiveValuesSelectSummaryAddressPushButton.uiCapability()->setUiLabelPosition( caf::PdmUiItemInfo::HIDDEN ); m_objectiveValuesSelectSummaryAddressPushButton = false; - CAF_PDM_InitFieldNoDefault( &m_customObjectiveFunction, "CustomObjectiveFunction", "Objective Function", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_customObjectiveFunction, "CustomObjectiveFunction", "Objective Function" ); m_customObjectiveFunction.uiCapability()->setUiEditorTypeName( caf::PdmUiListEditor::uiEditorTypeName() ); - CAF_PDM_InitField( &m_showObjectiveFunctionFormula, "ShowObjectiveFunctionFormula", true, "Show Text Box in Plot", "", "", "" ); + CAF_PDM_InitField( &m_showObjectiveFunctionFormula, "ShowObjectiveFunctionFormula", true, "Show Text Box in Plot" ); - CAF_PDM_InitFieldNoDefault( &m_minDateRange, "MinDateRange", "From", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_minDateRange, "MinDateRange", "From" ); m_minDateRange.uiCapability()->setUiEditorTypeName( caf::PdmUiDateEditor::uiEditorTypeName() ); - CAF_PDM_InitFieldNoDefault( &m_minTimeStep, "MinTimeStep", "", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_minTimeStep, "MinTimeStep", "" ); m_minTimeStep.uiCapability()->setUiEditorTypeName( caf::PdmUiSliderEditor::uiEditorTypeName() ); - CAF_PDM_InitFieldNoDefault( &m_maxDateRange, "MaxDateRange", "To", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_maxDateRange, "MaxDateRange", "To" ); m_maxDateRange.uiCapability()->setUiEditorTypeName( caf::PdmUiDateEditor::uiEditorTypeName() ); - CAF_PDM_InitFieldNoDefault( &m_maxTimeStep, "MaxTimeStep", "", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_maxTimeStep, "MaxTimeStep", "" ); m_maxTimeStep.uiCapability()->setUiEditorTypeName( caf::PdmUiSliderEditor::uiEditorTypeName() ); // Time Step Selection - CAF_PDM_InitFieldNoDefault( &m_timeStepFilter, "TimeStepFilter", "Available Time Steps", "", "", "" ); - CAF_PDM_InitFieldNoDefault( &m_selectedTimeSteps, "TimeSteps", "Select Time Steps", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_timeStepFilter, "TimeStepFilter", "Available Time Steps" ); + CAF_PDM_InitFieldNoDefault( &m_selectedTimeSteps, "TimeSteps", "Select Time Steps" ); m_selectedTimeSteps.uiCapability()->setUiEditorTypeName( caf::PdmUiTreeSelectionEditor::uiEditorTypeName() ); m_selectedTimeSteps.uiCapability()->setUiLabelPosition( caf::PdmUiItemInfo::TOP ); - CAF_PDM_InitFieldNoDefault( &m_plotAxis, "PlotAxis", "Axis", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_plotAxis, "PlotAxis", "Axis" ); - CAF_PDM_InitFieldNoDefault( &m_legendConfig, "LegendConfig", "", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_legendConfig, "LegendConfig", "" ); m_legendConfig = new RimRegularLegendConfig(); m_legendConfig->setColorLegend( RimRegularLegendConfig::mapToColorLegend( RimEnsembleCurveSetColorManager::DEFAULT_ENSEMBLE_COLOR_RANGE ) ); - CAF_PDM_InitFieldNoDefault( &m_curveFilters, "CurveFilters", "Curve Filters", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_curveFilters, "CurveFilters", "Curve Filters" ); m_curveFilters = new RimEnsembleCurveFilterCollection(); m_curveFilters->setUiTreeHidden( true ); m_curveFilters->uiCapability()->setUiTreeHidden( true ); - CAF_PDM_InitFieldNoDefault( &m_customObjectiveFunctions, - "CustomObjectiveFunctions", - "Custom Objective Functions", - "", - "", - "" ); + CAF_PDM_InitFieldNoDefault( &m_customObjectiveFunctions, "CustomObjectiveFunctions", "Custom Objective Functions" ); m_customObjectiveFunctions = new RimCustomObjectiveFunctionCollection(); m_customObjectiveFunctions->objectiveFunctionChanged.connect( this, &RimEnsembleCurveSet::onCustomObjectiveFunctionChanged ); - CAF_PDM_InitFieldNoDefault( &m_objectiveFunction, "ObjectiveFunction", "Objective Function", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_objectiveFunction, "ObjectiveFunction", "Objective Function" ); m_objectiveFunction = new RimObjectiveFunction(); m_objectiveFunction.uiCapability()->setUiTreeHidden( true ); m_objectiveFunction->changed.connect( this, &RimEnsembleCurveSet::onObjectiveFunctionChanged ); - CAF_PDM_InitFieldNoDefault( &m_statistics, "Statistics", "Statistics", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_statistics, "Statistics", "Statistics" ); m_statistics = new RimEnsembleStatistics( this ); m_statistics.uiCapability()->setUiTreeHidden( true ); - CAF_PDM_InitField( &m_userDefinedName, "UserDefinedName", QString( "Ensemble Curve Set" ), "Curve Set Name", "", "", "" ); + CAF_PDM_InitField( &m_userDefinedName, "UserDefinedName", QString( "Ensemble Curve Set" ), "Curve Set Name" ); - CAF_PDM_InitFieldNoDefault( &m_autoGeneratedName, "AutoGeneratedName", "Curve Set Name", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_autoGeneratedName, "AutoGeneratedName", "Curve Set Name" ); m_autoGeneratedName.registerGetMethod( this, &RimEnsembleCurveSet::createAutoName ); m_autoGeneratedName.uiCapability()->setUiReadOnly( true ); m_autoGeneratedName.xmlCapability()->disableIO(); - CAF_PDM_InitField( &m_isUsingAutoName, "AutoName", true, "Auto Name", "", "", "" ); - CAF_PDM_InitFieldNoDefault( &m_summaryAddressNameTools, "SummaryAddressNameTools", "SummaryAddressNameTools", "", "", "" ); + CAF_PDM_InitField( &m_isUsingAutoName, "AutoName", true, "Auto Name" ); + CAF_PDM_InitFieldNoDefault( &m_summaryAddressNameTools, "SummaryAddressNameTools", "SummaryAddressNameTools" ); m_summaryAddressNameTools.uiCapability()->setUiTreeHidden( true ); m_summaryAddressNameTools.uiCapability()->setUiTreeChildrenHidden( true ); @@ -233,7 +223,7 @@ RimEnsembleCurveSet::RimEnsembleCurveSet() // Obsolete fields - CAF_PDM_InitFieldNoDefault( &m_yValuesSummaryFilter_OBSOLETE, "VarListFilter", "Filter", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_yValuesSummaryFilter_OBSOLETE, "VarListFilter", "Filter" ); m_yValuesSummaryFilter_OBSOLETE.uiCapability()->setUiTreeChildrenHidden( true ); m_yValuesSummaryFilter_OBSOLETE.uiCapability()->setUiTreeHidden( true ); m_yValuesSummaryFilter_OBSOLETE.xmlCapability()->setIOWritable( false ); diff --git a/ApplicationLibCode/ProjectDataModel/Summary/RimEnsembleCurveSetCollection.cpp b/ApplicationLibCode/ProjectDataModel/Summary/RimEnsembleCurveSetCollection.cpp index c192a531d9..6846f86b72 100644 --- a/ApplicationLibCode/ProjectDataModel/Summary/RimEnsembleCurveSetCollection.cpp +++ b/ApplicationLibCode/ProjectDataModel/Summary/RimEnsembleCurveSetCollection.cpp @@ -42,14 +42,14 @@ RimEnsembleCurveSetCollection::RimEnsembleCurveSetCollection() { CAF_PDM_InitObject( "Ensemble Curve Sets", ":/EnsembleCurveSets16x16.png", "", "" ); - CAF_PDM_InitFieldNoDefault( &m_curveSets, "EnsembleCurveSets", "Ensemble Curve Sets", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_curveSets, "EnsembleCurveSets", "Ensemble Curve Sets" ); m_curveSets.uiCapability()->setUiTreeHidden( true ); m_curveSets.uiCapability()->setUiTreeChildrenHidden( false ); - CAF_PDM_InitField( &m_showCurves, "IsActive", true, "Show Curves", "", "", "" ); + CAF_PDM_InitField( &m_showCurves, "IsActive", true, "Show Curves" ); m_showCurves.uiCapability()->setUiHidden( true ); - CAF_PDM_InitFieldNoDefault( &m_ySourceStepping, "YSourceStepping", "", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_ySourceStepping, "YSourceStepping", "" ); m_ySourceStepping = new RimSummaryPlotSourceStepping; m_ySourceStepping->setSourceSteppingType( RimSummaryPlotSourceStepping::Y_AXIS ); m_ySourceStepping.uiCapability()->setUiTreeHidden( true ); diff --git a/ApplicationLibCode/ProjectDataModel/Summary/RimEnsembleStatistics.cpp b/ApplicationLibCode/ProjectDataModel/Summary/RimEnsembleStatistics.cpp index 76b04bc47b..785fa1631d 100644 --- a/ApplicationLibCode/ProjectDataModel/Summary/RimEnsembleStatistics.cpp +++ b/ApplicationLibCode/ProjectDataModel/Summary/RimEnsembleStatistics.cpp @@ -34,19 +34,19 @@ RimEnsembleStatistics::RimEnsembleStatistics( RimEnsembleCurveSetInterface* pare m_parentCurveSet = parentCurveSet; - CAF_PDM_InitField( &m_active, "Active", true, "Show Statistics Curves", "", "", "" ); - CAF_PDM_InitField( &m_hideEnsembleCurves, "HideEnsembleCurves", false, "Hide Ensemble Curves", "", "", "" ); - CAF_PDM_InitField( &m_basedOnFilteredCases, "BasedOnFilteredCases", false, "Based on Filtered Cases", "", "", "" ); - CAF_PDM_InitField( &m_showP10Curve, "ShowP10Curve", true, "P10", "", "", "" ); - CAF_PDM_InitField( &m_showP50Curve, "ShowP50Curve", false, "P50", "", "", "" ); - CAF_PDM_InitField( &m_showP90Curve, "ShowP90Curve", true, "P90", "", "", "" ); - CAF_PDM_InitField( &m_showMeanCurve, "ShowMeanCurve", true, "Mean", "", "", "" ); - CAF_PDM_InitField( &m_showCurveLabels, "ShowCurveLabels", true, "Show Curve Labels", "", "", "" ); - CAF_PDM_InitField( &m_includeIncompleteCurves, "IncludeIncompleteCurves", false, "Include Incomplete Curves", "", "", "" ); + CAF_PDM_InitField( &m_active, "Active", true, "Show Statistics Curves" ); + CAF_PDM_InitField( &m_hideEnsembleCurves, "HideEnsembleCurves", false, "Hide Ensemble Curves" ); + CAF_PDM_InitField( &m_basedOnFilteredCases, "BasedOnFilteredCases", false, "Based on Filtered Cases" ); + CAF_PDM_InitField( &m_showP10Curve, "ShowP10Curve", true, "P10" ); + CAF_PDM_InitField( &m_showP50Curve, "ShowP50Curve", false, "P50" ); + CAF_PDM_InitField( &m_showP90Curve, "ShowP90Curve", true, "P90" ); + CAF_PDM_InitField( &m_showMeanCurve, "ShowMeanCurve", true, "Mean" ); + CAF_PDM_InitField( &m_showCurveLabels, "ShowCurveLabels", true, "Show Curve Labels" ); + CAF_PDM_InitField( &m_includeIncompleteCurves, "IncludeIncompleteCurves", false, "Include Incomplete Curves" ); - CAF_PDM_InitField( &m_warningLabel, "WarningLabel", QString( "Warning: Ensemble time range mismatch" ), "", "", "", "" ); + CAF_PDM_InitField( &m_warningLabel, "WarningLabel", QString( "Warning: Ensemble time range mismatch" ), "" ); - CAF_PDM_InitField( &m_color, "Color", RiaColorTools::textColor3f(), "Color", "", "", "" ); + CAF_PDM_InitField( &m_color, "Color", RiaColorTools::textColor3f(), "Color" ); m_warningLabel.xmlCapability()->disableIO(); m_warningLabel.uiCapability()->setUiLabelPosition( caf::PdmUiItemInfo::HIDDEN ); diff --git a/ApplicationLibCode/ProjectDataModel/Summary/RimFileSummaryCase.cpp b/ApplicationLibCode/ProjectDataModel/Summary/RimFileSummaryCase.cpp index 04dcec64d0..4644b9fab3 100644 --- a/ApplicationLibCode/ProjectDataModel/Summary/RimFileSummaryCase.cpp +++ b/ApplicationLibCode/ProjectDataModel/Summary/RimFileSummaryCase.cpp @@ -47,7 +47,7 @@ CAF_PDM_SOURCE_INIT( RimFileSummaryCase, "FileSummaryCase" ); RimFileSummaryCase::RimFileSummaryCase() { CAF_PDM_InitScriptableObject( "File Summary Case ", ":/SummaryCases16x16.png", "", "A Summary Case based on SMSPEC files" ); - CAF_PDM_InitScriptableField( &m_includeRestartFiles, "IncludeRestartFiles", false, "Include Restart Files", "", "", "" ); + CAF_PDM_InitScriptableField( &m_includeRestartFiles, "IncludeRestartFiles", false, "Include Restart Files" ); m_includeRestartFiles.uiCapability()->setUiHidden( true ); } diff --git a/ApplicationLibCode/ProjectDataModel/Summary/RimGridSummaryCase.cpp b/ApplicationLibCode/ProjectDataModel/Summary/RimGridSummaryCase.cpp index 8b2adcbee9..df309c42f4 100644 --- a/ApplicationLibCode/ProjectDataModel/Summary/RimGridSummaryCase.cpp +++ b/ApplicationLibCode/ProjectDataModel/Summary/RimGridSummaryCase.cpp @@ -47,18 +47,18 @@ RimGridSummaryCase::RimGridSummaryCase() ":/SummaryCases16x16.png", "", "A Summary Case based on extracting grid data." ); - CAF_PDM_InitFieldNoDefault( &m_eclipseCase, "Associated3DCase", "Eclipse Case", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_eclipseCase, "Associated3DCase", "Eclipse Case" ); m_eclipseCase.uiCapability()->setUiHidden( true ); - CAF_PDM_InitFieldNoDefault( &m_cachedCaseName, "CachedCasename", "Case Name", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_cachedCaseName, "CachedCasename", "Case Name" ); m_cachedCaseName.uiCapability()->setUiHidden( true ); - CAF_PDM_InitFieldNoDefault( &m_eclipseGridFileName, "Associated3DCaseGridFileName", "Grid File Name", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_eclipseGridFileName, "Associated3DCaseGridFileName", "Grid File Name" ); m_eclipseGridFileName.registerGetMethod( this, &RimGridSummaryCase::eclipseGridFileName ); m_eclipseGridFileName.uiCapability()->setUiReadOnly( true ); m_eclipseGridFileName.xmlCapability()->setIOWritable( false ); - CAF_PDM_InitField( &m_includeRestartFiles, "IncludeRestartFiles", false, "Include Restart Files", "", "", "" ); + CAF_PDM_InitField( &m_includeRestartFiles, "IncludeRestartFiles", false, "Include Restart Files" ); m_includeRestartFiles.uiCapability()->setUiHidden( true ); } diff --git a/ApplicationLibCode/ProjectDataModel/Summary/RimObjectiveFunction.cpp b/ApplicationLibCode/ProjectDataModel/Summary/RimObjectiveFunction.cpp index 869157c923..a73998edb2 100644 --- a/ApplicationLibCode/ProjectDataModel/Summary/RimObjectiveFunction.cpp +++ b/ApplicationLibCode/ProjectDataModel/Summary/RimObjectiveFunction.cpp @@ -53,9 +53,9 @@ RimObjectiveFunction::RimObjectiveFunction() : changed( this ) { - CAF_PDM_InitObject( "Objective Function", "", "", "" ); + CAF_PDM_InitObject( "Objective Function" ); - CAF_PDM_InitFieldNoDefault( &m_functionType, "FunctionType", "Function Type", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_functionType, "FunctionType", "Function Type" ); CAF_PDM_InitField( &m_normalizeByNumberOfObservations, "NormalizeByNumberOfObservations", @@ -73,9 +73,9 @@ RimObjectiveFunction::RimObjectiveFunction() "", "" ); - CAF_PDM_InitField( &m_errorEstimatePercentage, "ErrorEstimatePercentage", 100.0, "Error Estimate [0..100 %]", "", "", "" ); + CAF_PDM_InitField( &m_errorEstimatePercentage, "ErrorEstimatePercentage", 100.0, "Error Estimate [0..100 %]" ); - CAF_PDM_InitField( &m_useSquaredError, "UseSquaredError", true, "Use Squared Error Term", "", "", "" ); + CAF_PDM_InitField( &m_useSquaredError, "UseSquaredError", true, "Use Squared Error Term" ); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/ProjectDataModel/Summary/RimObservedSummaryData.cpp b/ApplicationLibCode/ProjectDataModel/Summary/RimObservedSummaryData.cpp index bd402becd1..72b0f7f88e 100644 --- a/ApplicationLibCode/ProjectDataModel/Summary/RimObservedSummaryData.cpp +++ b/ApplicationLibCode/ProjectDataModel/Summary/RimObservedSummaryData.cpp @@ -34,12 +34,12 @@ RimObservedSummaryData::RimObservedSummaryData() { m_isObservedData = true; - CAF_PDM_InitFieldNoDefault( &m_importedSummaryData, "ImportedSummaryData", "Imported Summary Data", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_importedSummaryData, "ImportedSummaryData", "Imported Summary Data" ); m_importedSummaryData.uiCapability()->setUiEditorTypeName( caf::PdmUiTextEditor::uiEditorTypeName() ); m_importedSummaryData.uiCapability()->setUiReadOnly( true ); m_importedSummaryData.xmlCapability()->disableIO(); - CAF_PDM_InitField( &m_useCustomIdentifier, "UseCustomIdentifier", false, "Use Custom Identifier", "", "", "" ); + CAF_PDM_InitField( &m_useCustomIdentifier, "UseCustomIdentifier", false, "Use Custom Identifier" ); m_useCustomIdentifier.uiCapability()->setUiHidden( true ); CAF_PDM_InitField( &m_summaryCategory, "SummaryType", @@ -49,7 +49,7 @@ RimObservedSummaryData::RimObservedSummaryData() "", "" ); m_summaryCategory.uiCapability()->setUiHidden( true ); - CAF_PDM_InitFieldNoDefault( &m_identifierName, "IdentifierName", "Identifier Name", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_identifierName, "IdentifierName", "Identifier Name" ); m_identifierName.uiCapability()->setUiHidden( true ); } diff --git a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryAddress.cpp b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryAddress.cpp index 4fd02de976..cea2e0e94a 100644 --- a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryAddress.cpp +++ b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryAddress.cpp @@ -58,20 +58,20 @@ CAF_PDM_SOURCE_INIT( RimSummaryAddress, "SummaryAddress" ); //-------------------------------------------------------------------------------------------------- RimSummaryAddress::RimSummaryAddress() { - CAF_PDM_InitFieldNoDefault( &m_category, "SummaryVarType", "Type", "", "", "" ); - CAF_PDM_InitFieldNoDefault( &m_quantityName, "SummaryQuantityName", "Quantity", "", "", "" ); - CAF_PDM_InitFieldNoDefault( &m_regionNumber, "SummaryRegion", "Region", "", "", "" ); - CAF_PDM_InitFieldNoDefault( &m_regionNumber2, "SummaryRegion2", "Region2", "", "", "" ); - CAF_PDM_InitFieldNoDefault( &m_wellGroupName, "SummaryWellGroup", "Group", "", "", "" ); - CAF_PDM_InitFieldNoDefault( &m_wellName, "SummaryWell", "Well", "", "", "" ); - CAF_PDM_InitFieldNoDefault( &m_wellSegmentNumber, "SummaryWellSegment", "Well Segment", "", "", "" ); - CAF_PDM_InitFieldNoDefault( &m_lgrName, "SummaryLgr", "Grid", "", "", "" ); - CAF_PDM_InitFieldNoDefault( &m_cellI, "SummaryCellI", "I", "", "", "" ); - CAF_PDM_InitFieldNoDefault( &m_cellJ, "SummaryCellJ", "J", "", "", "" ); - CAF_PDM_InitFieldNoDefault( &m_cellK, "SummaryCellK", "K", "", "", "" ); - CAF_PDM_InitFieldNoDefault( &m_aquiferNumber, "SummaryAquifer", "Aquifer", "", "", "" ); - CAF_PDM_InitFieldNoDefault( &m_isErrorResult, "IsErrorResult", "Is Error Result", "", "", "" ); - CAF_PDM_InitFieldNoDefault( &m_calculationId, "CalculationId", "Calculation Id", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_category, "SummaryVarType", "Type" ); + CAF_PDM_InitFieldNoDefault( &m_quantityName, "SummaryQuantityName", "Quantity" ); + CAF_PDM_InitFieldNoDefault( &m_regionNumber, "SummaryRegion", "Region" ); + CAF_PDM_InitFieldNoDefault( &m_regionNumber2, "SummaryRegion2", "Region2" ); + CAF_PDM_InitFieldNoDefault( &m_wellGroupName, "SummaryWellGroup", "Group" ); + CAF_PDM_InitFieldNoDefault( &m_wellName, "SummaryWell", "Well" ); + CAF_PDM_InitFieldNoDefault( &m_wellSegmentNumber, "SummaryWellSegment", "Well Segment" ); + CAF_PDM_InitFieldNoDefault( &m_lgrName, "SummaryLgr", "Grid" ); + CAF_PDM_InitFieldNoDefault( &m_cellI, "SummaryCellI", "I" ); + CAF_PDM_InitFieldNoDefault( &m_cellJ, "SummaryCellJ", "J" ); + CAF_PDM_InitFieldNoDefault( &m_cellK, "SummaryCellK", "K" ); + CAF_PDM_InitFieldNoDefault( &m_aquiferNumber, "SummaryAquifer", "Aquifer" ); + CAF_PDM_InitFieldNoDefault( &m_isErrorResult, "IsErrorResult", "Is Error Result" ); + CAF_PDM_InitFieldNoDefault( &m_calculationId, "CalculationId", "Calculation Id" ); m_category = RifEclipseSummaryAddress::SUMMARY_INVALID; m_regionNumber = -1; diff --git a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryCase.cpp b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryCase.cpp index 7a544f8564..86f3e451a6 100644 --- a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryCase.cpp +++ b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryCase.cpp @@ -47,17 +47,17 @@ RimSummaryCase::RimSummaryCase() { CAF_PDM_InitScriptableObject( "Summary Case", ":/SummaryCase.svg", "", "The Base Class for all Summary Cases" ); - CAF_PDM_InitScriptableFieldNoDefault( &m_displayName, "ShortName", "Display Name", "", "", "" ); - CAF_PDM_InitScriptableFieldNoDefault( &m_displayNameOption, "NameSetting", "Name Setting", "", "", "" ); + CAF_PDM_InitScriptableFieldNoDefault( &m_displayName, "ShortName", "Display Name" ); + CAF_PDM_InitScriptableFieldNoDefault( &m_displayNameOption, "NameSetting", "Name Setting" ); - CAF_PDM_InitScriptableField( &m_useAutoShortName_OBSOLETE, "AutoShortyName", false, "Use Auto Display Name", "", "", "" ); + CAF_PDM_InitScriptableField( &m_useAutoShortName_OBSOLETE, "AutoShortyName", false, "Use Auto Display Name" ); m_useAutoShortName_OBSOLETE.xmlCapability()->setIOWritable( false ); m_useAutoShortName_OBSOLETE.uiCapability()->setUiHidden( true ); - CAF_PDM_InitScriptableFieldNoDefault( &m_summaryHeaderFilename, "SummaryHeaderFilename", "Summary Header File", "", "", "" ); + CAF_PDM_InitScriptableFieldNoDefault( &m_summaryHeaderFilename, "SummaryHeaderFilename", "Summary Header File" ); m_summaryHeaderFilename.uiCapability()->setUiReadOnly( true ); - CAF_PDM_InitScriptableField( &m_caseId, "Id", -1, "Case ID", "", "", "" ); + CAF_PDM_InitScriptableField( &m_caseId, "Id", -1, "Case ID" ); m_caseId.registerKeywordAlias( "CaseId" ); m_caseId.uiCapability()->setUiReadOnly( true ); m_caseId.capability()->setIOWriteable( false ); diff --git a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryCaseCollection.cpp b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryCaseCollection.cpp index 879c99fa7d..46bcbdf9f1 100644 --- a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryCaseCollection.cpp +++ b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryCaseCollection.cpp @@ -107,19 +107,19 @@ RimSummaryCaseCollection::RimSummaryCaseCollection() { CAF_PDM_InitScriptableObject( "Summary Case Group", ":/SummaryGroup16x16.png", "", "" ); - CAF_PDM_InitFieldNoDefault( &m_cases, "SummaryCases", "", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_cases, "SummaryCases", "" ); m_cases.uiCapability()->setUiTreeHidden( true ); - CAF_PDM_InitScriptableField( &m_name, "SummaryCollectionName", QString( "Group" ), "Name", "", "", "" ); + CAF_PDM_InitScriptableField( &m_name, "SummaryCollectionName", QString( "Group" ), "Name" ); - CAF_PDM_InitScriptableFieldNoDefault( &m_nameAndItemCount, "NameCount", "Name", "", "", "" ); + CAF_PDM_InitScriptableFieldNoDefault( &m_nameAndItemCount, "NameCount", "Name" ); m_nameAndItemCount.registerGetMethod( this, &RimSummaryCaseCollection::nameAndItemCount ); RiaFieldhandleTools::disableWriteAndSetFieldHidden( &m_nameAndItemCount ); - CAF_PDM_InitScriptableField( &m_isEnsemble, "IsEnsemble", false, "Is Ensemble", "", "", "" ); + CAF_PDM_InitScriptableField( &m_isEnsemble, "IsEnsemble", false, "Is Ensemble" ); m_isEnsemble.uiCapability()->setUiHidden( true ); - CAF_PDM_InitScriptableField( &m_ensembleId, "Id", -1, "Ensemble ID", "", "", "" ); + CAF_PDM_InitScriptableField( &m_ensembleId, "Id", -1, "Ensemble ID" ); m_ensembleId.registerKeywordAlias( "EnsembleId" ); m_ensembleId.uiCapability()->setUiReadOnly( true ); m_ensembleId.capability()->setIOWriteable( false ); diff --git a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryCaseMainCollection.cpp b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryCaseMainCollection.cpp index d351bb20f1..5db2ba0b98 100644 --- a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryCaseMainCollection.cpp +++ b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryCaseMainCollection.cpp @@ -97,8 +97,8 @@ RimSummaryCaseMainCollection::RimSummaryCaseMainCollection() { CAF_PDM_InitObject( "Summary Cases", ":/SummaryCases16x16.png", "", "" ); - CAF_PDM_InitFieldNoDefault( &m_cases, "SummaryCases", "", "", "", "" ); - CAF_PDM_InitFieldNoDefault( &m_caseCollections, "SummaryCaseCollections", "", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_cases, "SummaryCases", "" ); + CAF_PDM_InitFieldNoDefault( &m_caseCollections, "SummaryCaseCollections", "" ); m_cases.uiCapability()->setUiTreeHidden( true ); m_caseCollections.uiCapability()->setUiTreeHidden( true ); diff --git a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryCrossPlotCollection.cpp b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryCrossPlotCollection.cpp index 0f5fb8842a..ddedbd407f 100644 --- a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryCrossPlotCollection.cpp +++ b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryCrossPlotCollection.cpp @@ -33,7 +33,7 @@ RimSummaryCrossPlotCollection::RimSummaryCrossPlotCollection() { CAF_PDM_InitObject( "Summary Cross Plots", ":/SummaryXPlotsLight16x16.png", "", "" ); - CAF_PDM_InitFieldNoDefault( &m_summaryCrossPlots, "SummaryCrossPlots", "Summary Cross Plots", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_summaryCrossPlots, "SummaryCrossPlots", "Summary Cross Plots" ); m_summaryCrossPlots.uiCapability()->setUiTreeHidden( true ); caf::PdmFieldReorderCapability::addToField( &m_summaryCrossPlots ); } diff --git a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryCurve.cpp b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryCurve.cpp index f2db0bec13..3232b054c5 100644 --- a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryCurve.cpp +++ b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryCurve.cpp @@ -68,41 +68,41 @@ RimSummaryCurve::RimSummaryCurve() CAF_PDM_InitObject( "Summary Curve", ":/SummaryCurve16x16.png", "", "" ); // Y Values - CAF_PDM_InitFieldNoDefault( &m_yValuesSummaryCase, "SummaryCase", "Case", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_yValuesSummaryCase, "SummaryCase", "Case" ); m_yValuesSummaryCase.uiCapability()->setUiTreeChildrenHidden( true ); m_yValuesSummaryCase.uiCapability()->setAutoAddingOptionFromValue( false ); - CAF_PDM_InitFieldNoDefault( &m_yValuesSummaryAddressUiField, "SelectedVariableDisplayVar", "Vector", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_yValuesSummaryAddressUiField, "SelectedVariableDisplayVar", "Vector" ); m_yValuesSummaryAddressUiField.xmlCapability()->disableIO(); m_yValuesSummaryAddressUiField.uiCapability()->setUiEditorTypeName( caf::PdmUiLineEditor::uiEditorTypeName() ); - CAF_PDM_InitFieldNoDefault( &m_yValuesSummaryAddress, "SummaryAddress", "Summary Address", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_yValuesSummaryAddress, "SummaryAddress", "Summary Address" ); m_yValuesSummaryAddress.uiCapability()->setUiTreeHidden( true ); m_yValuesSummaryAddress.uiCapability()->setUiTreeChildrenHidden( true ); - CAF_PDM_InitFieldNoDefault( &m_yPushButtonSelectSummaryAddress, "SelectAddress", "", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_yPushButtonSelectSummaryAddress, "SelectAddress", "" ); caf::PdmUiPushButtonEditor::configureEditorForField( &m_yPushButtonSelectSummaryAddress ); m_yPushButtonSelectSummaryAddress.uiCapability()->setUiLabelPosition( caf::PdmUiItemInfo::HIDDEN ); m_yPushButtonSelectSummaryAddress = false; m_yValuesSummaryAddress = new RimSummaryAddress; - CAF_PDM_InitFieldNoDefault( &m_resampling, "Resampling", "Resampling", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_resampling, "Resampling", "Resampling" ); // X Values - CAF_PDM_InitFieldNoDefault( &m_xValuesSummaryCase, "SummaryCaseX", "Case", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_xValuesSummaryCase, "SummaryCaseX", "Case" ); m_xValuesSummaryCase.uiCapability()->setUiTreeChildrenHidden( true ); m_xValuesSummaryCase.uiCapability()->setAutoAddingOptionFromValue( false ); - CAF_PDM_InitFieldNoDefault( &m_xValuesSummaryAddressUiField, "SelectedVariableDisplayVarX", "Vector", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_xValuesSummaryAddressUiField, "SelectedVariableDisplayVarX", "Vector" ); m_xValuesSummaryAddressUiField.xmlCapability()->disableIO(); m_xValuesSummaryAddressUiField.uiCapability()->setUiEditorTypeName( caf::PdmUiLineEditor::uiEditorTypeName() ); - CAF_PDM_InitFieldNoDefault( &m_xValuesSummaryAddress, "SummaryAddressX", "Summary Address", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_xValuesSummaryAddress, "SummaryAddressX", "Summary Address" ); m_xValuesSummaryAddress.uiCapability()->setUiTreeHidden( true ); m_xValuesSummaryAddress.uiCapability()->setUiTreeChildrenHidden( true ); - CAF_PDM_InitFieldNoDefault( &m_xPushButtonSelectSummaryAddress, "SelectAddressX", "", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_xPushButtonSelectSummaryAddress, "SelectAddressX", "" ); caf::PdmUiPushButtonEditor::configureEditorForField( &m_xPushButtonSelectSummaryAddress ); m_xPushButtonSelectSummaryAddress.uiCapability()->setUiLabelPosition( caf::PdmUiItemInfo::HIDDEN ); @@ -111,30 +111,30 @@ RimSummaryCurve::RimSummaryCurve() m_xValuesSummaryAddress = new RimSummaryAddress; // Other members - CAF_PDM_InitFieldNoDefault( &m_isEnsembleCurve, "IsEnsembleCurve", "Ensemble Curve", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_isEnsembleCurve, "IsEnsembleCurve", "Ensemble Curve" ); m_isEnsembleCurve.v() = caf::Tristate::State::PartiallyTrue; - CAF_PDM_InitFieldNoDefault( &m_plotAxis, "PlotAxis", "Axis", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_plotAxis, "PlotAxis", "Axis" ); - CAF_PDM_InitFieldNoDefault( &m_curveNameConfig, "SummaryCurveNameConfig", "SummaryCurveNameConfig", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_curveNameConfig, "SummaryCurveNameConfig", "SummaryCurveNameConfig" ); m_curveNameConfig.uiCapability()->setUiTreeHidden( true ); m_curveNameConfig.uiCapability()->setUiTreeChildrenHidden( true ); m_curveNameConfig = new RimSummaryCurveAutoName; - CAF_PDM_InitField( &m_isTopZWithinCategory, "isTopZWithinCategory", false, "", "", "", "" ); + CAF_PDM_InitField( &m_isTopZWithinCategory, "isTopZWithinCategory", false, "" ); m_isTopZWithinCategory.uiCapability()->setUiHidden( true ); setSymbolSkipDistance( 10.0f ); setLineThickness( 2 ); - CAF_PDM_InitFieldNoDefault( &m_yValuesSummaryFilter_OBSOLETE, "VarListFilter", "Filter", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_yValuesSummaryFilter_OBSOLETE, "VarListFilter", "Filter" ); m_yValuesSummaryFilter_OBSOLETE.uiCapability()->setUiTreeChildrenHidden( true ); m_yValuesSummaryFilter_OBSOLETE.uiCapability()->setUiTreeHidden( true ); m_yValuesSummaryFilter_OBSOLETE.xmlCapability()->setIOWritable( false ); m_yValuesSummaryFilter_OBSOLETE = new RimSummaryFilter_OBSOLETE; - CAF_PDM_InitFieldNoDefault( &m_xValuesSummaryFilter_OBSOLETE, "VarListFilterX", "Filter", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_xValuesSummaryFilter_OBSOLETE, "VarListFilterX", "Filter" ); m_xValuesSummaryFilter_OBSOLETE.uiCapability()->setUiTreeChildrenHidden( true ); m_xValuesSummaryFilter_OBSOLETE.uiCapability()->setUiTreeHidden( true ); m_xValuesSummaryFilter_OBSOLETE.xmlCapability()->setIOWritable( false ); diff --git a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryCurveCollection.cpp b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryCurveCollection.cpp index 531d7e7800..4080ee8ed5 100644 --- a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryCurveCollection.cpp +++ b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryCurveCollection.cpp @@ -50,34 +50,34 @@ RimSummaryCurveCollection::RimSummaryCurveCollection() { CAF_PDM_InitObject( "Summary Curves", ":/SummaryCurveFilter16x16.png", "", "" ); - CAF_PDM_InitFieldNoDefault( &m_curves, "CollectionCurves", "Collection Curves", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_curves, "CollectionCurves", "Collection Curves" ); m_curves.uiCapability()->setUiTreeHidden( true ); m_curves.uiCapability()->setUiTreeChildrenHidden( false ); caf::PdmFieldReorderCapability::addToFieldWithCallback( &m_curves, this, &RimSummaryCurveCollection::onCurvesReordered ); - CAF_PDM_InitField( &m_showCurves, "IsActive", true, "Show Curves", "", "", "" ); + CAF_PDM_InitField( &m_showCurves, "IsActive", true, "Show Curves" ); m_showCurves.uiCapability()->setUiHidden( true ); m_showCurves.uiCapability()->setUiTreeHidden( true ); - CAF_PDM_InitField( &m_editPlot, "EditPlot", false, "", "", "", "" ); + CAF_PDM_InitField( &m_editPlot, "EditPlot", false, "" ); m_editPlot.xmlCapability()->disableIO(); m_editPlot.uiCapability()->setUiEditorTypeName( caf::PdmUiPushButtonEditor::uiEditorTypeName() ); - CAF_PDM_InitFieldNoDefault( &m_ySourceStepping, "YSourceStepping", "", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_ySourceStepping, "YSourceStepping", "" ); m_ySourceStepping = new RimSummaryPlotSourceStepping; m_ySourceStepping->setSourceSteppingType( RimSummaryPlotSourceStepping::Y_AXIS ); m_ySourceStepping.uiCapability()->setUiTreeHidden( true ); m_ySourceStepping.uiCapability()->setUiTreeChildrenHidden( true ); m_ySourceStepping.xmlCapability()->disableIO(); - CAF_PDM_InitFieldNoDefault( &m_xSourceStepping, "XSourceStepping", "", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_xSourceStepping, "XSourceStepping", "" ); m_xSourceStepping = new RimSummaryPlotSourceStepping; m_xSourceStepping->setSourceSteppingType( RimSummaryPlotSourceStepping::X_AXIS ); m_xSourceStepping.uiCapability()->setUiTreeHidden( true ); m_xSourceStepping.uiCapability()->setUiTreeChildrenHidden( true ); m_xSourceStepping.xmlCapability()->disableIO(); - CAF_PDM_InitFieldNoDefault( &m_unionSourceStepping, "UnionSourceStepping", "", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_unionSourceStepping, "UnionSourceStepping", "" ); m_unionSourceStepping = new RimSummaryPlotSourceStepping; m_unionSourceStepping->setSourceSteppingType( RimSummaryPlotSourceStepping::UNION_X_Y_AXIS ); m_unionSourceStepping.uiCapability()->setUiTreeHidden( true ); diff --git a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryCurveFilter.cpp b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryCurveFilter.cpp index 3f0f094ef1..35969f6add 100644 --- a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryCurveFilter.cpp +++ b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryCurveFilter.cpp @@ -48,14 +48,14 @@ RimSummaryCurveFilter_OBSOLETE::RimSummaryCurveFilter_OBSOLETE() { CAF_PDM_InitObject( "Curve Filter", ":/SummaryCurveFilter16x16.png", "", "" ); - CAF_PDM_InitFieldNoDefault( &m_selectedSummaryCases, "SummaryCases", "Cases", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_selectedSummaryCases, "SummaryCases", "Cases" ); m_selectedSummaryCases.uiCapability()->setUiTreeChildrenHidden( true ); m_selectedSummaryCases.uiCapability()->setUiEditorTypeName( caf::PdmUiListEditor::uiEditorTypeName() ); m_selectedSummaryCases.uiCapability()->setAutoAddingOptionFromValue( false ); m_selectedSummaryCases.xmlCapability()->disableIO(); m_selectedSummaryCases.uiCapability()->setUiLabelPosition( caf::PdmUiItemInfo::HIDDEN ); - CAF_PDM_InitFieldNoDefault( &m_summaryFilter, "VarListFilter", "Filter", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_summaryFilter, "VarListFilter", "Filter" ); m_summaryFilter.uiCapability()->setUiTreeChildrenHidden( true ); m_summaryFilter.uiCapability()->setUiTreeHidden( true ); @@ -72,33 +72,33 @@ RimSummaryCurveFilter_OBSOLETE::RimSummaryCurveFilter_OBSOLETE() m_uiFilterResultMultiSelection.uiCapability()->setUiLabelPosition( caf::PdmUiItemInfo::HIDDEN ); m_uiFilterResultMultiSelection.uiCapability()->setAutoAddingOptionFromValue( false ); - CAF_PDM_InitFieldNoDefault( &m_curves, "FilteredCurves", "Filtered Curves", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_curves, "FilteredCurves", "Filtered Curves" ); m_curves.uiCapability()->setUiTreeHidden( true ); m_curves.uiCapability()->setUiTreeChildrenHidden( false ); - CAF_PDM_InitFieldNoDefault( &m_applyButtonField, "ApplySelection", "", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_applyButtonField, "ApplySelection", "" ); m_applyButtonField.xmlCapability()->disableIO(); m_applyButtonField = false; m_applyButtonField.uiCapability()->setUiEditorTypeName( caf::PdmUiPushButtonEditor::uiEditorTypeName() ); m_applyButtonField.uiCapability()->setUiLabelPosition( caf::PdmUiItemInfo::LEFT ); - CAF_PDM_InitField( &m_autoApplyChangesToPlot, "AutoApplyFilterChanges", true, "Auto Apply Changes", "", "", "" ); + CAF_PDM_InitField( &m_autoApplyChangesToPlot, "AutoApplyFilterChanges", true, "Auto Apply Changes" ); - CAF_PDM_InitField( &m_showCurves, "IsActive", true, "Show Curves", "", "", "" ); + CAF_PDM_InitField( &m_showCurves, "IsActive", true, "Show Curves" ); m_showCurves.uiCapability()->setUiHidden( true ); - CAF_PDM_InitField( &m_useAutoAppearanceAssignment, "UseAutoAppearanceAssignment", true, "Auto", "", "", "" ); + CAF_PDM_InitField( &m_useAutoAppearanceAssignment, "UseAutoAppearanceAssignment", true, "Auto" ); - CAF_PDM_InitFieldNoDefault( &m_caseAppearanceType, "CaseAppearanceType", "Case", "", "", "" ); - CAF_PDM_InitFieldNoDefault( &m_variableAppearanceType, "VariableAppearanceType", "Vector", "", "", "" ); - CAF_PDM_InitFieldNoDefault( &m_wellAppearanceType, "WellAppearanceType", "Well", "", "", "" ); - CAF_PDM_InitFieldNoDefault( &m_groupAppearanceType, "GroupAppearanceType", "Group", "", "", "" ); - CAF_PDM_InitFieldNoDefault( &m_regionAppearanceType, "RegionAppearanceType", "Region", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_caseAppearanceType, "CaseAppearanceType", "Case" ); + CAF_PDM_InitFieldNoDefault( &m_variableAppearanceType, "VariableAppearanceType", "Vector" ); + CAF_PDM_InitFieldNoDefault( &m_wellAppearanceType, "WellAppearanceType", "Well" ); + CAF_PDM_InitFieldNoDefault( &m_groupAppearanceType, "GroupAppearanceType", "Group" ); + CAF_PDM_InitFieldNoDefault( &m_regionAppearanceType, "RegionAppearanceType", "Region" ); - CAF_PDM_InitFieldNoDefault( &m_plotAxis, "PlotAxis", "Axis", "", "", "" ); - CAF_PDM_InitField( &m_showLegend, "ShowLegend", true, "Contribute To Legend", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_plotAxis, "PlotAxis", "Axis" ); + CAF_PDM_InitField( &m_showLegend, "ShowLegend", true, "Contribute To Legend" ); - CAF_PDM_InitFieldNoDefault( &m_curveNameConfig, "SummaryCurveNameConfig", "SummaryCurveNameConfig", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_curveNameConfig, "SummaryCurveNameConfig", "SummaryCurveNameConfig" ); m_curveNameConfig.uiCapability()->setUiTreeHidden( true ); m_curveNameConfig.uiCapability()->setUiTreeChildrenHidden( true ); diff --git a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryFilter.cpp b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryFilter.cpp index 7f13056a00..6c7c5ee246 100644 --- a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryFilter.cpp +++ b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryFilter.cpp @@ -54,18 +54,18 @@ CAF_PDM_SOURCE_INIT( RimSummaryFilter_OBSOLETE, "SummaryFilterSettings" ); //-------------------------------------------------------------------------------------------------- RimSummaryFilter_OBSOLETE::RimSummaryFilter_OBSOLETE() { - CAF_PDM_InitObject( "Summary Filter", "", "", "" ); + CAF_PDM_InitObject( "Summary Filter" ); - CAF_PDM_InitFieldNoDefault( &m_filterType, "SummaryFilterType", "Search", "", "", "" ); - CAF_PDM_InitFieldNoDefault( &m_completeVarStringFilter, "SummaryCompleteVarStringFilter", "Filter", "", "", "" ); - CAF_PDM_InitFieldNoDefault( &m_filterQuantityName, "SummaryVarQuantityFilter", "Vector name", "", "", "" ); - CAF_PDM_InitFieldNoDefault( &m_regionNumberFilter, "SummaryRegionNumberFilter", "Region number", "", "", "" ); - CAF_PDM_InitFieldNoDefault( &m_regionNumber2Filter, "SummaryRegionNumber2Filter", "2. Region number", "", "", "" ); - CAF_PDM_InitFieldNoDefault( &m_wellGroupNameFilter, "SummaryWellGroupNameFilter", "Group name", "", "", "" ); - CAF_PDM_InitFieldNoDefault( &m_wellNameFilter, "SummaryWellNameFilter", "Well name", "", "", "" ); - CAF_PDM_InitFieldNoDefault( &m_wellSegmentNumberFilter, "SummaryWellSegmentNumberFilter", "Segment number", "", "", "" ); - CAF_PDM_InitFieldNoDefault( &m_lgrNameFilter, "SummaryLgrNameFilter", "LGR Name", "", "", "" ); - CAF_PDM_InitFieldNoDefault( &m_cellIJKFilter, "SummaryCellIJKFilter", "I, J, K", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_filterType, "SummaryFilterType", "Search" ); + CAF_PDM_InitFieldNoDefault( &m_completeVarStringFilter, "SummaryCompleteVarStringFilter", "Filter" ); + CAF_PDM_InitFieldNoDefault( &m_filterQuantityName, "SummaryVarQuantityFilter", "Vector name" ); + CAF_PDM_InitFieldNoDefault( &m_regionNumberFilter, "SummaryRegionNumberFilter", "Region number" ); + CAF_PDM_InitFieldNoDefault( &m_regionNumber2Filter, "SummaryRegionNumber2Filter", "2. Region number" ); + CAF_PDM_InitFieldNoDefault( &m_wellGroupNameFilter, "SummaryWellGroupNameFilter", "Group name" ); + CAF_PDM_InitFieldNoDefault( &m_wellNameFilter, "SummaryWellNameFilter", "Well name" ); + CAF_PDM_InitFieldNoDefault( &m_wellSegmentNumberFilter, "SummaryWellSegmentNumberFilter", "Segment number" ); + CAF_PDM_InitFieldNoDefault( &m_lgrNameFilter, "SummaryLgrNameFilter", "LGR Name" ); + CAF_PDM_InitFieldNoDefault( &m_cellIJKFilter, "SummaryCellIJKFilter", "I, J, K" ); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryPlot.cpp b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryPlot.cpp index 23ce5e6053..9c6699bca1 100644 --- a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryPlot.cpp +++ b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryPlot.cpp @@ -201,36 +201,36 @@ RimSummaryPlot::RimSummaryPlot() { CAF_PDM_InitScriptableObject( "Summary Plot", ":/SummaryPlotLight16x16.png", "", "A Summary Plot" ); - CAF_PDM_InitScriptableField( &m_useAutoPlotTitle, "IsUsingAutoName", true, "Auto Title", "", "", "" ); - CAF_PDM_InitScriptableField( &m_description, "PlotDescription", QString( "Summary Plot" ), "Name", "", "", "" ); - CAF_PDM_InitScriptableField( &m_normalizeCurveYValues, "normalizeCurveYValues", false, "Normalize all curves", "", "", "" ); + CAF_PDM_InitScriptableField( &m_useAutoPlotTitle, "IsUsingAutoName", true, "Auto Title" ); + CAF_PDM_InitScriptableField( &m_description, "PlotDescription", QString( "Summary Plot" ), "Name" ); + CAF_PDM_InitScriptableField( &m_normalizeCurveYValues, "normalizeCurveYValues", false, "Normalize all curves" ); - CAF_PDM_InitFieldNoDefault( &m_summaryCurveCollection, "SummaryCurveCollection", "", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_summaryCurveCollection, "SummaryCurveCollection", "" ); m_summaryCurveCollection.uiCapability()->setUiTreeHidden( true ); m_summaryCurveCollection = new RimSummaryCurveCollection; m_summaryCurveCollection->curvesChanged.connect( this, &RimSummaryPlot::onCurveCollectionChanged ); - CAF_PDM_InitFieldNoDefault( &m_ensembleCurveSetCollection, "EnsembleCurveSetCollection", "", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_ensembleCurveSetCollection, "EnsembleCurveSetCollection", "" ); m_ensembleCurveSetCollection.uiCapability()->setUiTreeHidden( true ); m_ensembleCurveSetCollection = new RimEnsembleCurveSetCollection(); - CAF_PDM_InitFieldNoDefault( &m_gridTimeHistoryCurves, "GridTimeHistoryCurves", "", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_gridTimeHistoryCurves, "GridTimeHistoryCurves", "" ); m_gridTimeHistoryCurves.uiCapability()->setUiTreeHidden( true ); - CAF_PDM_InitFieldNoDefault( &m_asciiDataCurves, "AsciiDataCurves", "", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_asciiDataCurves, "AsciiDataCurves", "" ); m_asciiDataCurves.uiCapability()->setUiTreeHidden( true ); - CAF_PDM_InitFieldNoDefault( &m_leftYAxisProperties, "LeftYAxisProperties", "Left Y Axis", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_leftYAxisProperties, "LeftYAxisProperties", "Left Y Axis" ); m_leftYAxisProperties.uiCapability()->setUiTreeHidden( true ); m_leftYAxisProperties = new RimPlotAxisProperties; m_leftYAxisProperties->setNameAndAxis( "Left Y-Axis", QwtPlot::yLeft ); - CAF_PDM_InitFieldNoDefault( &m_rightYAxisProperties, "RightYAxisProperties", "Right Y Axis", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_rightYAxisProperties, "RightYAxisProperties", "Right Y Axis" ); m_rightYAxisProperties.uiCapability()->setUiTreeHidden( true ); m_rightYAxisProperties = new RimPlotAxisProperties; m_rightYAxisProperties->setNameAndAxis( "Right Y-Axis", QwtPlot::yRight ); - CAF_PDM_InitFieldNoDefault( &m_bottomAxisProperties, "BottomAxisProperties", "Bottom X Axis", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_bottomAxisProperties, "BottomAxisProperties", "Bottom X Axis" ); m_bottomAxisProperties.uiCapability()->setUiTreeHidden( true ); m_bottomAxisProperties = new RimPlotAxisProperties; m_bottomAxisProperties->setNameAndAxis( "Bottom X-Axis", QwtPlot::xBottom ); @@ -239,16 +239,11 @@ RimSummaryPlot::RimSummaryPlot() connectAxisSignals( m_rightYAxisProperties() ); connectAxisSignals( m_bottomAxisProperties() ); - CAF_PDM_InitFieldNoDefault( &m_timeAxisProperties, "TimeAxisProperties", "Time Axis", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_timeAxisProperties, "TimeAxisProperties", "Time Axis" ); m_timeAxisProperties.uiCapability()->setUiTreeHidden( true ); m_timeAxisProperties = new RimSummaryTimeAxisProperties; - CAF_PDM_InitFieldNoDefault( &m_textCurveSetEditor, - "SummaryPlotFilterTextCurveSetEditor", - "Text Filter Curve Creator", - "", - "", - "" ); + CAF_PDM_InitFieldNoDefault( &m_textCurveSetEditor, "SummaryPlotFilterTextCurveSetEditor", "Text Filter Curve Creator" ); m_textCurveSetEditor.uiCapability()->setUiTreeHidden( true ); m_textCurveSetEditor = new RimSummaryPlotFilterTextCurveSetEditor; diff --git a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryPlotCollection.cpp b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryPlotCollection.cpp index c34ba3b365..bb4dec0089 100644 --- a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryPlotCollection.cpp +++ b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryPlotCollection.cpp @@ -39,7 +39,7 @@ RimSummaryPlotCollection::RimSummaryPlotCollection() { CAF_PDM_InitScriptableObject( "Summary Plots", ":/SummaryPlotsLight16x16.png", "", "" ); - CAF_PDM_InitFieldNoDefault( &m_summaryPlots, "SummaryPlots", "Summary Plots", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_summaryPlots, "SummaryPlots", "Summary Plots" ); m_summaryPlots.uiCapability()->setUiTreeHidden( true ); caf::PdmFieldReorderCapability::addToField( &m_summaryPlots ); } diff --git a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryPlotFilterTextCurveSetEditor.cpp b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryPlotFilterTextCurveSetEditor.cpp index 937f223403..64c89fae9a 100644 --- a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryPlotFilterTextCurveSetEditor.cpp +++ b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryPlotFilterTextCurveSetEditor.cpp @@ -68,7 +68,7 @@ CAF_PDM_SOURCE_INIT( RimSummaryPlotFilterTextCurveSetEditor, "SummaryPlotFilterT RimSummaryPlotFilterTextCurveSetEditor::RimSummaryPlotFilterTextCurveSetEditor() : m_isFieldRecentlyChangedFromGui( false ) { - CAF_PDM_InitObject( "Curve Set Filter Text", "", "", "" ); + CAF_PDM_InitObject( "Curve Set Filter Text" ); // clang-format off QString filterTextHeading = "Create Summary Curves from Text"; @@ -85,7 +85,7 @@ RimSummaryPlotFilterTextCurveSetEditor::RimSummaryPlotFilterTextCurveSetEditor() QString toolTipPropertyEditor = filterTextHeading + "\n\n" + filterTextToolTip; QString toolTipToolbar = filterTextHeading + filterTextShortcut + "\n\n" + filterTextToolTip; - CAF_PDM_InitFieldNoDefault( &m_curveFilterLabelText, "Summary", "Summary", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_curveFilterLabelText, "Summary", "Summary" ); m_curveFilterLabelText.uiCapability()->setUiEditorTypeName( caf::PdmUiLabelEditor::uiEditorTypeName() ); m_curveFilterLabelText.xmlCapability()->disableIO(); @@ -96,7 +96,7 @@ RimSummaryPlotFilterTextCurveSetEditor::RimSummaryPlotFilterTextCurveSetEditor() // Special tool tip for toolbar m_curveFilterText.uiCapability()->setUiToolTip( toolTipToolbar, caf::PdmUiToolBarEditor::uiEditorConfigName() ); - CAF_PDM_InitFieldNoDefault( &m_selectedSources, "SummaryCases", "Sources", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_selectedSources, "SummaryCases", "Sources" ); m_selectedSources.uiCapability()->setAutoAddingOptionFromValue( false ); m_selectedSources.uiCapability()->setUiEditorTypeName( caf::PdmUiTreeSelectionEditor::uiEditorTypeName() ); m_selectedSources.uiCapability()->setUiLabelPosition( caf::PdmUiItemInfo::TOP ); diff --git a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryPlotSourceStepping.cpp b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryPlotSourceStepping.cpp index c56ced5314..524ae6358b 100644 --- a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryPlotSourceStepping.cpp +++ b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryPlotSourceStepping.cpp @@ -51,9 +51,9 @@ CAF_PDM_SOURCE_INIT( RimSummaryPlotSourceStepping, "RimSummaryCurveCollectionMod RimSummaryPlotSourceStepping::RimSummaryPlotSourceStepping() : m_sourceSteppingType( Y_AXIS ) { - CAF_PDM_InitObject( "Summary Curves Modifier", "", "", "" ); + CAF_PDM_InitObject( "Summary Curves Modifier" ); - CAF_PDM_InitFieldNoDefault( &m_summaryCase, "CurveCase", "Case", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_summaryCase, "CurveCase", "Case" ); CAF_PDM_InitField( &m_includeEnsembleCasesForCaseStepping, "IncludeEnsembleCasesForCaseStepping", @@ -63,19 +63,19 @@ RimSummaryPlotSourceStepping::RimSummaryPlotSourceStepping() "", "" ); - CAF_PDM_InitFieldNoDefault( &m_wellName, "WellName", "Well Name", "", "", "" ); - CAF_PDM_InitFieldNoDefault( &m_wellGroupName, "GroupName", "Group Name", "", "", "" ); - CAF_PDM_InitFieldNoDefault( &m_region, "Region", "Region", "", "", "" ); - CAF_PDM_InitFieldNoDefault( &m_quantity, "Quantities", "Quantity", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_wellName, "WellName", "Well Name" ); + CAF_PDM_InitFieldNoDefault( &m_wellGroupName, "GroupName", "Group Name" ); + CAF_PDM_InitFieldNoDefault( &m_region, "Region", "Region" ); + CAF_PDM_InitFieldNoDefault( &m_quantity, "Quantities", "Quantity" ); - CAF_PDM_InitFieldNoDefault( &m_cellBlock, "CellBlock", "Block", "", "", "" ); - CAF_PDM_InitFieldNoDefault( &m_segment, "Segment", "Segment", "", "", "" ); - CAF_PDM_InitFieldNoDefault( &m_completion, "Completion", "Completion", "", "", "" ); - CAF_PDM_InitFieldNoDefault( &m_aquifer, "Aquifer", "Aquifer", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_cellBlock, "CellBlock", "Block" ); + CAF_PDM_InitFieldNoDefault( &m_segment, "Segment", "Segment" ); + CAF_PDM_InitFieldNoDefault( &m_completion, "Completion", "Completion" ); + CAF_PDM_InitFieldNoDefault( &m_aquifer, "Aquifer", "Aquifer" ); - CAF_PDM_InitFieldNoDefault( &m_ensemble, "Ensemble", "Ensemble", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_ensemble, "Ensemble", "Ensemble" ); - CAF_PDM_InitFieldNoDefault( &m_placeholderForLabel, "Placeholder", "", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_placeholderForLabel, "Placeholder", "" ); m_placeholderForLabel = "No common identifiers detected"; m_placeholderForLabel.uiCapability()->setUiLabelPosition( caf::PdmUiItemInfo::TOP ); m_placeholderForLabel.uiCapability()->setUiReadOnly( true ); diff --git a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryTimeAxisProperties.cpp b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryTimeAxisProperties.cpp index 44f3305d12..842aa44c24 100644 --- a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryTimeAxisProperties.cpp +++ b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryTimeAxisProperties.cpp @@ -70,54 +70,54 @@ RimSummaryTimeAxisProperties::RimSummaryTimeAxisProperties() { CAF_PDM_InitObject( "Time Axis", ":/BottomAxis16x16.png", "", "" ); - CAF_PDM_InitField( &m_isActive, "Active", true, "Active", "", "", "" ); + CAF_PDM_InitField( &m_isActive, "Active", true, "Active" ); m_isActive.uiCapability()->setUiHidden( true ); - CAF_PDM_InitField( &showTitle, "ShowTitle", false, "Show Title ", "", "", "" ); - CAF_PDM_InitField( &title, "Title", QString( "Time" ), "Title ", "", "", "" ); + CAF_PDM_InitField( &showTitle, "ShowTitle", false, "Show Title " ); + CAF_PDM_InitField( &title, "Title", QString( "Time" ), "Title " ); - CAF_PDM_InitField( &m_isAutoZoom, "AutoZoom", true, "Set Range Automatically", "", "", "" ); - CAF_PDM_InitFieldNoDefault( &m_timeMode, "TimeMode", "Time Mode", "", "", "" ); - CAF_PDM_InitFieldNoDefault( &m_timeUnit, "TimeUnit", "Time Unit", "", "", "" ); + CAF_PDM_InitField( &m_isAutoZoom, "AutoZoom", true, "Set Range Automatically" ); + CAF_PDM_InitFieldNoDefault( &m_timeMode, "TimeMode", "Time Mode" ); + CAF_PDM_InitFieldNoDefault( &m_timeUnit, "TimeUnit", "Time Unit" ); - CAF_PDM_InitFieldNoDefault( &m_visibleDateRangeMax, "VisibleDateRangeMax", "Max Date", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_visibleDateRangeMax, "VisibleDateRangeMax", "Max Date" ); m_visibleDateRangeMax.uiCapability()->setUiEditorTypeName( caf::PdmUiDateEditor::uiEditorTypeName() ); - CAF_PDM_InitFieldNoDefault( &m_visibleDateRangeMin, "VisibleDateRangeMin", "Min Date", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_visibleDateRangeMin, "VisibleDateRangeMin", "Min Date" ); m_visibleDateRangeMin.uiCapability()->setUiEditorTypeName( caf::PdmUiDateEditor::uiEditorTypeName() ); - CAF_PDM_InitFieldNoDefault( &m_visibleTimeRangeMax, "VisibleTimeRangeMax", "MaxTime", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_visibleTimeRangeMax, "VisibleTimeRangeMax", "MaxTime" ); m_visibleTimeRangeMax.uiCapability()->setUiEditorTypeName( caf::PdmUiTimeEditor::uiEditorTypeName() ); m_visibleTimeRangeMax.uiCapability()->setUiLabelPosition( caf::PdmUiItemInfo::HIDDEN ); - CAF_PDM_InitFieldNoDefault( &m_visibleTimeRangeMin, "VisibleTimeRangeMin", "Min Time", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_visibleTimeRangeMin, "VisibleTimeRangeMin", "Min Time" ); m_visibleTimeRangeMin.uiCapability()->setUiEditorTypeName( caf::PdmUiTimeEditor::uiEditorTypeName() ); m_visibleTimeRangeMin.uiCapability()->setUiLabelPosition( caf::PdmUiItemInfo::HIDDEN ); - CAF_PDM_InitFieldNoDefault( &m_visibleTimeSinceStartRangeMax, "VisibleTimeModeRangeMax", "Max", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_visibleTimeSinceStartRangeMax, "VisibleTimeModeRangeMax", "Max" ); m_visibleTimeSinceStartRangeMax.uiCapability()->setUiEditorTypeName( caf::PdmUiLineEditor::uiEditorTypeName() ); - CAF_PDM_InitFieldNoDefault( &m_visibleTimeSinceStartRangeMin, "VisibleTimeModeRangeMin", "Min", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_visibleTimeSinceStartRangeMin, "VisibleTimeModeRangeMin", "Min" ); m_visibleTimeSinceStartRangeMin.uiCapability()->setUiEditorTypeName( caf::PdmUiLineEditor::uiEditorTypeName() ); - CAF_PDM_InitFieldNoDefault( &m_titlePositionEnum, "TitlePosition", "Title Position", "", "", "" ); - CAF_PDM_InitFieldNoDefault( &m_titleFontSize, "FontSize", "Font Size", "", "", "" ); - CAF_PDM_InitFieldNoDefault( &m_valuesFontSize, "ValuesFontSize", "Font Size", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_titlePositionEnum, "TitlePosition", "Title Position" ); + CAF_PDM_InitFieldNoDefault( &m_titleFontSize, "FontSize", "Font Size" ); + CAF_PDM_InitFieldNoDefault( &m_valuesFontSize, "ValuesFontSize", "Font Size" ); - CAF_PDM_InitField( &m_automaticDateComponents, "AutoDate", true, "Automatic Date/Time Labels", "", "", "" ); - CAF_PDM_InitFieldNoDefault( &m_dateComponents, "DateComponents", "Set Date Label", "", "", "" ); - CAF_PDM_InitFieldNoDefault( &m_timeComponents, "TimeComponents", "Set Time Label", "", "", "" ); + CAF_PDM_InitField( &m_automaticDateComponents, "AutoDate", true, "Automatic Date/Time Labels" ); + CAF_PDM_InitFieldNoDefault( &m_dateComponents, "DateComponents", "Set Date Label" ); + CAF_PDM_InitFieldNoDefault( &m_timeComponents, "TimeComponents", "Set Time Label" ); - CAF_PDM_InitFieldNoDefault( &m_dateFormat, "DateFormat", "Date Label Format", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_dateFormat, "DateFormat", "Date Label Format" ); m_dateFormat.uiCapability()->setUiEditorTypeName( caf::PdmUiComboBoxEditor::uiEditorTypeName() ); m_dateFormat = RiaPreferences::current()->dateFormat(); - CAF_PDM_InitFieldNoDefault( &m_timeFormat, "TimeFormat", "Time Label Format", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_timeFormat, "TimeFormat", "Time Label Format" ); m_timeFormat.uiCapability()->setUiEditorTypeName( caf::PdmUiComboBoxEditor::uiEditorTypeName() ); m_timeFormat = RiaPreferences::current()->timeFormat(); - CAF_PDM_InitFieldNoDefault( &m_majorTickmarkCount, "MajorTickmarkCount", "Major Tickmark Count", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_majorTickmarkCount, "MajorTickmarkCount", "Major Tickmark Count" ); - CAF_PDM_InitFieldNoDefault( &m_annotations, "Annotations", "", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_annotations, "Annotations", "" ); m_annotations.uiCapability()->setUiTreeHidden( true ); } diff --git a/ApplicationLibCode/ProjectDataModel/Surfaces/RimEnsembleStatisticsSurface.cpp b/ApplicationLibCode/ProjectDataModel/Surfaces/RimEnsembleStatisticsSurface.cpp index d7f45e9301..e17a89afea 100644 --- a/ApplicationLibCode/ProjectDataModel/Surfaces/RimEnsembleStatisticsSurface.cpp +++ b/ApplicationLibCode/ProjectDataModel/Surfaces/RimEnsembleStatisticsSurface.cpp @@ -37,7 +37,7 @@ RimEnsembleStatisticsSurface::RimEnsembleStatisticsSurface() { CAF_PDM_InitScriptableObject( "Surface", ":/ReservoirSurface16x16.png", "", "" ); - CAF_PDM_InitFieldNoDefault( &m_statisticsType, "StatisticsType", "StatisticsType", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_statisticsType, "StatisticsType", "StatisticsType" ); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/ProjectDataModel/Surfaces/RimEnsembleSurface.cpp b/ApplicationLibCode/ProjectDataModel/Surfaces/RimEnsembleSurface.cpp index 9c0d73058c..09a632a5a4 100644 --- a/ApplicationLibCode/ProjectDataModel/Surfaces/RimEnsembleSurface.cpp +++ b/ApplicationLibCode/ProjectDataModel/Surfaces/RimEnsembleSurface.cpp @@ -44,7 +44,7 @@ RimEnsembleSurface::RimEnsembleSurface() { CAF_PDM_InitScriptableObject( "Ensemble Surface", ":/ReservoirSurfaces16x16.png", "", "" ); - CAF_PDM_InitFieldNoDefault( &m_ensembleCurveSet, "FilterEnsembleCurveSet", "Filter by Ensemble Curve Set", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_ensembleCurveSet, "FilterEnsembleCurveSet", "Filter by Ensemble Curve Set" ); std::vector statisticsTypes = { RigSurfaceStatisticsCalculator::StatisticsType::MIN, diff --git a/ApplicationLibCode/ProjectDataModel/Surfaces/RimFileSurface.cpp b/ApplicationLibCode/ProjectDataModel/Surfaces/RimFileSurface.cpp index 19cff0309f..ffbe787495 100644 --- a/ApplicationLibCode/ProjectDataModel/Surfaces/RimFileSurface.cpp +++ b/ApplicationLibCode/ProjectDataModel/Surfaces/RimFileSurface.cpp @@ -40,7 +40,7 @@ RimFileSurface::RimFileSurface() { CAF_PDM_InitScriptableObject( "Surface", ":/ReservoirSurface16x16.png", "", "" ); - CAF_PDM_InitFieldNoDefault( &m_surfaceDefinitionFilePath, "SurfaceFilePath", "File", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_surfaceDefinitionFilePath, "SurfaceFilePath", "File" ); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/ProjectDataModel/Surfaces/RimGridCaseSurface.cpp b/ApplicationLibCode/ProjectDataModel/Surfaces/RimGridCaseSurface.cpp index 6f8d1da5c4..d4bfe3ca3d 100644 --- a/ApplicationLibCode/ProjectDataModel/Surfaces/RimGridCaseSurface.cpp +++ b/ApplicationLibCode/ProjectDataModel/Surfaces/RimGridCaseSurface.cpp @@ -42,12 +42,12 @@ RimGridCaseSurface::RimGridCaseSurface() { CAF_PDM_InitScriptableObject( "Surface", ":/ReservoirSurface16x16.png", "", "" ); - CAF_PDM_InitScriptableFieldNoDefault( &m_case, "SourceCase", "Source Case", "", "", "" ); + CAF_PDM_InitScriptableFieldNoDefault( &m_case, "SourceCase", "Source Case" ); - CAF_PDM_InitScriptableField( &m_oneBasedSliceIndex, "SliceIndex", 1, "Slice Index (K)", "", "", "" ); + CAF_PDM_InitScriptableField( &m_oneBasedSliceIndex, "SliceIndex", 1, "Slice Index (K)" ); m_oneBasedSliceIndex.uiCapability()->setUiEditorTypeName( caf::PdmUiSliderEditor::uiEditorTypeName() ); - CAF_PDM_InitScriptableField( &m_watertight, "Watertight", false, "Watertight Surface (fill gaps)", "", "", "" ); + CAF_PDM_InitScriptableField( &m_watertight, "Watertight", false, "Watertight Surface (fill gaps)" ); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/ProjectDataModel/Surfaces/RimSurface.cpp b/ApplicationLibCode/ProjectDataModel/Surfaces/RimSurface.cpp index cc1bea4c4f..85a2ae5ae3 100644 --- a/ApplicationLibCode/ProjectDataModel/Surfaces/RimSurface.cpp +++ b/ApplicationLibCode/ProjectDataModel/Surfaces/RimSurface.cpp @@ -55,14 +55,14 @@ RimSurface::RimSurface() { CAF_PDM_InitScriptableObject( "Surface", ":/ReservoirSurface16x16.png", "", "" ); - CAF_PDM_InitScriptableFieldNoDefault( &m_userDescription, "SurfaceUserDecription", "Name", "", "", "" ); - CAF_PDM_InitField( &m_color, "SurfaceColor", cvf::Color3f( 0.5f, 0.3f, 0.2f ), "Color", "", "", "" ); + CAF_PDM_InitScriptableFieldNoDefault( &m_userDescription, "SurfaceUserDecription", "Name" ); + CAF_PDM_InitField( &m_color, "SurfaceColor", cvf::Color3f( 0.5f, 0.3f, 0.2f ), "Color" ); - CAF_PDM_InitScriptableField( &m_depthOffset, "DepthOffset", 0.0, "Depth Offset", "", "", "" ); + CAF_PDM_InitScriptableField( &m_depthOffset, "DepthOffset", 0.0, "Depth Offset" ); m_depthOffset.uiCapability()->setUiEditorTypeName( caf::PdmUiDoubleSliderEditor::uiEditorTypeName() ); m_depthOffset.capability()->setIOWriteable( true ); - CAF_PDM_InitFieldNoDefault( &m_nameProxy, "NameProxy", "Name Proxy", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_nameProxy, "NameProxy", "Name Proxy" ); m_nameProxy.registerGetMethod( this, &RimSurface::fullName ); m_nameProxy.uiCapability()->setUiReadOnly( true ); m_nameProxy.uiCapability()->setUiHidden( true ); diff --git a/ApplicationLibCode/ProjectDataModel/Surfaces/RimSurfaceCollection.cpp b/ApplicationLibCode/ProjectDataModel/Surfaces/RimSurfaceCollection.cpp index 26b2734666..9898fc3903 100644 --- a/ApplicationLibCode/ProjectDataModel/Surfaces/RimSurfaceCollection.cpp +++ b/ApplicationLibCode/ProjectDataModel/Surfaces/RimSurfaceCollection.cpp @@ -51,15 +51,15 @@ RimSurfaceCollection::RimSurfaceCollection() { CAF_PDM_InitScriptableObject( "Surfaces", ":/ReservoirSurfaces16x16.png", "", "" ); - CAF_PDM_InitScriptableFieldNoDefault( &m_collectionName, "SurfaceUserDecription", "Name", "", "", "" ); + CAF_PDM_InitScriptableFieldNoDefault( &m_collectionName, "SurfaceUserDecription", "Name" ); m_collectionName = "Surfaces"; - CAF_PDM_InitScriptableFieldNoDefault( &m_subCollections, "SubCollections", "Surfaces", "", "", "" ); + CAF_PDM_InitScriptableFieldNoDefault( &m_subCollections, "SubCollections", "Surfaces" ); m_subCollections.uiCapability()->setUiTreeHidden( true ); auto reorderability = caf::PdmFieldReorderCapability::addToField( &m_subCollections ); reorderability->orderChanged.connect( this, &RimSurfaceCollection::orderChanged ); - CAF_PDM_InitScriptableFieldNoDefault( &m_surfaces, "SurfacesField", "Surfaces", "", "", "" ); + CAF_PDM_InitScriptableFieldNoDefault( &m_surfaces, "SurfacesField", "Surfaces" ); m_surfaces.uiCapability()->setUiTreeHidden( true ); setDeletable( true ); diff --git a/ApplicationLibCode/ProjectDataModel/Surfaces/RimSurfaceInView.cpp b/ApplicationLibCode/ProjectDataModel/Surfaces/RimSurfaceInView.cpp index 6086bcbd72..d6e7c3d024 100644 --- a/ApplicationLibCode/ProjectDataModel/Surfaces/RimSurfaceInView.cpp +++ b/ApplicationLibCode/ProjectDataModel/Surfaces/RimSurfaceInView.cpp @@ -43,15 +43,15 @@ RimSurfaceInView::RimSurfaceInView() { CAF_PDM_InitObject( "Surface", ":/ReservoirSurface16x16.png", "", "" ); - CAF_PDM_InitFieldNoDefault( &m_name, "Name", "Name", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_name, "Name", "Name" ); m_name.registerGetMethod( this, &RimSurfaceInView::name ); m_name.uiCapability()->setUiReadOnly( true ); - CAF_PDM_InitFieldNoDefault( &m_surface, "SurfaceRef", "Surface", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_surface, "SurfaceRef", "Surface" ); m_surface.uiCapability()->setUiHidden( true ); m_surface.uiCapability()->setUiTreeHidden( true ); - CAF_PDM_InitFieldNoDefault( &m_resultDefinition, "ResultDefinition", "Result Definition", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_resultDefinition, "ResultDefinition", "Result Definition" ); m_resultDefinition.uiCapability()->setUiTreeHidden( true ); m_resultDefinition.uiCapability()->setUiTreeChildrenHidden( true ); m_resultDefinition = new RimSurfaceResultDefinition; diff --git a/ApplicationLibCode/ProjectDataModel/Surfaces/RimSurfaceInViewCollection.cpp b/ApplicationLibCode/ProjectDataModel/Surfaces/RimSurfaceInViewCollection.cpp index 96e5ba59d1..db4bbc3a15 100644 --- a/ApplicationLibCode/ProjectDataModel/Surfaces/RimSurfaceInViewCollection.cpp +++ b/ApplicationLibCode/ProjectDataModel/Surfaces/RimSurfaceInViewCollection.cpp @@ -43,23 +43,18 @@ RimSurfaceInViewCollection::RimSurfaceInViewCollection() { CAF_PDM_InitObject( "Surfaces", ":/ReservoirSurfaces16x16.png", "", "" ); - CAF_PDM_InitFieldNoDefault( &m_collectionName, "CollectionName", "Name", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_collectionName, "CollectionName", "Name" ); m_collectionName.registerGetMethod( this, &RimSurfaceInViewCollection::name ); m_collectionName.uiCapability()->setUiReadOnly( true ); m_collectionName.xmlCapability()->disableIO(); - CAF_PDM_InitFieldNoDefault( &m_collectionsInView, - "SurfacesInViewFieldCollections", - "SurfacesInViewFieldCollections", - "", - "", - "" ); + CAF_PDM_InitFieldNoDefault( &m_collectionsInView, "SurfacesInViewFieldCollections", "SurfacesInViewFieldCollections" ); m_collectionsInView.uiCapability()->setUiTreeHidden( true ); - CAF_PDM_InitFieldNoDefault( &m_surfacesInView, "SurfacesInViewField", "SurfacesInViewField", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_surfacesInView, "SurfacesInViewField", "SurfacesInViewField" ); m_surfacesInView.uiCapability()->setUiTreeHidden( true ); - CAF_PDM_InitFieldNoDefault( &m_surfaceCollection, "SurfaceCollectionRef", "SurfaceCollection", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_surfaceCollection, "SurfaceCollectionRef", "SurfaceCollection" ); m_surfaceCollection.uiCapability()->setUiHidden( true ); nameField()->uiCapability()->setUiHidden( true ); diff --git a/ApplicationLibCode/ProjectDataModel/Surfaces/RimSurfaceResultDefinition.cpp b/ApplicationLibCode/ProjectDataModel/Surfaces/RimSurfaceResultDefinition.cpp index 6ecd9154db..da6dffff1e 100644 --- a/ApplicationLibCode/ProjectDataModel/Surfaces/RimSurfaceResultDefinition.cpp +++ b/ApplicationLibCode/ProjectDataModel/Surfaces/RimSurfaceResultDefinition.cpp @@ -38,16 +38,16 @@ RimSurfaceResultDefinition::RimSurfaceResultDefinition() { CAF_PDM_InitObject( "Surface", ":/ReservoirSurface16x16.png", "", "" ); - CAF_PDM_InitFieldNoDefault( &m_propertyName, "PropertyName", "Property Name", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_propertyName, "PropertyName", "Property Name" ); - CAF_PDM_InitFieldNoDefault( &m_legendConfig, "LegendConfig", "Legend", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_legendConfig, "LegendConfig", "Legend" ); m_legendConfig.uiCapability()->setUiTreeHidden( true ); m_legendConfig.uiCapability()->setUiTreeChildrenHidden( false ); m_legendConfig = new RimRegularLegendConfig; setName( "Surface Result" ); - CAF_PDM_InitFieldNoDefault( &m_surfaceInView, "SurfaceInView", "Surface In View", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_surfaceInView, "SurfaceInView", "Surface In View" ); m_surfaceInView.uiCapability()->setUiHidden( true ); m_surfaceInView.uiCapability()->setUiTreeChildrenHidden( true ); } diff --git a/ApplicationLibCode/ProjectDataModel/WellLog/Rim3dWellLogCurve.cpp b/ApplicationLibCode/ProjectDataModel/WellLog/Rim3dWellLogCurve.cpp index e8b57132ef..63fee94e9d 100644 --- a/ApplicationLibCode/ProjectDataModel/WellLog/Rim3dWellLogCurve.cpp +++ b/ApplicationLibCode/ProjectDataModel/WellLog/Rim3dWellLogCurve.cpp @@ -62,7 +62,7 @@ Rim3dWellLogCurve::Rim3dWellLogCurve() { CAF_PDM_InitObject( "3d Well Log Curve", ":/WellLogCurve16x16.png", "", "" ); - CAF_PDM_InitField( &m_showCurve, "Show3dWellLogCurve", true, "Show 3d Well Log Curve", "", "", "" ); + CAF_PDM_InitField( &m_showCurve, "Show3dWellLogCurve", true, "Show 3d Well Log Curve" ); m_showCurve.uiCapability()->setUiHidden( true ); CAF_PDM_InitField( &m_minCurveUIValue, "MinCurveValue", @@ -79,8 +79,8 @@ Rim3dWellLogCurve::Rim3dWellLogCurve() "Clip curve values above this.", "" ); - CAF_PDM_InitField( &m_drawPlane, "DrawPlane", DrawPlaneEnum( VERTICAL_ABOVE ), "Draw Plane", "", "", "" ); - CAF_PDM_InitField( &m_color, "CurveColor", cvf::Color3f( 0.0f, 0.0f, 0.0f ), "Curve Color", "", "", "" ); + CAF_PDM_InitField( &m_drawPlane, "DrawPlane", DrawPlaneEnum( VERTICAL_ABOVE ), "Draw Plane" ); + CAF_PDM_InitField( &m_color, "CurveColor", cvf::Color3f( 0.0f, 0.0f, 0.0f ), "Curve Color" ); this->uiCapability()->setUiTreeChildrenHidden( true ); } diff --git a/ApplicationLibCode/ProjectDataModel/WellLog/Rim3dWellLogExtractionCurve.cpp b/ApplicationLibCode/ProjectDataModel/WellLog/Rim3dWellLogExtractionCurve.cpp index 679b21743d..5671f05a75 100644 --- a/ApplicationLibCode/ProjectDataModel/WellLog/Rim3dWellLogExtractionCurve.cpp +++ b/ApplicationLibCode/ProjectDataModel/WellLog/Rim3dWellLogExtractionCurve.cpp @@ -66,25 +66,25 @@ Rim3dWellLogExtractionCurve::Rim3dWellLogExtractionCurve() { CAF_PDM_InitObject( "3d Well Log Extraction Curve", ":/WellLogCurve16x16.png", "", "" ); - CAF_PDM_InitFieldNoDefault( &m_case, "CurveCase", "Case", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_case, "CurveCase", "Case" ); m_case.uiCapability()->setUiTreeChildrenHidden( true ); m_case = nullptr; - CAF_PDM_InitField( &m_timeStep, "CurveTimeStep", -1, "Time Step", "", "", "" ); + CAF_PDM_InitField( &m_timeStep, "CurveTimeStep", -1, "Time Step" ); - CAF_PDM_InitFieldNoDefault( &m_eclipseResultDefinition, "CurveEclipseResult", "", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_eclipseResultDefinition, "CurveEclipseResult", "" ); m_eclipseResultDefinition.uiCapability()->setUiTreeHidden( true ); m_eclipseResultDefinition.uiCapability()->setUiTreeChildrenHidden( true ); m_eclipseResultDefinition = new RimEclipseResultDefinition; m_eclipseResultDefinition->findField( "MResultType" )->uiCapability()->setUiName( "Result Type" ); - CAF_PDM_InitFieldNoDefault( &m_geomResultDefinition, "CurveGeomechResult", "", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_geomResultDefinition, "CurveGeomechResult", "" ); m_geomResultDefinition.uiCapability()->setUiTreeHidden( true ); m_geomResultDefinition.uiCapability()->setUiTreeChildrenHidden( true ); m_geomResultDefinition = new RimGeoMechResultDefinition; m_geomResultDefinition->setAddWellPathDerivedResults( true ); - CAF_PDM_InitFieldNoDefault( &m_nameConfig, "NameConfig", "", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_nameConfig, "NameConfig", "" ); m_nameConfig = new RimWellLogExtractionCurveNameConfig(); } diff --git a/ApplicationLibCode/ProjectDataModel/WellLog/Rim3dWellLogFileCurve.cpp b/ApplicationLibCode/ProjectDataModel/WellLog/Rim3dWellLogFileCurve.cpp index 7111dbd879..b23d74ad94 100644 --- a/ApplicationLibCode/ProjectDataModel/WellLog/Rim3dWellLogFileCurve.cpp +++ b/ApplicationLibCode/ProjectDataModel/WellLog/Rim3dWellLogFileCurve.cpp @@ -41,11 +41,11 @@ Rim3dWellLogFileCurve::Rim3dWellLogFileCurve() { CAF_PDM_InitObject( "3d Well Log File Curve", ":/WellLogCurve16x16.png", "", "" ); - CAF_PDM_InitFieldNoDefault( &m_wellLogChannelName, "CurveWellLogChannel", "Well Log Channel", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_wellLogChannelName, "CurveWellLogChannel", "Well Log Channel" ); - CAF_PDM_InitFieldNoDefault( &m_wellLogFile, "WellLogFile", "Well Log File", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_wellLogFile, "WellLogFile", "Well Log File" ); - CAF_PDM_InitFieldNoDefault( &m_nameConfig, "NameConfig", "", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_nameConfig, "NameConfig", "" ); m_nameConfig = new RimWellLogFileCurveNameConfig(); } diff --git a/ApplicationLibCode/ProjectDataModel/WellLog/Rim3dWellLogRftCurve.cpp b/ApplicationLibCode/ProjectDataModel/WellLog/Rim3dWellLogRftCurve.cpp index fb67f8bdea..2a8f5785ac 100644 --- a/ApplicationLibCode/ProjectDataModel/WellLog/Rim3dWellLogRftCurve.cpp +++ b/ApplicationLibCode/ProjectDataModel/WellLog/Rim3dWellLogRftCurve.cpp @@ -44,17 +44,17 @@ Rim3dWellLogRftCurve::Rim3dWellLogRftCurve() { CAF_PDM_InitObject( "3d Well Log RFT Curve", ":/WellLogCurve16x16.png", "", "" ); - CAF_PDM_InitFieldNoDefault( &m_eclipseResultCase, "eclipseResultCase", "", "", "", "" ); - CAF_PDM_InitFieldNoDefault( &m_timeStep, "timeStep", "", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_eclipseResultCase, "eclipseResultCase", "" ); + CAF_PDM_InitFieldNoDefault( &m_timeStep, "timeStep", "" ); - CAF_PDM_InitFieldNoDefault( &m_wellLogChannelName, "wellLogChannelName", "", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_wellLogChannelName, "wellLogChannelName", "" ); - CAF_PDM_InitFieldNoDefault( &m_2dWellLogRftCurve, "my2dWellLogRftCurve", "", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_2dWellLogRftCurve, "my2dWellLogRftCurve", "" ); m_2dWellLogRftCurve = new RimWellLogRftCurve(); m_2dWellLogRftCurve.xmlCapability()->disableIO(); - CAF_PDM_InitFieldNoDefault( &m_nameConfig, "NameConfig", "", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_nameConfig, "NameConfig", "" ); m_nameConfig = new RimWellLogRftCurveNameConfig(); } diff --git a/ApplicationLibCode/ProjectDataModel/WellLog/RimEnsembleWellLogCurveSet.cpp b/ApplicationLibCode/ProjectDataModel/WellLog/RimEnsembleWellLogCurveSet.cpp index 82b8524397..bf33dd0a44 100644 --- a/ApplicationLibCode/ProjectDataModel/WellLog/RimEnsembleWellLogCurveSet.cpp +++ b/ApplicationLibCode/ProjectDataModel/WellLog/RimEnsembleWellLogCurveSet.cpp @@ -96,39 +96,39 @@ RimEnsembleWellLogCurveSet::RimEnsembleWellLogCurveSet() { CAF_PDM_InitObject( "Ensemble Curve Set", ":/EnsembleCurveSet16x16.png", "", "" ); - CAF_PDM_InitFieldNoDefault( &m_curves, "EnsembleCurveSet", "Ensemble Curve Set", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_curves, "EnsembleCurveSet", "Ensemble Curve Set" ); m_curves.uiCapability()->setUiHidden( true ); m_curves.uiCapability()->setUiTreeChildrenHidden( false ); - CAF_PDM_InitField( &m_showCurves, "IsActive", true, "Show Curves", "", "", "" ); + CAF_PDM_InitField( &m_showCurves, "IsActive", true, "Show Curves" ); m_showCurves.uiCapability()->setUiHidden( true ); - CAF_PDM_InitFieldNoDefault( &m_ensembleWellLogs, "EnsembleWellLogs", "Ensemble Well Logs", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_ensembleWellLogs, "EnsembleWellLogs", "Ensemble Well Logs" ); m_ensembleWellLogs.uiCapability()->setUiTreeChildrenHidden( true ); - CAF_PDM_InitField( &m_wellLogChannelName, "WellLogChannelName", QString( "None" ), "Well Log Channel Name", "", "", "" ); + CAF_PDM_InitField( &m_wellLogChannelName, "WellLogChannelName", QString( "None" ), "Well Log Channel Name" ); - CAF_PDM_InitFieldNoDefault( &m_ensembleCurveSet, "FilterEnsembleCurveSet", "Filter by Ensemble Curve Set", "", "", "" ); - CAF_PDM_InitFieldNoDefault( &m_depthEqualization, "DepthEqualization", "Depth Equalization", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_ensembleCurveSet, "FilterEnsembleCurveSet", "Filter by Ensemble Curve Set" ); + CAF_PDM_InitFieldNoDefault( &m_depthEqualization, "DepthEqualization", "Depth Equalization" ); - CAF_PDM_InitField( &m_colorMode, "ColorMode", caf::AppEnum( ColorMode::SINGLE_COLOR ), "Coloring Mode", "", "", "" ); + CAF_PDM_InitField( &m_colorMode, "ColorMode", caf::AppEnum( ColorMode::SINGLE_COLOR ), "Coloring Mode" ); - CAF_PDM_InitField( &m_color, "Color", RiaColorTools::textColor3f(), "Color", "", "", "" ); + CAF_PDM_InitField( &m_color, "Color", RiaColorTools::textColor3f(), "Color" ); - CAF_PDM_InitFieldNoDefault( &m_statistics, "Statistics", "Statistics", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_statistics, "Statistics", "Statistics" ); m_statistics = new RimEnsembleStatistics( this ); m_statistics.uiCapability()->setUiTreeHidden( true ); - CAF_PDM_InitField( &m_userDefinedName, "UserDefinedName", QString( "Ensemble Curve Set" ), "Curve Set Name", "", "", "" ); + CAF_PDM_InitField( &m_userDefinedName, "UserDefinedName", QString( "Ensemble Curve Set" ), "Curve Set Name" ); - CAF_PDM_InitFieldNoDefault( &m_autoGeneratedName, "AutoGeneratedName", "Curve Set Name", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_autoGeneratedName, "AutoGeneratedName", "Curve Set Name" ); m_autoGeneratedName.registerGetMethod( this, &RimEnsembleWellLogCurveSet::createAutoName ); m_autoGeneratedName.uiCapability()->setUiReadOnly( true ); m_autoGeneratedName.xmlCapability()->disableIO(); - CAF_PDM_InitField( &m_isUsingAutoName, "AutoName", true, "Auto Name", "", "", "" ); + CAF_PDM_InitField( &m_isUsingAutoName, "AutoName", true, "Auto Name" ); - CAF_PDM_InitFieldNoDefault( &m_curveAppearance, "PlotCurveAppearance", "PlotCurveAppearance", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_curveAppearance, "PlotCurveAppearance", "PlotCurveAppearance" ); m_curveAppearance = new RimPlotCurveAppearance; m_curveAppearance.uiCapability()->setUiTreeHidden( true ); m_curveAppearance->setInterpolationVisible( false ); diff --git a/ApplicationLibCode/ProjectDataModel/WellLog/RimEnsembleWellLogStatisticsCurve.cpp b/ApplicationLibCode/ProjectDataModel/WellLog/RimEnsembleWellLogStatisticsCurve.cpp index ca1b996876..27d3932da5 100644 --- a/ApplicationLibCode/ProjectDataModel/WellLog/RimEnsembleWellLogStatisticsCurve.cpp +++ b/ApplicationLibCode/ProjectDataModel/WellLog/RimEnsembleWellLogStatisticsCurve.cpp @@ -39,13 +39,13 @@ CAF_PDM_SOURCE_INIT( RimEnsembleWellLogStatisticsCurve, "EnsembleWellLogStatisti //-------------------------------------------------------------------------------------------------- RimEnsembleWellLogStatisticsCurve::RimEnsembleWellLogStatisticsCurve() { - CAF_PDM_InitObject( "Ensemble Well Log Statistics Curve", "", "", "" ); + CAF_PDM_InitObject( "Ensemble Well Log Statistics Curve" ); - CAF_PDM_InitFieldNoDefault( &m_ensembleWellLogCurveSet, "EnsembleWellLogCurveSet", "Ensemble Well Log Curve Set", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_ensembleWellLogCurveSet, "EnsembleWellLogCurveSet", "Ensemble Well Log Curve Set" ); m_ensembleWellLogCurveSet.uiCapability()->setUiTreeChildrenHidden( true ); m_ensembleWellLogCurveSet.uiCapability()->setUiTreeHidden( true ); - CAF_PDM_InitFieldNoDefault( &m_statisticsType, "StatisticsType", "Statistics Type", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_statisticsType, "StatisticsType", "Statistics Type" ); m_statisticsType.uiCapability()->setUiHidden( true ); m_wellPath = nullptr; diff --git a/ApplicationLibCode/ProjectDataModel/WellLog/RimEnsembleWellLogs.cpp b/ApplicationLibCode/ProjectDataModel/WellLog/RimEnsembleWellLogs.cpp index 8e13ad98ff..6601de125f 100644 --- a/ApplicationLibCode/ProjectDataModel/WellLog/RimEnsembleWellLogs.cpp +++ b/ApplicationLibCode/ProjectDataModel/WellLog/RimEnsembleWellLogs.cpp @@ -32,9 +32,9 @@ CAF_PDM_SOURCE_INIT( RimEnsembleWellLogs, "EnsembleWellLogs" ); //-------------------------------------------------------------------------------------------------- RimEnsembleWellLogs::RimEnsembleWellLogs() { - CAF_PDM_InitScriptableObject( "Ensemble Well Logs", "", "", "" ); + CAF_PDM_InitScriptableObject( "Ensemble Well Logs" ); - CAF_PDM_InitFieldNoDefault( &m_wellLogFiles, "WellLogFiles", "", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_wellLogFiles, "WellLogFiles", "" ); m_wellLogFiles.uiCapability()->setUiTreeHidden( true ); } diff --git a/ApplicationLibCode/ProjectDataModel/WellLog/RimEnsembleWellLogsCollection.cpp b/ApplicationLibCode/ProjectDataModel/WellLog/RimEnsembleWellLogsCollection.cpp index 4d350cedd7..fd3547d02e 100644 --- a/ApplicationLibCode/ProjectDataModel/WellLog/RimEnsembleWellLogsCollection.cpp +++ b/ApplicationLibCode/ProjectDataModel/WellLog/RimEnsembleWellLogsCollection.cpp @@ -31,7 +31,7 @@ RimEnsembleWellLogsCollection::RimEnsembleWellLogsCollection() { CAF_PDM_InitObject( "Ensemble Well Logs", ":/LasFile16x16.png", "", "" ); - CAF_PDM_InitFieldNoDefault( &m_ensembleWellLogs, "EnsembleWellLogsCollection", "", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_ensembleWellLogs, "EnsembleWellLogsCollection", "" ); m_ensembleWellLogs.uiCapability()->setUiTreeHidden( true ); } diff --git a/ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogCurveCommonDataSource.cpp b/ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogCurveCommonDataSource.cpp index 7a0a2da962..710bb28041 100644 --- a/ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogCurveCommonDataSource.cpp +++ b/ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogCurveCommonDataSource.cpp @@ -70,14 +70,14 @@ bool RimWellLogCurveCommonDataSource::DoubleComparator::operator()( const double RimWellLogCurveCommonDataSource::RimWellLogCurveCommonDataSource() : m_caseType( RiaDefines::CaseType::UNDEFINED_CASE ) { - CAF_PDM_InitObject( "Change Data Source", "", "", "" ); + CAF_PDM_InitObject( "Change Data Source" ); - CAF_PDM_InitFieldNoDefault( &m_case, "CurveCase", "Case", "", "", "" ); - CAF_PDM_InitFieldNoDefault( &m_trajectoryType, "TrajectoryType", "Trajectory Type", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_case, "CurveCase", "Case" ); + CAF_PDM_InitFieldNoDefault( &m_trajectoryType, "TrajectoryType", "Trajectory Type" ); - CAF_PDM_InitFieldNoDefault( &m_wellPath, "CurveWellPath", "Well Name", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_wellPath, "CurveWellPath", "Well Name" ); - CAF_PDM_InitFieldNoDefault( &m_simWellName, "SimulationWellName", "Well Name", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_simWellName, "SimulationWellName", "Well Name" ); CAF_PDM_InitFieldNoDefault( &m_branchDetection, "BranchDetection", "Branch Detection", @@ -86,15 +86,15 @@ RimWellLogCurveCommonDataSource::RimWellLogCurveCommonDataSource() "" ); m_branchDetection.v() = caf::Tristate::State::PartiallyTrue; m_branchDetection.uiCapability()->setUiEditorTypeName( caf::PdmUiCheckBoxTristateEditor::uiEditorTypeName() ); - CAF_PDM_InitField( &m_branchIndex, "Branch", -1, "Branch Index", "", "", "" ); + CAF_PDM_InitField( &m_branchIndex, "Branch", -1, "Branch Index" ); - CAF_PDM_InitField( &m_timeStep, "CurveTimeStep", -1, "Time Step", "", "", "" ); + CAF_PDM_InitField( &m_timeStep, "CurveTimeStep", -1, "Time Step" ); - CAF_PDM_InitFieldNoDefault( &m_wbsSmoothing, "WBSSmoothing", "Smooth Curves", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_wbsSmoothing, "WBSSmoothing", "Smooth Curves" ); m_wbsSmoothing.uiCapability()->setUiEditorTypeName( caf::PdmUiCheckBoxTristateEditor::uiEditorTypeName() ); m_wbsSmoothing.v() = caf::Tristate::State::PartiallyTrue; - CAF_PDM_InitField( &m_wbsSmoothingThreshold, "WBSSmoothingThreshold", -1.0, "Smoothing Threshold", "", "", "" ); + CAF_PDM_InitField( &m_wbsSmoothingThreshold, "WBSSmoothingThreshold", -1.0, "Smoothing Threshold" ); m_case = nullptr; m_wellPath = nullptr; diff --git a/ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogExtractionCurve.cpp b/ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogExtractionCurve.cpp index 271dfb91a5..279cc56609 100644 --- a/ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogExtractionCurve.cpp +++ b/ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogExtractionCurve.cpp @@ -96,12 +96,12 @@ RimWellLogExtractionCurve::RimWellLogExtractionCurve() { CAF_PDM_InitScriptableObject( "Well Log Curve", RimWellLogCurve::wellLogCurveIconName(), "", "" ); - CAF_PDM_InitFieldNoDefault( &m_trajectoryType, "TrajectoryType", "Trajectory Type", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_trajectoryType, "TrajectoryType", "Trajectory Type" ); - CAF_PDM_InitFieldNoDefault( &m_wellPath, "CurveWellPath", "Well Name", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_wellPath, "CurveWellPath", "Well Name" ); m_wellPath.uiCapability()->setUiTreeChildrenHidden( true ); - CAF_PDM_InitField( &m_simWellName, "SimulationWellName", QString( "" ), "Well Name", "", "", "" ); + CAF_PDM_InitField( &m_simWellName, "SimulationWellName", QString( "" ), "Well Name" ); CAF_PDM_InitField( &m_branchDetection, "BranchDetection", true, @@ -109,31 +109,31 @@ RimWellLogExtractionCurve::RimWellLogExtractionCurve() "", "Compute branches based on how simulation well cells are organized", "" ); - CAF_PDM_InitField( &m_branchIndex, "Branch", 0, "Branch Index", "", "", "" ); + CAF_PDM_InitField( &m_branchIndex, "Branch", 0, "Branch Index" ); - CAF_PDM_InitFieldNoDefault( &m_case, "CurveCase", "Case", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_case, "CurveCase", "Case" ); m_case.uiCapability()->setUiTreeChildrenHidden( true ); - CAF_PDM_InitFieldNoDefault( &m_eclipseResultDefinition, "CurveEclipseResult", "", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_eclipseResultDefinition, "CurveEclipseResult", "" ); m_eclipseResultDefinition.uiCapability()->setUiTreeHidden( true ); m_eclipseResultDefinition.uiCapability()->setUiTreeChildrenHidden( true ); m_eclipseResultDefinition = new RimEclipseResultDefinition; m_eclipseResultDefinition->findField( "MResultType" )->uiCapability()->setUiName( "Result Type" ); - CAF_PDM_InitFieldNoDefault( &m_geomResultDefinition, "CurveGeomechResult", "", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_geomResultDefinition, "CurveGeomechResult", "" ); m_geomResultDefinition.uiCapability()->setUiTreeHidden( true ); m_geomResultDefinition.uiCapability()->setUiTreeChildrenHidden( true ); m_geomResultDefinition = new RimGeoMechResultDefinition; m_geomResultDefinition->setAddWellPathDerivedResults( true ); - CAF_PDM_InitField( &m_timeStep, "CurveTimeStep", 0, "Time Step", "", "", "" ); + CAF_PDM_InitField( &m_timeStep, "CurveTimeStep", 0, "Time Step" ); // Add some space before name to indicate these belong to the Auto Name field - CAF_PDM_InitField( &m_addCaseNameToCurveName, "AddCaseNameToCurveName", true, " Case Name", "", "", "" ); - CAF_PDM_InitField( &m_addPropertyToCurveName, "AddPropertyToCurveName", true, " Property", "", "", "" ); - CAF_PDM_InitField( &m_addWellNameToCurveName, "AddWellNameToCurveName", true, " Well Name", "", "", "" ); - CAF_PDM_InitField( &m_addTimestepToCurveName, "AddTimestepToCurveName", false, " Timestep", "", "", "" ); - CAF_PDM_InitField( &m_addDateToCurveName, "AddDateToCurveName", true, " Date", "", "", "" ); + CAF_PDM_InitField( &m_addCaseNameToCurveName, "AddCaseNameToCurveName", true, " Case Name" ); + CAF_PDM_InitField( &m_addPropertyToCurveName, "AddPropertyToCurveName", true, " Property" ); + CAF_PDM_InitField( &m_addWellNameToCurveName, "AddWellNameToCurveName", true, " Well Name" ); + CAF_PDM_InitField( &m_addTimestepToCurveName, "AddTimestepToCurveName", false, " Timestep" ); + CAF_PDM_InitField( &m_addDateToCurveName, "AddDateToCurveName", true, " Date" ); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogExtractionCurveNameConfig.cpp b/ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogExtractionCurveNameConfig.cpp index 903fbf0ff3..d5027af8c3 100644 --- a/ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogExtractionCurveNameConfig.cpp +++ b/ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogExtractionCurveNameConfig.cpp @@ -31,13 +31,13 @@ CAF_PDM_SOURCE_INIT( RimWellLogExtractionCurveNameConfig, "RimWellLogExtractionC RimWellLogExtractionCurveNameConfig::RimWellLogExtractionCurveNameConfig() : RimNameConfig( "Log Extraction" ) { - CAF_PDM_InitObject( "Well Log Extraction Curve Name Generator", "", "", "" ); + CAF_PDM_InitObject( "Well Log Extraction Curve Name Generator" ); - CAF_PDM_InitField( &m_addCaseName, "AddCaseName", true, "Add Case Name", "", "", "" ); - CAF_PDM_InitField( &m_addProperty, "AddProperty", true, "Add Property Type", "", "", "" ); - CAF_PDM_InitField( &m_addWellName, "AddWellName", true, "Add Well Name", "", "", "" ); - CAF_PDM_InitField( &m_addTimestep, "AddTimeStep", true, "Add Time Step", "", "", "" ); - CAF_PDM_InitField( &m_addDate, "AddDate", true, "Add Date", "", "", "" ); + CAF_PDM_InitField( &m_addCaseName, "AddCaseName", true, "Add Case Name" ); + CAF_PDM_InitField( &m_addProperty, "AddProperty", true, "Add Property Type" ); + CAF_PDM_InitField( &m_addWellName, "AddWellName", true, "Add Well Name" ); + CAF_PDM_InitField( &m_addTimestep, "AddTimeStep", true, "Add Time Step" ); + CAF_PDM_InitField( &m_addDate, "AddDate", true, "Add Date" ); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogFile.cpp b/ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogFile.cpp index c2547c3aff..48151afadc 100644 --- a/ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogFile.cpp +++ b/ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogFile.cpp @@ -66,21 +66,21 @@ RimWellLogFile::RimWellLogFile() { CAF_PDM_InitObject( "Well LAS File Info", ":/LasFile16x16.png", "", "" ); - CAF_PDM_InitFieldNoDefault( &m_wellName, "WellName", "", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_wellName, "WellName", "" ); m_wellName.uiCapability()->setUiReadOnly( true ); RiaFieldhandleTools::disableWriteAndSetFieldHidden( &m_wellName ); - CAF_PDM_InitFieldNoDefault( &m_date, "Date", "Date", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_date, "Date", "Date" ); m_date.uiCapability()->setUiReadOnly( true ); - CAF_PDM_InitFieldNoDefault( &m_fileName, "FileName", "Filename", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_fileName, "FileName", "Filename" ); m_fileName.uiCapability()->setUiReadOnly( true ); - CAF_PDM_InitFieldNoDefault( &m_name, "Name", "", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_name, "Name", "" ); m_name.uiCapability()->setUiReadOnly( true ); RiaFieldhandleTools::disableWriteAndSetFieldHidden( &m_name ); - CAF_PDM_InitFieldNoDefault( &m_wellLogChannelNames, "WellLogFileChannels", "", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_wellLogChannelNames, "WellLogFileChannels", "" ); RiaFieldhandleTools::disableWriteAndSetFieldHidden( &m_wellLogChannelNames ); CAF_PDM_InitField( &m_wellFlowCondition, @@ -91,7 +91,7 @@ RimWellLogFile::RimWellLogFile() "", "" ); - CAF_PDM_InitField( &m_invalidDateMessage, "InvalidDateMessage", QString( "Invalid or no date" ), "", "", "", "" ); + CAF_PDM_InitField( &m_invalidDateMessage, "InvalidDateMessage", QString( "Invalid or no date" ), "" ); m_invalidDateMessage.uiCapability()->setUiReadOnly( true ); m_invalidDateMessage.xmlCapability()->disableIO(); diff --git a/ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogFileChannel.cpp b/ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogFileChannel.cpp index c1ea680c0e..c5d6bd779d 100644 --- a/ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogFileChannel.cpp +++ b/ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogFileChannel.cpp @@ -30,9 +30,9 @@ CAF_PDM_SOURCE_INIT( RimWellLogFileChannel, "WellLogFileChannel" ); //-------------------------------------------------------------------------------------------------- RimWellLogFileChannel::RimWellLogFileChannel() { - CAF_PDM_InitObject( "Well Log File Channel", "", "", "" ); + CAF_PDM_InitObject( "Well Log File Channel" ); - CAF_PDM_InitFieldNoDefault( &m_name, "Name", "", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_name, "Name", "" ); RiaFieldhandleTools::disableWriteAndSetFieldHidden( &m_name ); } @@ -42,4 +42,4 @@ RimWellLogFileChannel::RimWellLogFileChannel() void RimWellLogFileChannel::setName( const QString& name ) { m_name = name; -} \ No newline at end of file +} diff --git a/ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogFileCurve.cpp b/ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogFileCurve.cpp index df7daccfe2..9f09c4a36d 100644 --- a/ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogFileCurve.cpp +++ b/ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogFileCurve.cpp @@ -54,12 +54,12 @@ RimWellLogFileCurve::RimWellLogFileCurve() { CAF_PDM_InitObject( "Well Log File Curve", RimWellLogCurve::wellLogCurveIconName(), "", "" ); - CAF_PDM_InitFieldNoDefault( &m_wellPath, "CurveWellPath", "Well Path", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_wellPath, "CurveWellPath", "Well Path" ); m_wellPath.uiCapability()->setUiTreeChildrenHidden( true ); - CAF_PDM_InitFieldNoDefault( &m_wellLogChannelName, "CurveWellLogChannel", "Well Log Channel", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_wellLogChannelName, "CurveWellLogChannel", "Well Log Channel" ); - CAF_PDM_InitFieldNoDefault( &m_wellLogFile, "WellLogFile", "Well Log File", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_wellLogFile, "WellLogFile", "Well Log File" ); m_wellPath = nullptr; } diff --git a/ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogFileCurveNameConfig.cpp b/ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogFileCurveNameConfig.cpp index bf0a78fed6..0196e579c2 100644 --- a/ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogFileCurveNameConfig.cpp +++ b/ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogFileCurveNameConfig.cpp @@ -31,7 +31,7 @@ CAF_PDM_SOURCE_INIT( RimWellLogFileCurveNameConfig, "RimWellLogFileCurveNameConf RimWellLogFileCurveNameConfig::RimWellLogFileCurveNameConfig() : RimNameConfig( "Las Curve" ) { - CAF_PDM_InitObject( "Well Log File Curve Name Generator", "", "", "" ); + CAF_PDM_InitObject( "Well Log File Curve Name Generator" ); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogPlotCollection.cpp b/ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogPlotCollection.cpp index 0be5aad571..78c917d5f8 100644 --- a/ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogPlotCollection.cpp +++ b/ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogPlotCollection.cpp @@ -48,7 +48,7 @@ RimWellLogPlotCollection::RimWellLogPlotCollection() { CAF_PDM_InitScriptableObject( "Well Log Plots", ":/WellLogPlots16x16.png", "", "" ); - CAF_PDM_InitScriptableFieldNoDefault( &m_wellLogPlots, "WellLogPlots", "", "", "", "" ); + CAF_PDM_InitScriptableFieldNoDefault( &m_wellLogPlots, "WellLogPlots", "" ); m_wellLogPlots.uiCapability()->setUiTreeHidden( true ); } diff --git a/ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogPlotNameConfig.cpp b/ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogPlotNameConfig.cpp index 65bb5e2523..b41cc6dadb 100644 --- a/ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogPlotNameConfig.cpp +++ b/ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogPlotNameConfig.cpp @@ -31,13 +31,13 @@ CAF_PDM_SOURCE_INIT( RimWellLogPlotNameConfig, "RimWellLogPlotNameConfig" ); RimWellLogPlotNameConfig::RimWellLogPlotNameConfig() : RimNameConfig( "Well Log Plot" ) { - CAF_PDM_InitObject( "Well Log Plot Name Generator", "", "", "" ); + CAF_PDM_InitObject( "Well Log Plot Name Generator" ); - CAF_PDM_InitField( &m_addCaseName, "AddCaseName", false, "Show Case Name", "", "", "" ); - CAF_PDM_InitField( &m_addWellName, "AddWellName", false, "Show Well Name", "", "", "" ); - CAF_PDM_InitField( &m_addTimestep, "AddTimeStep", false, "Show Time Step", "", "", "" ); - CAF_PDM_InitField( &m_addAirGap, "AddAirGap", false, "Show Air Gap", "", "", "" ); - CAF_PDM_InitField( &m_addWaterDepth, "AddWaterDepth", false, "Show Water Depth", "", "", "" ); + CAF_PDM_InitField( &m_addCaseName, "AddCaseName", false, "Show Case Name" ); + CAF_PDM_InitField( &m_addWellName, "AddWellName", false, "Show Well Name" ); + CAF_PDM_InitField( &m_addTimestep, "AddTimeStep", false, "Show Time Step" ); + CAF_PDM_InitField( &m_addAirGap, "AddAirGap", false, "Show Air Gap" ); + CAF_PDM_InitField( &m_addWaterDepth, "AddWaterDepth", false, "Show Water Depth" ); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogRftCurve.cpp b/ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogRftCurve.cpp index 491e77398b..491eb8875b 100644 --- a/ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogRftCurve.cpp +++ b/ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogRftCurve.cpp @@ -96,22 +96,22 @@ RimWellLogRftCurve::RimWellLogRftCurve() { CAF_PDM_InitObject( "Well Log RFT Curve", RimWellLogCurve::wellLogCurveIconName(), "", "" ); - CAF_PDM_InitFieldNoDefault( &m_eclipseResultCase, "CurveEclipseResultCase", "Eclipse Result Case", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_eclipseResultCase, "CurveEclipseResultCase", "Eclipse Result Case" ); m_eclipseResultCase.uiCapability()->setUiTreeChildrenHidden( true ); - CAF_PDM_InitFieldNoDefault( &m_summaryCase, "CurveSummaryCase", "Summary Case", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_summaryCase, "CurveSummaryCase", "Summary Case" ); m_summaryCase.uiCapability()->setUiTreeChildrenHidden( true ); - CAF_PDM_InitFieldNoDefault( &m_ensemble, "CurveEnsemble", "Ensemble", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_ensemble, "CurveEnsemble", "Ensemble" ); m_ensemble.uiCapability()->setUiTreeChildrenHidden( true ); - CAF_PDM_InitFieldNoDefault( &m_observedFmuRftData, "ObservedFmuRftData", "Observed FMU RFT Data", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_observedFmuRftData, "ObservedFmuRftData", "Observed FMU RFT Data" ); m_observedFmuRftData.uiCapability()->setUiTreeChildrenHidden( true ); - CAF_PDM_InitFieldNoDefault( &m_timeStep, "TimeStep", "Time Step", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_timeStep, "TimeStep", "Time Step" ); - CAF_PDM_InitFieldNoDefault( &m_wellName, "WellName", "Well Name", "", "", "" ); - CAF_PDM_InitField( &m_branchIndex, "BranchIndex", 0, "Branch Index", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_wellName, "WellName", "Well Name" ); + CAF_PDM_InitField( &m_branchIndex, "BranchIndex", 0, "Branch Index" ); CAF_PDM_InitField( &m_branchDetection, "BranchDetection", true, @@ -120,7 +120,7 @@ RimWellLogRftCurve::RimWellLogRftCurve() "Compute branches based on how simulation well cells are organized", "" ); - CAF_PDM_InitFieldNoDefault( &m_wellLogChannelName, "WellLogChannelName", "Well Property", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_wellLogChannelName, "WellLogChannelName", "Well Property" ); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogRftCurveNameConfig.cpp b/ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogRftCurveNameConfig.cpp index cabb7ceeab..338885cab1 100644 --- a/ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogRftCurveNameConfig.cpp +++ b/ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogRftCurveNameConfig.cpp @@ -31,7 +31,7 @@ CAF_PDM_SOURCE_INIT( RimWellLogRftCurveNameConfig, "RimWellLogRftCurveNameConfig RimWellLogRftCurveNameConfig::RimWellLogRftCurveNameConfig() : RimNameConfig( "Rft Curve" ) { - CAF_PDM_InitObject( "Well Log Rft Curve Name Generator", "", "", "" ); + CAF_PDM_InitObject( "Well Log Rft Curve Name Generator" ); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogTrack.cpp b/ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogTrack.cpp index 9b8eac313d..30c2c9bf60 100644 --- a/ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogTrack.cpp +++ b/ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogTrack.cpp @@ -176,71 +176,66 @@ RimWellLogTrack::RimWellLogTrack() { CAF_PDM_InitScriptableObject( "Track", ":/WellLogTrack16x16.png", "", "" ); - CAF_PDM_InitFieldNoDefault( &m_description, "TrackDescription", "Name", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_description, "TrackDescription", "Name" ); m_description.uiCapability()->setUiReadOnly( true ); - CAF_PDM_InitFieldNoDefault( &m_curves, "Curves", "", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_curves, "Curves", "" ); m_curves.uiCapability()->setUiTreeHidden( true ); auto reorderability = caf::PdmFieldReorderCapability::addToField( &m_curves ); reorderability->orderChanged.connect( this, &RimWellLogTrack::curveDataChanged ); - CAF_PDM_InitField( &m_visibleXRangeMin, "VisibleXRangeMin", RI_LOGPLOTTRACK_MINX_DEFAULT, "Min", "", "", "" ); - CAF_PDM_InitField( &m_visibleXRangeMax, "VisibleXRangeMax", RI_LOGPLOTTRACK_MAXX_DEFAULT, "Max", "", "", "" ); - CAF_PDM_InitField( &m_visibleDepthRangeMin, "VisibleYRangeMin", RI_LOGPLOTTRACK_MINX_DEFAULT, "Min", "", "", "" ); - CAF_PDM_InitField( &m_visibleDepthRangeMax, "VisibleYRangeMax", RI_LOGPLOTTRACK_MAXX_DEFAULT, "Max", "", "", "" ); + CAF_PDM_InitField( &m_visibleXRangeMin, "VisibleXRangeMin", RI_LOGPLOTTRACK_MINX_DEFAULT, "Min" ); + CAF_PDM_InitField( &m_visibleXRangeMax, "VisibleXRangeMax", RI_LOGPLOTTRACK_MAXX_DEFAULT, "Max" ); + CAF_PDM_InitField( &m_visibleDepthRangeMin, "VisibleYRangeMin", RI_LOGPLOTTRACK_MINX_DEFAULT, "Min" ); + CAF_PDM_InitField( &m_visibleDepthRangeMax, "VisibleYRangeMax", RI_LOGPLOTTRACK_MAXX_DEFAULT, "Max" ); m_visibleDepthRangeMin.uiCapability()->setUiHidden( true ); m_visibleDepthRangeMin.xmlCapability()->disableIO(); m_visibleDepthRangeMax.uiCapability()->setUiHidden( true ); m_visibleDepthRangeMax.xmlCapability()->disableIO(); - CAF_PDM_InitField( &m_isAutoScaleXEnabled, "AutoScaleX", true, "Auto Scale", "", "", "" ); + CAF_PDM_InitField( &m_isAutoScaleXEnabled, "AutoScaleX", true, "Auto Scale" ); m_isAutoScaleXEnabled.uiCapability()->setUiHidden( true ); - CAF_PDM_InitField( &m_isLogarithmicScaleEnabled, "LogarithmicScaleX", false, "Logarithmic Scale", "", "", "" ); + CAF_PDM_InitField( &m_isLogarithmicScaleEnabled, "LogarithmicScaleX", false, "Logarithmic Scale" ); - CAF_PDM_InitFieldNoDefault( &m_xAxisGridVisibility, "ShowXGridLines", "Show Grid Lines", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_xAxisGridVisibility, "ShowXGridLines", "Show Grid Lines" ); - CAF_PDM_InitField( &m_explicitTickIntervals, "ExplicitTickIntervals", false, "Manually Set Tick Intervals", "", "", "" ); - CAF_PDM_InitField( &m_minAndMaxTicksOnly, "MinAndMaxTicksOnly", false, "Show Ticks at Min and Max", "", "", "" ); - CAF_PDM_InitField( &m_majorTickInterval, "MajorTickIntervals", 0.0, "Major Tick Interval", "", "", "" ); - CAF_PDM_InitField( &m_minorTickInterval, "MinorTickIntervals", 0.0, "Minor Tick Interval", "", "", "" ); + CAF_PDM_InitField( &m_explicitTickIntervals, "ExplicitTickIntervals", false, "Manually Set Tick Intervals" ); + CAF_PDM_InitField( &m_minAndMaxTicksOnly, "MinAndMaxTicksOnly", false, "Show Ticks at Min and Max" ); + CAF_PDM_InitField( &m_majorTickInterval, "MajorTickIntervals", 0.0, "Major Tick Interval" ); + CAF_PDM_InitField( &m_minorTickInterval, "MinorTickIntervals", 0.0, "Minor Tick Interval" ); m_majorTickInterval.uiCapability()->setUiHidden( true ); m_minorTickInterval.uiCapability()->setUiHidden( true ); - CAF_PDM_InitFieldNoDefault( &m_axisFontSize, "AxisFontSize", "Axis Font Size", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_axisFontSize, "AxisFontSize", "Axis Font Size" ); - CAF_PDM_InitFieldNoDefault( &m_regionAnnotationType, "AnnotationType", "Region Annotations", "", "", "" ); - CAF_PDM_InitFieldNoDefault( &m_regionAnnotationDisplay, "RegionDisplay", "Region Display", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_regionAnnotationType, "AnnotationType", "Region Annotations" ); + CAF_PDM_InitFieldNoDefault( &m_regionAnnotationDisplay, "RegionDisplay", "Region Display" ); - CAF_PDM_InitFieldNoDefault( &m_colorShadingLegend, "ColorShadingLegend", "Colors", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_colorShadingLegend, "ColorShadingLegend", "Colors" ); m_colorShadingLegend = RimRegularLegendConfig::mapToColorLegend( RimRegularLegendConfig::ColorRangesType::NORMAL ); - CAF_PDM_InitField( &m_colorShadingTransparency, "ColorShadingTransparency", 50, "Color Transparency", "", "", "" ); + CAF_PDM_InitField( &m_colorShadingTransparency, "ColorShadingTransparency", 50, "Color Transparency" ); m_colorShadingTransparency.uiCapability()->setUiEditorTypeName( caf::PdmUiSliderEditor::uiEditorTypeName() ); - CAF_PDM_InitField( &m_showRegionLabels, "ShowFormationLabels", true, "Show Labels", "", "", "" ); + CAF_PDM_InitField( &m_showRegionLabels, "ShowFormationLabels", true, "Show Labels" ); caf::FontTools::RelativeSizeEnum regionLabelFontSizeDefault = caf::FontTools::RelativeSize::XSmall; - CAF_PDM_InitField( &m_regionLabelFontSize, "RegionLabelFontSize", regionLabelFontSizeDefault, "Font Size", "", "", "" ); + CAF_PDM_InitField( &m_regionLabelFontSize, "RegionLabelFontSize", regionLabelFontSizeDefault, "Font Size" ); - CAF_PDM_InitFieldNoDefault( &m_formationSource, "FormationSource", "Source", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_formationSource, "FormationSource", "Source" ); - CAF_PDM_InitFieldNoDefault( &m_formationTrajectoryType, "FormationTrajectoryType", "Trajectory", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_formationTrajectoryType, "FormationTrajectoryType", "Trajectory" ); - CAF_PDM_InitFieldNoDefault( &m_formationWellPathForSourceCase, "FormationWellPath", "Well Path", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_formationWellPathForSourceCase, "FormationWellPath", "Well Path" ); m_formationWellPathForSourceCase.uiCapability()->setUiTreeChildrenHidden( true ); - CAF_PDM_InitFieldNoDefault( &m_formationWellPathForSourceWellPath, - "FormationWellPathForSourceWellPath", - "Well Path", - "", - "", - "" ); + CAF_PDM_InitFieldNoDefault( &m_formationWellPathForSourceWellPath, "FormationWellPathForSourceWellPath", "Well Path" ); m_formationWellPathForSourceWellPath.uiCapability()->setUiTreeChildrenHidden( true ); - CAF_PDM_InitField( &m_formationSimWellName, "FormationSimulationWellName", QString( "None" ), "Simulation Well", "", "", "" ); - CAF_PDM_InitField( &m_formationBranchIndex, "FormationBranchIndex", 0, " ", "", "", "" ); + CAF_PDM_InitField( &m_formationSimWellName, "FormationSimulationWellName", QString( "None" ), "Simulation Well" ); + CAF_PDM_InitField( &m_formationBranchIndex, "FormationBranchIndex", 0, " " ); CAF_PDM_InitField( &m_formationBranchDetection, "FormationBranchDetection", true, @@ -249,38 +244,33 @@ RimWellLogTrack::RimWellLogTrack() "Compute branches based on how simulation well cells are organized", "" ); - CAF_PDM_InitFieldNoDefault( &m_formationCase, "FormationCase", "Formation Case", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_formationCase, "FormationCase", "Formation Case" ); m_formationCase.uiCapability()->setUiTreeChildrenHidden( true ); - CAF_PDM_InitFieldNoDefault( &m_formationLevel, "FormationLevel", "Well Pick Filter", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_formationLevel, "FormationLevel", "Well Pick Filter" ); - CAF_PDM_InitField( &m_showformationFluids, "ShowFormationFluids", false, "Show Fluids", "", "", "" ); + CAF_PDM_InitField( &m_showformationFluids, "ShowFormationFluids", false, "Show Fluids" ); - CAF_PDM_InitField( &m_showWellPathAttributes, "ShowWellPathAttributes", false, "Show Well Attributes", "", "", "" ); - CAF_PDM_InitField( &m_wellPathAttributesInLegend, "WellPathAttributesInLegend", true, "Attributes in Legend", "", "", "" ); - CAF_PDM_InitField( &m_showWellPathCompletions, "ShowWellPathCompletions", true, "Show Well Completions", "", "", "" ); - CAF_PDM_InitField( &m_wellPathCompletionsInLegend, "WellPathCompletionsInLegend", true, "Completions in Legend", "", "", "" ); - CAF_PDM_InitField( &m_showWellPathComponentsBothSides, "ShowWellPathAttrBothSides", true, "Show Both Sides", "", "", "" ); - CAF_PDM_InitField( &m_showWellPathComponentLabels, "ShowWellPathAttrLabels", false, "Show Labels", "", "", "" ); - CAF_PDM_InitFieldNoDefault( &m_wellPathComponentSource, "AttributesWellPathSource", "Well Path", "", "", "" ); - CAF_PDM_InitFieldNoDefault( &m_wellPathAttributeCollection, "AttributesCollection", "Well Attributes", "", "", "" ); + CAF_PDM_InitField( &m_showWellPathAttributes, "ShowWellPathAttributes", false, "Show Well Attributes" ); + CAF_PDM_InitField( &m_wellPathAttributesInLegend, "WellPathAttributesInLegend", true, "Attributes in Legend" ); + CAF_PDM_InitField( &m_showWellPathCompletions, "ShowWellPathCompletions", true, "Show Well Completions" ); + CAF_PDM_InitField( &m_wellPathCompletionsInLegend, "WellPathCompletionsInLegend", true, "Completions in Legend" ); + CAF_PDM_InitField( &m_showWellPathComponentsBothSides, "ShowWellPathAttrBothSides", true, "Show Both Sides" ); + CAF_PDM_InitField( &m_showWellPathComponentLabels, "ShowWellPathAttrLabels", false, "Show Labels" ); + CAF_PDM_InitFieldNoDefault( &m_wellPathComponentSource, "AttributesWellPathSource", "Well Path" ); + CAF_PDM_InitFieldNoDefault( &m_wellPathAttributeCollection, "AttributesCollection", "Well Attributes" ); - CAF_PDM_InitField( &m_overburdenHeight, "OverburdenHeight", 0.0, "Overburden Height", "", "", "" ); + CAF_PDM_InitField( &m_overburdenHeight, "OverburdenHeight", 0.0, "Overburden Height" ); m_overburdenHeight.uiCapability()->setUiHidden( true ); - CAF_PDM_InitField( &m_underburdenHeight, "UnderburdenHeight", 0.0, "Underburden Height", "", "", "" ); + CAF_PDM_InitField( &m_underburdenHeight, "UnderburdenHeight", 0.0, "Underburden Height" ); m_underburdenHeight.uiCapability()->setUiHidden( true ); - CAF_PDM_InitFieldNoDefault( &m_resultDefinition, "ResultDefinition", "Result Definition", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_resultDefinition, "ResultDefinition", "Result Definition" ); m_resultDefinition.uiCapability()->setUiTreeHidden( true ); m_resultDefinition.uiCapability()->setUiTreeChildrenHidden( true ); m_resultDefinition = new RimEclipseResultDefinition; - CAF_PDM_InitFieldNoDefault( &m_ensembleWellLogCurveSet, - "EnsembleWellLogCurveSet", - "Ensemble Well Logs Curve Set", - "", - "", - "" ); + CAF_PDM_InitFieldNoDefault( &m_ensembleWellLogCurveSet, "EnsembleWellLogCurveSet", "Ensemble Well Logs Curve Set" ); m_ensembleWellLogCurveSet.uiCapability()->setUiTreeHidden( true ); m_formationsForCaseWithSimWellOnly = false; diff --git a/ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogWbsCurve.cpp b/ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogWbsCurve.cpp index 59fe90554d..ec3b6f13c0 100644 --- a/ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogWbsCurve.cpp +++ b/ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogWbsCurve.cpp @@ -14,8 +14,8 @@ RimWellLogWbsCurve::RimWellLogWbsCurve() { CAF_PDM_InitObject( "Well Bore Stability Curve", RimWellLogCurve::wellLogCurveIconName(), "", "" ); - CAF_PDM_InitField( &m_smoothCurve, "SmoothCurve", false, "Smooth Curve", "", "", "" ); - CAF_PDM_InitField( &m_smoothingThreshold, "SmoothingThreshold", 0.002, "Smoothing Threshold", "", "", "" ); + CAF_PDM_InitField( &m_smoothCurve, "SmoothCurve", false, "Smooth Curve" ); + CAF_PDM_InitField( &m_smoothingThreshold, "SmoothingThreshold", 0.002, "Smoothing Threshold" ); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/ProjectDataModel/WellMeasurement/RimWellMeasurement.cpp b/ApplicationLibCode/ProjectDataModel/WellMeasurement/RimWellMeasurement.cpp index d0c6a849b0..d61ec04dca 100644 --- a/ApplicationLibCode/ProjectDataModel/WellMeasurement/RimWellMeasurement.cpp +++ b/ApplicationLibCode/ProjectDataModel/WellMeasurement/RimWellMeasurement.cpp @@ -31,14 +31,14 @@ RimWellMeasurement::RimWellMeasurement() { CAF_PDM_InitObject( "RimWellMeasurement", ":/WellMeasurement16x16.png", "", "" ); - CAF_PDM_InitFieldNoDefault( &m_wellName, "WellName", "Well Name", "", "", "" ); - CAF_PDM_InitField( &m_MD, "Depth", -1.0, "MD", "", "", "" ); - CAF_PDM_InitFieldNoDefault( &m_date, "Date", "Date", "", "", "" ); - CAF_PDM_InitField( &m_value, "Value", 0.0, "Value", "", "", "" ); - CAF_PDM_InitFieldNoDefault( &m_kind, "Kind", "Kind", "", "", "" ); - CAF_PDM_InitFieldNoDefault( &m_quality, "Quality", "Quality", "", "", "" ); - CAF_PDM_InitFieldNoDefault( &m_remark, "Remark", "Remark", "", "", "" ); - CAF_PDM_InitFieldNoDefault( &m_filePath, "FilePath", "File Path", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_wellName, "WellName", "Well Name" ); + CAF_PDM_InitField( &m_MD, "Depth", -1.0, "MD" ); + CAF_PDM_InitFieldNoDefault( &m_date, "Date", "Date" ); + CAF_PDM_InitField( &m_value, "Value", 0.0, "Value" ); + CAF_PDM_InitFieldNoDefault( &m_kind, "Kind", "Kind" ); + CAF_PDM_InitFieldNoDefault( &m_quality, "Quality", "Quality" ); + CAF_PDM_InitFieldNoDefault( &m_remark, "Remark", "Remark" ); + CAF_PDM_InitFieldNoDefault( &m_filePath, "FilePath", "File Path" ); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/ProjectDataModel/WellMeasurement/RimWellMeasurementCollection.cpp b/ApplicationLibCode/ProjectDataModel/WellMeasurement/RimWellMeasurementCollection.cpp index a8d626d839..2a486a3890 100644 --- a/ApplicationLibCode/ProjectDataModel/WellMeasurement/RimWellMeasurementCollection.cpp +++ b/ApplicationLibCode/ProjectDataModel/WellMeasurement/RimWellMeasurementCollection.cpp @@ -39,12 +39,12 @@ RimWellMeasurementCollection::RimWellMeasurementCollection() { CAF_PDM_InitObject( "Well Measurements", ":/WellMeasurement16x16.png", "", "" ); - CAF_PDM_InitFieldNoDefault( &m_measurements, "Measurements", "Well Measurements", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_measurements, "Measurements", "Well Measurements" ); m_measurements.uiCapability()->setUiEditorTypeName( caf::PdmUiTableViewEditor::uiEditorTypeName() ); m_measurements.uiCapability()->setUiLabelPosition( caf::PdmUiItemInfo::TOP ); m_measurements.uiCapability()->setUiTreeHidden( true ); - CAF_PDM_InitFieldNoDefault( &m_importedFiles, "ImportedFiles", "Imported Files", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_importedFiles, "ImportedFiles", "Imported Files" ); m_importedFiles.uiCapability()->setUiTreeHidden( true ); } diff --git a/ApplicationLibCode/ProjectDataModel/WellMeasurement/RimWellMeasurementCurve.cpp b/ApplicationLibCode/ProjectDataModel/WellMeasurement/RimWellMeasurementCurve.cpp index d8766e549d..435c19fb7f 100644 --- a/ApplicationLibCode/ProjectDataModel/WellMeasurement/RimWellMeasurementCurve.cpp +++ b/ApplicationLibCode/ProjectDataModel/WellMeasurement/RimWellMeasurementCurve.cpp @@ -52,10 +52,10 @@ RimWellMeasurementCurve::RimWellMeasurementCurve() { CAF_PDM_InitObject( "Well Measurement Curve", RimWellLogCurve::wellLogCurveIconName(), "", "" ); - CAF_PDM_InitFieldNoDefault( &m_wellPath, "CurveWellPath", "Well Path", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_wellPath, "CurveWellPath", "Well Path" ); m_wellPath.uiCapability()->setUiTreeChildrenHidden( true ); - CAF_PDM_InitFieldNoDefault( &m_measurementKind, "CurveMeasurementKind", "Measurement Kind", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_measurementKind, "CurveMeasurementKind", "Measurement Kind" ); m_measurementKind.uiCapability()->setUiTreeChildrenHidden( true ); m_wellPath = nullptr; diff --git a/ApplicationLibCode/ProjectDataModel/WellMeasurement/RimWellMeasurementFilePath.cpp b/ApplicationLibCode/ProjectDataModel/WellMeasurement/RimWellMeasurementFilePath.cpp index 21ac554355..32ba0ff0f2 100644 --- a/ApplicationLibCode/ProjectDataModel/WellMeasurement/RimWellMeasurementFilePath.cpp +++ b/ApplicationLibCode/ProjectDataModel/WellMeasurement/RimWellMeasurementFilePath.cpp @@ -31,8 +31,8 @@ RimWellMeasurementFilePath::RimWellMeasurementFilePath() { CAF_PDM_InitObject( "RimWellMeasurementFilePath", ":/WellMeasurement16x16.png", "", "" ); - CAF_PDM_InitFieldNoDefault( &m_userDescription, "UserDecription", "Name", "", "", "" ); - CAF_PDM_InitFieldNoDefault( &m_filePath, "FilePath", "File Path", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_userDescription, "UserDecription", "Name" ); + CAF_PDM_InitFieldNoDefault( &m_filePath, "FilePath", "File Path" ); m_filePath.uiCapability()->setUiReadOnly( true ); m_filePath.uiCapability()->setUiEditorTypeName( caf::PdmUiLineEditor::uiEditorTypeName() ); } diff --git a/ApplicationLibCode/ProjectDataModel/WellMeasurement/RimWellMeasurementInView.cpp b/ApplicationLibCode/ProjectDataModel/WellMeasurement/RimWellMeasurementInView.cpp index b9dac31c47..16e1af635c 100644 --- a/ApplicationLibCode/ProjectDataModel/WellMeasurement/RimWellMeasurementInView.cpp +++ b/ApplicationLibCode/ProjectDataModel/WellMeasurement/RimWellMeasurementInView.cpp @@ -50,39 +50,39 @@ RimWellMeasurementInView::RimWellMeasurementInView() { CAF_PDM_InitObject( "Well Measurement", ":/WellMeasurement16x16.png", "", "" ); - CAF_PDM_InitFieldNoDefault( &m_measurementKind, "MeasurementKind", "Measurement Kind", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_measurementKind, "MeasurementKind", "Measurement Kind" ); m_measurementKind.uiCapability()->setUiHidden( true ); - CAF_PDM_InitFieldNoDefault( &m_legendConfig, "LegendDefinition", "Color Legend", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_legendConfig, "LegendDefinition", "Color Legend" ); m_legendConfig = new RimRegularLegendConfig(); m_legendConfig.uiCapability()->setUiTreeHidden( true ); - CAF_PDM_InitFieldNoDefault( &m_wells, "Wells", "Wells", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_wells, "Wells", "Wells" ); m_wells.uiCapability()->setAutoAddingOptionFromValue( false ); m_wells.uiCapability()->setUiEditorTypeName( caf::PdmUiTreeSelectionEditor::uiEditorTypeName() ); m_wells.xmlCapability()->disableIO(); // The m_wells field does not serialize in a suitable format, so we work around it by // serializing to a pipe-delimited string. - CAF_PDM_InitFieldNoDefault( &m_wellsSerialized, "WellsSerialized", "WellsSerialized", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_wellsSerialized, "WellsSerialized", "WellsSerialized" ); m_wellsSerialized.uiCapability()->setUiHidden( true ); // Keep track of the wells which has a given measurement in order to automatically select // new wells when they appear in new measurements - CAF_PDM_InitFieldNoDefault( &m_availableWellsSerialized, "AvailableWellsSerialized", "AvailableWellsSerialized", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_availableWellsSerialized, "AvailableWellsSerialized", "AvailableWellsSerialized" ); // m_availableWellsSerialized.uiCapability()->setUiHidden( true ); - CAF_PDM_InitField( &m_lowerBound, "LowerBound", -HUGE_VAL, "Min", "", "", "" ); + CAF_PDM_InitField( &m_lowerBound, "LowerBound", -HUGE_VAL, "Min" ); m_lowerBound.uiCapability()->setUiEditorTypeName( caf::PdmUiDoubleSliderEditor::uiEditorTypeName() ); - CAF_PDM_InitField( &m_upperBound, "UpperBound", HUGE_VAL, "Max", "", "", "" ); + CAF_PDM_InitField( &m_upperBound, "UpperBound", HUGE_VAL, "Max" ); m_upperBound.uiCapability()->setUiEditorTypeName( caf::PdmUiDoubleSliderEditor::uiEditorTypeName() ); - CAF_PDM_InitFieldNoDefault( &m_qualityFilter, "QualityFilter", "Quality Filter", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_qualityFilter, "QualityFilter", "Quality Filter" ); m_qualityFilter.uiCapability()->setAutoAddingOptionFromValue( false ); m_qualityFilter.uiCapability()->setUiEditorTypeName( caf::PdmUiTreeSelectionEditor::uiEditorTypeName() ); - CAF_PDM_InitField( &m_radiusScaleFactor, "RadiusScaleFactor", 2.5, "Radius Scale", "", "", "" ); + CAF_PDM_InitField( &m_radiusScaleFactor, "RadiusScaleFactor", 2.5, "Radius Scale" ); m_radiusScaleFactor.uiCapability()->setUiEditorTypeName( caf::PdmUiDoubleValueEditor::uiEditorTypeName() ); this->setName( "Well Measurement" ); diff --git a/ApplicationLibCode/ProjectDataModel/WellMeasurement/RimWellMeasurementInViewCollection.cpp b/ApplicationLibCode/ProjectDataModel/WellMeasurement/RimWellMeasurementInViewCollection.cpp index de0fb11e97..affdcf921e 100644 --- a/ApplicationLibCode/ProjectDataModel/WellMeasurement/RimWellMeasurementInViewCollection.cpp +++ b/ApplicationLibCode/ProjectDataModel/WellMeasurement/RimWellMeasurementInViewCollection.cpp @@ -45,7 +45,7 @@ RimWellMeasurementInViewCollection::RimWellMeasurementInViewCollection() { CAF_PDM_InitObject( "Well Measurements", ":/WellMeasurement16x16.png", "", "" ); - CAF_PDM_InitFieldNoDefault( &m_measurementsInView, "MeasurementKinds", "Measurement Kinds", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_measurementsInView, "MeasurementKinds", "Measurement Kinds" ); m_measurementsInView.uiCapability()->setUiTreeHidden( true ); m_isChecked = false; diff --git a/ApplicationLibCode/ProjectDataModel/WellPath/RimFileWellPath.cpp b/ApplicationLibCode/ProjectDataModel/WellPath/RimFileWellPath.cpp index 5d6c2799c0..632f47fa15 100644 --- a/ApplicationLibCode/ProjectDataModel/WellPath/RimFileWellPath.cpp +++ b/ApplicationLibCode/ProjectDataModel/WellPath/RimFileWellPath.cpp @@ -26,31 +26,31 @@ RimFileWellPath::RimFileWellPath() "FileWellPath", "Well Paths Loaded From File" ); - CAF_PDM_InitFieldNoDefault( &id, "WellPathId", "Id", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &id, "WellPathId", "Id" ); id.uiCapability()->setUiReadOnly( true ); id.xmlCapability()->disableIO(); - CAF_PDM_InitFieldNoDefault( &sourceSystem, "SourceSystem", "Source System", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &sourceSystem, "SourceSystem", "Source System" ); sourceSystem.uiCapability()->setUiReadOnly( true ); sourceSystem.xmlCapability()->disableIO(); - CAF_PDM_InitFieldNoDefault( &utmZone, "UTMZone", "UTM Zone", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &utmZone, "UTMZone", "UTM Zone" ); utmZone.uiCapability()->setUiReadOnly( true ); utmZone.xmlCapability()->disableIO(); - CAF_PDM_InitFieldNoDefault( &updateDate, "WellPathUpdateDate", "Update Date", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &updateDate, "WellPathUpdateDate", "Update Date" ); updateDate.uiCapability()->setUiReadOnly( true ); updateDate.xmlCapability()->disableIO(); - CAF_PDM_InitFieldNoDefault( &updateUser, "WellPathUpdateUser", "Update User", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &updateUser, "WellPathUpdateUser", "Update User" ); updateUser.uiCapability()->setUiReadOnly( true ); updateUser.xmlCapability()->disableIO(); - CAF_PDM_InitFieldNoDefault( &m_surveyType, "WellPathSurveyType", "Survey Type", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_surveyType, "WellPathSurveyType", "Survey Type" ); m_surveyType.uiCapability()->setUiReadOnly( true ); m_surveyType.xmlCapability()->disableIO(); - CAF_PDM_InitFieldNoDefault( &m_filePath, "WellPathFilepath", "File Path", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_filePath, "WellPathFilepath", "File Path" ); m_filePath.uiCapability()->setUiReadOnly( true ); - CAF_PDM_InitFieldNoDefault( &m_filePathInCache, "WellPathFilePathInCache", "File Name", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_filePathInCache, "WellPathFilePathInCache", "File Name" ); m_filePathInCache.uiCapability()->setUiReadOnly( true ); - CAF_PDM_InitField( &m_wellPathIndexInFile, "WellPathNumberInFile", -1, "Well Number in File", "", "", "" ); + CAF_PDM_InitField( &m_wellPathIndexInFile, "WellPathNumberInFile", -1, "Well Number in File" ); m_wellPathIndexInFile.uiCapability()->setUiReadOnly( true ); CAF_PDM_InitField( &m_useAutoGeneratedPointAtSeaLevel, diff --git a/ApplicationLibCode/ProjectDataModel/WellPath/RimWellIASettings.cpp b/ApplicationLibCode/ProjectDataModel/WellPath/RimWellIASettings.cpp index 9edaf5651b..d9d9b24241 100644 --- a/ApplicationLibCode/ProjectDataModel/WellPath/RimWellIASettings.cpp +++ b/ApplicationLibCode/ProjectDataModel/WellPath/RimWellIASettings.cpp @@ -63,13 +63,13 @@ RimWellIASettings::RimWellIASettings() setName( "Model" ); - CAF_PDM_InitFieldNoDefault( &m_geomechCase, "GeomechCase", "GeoMech Case", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_geomechCase, "GeomechCase", "GeoMech Case" ); - CAF_PDM_InitFieldNoDefault( &m_baseDir, "BaseDir", "Working Directory", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_baseDir, "BaseDir", "Working Directory" ); m_baseDir.uiCapability()->setUiReadOnly( true ); - CAF_PDM_InitField( &m_startMD, "StartMeasuredDepth", 0.0, "Start MD", "", "", "" ); - CAF_PDM_InitField( &m_endMD, "EndMeasuredDepth", 0.0, "End MD", "", "", "" ); + CAF_PDM_InitField( &m_startMD, "StartMeasuredDepth", 0.0, "Start MD" ); + CAF_PDM_InitField( &m_endMD, "EndMeasuredDepth", 0.0, "End MD" ); m_startMD.uiCapability()->setUiEditorTypeName( caf::PdmUiDoubleSliderEditor::uiEditorTypeName() ); m_endMD.uiCapability()->setUiEditorTypeName( caf::PdmUiDoubleSliderEditor::uiEditorTypeName() ); @@ -79,17 +79,17 @@ RimWellIASettings::RimWellIASettings() CAF_PDM_InitFieldNoDefault( &m_csvParameters, "TimeStepParameters", "Time Step Parameters", ":/Bullet.png", "", "" ); - CAF_PDM_InitFieldNoDefault( &m_nameProxy, "NameProxy", "Name Proxy", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_nameProxy, "NameProxy", "Name Proxy" ); m_nameProxy.registerGetMethod( this, &RimWellIASettings::fullName ); m_nameProxy.uiCapability()->setUiReadOnly( true ); m_nameProxy.uiCapability()->setUiHidden( true ); m_nameProxy.xmlCapability()->disableIO(); - CAF_PDM_InitField( &m_showBox, "showBox", false, "Show model box", "", "", "" ); + CAF_PDM_InitField( &m_showBox, "showBox", false, "Show model box" ); - CAF_PDM_InitFieldNoDefault( &m_geostaticDate, "startDate", "Start Date (geostatic):", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_geostaticDate, "startDate", "Start Date (geostatic):" ); - CAF_PDM_InitField( &m_boxValid, "boxValid", false, "Model box is valid", "", "", "" ); + CAF_PDM_InitField( &m_boxValid, "boxValid", false, "Model box is valid" ); m_boxValid.uiCapability()->setUiHidden( true ); this->setDeletable( true ); diff --git a/ApplicationLibCode/ProjectDataModel/WellPath/RimWellIASettingsCollection.cpp b/ApplicationLibCode/ProjectDataModel/WellPath/RimWellIASettingsCollection.cpp index fa8042fbf7..1548253415 100644 --- a/ApplicationLibCode/ProjectDataModel/WellPath/RimWellIASettingsCollection.cpp +++ b/ApplicationLibCode/ProjectDataModel/WellPath/RimWellIASettingsCollection.cpp @@ -40,7 +40,7 @@ RimWellIASettingsCollection::RimWellIASettingsCollection() { CAF_PDM_InitObject( "Integrity Analysis Models", ":/WellIntAnalysis.png", "", "" ); - CAF_PDM_InitFieldNoDefault( &m_wellIASettings, "WellIASettings", "Settings", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_wellIASettings, "WellIASettings", "Settings" ); m_wellIASettings.uiCapability()->setUiHidden( true ); m_wellIASettings.uiCapability()->setUiTreeHidden( true ); diff --git a/ApplicationLibCode/ProjectDataModel/WellPath/RimWellPath.cpp b/ApplicationLibCode/ProjectDataModel/WellPath/RimWellPath.cpp index c84d6c8ee0..a52b4916db 100644 --- a/ApplicationLibCode/ProjectDataModel/WellPath/RimWellPath.cpp +++ b/ApplicationLibCode/ProjectDataModel/WellPath/RimWellPath.cpp @@ -83,63 +83,63 @@ RimWellPath::RimWellPath() { CAF_PDM_InitScriptableObjectWithNameAndComment( "WellPath", ":/Well.svg", "", "", "WellPath", "A ResInsight Well Path" ); - CAF_PDM_InitScriptableFieldNoDefault( &m_name, "Name", "Name", "", "", "" ); + CAF_PDM_InitScriptableFieldNoDefault( &m_name, "Name", "Name" ); m_name.registerKeywordAlias( "WellPathName" ); m_name.uiCapability()->setUiReadOnly( true ); m_name.uiCapability()->setUiHidden( true ); m_name.xmlCapability()->disableIO(); - CAF_PDM_InitFieldNoDefault( &m_airGap, "AirGap", "Air Gap", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_airGap, "AirGap", "Air Gap" ); m_airGap.registerGetMethod( this, &RimWellPath::airGap ); m_airGap.uiCapability()->setUiReadOnly( true ); - CAF_PDM_InitFieldNoDefault( &m_datumElevation, "DatumElevation", "Datum Elevation", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_datumElevation, "DatumElevation", "Datum Elevation" ); m_datumElevation.registerGetMethod( this, &RimWellPath::datumElevation ); m_datumElevation.uiCapability()->setUiReadOnly( true ); - CAF_PDM_InitFieldNoDefault( &m_unitSystem, "UnitSystem", "Unit System", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_unitSystem, "UnitSystem", "Unit System" ); m_unitSystem.uiCapability()->setUiReadOnly( true ); - CAF_PDM_InitField( &m_simWellName, "SimWellName", QString( "" ), "Well", "", "", "" ); - CAF_PDM_InitField( &m_branchIndex, "SimBranchIndex", 0, "Branch", "", "", "" ); + CAF_PDM_InitField( &m_simWellName, "SimWellName", QString( "" ), "Well" ); + CAF_PDM_InitField( &m_branchIndex, "SimBranchIndex", 0, "Branch" ); - CAF_PDM_InitField( &m_showWellPathLabel, "ShowWellPathLabel", true, "Show Well Path Label", "", "", "" ); + CAF_PDM_InitField( &m_showWellPathLabel, "ShowWellPathLabel", true, "Show Well Path Label" ); - CAF_PDM_InitField( &m_showWellPath, "ShowWellPath", true, "Show Well Path", "", "", "" ); + CAF_PDM_InitField( &m_showWellPath, "ShowWellPath", true, "Show Well Path" ); m_showWellPath.uiCapability()->setUiHidden( true ); - CAF_PDM_InitField( &m_wellPathRadiusScaleFactor, "WellPathRadiusScale", 1.0, "Well Path Radius Scale", "", "", "" ); - CAF_PDM_InitField( &m_wellPathColor, "WellPathColor", cvf::Color3f( 0.999f, 0.333f, 0.999f ), "Well Path Color", "", "", "" ); + CAF_PDM_InitField( &m_wellPathRadiusScaleFactor, "WellPathRadiusScale", 1.0, "Well Path Radius Scale" ); + CAF_PDM_InitField( &m_wellPathColor, "WellPathColor", cvf::Color3f( 0.999f, 0.333f, 0.999f ), "Well Path Color" ); - CAF_PDM_InitFieldNoDefault( &m_completions, "Completions", "Completions", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_completions, "Completions", "Completions" ); m_completions = new RimWellPathCompletions; m_completions.uiCapability()->setUiTreeHidden( true ); - CAF_PDM_InitFieldNoDefault( &m_completionSettings, "CompletionSettings", "Completion Settings", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_completionSettings, "CompletionSettings", "Completion Settings" ); m_completionSettings = new RimWellPathCompletionSettings; - CAF_PDM_InitFieldNoDefault( &m_wellLogFiles, "WellLogFiles", "Well Log Files", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_wellLogFiles, "WellLogFiles", "Well Log Files" ); m_wellLogFiles.uiCapability()->setUiTreeHidden( true ); - CAF_PDM_InitFieldNoDefault( &m_3dWellLogCurves, "CollectionOf3dWellLogCurves", "3D Track", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_3dWellLogCurves, "CollectionOf3dWellLogCurves", "3D Track" ); m_3dWellLogCurves = new Rim3dWellLogCurveCollection; m_3dWellLogCurves.uiCapability()->setUiTreeHidden( true ); - CAF_PDM_InitField( &m_formationKeyInFile, "WellPathFormationKeyInFile", QString( "" ), "Key in File", "", "", "" ); + CAF_PDM_InitField( &m_formationKeyInFile, "WellPathFormationKeyInFile", QString( "" ), "Key in File" ); m_formationKeyInFile.uiCapability()->setUiReadOnly( true ); - CAF_PDM_InitFieldNoDefault( &m_wellPathFormationFilePath, "WellPathFormationFilePath", "File Path", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_wellPathFormationFilePath, "WellPathFormationFilePath", "File Path" ); m_wellPathFormationFilePath.uiCapability()->setUiReadOnly( true ); - CAF_PDM_InitFieldNoDefault( &m_wellPathAttributes, "WellPathAttributes", "Casing Design Rubbish", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_wellPathAttributes, "WellPathAttributes", "Casing Design Rubbish" ); m_wellPathAttributes = new RimWellPathAttributeCollection; m_wellPathAttributes->uiCapability()->setUiTreeHidden( true ); - CAF_PDM_InitFieldNoDefault( &m_wellPathTieIn, "WellPathTieIn", "well Path Tie-In", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_wellPathTieIn, "WellPathTieIn", "well Path Tie-In" ); m_wellPathTieIn = new RimWellPathTieIn; m_wellPathTieIn->connectWellPaths( nullptr, this, 0.0 ); - CAF_PDM_InitFieldNoDefault( &m_wellIASettingsCollection, "WellIASettings", "Integrity Analysis Settings", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_wellIASettingsCollection, "WellIASettings", "Integrity Analysis Settings" ); m_wellIASettingsCollection = new RimWellIASettingsCollection(); this->setDeletable( true ); diff --git a/ApplicationLibCode/ProjectDataModel/WellPath/RimWellPathAttribute.cpp b/ApplicationLibCode/ProjectDataModel/WellPath/RimWellPathAttribute.cpp index 90bb5711d5..93f480b9a7 100644 --- a/ApplicationLibCode/ProjectDataModel/WellPath/RimWellPathAttribute.cpp +++ b/ApplicationLibCode/ProjectDataModel/WellPath/RimWellPathAttribute.cpp @@ -38,11 +38,11 @@ double RimWellPathAttribute::MIN_DIAMETER_IN_INCHES = 7.0; //-------------------------------------------------------------------------------------------------- RimWellPathAttribute::RimWellPathAttribute() { - CAF_PDM_InitObject( "RimWellPathAttribute", "", "", "" ); - CAF_PDM_InitFieldNoDefault( &m_type, "CompletionType", "Type ", "", "", "" ); - CAF_PDM_InitField( &m_startMD, "DepthStart", -1.0, "Start MD", "", "", "" ); - CAF_PDM_InitField( &m_endMD, "DepthEnd", -1.0, "End MD", "", "", "" ); - CAF_PDM_InitField( &m_diameterInInches, "DiameterInInches", MAX_DIAMETER_IN_INCHES, "Diameter", "", "", "" ); + CAF_PDM_InitObject( "RimWellPathAttribute" ); + CAF_PDM_InitFieldNoDefault( &m_type, "CompletionType", "Type " ); + CAF_PDM_InitField( &m_startMD, "DepthStart", -1.0, "Start MD" ); + CAF_PDM_InitField( &m_endMD, "DepthEnd", -1.0, "End MD" ); + CAF_PDM_InitField( &m_diameterInInches, "DiameterInInches", MAX_DIAMETER_IN_INCHES, "Diameter" ); m_type = RiaDefines::WellPathComponentType::CASING; m_diameterInInches.uiCapability()->setUiEditorTypeName( caf::PdmUiComboBoxEditor::uiEditorTypeName() ); } diff --git a/ApplicationLibCode/ProjectDataModel/WellPath/RimWellPathAttributeCollection.cpp b/ApplicationLibCode/ProjectDataModel/WellPath/RimWellPathAttributeCollection.cpp index 61bac96986..e31b36280d 100644 --- a/ApplicationLibCode/ProjectDataModel/WellPath/RimWellPathAttributeCollection.cpp +++ b/ApplicationLibCode/ProjectDataModel/WellPath/RimWellPathAttributeCollection.cpp @@ -34,7 +34,7 @@ RimWellPathAttributeCollection::RimWellPathAttributeCollection() { CAF_PDM_InitObject( "Casing Design", ":/CasingDesign16x16", "", "" ); - CAF_PDM_InitFieldNoDefault( &m_attributes, "Attributes", "Casing Design Attributes", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_attributes, "Attributes", "Casing Design Attributes" ); m_attributes.uiCapability()->setUiEditorTypeName( caf::PdmUiTableViewEditor::uiEditorTypeName() ); m_attributes.uiCapability()->setUiLabelPosition( caf::PdmUiItemInfo::TOP ); m_attributes.uiCapability()->setCustomContextMenuEnabled( true ); diff --git a/ApplicationLibCode/ProjectDataModel/WellPath/RimWellPathCollection.cpp b/ApplicationLibCode/ProjectDataModel/WellPath/RimWellPathCollection.cpp index aa2b59d153..0c563fffa0 100644 --- a/ApplicationLibCode/ProjectDataModel/WellPath/RimWellPathCollection.cpp +++ b/ApplicationLibCode/ProjectDataModel/WellPath/RimWellPathCollection.cpp @@ -93,13 +93,13 @@ RimWellPathCollection::RimWellPathCollection() "WellPathCollection", "Collection of Well Paths" ); - CAF_PDM_InitField( &isActive, "Active", true, "Active", "", "", "" ); + CAF_PDM_InitField( &isActive, "Active", true, "Active" ); isActive.uiCapability()->setUiHidden( true ); - CAF_PDM_InitField( &showWellPathLabel, "ShowWellPathLabel", true, "Show Well Path Labels", "", "", "" ); + CAF_PDM_InitField( &showWellPathLabel, "ShowWellPathLabel", true, "Show Well Path Labels" ); cvf::Color3f defWellLabelColor = RiaPreferences::current()->defaultWellLabelColor(); - CAF_PDM_InitField( &wellPathLabelColor, "WellPathLabelColor", defWellLabelColor, "Well label color", "", "", "" ); + CAF_PDM_InitField( &wellPathLabelColor, "WellPathLabelColor", defWellLabelColor, "Well label color" ); CAF_PDM_InitField( &wellPathVisibility, "GlobalWellPathVisibility", @@ -109,23 +109,23 @@ RimWellPathCollection::RimWellPathCollection() "", "" ); - CAF_PDM_InitField( &wellPathRadiusScaleFactor, "WellPathRadiusScale", 0.1, "Well Path Radius Scale", "", "", "" ); - CAF_PDM_InitField( &wellPathCrossSectionVertexCount, "WellPathVertexCount", 12, "Well Path Vertex Count", "", "", "" ); + CAF_PDM_InitField( &wellPathRadiusScaleFactor, "WellPathRadiusScale", 0.1, "Well Path Radius Scale" ); + CAF_PDM_InitField( &wellPathCrossSectionVertexCount, "WellPathVertexCount", 12, "Well Path Vertex Count" ); wellPathCrossSectionVertexCount.xmlCapability()->disableIO(); wellPathCrossSectionVertexCount.uiCapability()->setUiHidden( true ); - CAF_PDM_InitField( &wellPathClip, "WellPathClip", true, "Clip Well Paths", "", "", "" ); - CAF_PDM_InitField( &wellPathClipZDistance, "WellPathClipZDistance", 100, "Well Path Clipping Depth Distance", "", "", "" ); + CAF_PDM_InitField( &wellPathClip, "WellPathClip", true, "Clip Well Paths" ); + CAF_PDM_InitField( &wellPathClipZDistance, "WellPathClipZDistance", 100, "Well Path Clipping Depth Distance" ); - CAF_PDM_InitScriptableFieldNoDefault( &m_wellPaths, "WellPaths", "Well Paths", "", "", "" ); + CAF_PDM_InitScriptableFieldNoDefault( &m_wellPaths, "WellPaths", "Well Paths" ); m_wellPaths.uiCapability()->setUiTreeHidden( true ); m_wellPaths.uiCapability()->setUiTreeChildrenHidden( true ); - CAF_PDM_InitFieldNoDefault( &m_wellMeasurements, "WellMeasurements", "Measurements", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_wellMeasurements, "WellMeasurements", "Measurements" ); m_wellMeasurements = new RimWellMeasurementCollection; m_wellMeasurements.uiCapability()->setUiTreeHidden( true ); - CAF_PDM_InitFieldNoDefault( &m_wellPathNodes, "WellPathNodes", "Well Path Nodes", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_wellPathNodes, "WellPathNodes", "Well Path Nodes" ); m_wellPathNodes.xmlCapability()->disableIO(); m_wellPathImporter = std::make_unique(); diff --git a/ApplicationLibCode/ProjectDataModel/WellPath/RimWellPathGeometryDef.cpp b/ApplicationLibCode/ProjectDataModel/WellPath/RimWellPathGeometryDef.cpp index 1ea4923911..7a4471d9e2 100644 --- a/ApplicationLibCode/ProjectDataModel/WellPath/RimWellPathGeometryDef.cpp +++ b/ApplicationLibCode/ProjectDataModel/WellPath/RimWellPathGeometryDef.cpp @@ -73,19 +73,19 @@ RimWellPathGeometryDef::RimWellPathGeometryDef() "", "" ); - CAF_PDM_InitScriptableField( &m_airGap, "AirGap", 0.0, "Air Gap", "", "", "" ); + CAF_PDM_InitScriptableField( &m_airGap, "AirGap", 0.0, "Air Gap" ); m_airGap.uiCapability()->setUiEditorTypeName( caf::PdmUiDoubleValueEditor::uiEditorTypeName() ); - CAF_PDM_InitScriptableField( &m_mdAtFirstTarget, "MdAtFirstTarget", 0.0, "MD at First Target", "", "", "" ); + CAF_PDM_InitScriptableField( &m_mdAtFirstTarget, "MdAtFirstTarget", 0.0, "MD at First Target" ); m_mdAtFirstTarget.uiCapability()->setUiEditorTypeName( caf::PdmUiDoubleValueEditor::uiEditorTypeName() ); - CAF_PDM_InitScriptableFieldNoDefault( &m_wellTargets, "WellPathTargets", "Well Targets", "", "", "" ); + CAF_PDM_InitScriptableFieldNoDefault( &m_wellTargets, "WellPathTargets", "Well Targets" ); m_wellTargets.uiCapability()->setUiEditorTypeName( caf::PdmUiTableViewEditor::uiEditorTypeName() ); m_wellTargets.uiCapability()->setUiTreeChildrenHidden( true ); m_wellTargets.uiCapability()->setUiLabelPosition( caf::PdmUiItemInfo::TOP ); m_wellTargets.uiCapability()->setCustomContextMenuEnabled( true ); - CAF_PDM_InitField( &m_showAbsolutePosForWellTargets, "ShowAbsolutePosForWellTargets", false, "Show UTM Coords", "", "", "" ); + CAF_PDM_InitField( &m_showAbsolutePosForWellTargets, "ShowAbsolutePosForWellTargets", false, "Show UTM Coords" ); CAF_PDM_InitField( &m_useTopLevelWellReferencePoint, "UseTopLevelWellReferencePoint", false, @@ -110,20 +110,20 @@ RimWellPathGeometryDef::RimWellPathGeometryDef() "", "" ); - CAF_PDM_InitScriptableFieldNoDefault( &m_autoTargetAtSeaLevel, "AutoGeneratedTarget", "Auto Generated Target", "", "", "" ); + CAF_PDM_InitScriptableFieldNoDefault( &m_autoTargetAtSeaLevel, "AutoGeneratedTarget", "Auto Generated Target" ); m_autoTargetAtSeaLevel = new RimWellPathTarget; m_autoTargetAtSeaLevel->setEnabled( false ); - CAF_PDM_InitScriptableField( &m_isAttachedToParentWell, "AttachedToParentWell", false, "Attached to Parent Well", "", "", "" ); - CAF_PDM_InitFieldNoDefault( &m_fixedWellPathPoints, "FixedWellPathPoints", "", "", "", "" ); - CAF_PDM_InitFieldNoDefault( &m_fixedMeasuredDepths, "FixedMeasuredDepths", "", "", "", "" ); + CAF_PDM_InitScriptableField( &m_isAttachedToParentWell, "AttachedToParentWell", false, "Attached to Parent Well" ); + CAF_PDM_InitFieldNoDefault( &m_fixedWellPathPoints, "FixedWellPathPoints", "" ); + CAF_PDM_InitFieldNoDefault( &m_fixedMeasuredDepths, "FixedMeasuredDepths", "" ); - CAF_PDM_InitField( &m_pickPointsEnabled, "m_pickPointsEnabled", false, "", "", "", "" ); + CAF_PDM_InitField( &m_pickPointsEnabled, "m_pickPointsEnabled", false, "" ); caf::PdmUiPushButtonEditor::configureEditorForField( &m_pickPointsEnabled ); - CAF_PDM_InitScriptableField( &m_showSpheres, "ShowSpheres", true, "Spheres", "", "", "" ); - CAF_PDM_InitField( &m_sphereColor, "SphereColor", cvf::Color3f( cvf::Color3f::CEETRON ), "Sphere Color", "", "", "" ); - CAF_PDM_InitField( &m_sphereRadiusFactor, "SphereRadiusFactor", 0.15, "Sphere Radius Factor", "", "", "" ); + CAF_PDM_InitScriptableField( &m_showSpheres, "ShowSpheres", true, "Spheres" ); + CAF_PDM_InitField( &m_sphereColor, "SphereColor", cvf::Color3f( cvf::Color3f::CEETRON ), "Sphere Color" ); + CAF_PDM_InitField( &m_sphereRadiusFactor, "SphereRadiusFactor", 0.15, "Sphere Radius Factor" ); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/ProjectDataModel/WellPath/RimWellPathGroup.cpp b/ApplicationLibCode/ProjectDataModel/WellPath/RimWellPathGroup.cpp index f1afeb8997..a0eb9a2088 100644 --- a/ApplicationLibCode/ProjectDataModel/WellPath/RimWellPathGroup.cpp +++ b/ApplicationLibCode/ProjectDataModel/WellPath/RimWellPathGroup.cpp @@ -38,8 +38,8 @@ CAF_PDM_SOURCE_INIT( RimWellPathGroup, "WellPathGroup" ); RimWellPathGroup::RimWellPathGroup() { CAF_PDM_InitObject( "Well Path Group", ":/WellPathGroup.svg", "", "" ); - CAF_PDM_InitFieldNoDefault( &m_childWellPaths, "ChildWellPaths", "Child Well Paths", "", "", "" ); - CAF_PDM_InitFieldNoDefault( &m_groupName, "GroupName", "Group Name", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_childWellPaths, "ChildWellPaths", "Child Well Paths" ); + CAF_PDM_InitFieldNoDefault( &m_groupName, "GroupName", "Group Name" ); CAF_PDM_InitField( &m_addValveAtConnection, "AddValveAtConnection", @@ -48,7 +48,7 @@ RimWellPathGroup::RimWellPathGroup() "", "Should an outlet valve be added to branches for MSW export?", "" ); - CAF_PDM_InitFieldNoDefault( &m_valve, "Valve", "Branch Outlet Valve", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_valve, "Valve", "Branch Outlet Valve" ); m_valve = new RimWellPathValve; m_groupName.registerGetMethod( this, &RimWellPathGroup::createGroupName ); diff --git a/ApplicationLibCode/ProjectDataModel/WellPath/RimWellPathTarget.cpp b/ApplicationLibCode/ProjectDataModel/WellPath/RimWellPathTarget.cpp index 9087b479a4..a38ca15cfa 100644 --- a/ApplicationLibCode/ProjectDataModel/WellPath/RimWellPathTarget.cpp +++ b/ApplicationLibCode/ProjectDataModel/WellPath/RimWellPathTarget.cpp @@ -64,28 +64,28 @@ RimWellPathTarget::RimWellPathTarget() "WellPathTarget", "Class containing the Well Target definition" ); - CAF_PDM_InitField( &m_isEnabled, "IsEnabled", true, "", "", "", "" ); - CAF_PDM_InitField( &m_isLocked, "IsLocked", false, "", "", "", "" ); + CAF_PDM_InitField( &m_isEnabled, "IsEnabled", true, "" ); + CAF_PDM_InitField( &m_isLocked, "IsLocked", false, "" ); m_isLocked.uiCapability()->setUiHidden( true ); - CAF_PDM_InitScriptableFieldNoDefault( &m_targetPointXYD, "TargetPoint", "Relative Coord", "", "", "" ); - CAF_PDM_InitFieldNoDefault( &m_targetPointForDisplay, "TargetPointForDisplay", "UTM Coord", "", "", "" ); + CAF_PDM_InitScriptableFieldNoDefault( &m_targetPointXYD, "TargetPoint", "Relative Coord" ); + CAF_PDM_InitFieldNoDefault( &m_targetPointForDisplay, "TargetPointForDisplay", "UTM Coord" ); m_targetPointForDisplay.registerGetMethod( this, &RimWellPathTarget::targetPointForDisplayXYD ); m_targetPointForDisplay.registerSetMethod( this, &RimWellPathTarget::setTargetPointFromDisplayCoord ); - CAF_PDM_InitScriptableFieldNoDefault( &m_targetMeasuredDepth, "TargetMeasuredDepth", "MD", "", "", "" ); + CAF_PDM_InitScriptableFieldNoDefault( &m_targetMeasuredDepth, "TargetMeasuredDepth", "MD" ); m_targetMeasuredDepth.registerGetMethod( this, &RimWellPathTarget::measuredDepth ); CAF_PDM_InitScriptableField( &m_dogleg1, "Dogleg1", 3.0, "DL in", "", "[deg/30m]", "" ); CAF_PDM_InitScriptableField( &m_dogleg2, "Dogleg2", 3.0, "DL out", "", "[deg/30m]", "" ); - CAF_PDM_InitFieldNoDefault( &m_targetType, "TargetType", "Type", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_targetType, "TargetType", "Type" ); m_targetType.uiCapability()->setUiHidden( true ); - CAF_PDM_InitField( &m_hasTangentConstraintUiField, "HasTangentConstraint", false, "Dir", "", "", "" ); + CAF_PDM_InitField( &m_hasTangentConstraintUiField, "HasTangentConstraint", false, "Dir" ); m_hasTangentConstraintUiField.xmlCapability()->disableIO(); - CAF_PDM_InitScriptableField( &m_azimuth, "Azimuth", 0.0, "Azi(deg)", "", "", "" ); - CAF_PDM_InitScriptableField( &m_inclination, "Inclination", 0.0, "Inc(deg)", "", "", "" ); + CAF_PDM_InitScriptableField( &m_azimuth, "Azimuth", 0.0, "Azi(deg)" ); + CAF_PDM_InitScriptableField( &m_inclination, "Inclination", 0.0, "Inc(deg)" ); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/ProjectDataModel/WellPath/RimWellPathTieIn.cpp b/ApplicationLibCode/ProjectDataModel/WellPath/RimWellPathTieIn.cpp index cd9352efd3..1dde40d4af 100644 --- a/ApplicationLibCode/ProjectDataModel/WellPath/RimWellPathTieIn.cpp +++ b/ApplicationLibCode/ProjectDataModel/WellPath/RimWellPathTieIn.cpp @@ -42,14 +42,14 @@ RimWellPathTieIn::RimWellPathTieIn() { CAF_PDM_InitObject( "Well Path Tie In", ":/NotDefined.png", "", "Well Path Tie In description" ); - CAF_PDM_InitFieldNoDefault( &m_parentWell, "ParentWellPath", "Parent Well Path", "", "", "" ); - CAF_PDM_InitFieldNoDefault( &m_childWell, "ChildWellPath", "ChildWellPath", "", "", "" ); - CAF_PDM_InitFieldNoDefault( &m_tieInMeasuredDepth, "TieInMeasuredDepth", "Tie In Measured Depth", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_parentWell, "ParentWellPath", "Parent Well Path" ); + CAF_PDM_InitFieldNoDefault( &m_childWell, "ChildWellPath", "ChildWellPath" ); + CAF_PDM_InitFieldNoDefault( &m_tieInMeasuredDepth, "TieInMeasuredDepth", "Tie In Measured Depth" ); m_tieInMeasuredDepth.uiCapability()->setUiEditorTypeName( caf::PdmUiDoubleSliderEditor::uiEditorTypeName() ); - CAF_PDM_InitField( &m_addValveAtConnection, "AddValveAtConnection", false, "Add Outlet Valve for Branches", "", "", "" ); + CAF_PDM_InitField( &m_addValveAtConnection, "AddValveAtConnection", false, "Add Outlet Valve for Branches" ); - CAF_PDM_InitFieldNoDefault( &m_valve, "Valve", "Branch Outlet Valve", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_valve, "Valve", "Branch Outlet Valve" ); m_valve = new RimWellPathValve; } diff --git a/ApplicationLibCode/ProjectDataModel/cafTreeNode.cpp b/ApplicationLibCode/ProjectDataModel/cafTreeNode.cpp index 1031c14372..8698d7389c 100644 --- a/ApplicationLibCode/ProjectDataModel/cafTreeNode.cpp +++ b/ApplicationLibCode/ProjectDataModel/cafTreeNode.cpp @@ -29,7 +29,7 @@ cafTreeNode::cafTreeNode() { CAF_PDM_InitObject( "WellPath", ":/Folder.svg", "", "" ); - CAF_PDM_InitFieldNoDefault( &m_childNodes, "ChildNodes", "ChildNodes", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_childNodes, "ChildNodes", "ChildNodes" ); } //-------------------------------------------------------------------------------------------------- @@ -106,10 +106,10 @@ cafNamedTreeNode::cafNamedTreeNode() { CAF_PDM_InitObject( "Node", ":/Folder.svg", "", "" ); - CAF_PDM_InitField( &m_name, "Name", QString(), "Name", "", "", "" ); + CAF_PDM_InitField( &m_name, "Name", QString(), "Name" ); m_name.uiCapability()->setUiHidden( true ); - CAF_PDM_InitField( &m_isChecked, "IsChecked", true, "Active", "", "", "" ); + CAF_PDM_InitField( &m_isChecked, "IsChecked", true, "Active" ); m_isChecked.uiCapability()->setUiHidden( true ); } @@ -192,7 +192,7 @@ cafObjectReferenceTreeNode::cafObjectReferenceTreeNode() { CAF_PDM_InitObject( "cafObjectReferenceTreeNode", ":/Folder.svg", "", "" ); - CAF_PDM_InitFieldNoDefault( &m_referencedObject, "ReferencedObject", "Referenced Object", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_referencedObject, "ReferencedObject", "Referenced Object" ); m_childNodes.uiCapability()->setUiTreeHidden( true ); diff --git a/ApplicationLibCode/ProjectDataModelCommands/CommandRouter/RimcExtractSurfaces.cpp b/ApplicationLibCode/ProjectDataModelCommands/CommandRouter/RimcExtractSurfaces.cpp index 248422020c..43be85f5af 100644 --- a/ApplicationLibCode/ProjectDataModelCommands/CommandRouter/RimcExtractSurfaces.cpp +++ b/ApplicationLibCode/ProjectDataModelCommands/CommandRouter/RimcExtractSurfaces.cpp @@ -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(), "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(), "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" ); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/ProjectDataModelCommands/RimcDataContainerDouble.cpp b/ApplicationLibCode/ProjectDataModelCommands/RimcDataContainerDouble.cpp index af38543062..0627fb5239 100644 --- a/ApplicationLibCode/ProjectDataModelCommands/RimcDataContainerDouble.cpp +++ b/ApplicationLibCode/ProjectDataModelCommands/RimcDataContainerDouble.cpp @@ -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" ); } diff --git a/ApplicationLibCode/ProjectDataModelCommands/RimcDataContainerString.cpp b/ApplicationLibCode/ProjectDataModelCommands/RimcDataContainerString.cpp index 5910d6103f..c8127da08e 100644 --- a/ApplicationLibCode/ProjectDataModelCommands/RimcDataContainerString.cpp +++ b/ApplicationLibCode/ProjectDataModelCommands/RimcDataContainerString.cpp @@ -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" ); } diff --git a/ApplicationLibCode/ProjectDataModelCommands/RimcDataContainerTime.cpp b/ApplicationLibCode/ProjectDataModelCommands/RimcDataContainerTime.cpp index 877aec9978..cce355fc72 100644 --- a/ApplicationLibCode/ProjectDataModelCommands/RimcDataContainerTime.cpp +++ b/ApplicationLibCode/ProjectDataModelCommands/RimcDataContainerTime.cpp @@ -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" ); } diff --git a/ApplicationLibCode/ProjectDataModelCommands/RimcProject.cpp b/ApplicationLibCode/ProjectDataModelCommands/RimcProject.cpp index ac971634e3..761b62e297 100644 --- a/ApplicationLibCode/ProjectDataModelCommands/RimcProject.cpp +++ b/ApplicationLibCode/ProjectDataModelCommands/RimcProject.cpp @@ -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", "" ); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/ProjectDataModelCommands/RimcStimPlanModelCollection.cpp b/ApplicationLibCode/ProjectDataModelCommands/RimcStimPlanModelCollection.cpp index a4e85ae916..6e8dfac619 100644 --- a/ApplicationLibCode/ProjectDataModelCommands/RimcStimPlanModelCollection.cpp +++ b/ApplicationLibCode/ProjectDataModelCommands/RimcStimPlanModelCollection.cpp @@ -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" ); } diff --git a/ApplicationLibCode/ProjectDataModelCommands/RimcSummaryCase.cpp b/ApplicationLibCode/ProjectDataModelCommands/RimcSummaryCase.cpp index 56af273041..76dbd4322d 100644 --- a/ApplicationLibCode/ProjectDataModelCommands/RimcSummaryCase.cpp +++ b/ApplicationLibCode/ProjectDataModelCommands/RimcSummaryCase.cpp @@ -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" ); diff --git a/ApplicationLibCode/ProjectDataModelCommands/RimcSummaryResampleData.cpp b/ApplicationLibCode/ProjectDataModelCommands/RimcSummaryResampleData.cpp index 32db4cc80b..f4ba9c34f2 100644 --- a/ApplicationLibCode/ProjectDataModelCommands/RimcSummaryResampleData.cpp +++ b/ApplicationLibCode/ProjectDataModelCommands/RimcSummaryResampleData.cpp @@ -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" ); } diff --git a/ApplicationLibCode/ProjectDataModelCommands/RimcSurfaceCollection.cpp b/ApplicationLibCode/ProjectDataModelCommands/RimcSurfaceCollection.cpp index 16985c5482..237dcf061d 100644 --- a/ApplicationLibCode/ProjectDataModelCommands/RimcSurfaceCollection.cpp +++ b/ApplicationLibCode/ProjectDataModelCommands/RimcSurfaceCollection.cpp @@ -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", "" ); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/ProjectDataModelCommands/RimcWellPath.cpp b/ApplicationLibCode/ProjectDataModelCommands/RimcWellPath.cpp index 5fa296d9b9..85e09af2a9 100644 --- a/ApplicationLibCode/ProjectDataModelCommands/RimcWellPath.cpp +++ b/ApplicationLibCode/ProjectDataModelCommands/RimcWellPath.cpp @@ -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", "", diff --git a/ApplicationLibCode/UnitTests/RifcCommandCore-Test.cpp b/ApplicationLibCode/UnitTests/RifcCommandCore-Test.cpp index ced25e6cb3..66a31cd1af 100644 --- a/ApplicationLibCode/UnitTests/RifcCommandCore-Test.cpp +++ b/ApplicationLibCode/UnitTests/RifcCommandCore-Test.cpp @@ -15,10 +15,10 @@ class TestCommand1 : public RicfCommandObject public: TestCommand1() { - CAF_PDM_InitScriptableField( &m_textArgument, "TextArgument", QString(), "TextArgument", "", "", "" ); - CAF_PDM_InitScriptableField( &m_doubleArgument, "DoubleArgument", 0.0, "DoubleArgument", "", "", "" ); - CAF_PDM_InitScriptableField( &m_intArgument, "IntArgument", 0, "IntArgument", "", "", "" ); - CAF_PDM_InitScriptableField( &m_boolArgument, "BoolArgument", false, "BoolArgument", "", "", "" ); + CAF_PDM_InitScriptableField( &m_textArgument, "TextArgument", QString(), "TextArgument" ); + CAF_PDM_InitScriptableField( &m_doubleArgument, "DoubleArgument", 0.0, "DoubleArgument" ); + CAF_PDM_InitScriptableField( &m_intArgument, "IntArgument", 0, "IntArgument" ); + CAF_PDM_InitScriptableField( &m_boolArgument, "BoolArgument", false, "BoolArgument" ); } caf::PdmScriptResponse execute() override @@ -44,10 +44,10 @@ class TC2 : public RicfCommandObject public: TC2() { - CAF_PDM_InitScriptableField( &m_textArgument, "ta", QString(), "TextArgument", "", "", "" ); - CAF_PDM_InitScriptableField( &m_doubleArgument, "da", 0.0, "DoubleArgument", "", "", "" ); - CAF_PDM_InitScriptableField( &m_intArgument, "ia", 0, "IntArgument", "", "", "" ); - CAF_PDM_InitScriptableField( &m_boolArgument, "ba", false, "BoolArgument", "", "", "" ); + CAF_PDM_InitScriptableField( &m_textArgument, "ta", QString(), "TextArgument" ); + CAF_PDM_InitScriptableField( &m_doubleArgument, "da", 0.0, "DoubleArgument" ); + CAF_PDM_InitScriptableField( &m_intArgument, "ia", 0, "IntArgument" ); + CAF_PDM_InitScriptableField( &m_boolArgument, "ba", false, "BoolArgument" ); } caf::PdmScriptResponse execute() override diff --git a/ApplicationLibCode/UserInterface/RiuSummaryVectorSelectionUi.cpp b/ApplicationLibCode/UserInterface/RiuSummaryVectorSelectionUi.cpp index 3c570386bf..e0ef615776 100644 --- a/ApplicationLibCode/UserInterface/RiuSummaryVectorSelectionUi.cpp +++ b/ApplicationLibCode/UserInterface/RiuSummaryVectorSelectionUi.cpp @@ -138,225 +138,126 @@ RiuSummaryVectorSelectionUi::RiuSummaryVectorSelectionUi() } ) , m_showIndividualEnsembleCases( false ) { - CAF_PDM_InitFieldNoDefault( &m_selectedSources, "SummaryCases", "Cases", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_selectedSources, "SummaryCases", "Cases" ); m_selectedSources.uiCapability()->setAutoAddingOptionFromValue( false ); - CAF_PDM_InitFieldNoDefault( &m_currentSummaryCategory, "CurrentSummaryCategory", "Current Summary Category", "", "", "" ); - CAF_PDM_InitFieldNoDefault( &m_selectedSummaryCategories, "SelectedSummaryCategories", "Summary Categories", "", "", "" ); + CAF_PDM_InitFieldNoDefault( &m_currentSummaryCategory, "CurrentSummaryCategory", "Current Summary Category" ); + CAF_PDM_InitFieldNoDefault( &m_selectedSummaryCategories, "SelectedSummaryCategories", "Summary Categories" ); CAF_PDM_InitFieldNoDefault( m_identifierFieldsMap[RifEclipseSummaryAddress::SUMMARY_FIELD][0]->pdmField(), "FieldVectors", - "Field vectors", - "", - "", - "" ); + "Field vectors" ); CAF_PDM_InitFieldNoDefault( m_identifierFieldsMap[RifEclipseSummaryAddress::SUMMARY_AQUIFER][0]->pdmField(), "Aquifers", - "Aquifers", - "", - "", - "" ); + "Aquifers" ); CAF_PDM_InitFieldNoDefault( m_identifierFieldsMap[RifEclipseSummaryAddress::SUMMARY_AQUIFER][1]->pdmField(), "AquiferVectors", - "Aquifer Vectors", - "", - "", - "" ); + "Aquifer Vectors" ); CAF_PDM_InitFieldNoDefault( m_identifierFieldsMap[RifEclipseSummaryAddress::SUMMARY_NETWORK][0]->pdmField(), "NetworkVectors", - "Network Vectors", - "", - "", - "" ); + "Network Vectors" ); CAF_PDM_InitFieldNoDefault( m_identifierFieldsMap[RifEclipseSummaryAddress::SUMMARY_MISC][0]->pdmField(), "MiscVectors", - "Misc Vectors", - "", - "", - "" ); + "Misc Vectors" ); CAF_PDM_InitFieldNoDefault( m_identifierFieldsMap[RifEclipseSummaryAddress::SUMMARY_REGION][0]->pdmField(), "Regions", - "Regions", - "", - "", - "" ); + "Regions" ); CAF_PDM_InitFieldNoDefault( m_identifierFieldsMap[RifEclipseSummaryAddress::SUMMARY_REGION][1]->pdmField(), "RegionsVectors", - "Regions Vectors", - "", - "", - "" ); + "Regions Vectors" ); CAF_PDM_InitFieldNoDefault( m_identifierFieldsMap[RifEclipseSummaryAddress::SUMMARY_REGION_2_REGION][0]->pdmField(), "Region2RegionRegions", - "Regions", - "", - "", - "" ); + "Regions" ); CAF_PDM_InitFieldNoDefault( m_identifierFieldsMap[RifEclipseSummaryAddress::SUMMARY_REGION_2_REGION][1]->pdmField(), "Region2RegionVectors", - "Region2s Vectors", - "", - "", - "" ); + "Region2s Vectors" ); CAF_PDM_InitFieldNoDefault( m_identifierFieldsMap[RifEclipseSummaryAddress::SUMMARY_WELL_GROUP][0]->pdmField(), "WellGroupWellGroupNames", - "Well groups", - "", - "", - "" ); + "Well groups" ); CAF_PDM_InitFieldNoDefault( m_identifierFieldsMap[RifEclipseSummaryAddress::SUMMARY_WELL_GROUP][1]->pdmField(), "WellGroupVectors", - "Well Group Vectors", - "", - "", - "" ); + "Well Group Vectors" ); CAF_PDM_InitFieldNoDefault( m_identifierFieldsMap[RifEclipseSummaryAddress::SUMMARY_WELL][0]->pdmField(), "WellWellName", - "Wells", - "", - "", - "" ); + "Wells" ); CAF_PDM_InitFieldNoDefault( m_identifierFieldsMap[RifEclipseSummaryAddress::SUMMARY_WELL][1]->pdmField(), "WellVectors", - "Well Vectors", - "", - "", - "" ); + "Well Vectors" ); CAF_PDM_InitFieldNoDefault( m_identifierFieldsMap[RifEclipseSummaryAddress::SUMMARY_WELL_COMPLETION][0]->pdmField(), "WellCompletionWellName", - "Wells", - "", - "", - "" ); + "Wells" ); CAF_PDM_InitFieldNoDefault( m_identifierFieldsMap[RifEclipseSummaryAddress::SUMMARY_WELL_COMPLETION][1]->pdmField(), "WellCompletionIjk", - "Cell IJK", - "", - "", - "" ); + "Cell IJK" ); CAF_PDM_InitFieldNoDefault( m_identifierFieldsMap[RifEclipseSummaryAddress::SUMMARY_WELL_COMPLETION][2]->pdmField(), "WellCompletionVectors", - "Well Completion Vectors", - "", - "", - "" ); + "Well Completion Vectors" ); CAF_PDM_InitFieldNoDefault( m_identifierFieldsMap[RifEclipseSummaryAddress::SUMMARY_WELL_COMPLETION_LGR][0]->pdmField(), "WellCompletionLgrLgrName", - "LGR Names", - "", - "", - "" ); + "LGR Names" ); CAF_PDM_InitFieldNoDefault( m_identifierFieldsMap[RifEclipseSummaryAddress::SUMMARY_WELL_COMPLETION_LGR][1]->pdmField(), "WellCompletionLgrWellName", - "Wells", - "", - "", - "" ); + "Wells" ); CAF_PDM_InitFieldNoDefault( m_identifierFieldsMap[RifEclipseSummaryAddress::SUMMARY_WELL_COMPLETION_LGR][2]->pdmField(), "WellCompletionLgrIjk", - "Cell IJK", - "", - "", - "" ); + "Cell IJK" ); CAF_PDM_InitFieldNoDefault( m_identifierFieldsMap[RifEclipseSummaryAddress::SUMMARY_WELL_COMPLETION_LGR][3]->pdmField(), "WellCompletionLgrVectors", - "Well Completion Vectors", - "", - "", - "" ); + "Well Completion Vectors" ); CAF_PDM_InitFieldNoDefault( m_identifierFieldsMap[RifEclipseSummaryAddress::SUMMARY_WELL_LGR][0]->pdmField(), "WellLgrLgrName", - "LGR Names", - "", - "", - "" ); + "LGR Names" ); CAF_PDM_InitFieldNoDefault( m_identifierFieldsMap[RifEclipseSummaryAddress::SUMMARY_WELL_LGR][1]->pdmField(), "WellLgrWellName", - "Wells", - "", - "", - "" ); + "Wells" ); CAF_PDM_InitFieldNoDefault( m_identifierFieldsMap[RifEclipseSummaryAddress::SUMMARY_WELL_LGR][2]->pdmField(), "WellLgrVectors", - "Vectors", - "", - "", - "" ); + "Vectors" ); CAF_PDM_InitFieldNoDefault( m_identifierFieldsMap[RifEclipseSummaryAddress::SUMMARY_WELL_SEGMENT][0]->pdmField(), "WellSegmentWellName", - "Wells", - "", - "", - "" ); + "Wells" ); CAF_PDM_InitFieldNoDefault( m_identifierFieldsMap[RifEclipseSummaryAddress::SUMMARY_WELL_SEGMENT][1]->pdmField(), "WellSegmentNumber", - "Segments", - "", - "", - "" ); + "Segments" ); CAF_PDM_InitFieldNoDefault( m_identifierFieldsMap[RifEclipseSummaryAddress::SUMMARY_WELL_SEGMENT][2]->pdmField(), "WellSegmentVectors", - "Vectors", - "", - "", - "" ); + "Vectors" ); CAF_PDM_InitFieldNoDefault( m_identifierFieldsMap[RifEclipseSummaryAddress::SUMMARY_BLOCK][0]->pdmField(), "BlockIjk", - "Cell IJK", - "", - "", - "" ); + "Cell IJK" ); CAF_PDM_InitFieldNoDefault( m_identifierFieldsMap[RifEclipseSummaryAddress::SUMMARY_BLOCK][1]->pdmField(), "BlockVectors", - "Block Vectors", - "", - "", - "" ); + "Block Vectors" ); CAF_PDM_InitFieldNoDefault( m_identifierFieldsMap[RifEclipseSummaryAddress::SUMMARY_BLOCK_LGR][0]->pdmField(), "BlockLgrLgrName", - "LGR Names", - "", - "", - "" ); + "LGR Names" ); CAF_PDM_InitFieldNoDefault( m_identifierFieldsMap[RifEclipseSummaryAddress::SUMMARY_BLOCK_LGR][1]->pdmField(), "BlockLgrIjk", - "Cell IJK", - "", - "", - "" ); + "Cell IJK" ); CAF_PDM_InitFieldNoDefault( m_identifierFieldsMap[RifEclipseSummaryAddress::SUMMARY_BLOCK_LGR][2]->pdmField(), "BlockLgrVectors", - "Block Vectors", - "", - "", - "" ); + "Block Vectors" ); CAF_PDM_InitFieldNoDefault( m_identifierFieldsMap[RifEclipseSummaryAddress::SUMMARY_CALCULATED][0]->pdmField(), "CalculatedVectors", - "Calculated Vectors", - "", - "", - "" ); + "Calculated Vectors" ); CAF_PDM_InitFieldNoDefault( m_identifierFieldsMap[RifEclipseSummaryAddress::SUMMARY_IMPORTED][0]->pdmField(), "ImportedVectors", - "Imported vectors", - "", - "", - "" ); + "Imported vectors" ); for ( const auto& itemTypes : m_identifierFieldsMap ) {