diff --git a/ApplicationLibCode/Application/RiaPreferences.cpp b/ApplicationLibCode/Application/RiaPreferences.cpp index 7bc817ccb1..d4e4992d51 100644 --- a/ApplicationLibCode/Application/RiaPreferences.cpp +++ b/ApplicationLibCode/Application/RiaPreferences.cpp @@ -124,7 +124,7 @@ RiaPreferences::RiaPreferences() "", "", "" ); - octaveShowHeaderInfoWhenExecutingScripts.uiCapability()->setUiLabelPosition( caf::PdmUiItemInfo::HIDDEN ); + caf::PdmUiNativeCheckBoxEditor::configureFieldForEditor( &octaveShowHeaderInfoWhenExecutingScripts ); CAF_PDM_InitField( &m_pythonExecutable, "pythonExecutable", QString( "python" ), "Python Executable Location", "", "", "" ); m_pythonExecutable.uiCapability()->setUiEditorTypeName( caf::PdmUiFilePathEditor::uiEditorTypeName() ); @@ -179,14 +179,15 @@ RiaPreferences::RiaPreferences() "", "", "" ); - showLasCurveWithoutTvdWarning.uiCapability()->setUiLabelPosition( caf::PdmUiItemInfo::HIDDEN ); + caf::PdmUiNativeCheckBoxEditor::configureFieldForEditor( &showLasCurveWithoutTvdWarning ); CAF_PDM_InitField( &m_useShaders, "useShaders", true, "Use Shaders", "", "", "" ); - m_useShaders.uiCapability()->setUiLabelPosition( caf::PdmUiItemInfo::HIDDEN ); + caf::PdmUiNativeCheckBoxEditor::configureFieldForEditor( &m_useShaders ); CAF_PDM_InitField( &m_showHud, "showHud", false, "Show 3D Information", "", "", "" ); - m_showHud.uiCapability()->setUiLabelPosition( caf::PdmUiItemInfo::HIDDEN ); + caf::PdmUiNativeCheckBoxEditor::configureFieldForEditor( &m_showHud ); CAF_PDM_InitField( &m_appendClassNameToUiText, "appendClassNameToUiText", false, "Show Class Names", "", "", "" ); - m_appendClassNameToUiText.uiCapability()->setUiLabelPosition( caf::PdmUiItemInfo::HIDDEN ); + caf::PdmUiNativeCheckBoxEditor::configureFieldForEditor( &m_appendClassNameToUiText ); + CAF_PDM_InitField( &m_appendFieldKeywordToToolTipText, "appendFieldKeywordToToolTipText", false, @@ -194,12 +195,14 @@ RiaPreferences::RiaPreferences() "", "", "" ); - m_appendFieldKeywordToToolTipText.uiCapability()->setUiLabelPosition( caf::PdmUiItemInfo::HIDDEN ); + caf::PdmUiNativeCheckBoxEditor::configureFieldForEditor( &m_appendFieldKeywordToToolTipText ); + CAF_PDM_InitField( &m_showViewIdInProjectTree, "showViewIdInTree", false, "Show View Id in Project Tree", "", "", "" ); - m_showViewIdInProjectTree.uiCapability()->setUiLabelPosition( caf::PdmUiItemInfo::HIDDEN ); + caf::PdmUiNativeCheckBoxEditor::configureFieldForEditor( &m_showViewIdInProjectTree ); CAF_PDM_InitField( &m_showTestToolbar, "showTestToolbar", false, "Enable Test Toolbar", "", "", "" ); - m_showTestToolbar.uiCapability()->setUiLabelPosition( caf::PdmUiItemInfo::HIDDEN ); + caf::PdmUiNativeCheckBoxEditor::configureFieldForEditor( &m_showTestToolbar ); + CAF_PDM_InitField( &m_includeFractureDebugInfoFile, "includeFractureDebugInfoFile", false, @@ -207,19 +210,19 @@ RiaPreferences::RiaPreferences() "", "", "" ); - m_includeFractureDebugInfoFile.uiCapability()->setUiLabelPosition( caf::PdmUiItemInfo::HIDDEN ); + caf::PdmUiNativeCheckBoxEditor::configureFieldForEditor( &m_includeFractureDebugInfoFile ); CAF_PDM_InitField( &m_showLegendBackground, "showLegendBackground", true, "Show Box around Legends", "", "", "" ); - m_showLegendBackground.uiCapability()->setUiLabelPosition( caf::PdmUiItemInfo::HIDDEN ); + caf::PdmUiNativeCheckBoxEditor::configureFieldForEditor( &m_showLegendBackground ); CAF_PDM_InitField( &m_enableFaultsByDefault, "enableFaultsByDefault", true, "Enable Faults By Default", "", "", "" ); - m_enableFaultsByDefault.uiCapability()->setUiLabelPosition( caf::PdmUiItemInfo::HIDDEN ); + caf::PdmUiNativeCheckBoxEditor::configureFieldForEditor( &m_enableFaultsByDefault ); CAF_PDM_InitField( &m_showInfoBox, "showInfoBox", true, "Show Info Box in New Projects", "", "", "" ); - m_showInfoBox.uiCapability()->setUiLabelPosition( caf::PdmUiItemInfo::HIDDEN ); + caf::PdmUiNativeCheckBoxEditor::configureFieldForEditor( &m_showInfoBox ); CAF_PDM_InitField( &m_showGridBox, "showGridBox", true, "Show Grid Box in New Projects", "", "", "" ); - m_showGridBox.uiCapability()->setUiLabelPosition( caf::PdmUiItemInfo::HIDDEN ); + caf::PdmUiNativeCheckBoxEditor::configureFieldForEditor( &m_showGridBox ); CAF_PDM_InitFieldNoDefault( &lastUsedProjectFileName, "lastUsedProjectFileName", "Last Used Project File", "", "", "" ); lastUsedProjectFileName.uiCapability()->setUiHidden( true ); @@ -231,10 +234,10 @@ RiaPreferences::RiaPreferences() "", "DEPTH, DX, DY, DZ, TOP, BOTTOM", "" ); - autocomputeDepthRelatedProperties.uiCapability()->setUiLabelPosition( caf::PdmUiItemInfo::HIDDEN ); + caf::PdmUiNativeCheckBoxEditor::configureFieldForEditor( &autocomputeDepthRelatedProperties ); CAF_PDM_InitField( &loadAndShowSoil, "loadAndShowSoil", true, "Load and Show SOIL", "", "", "" ); - loadAndShowSoil.uiCapability()->setUiLabelPosition( caf::PdmUiItemInfo::HIDDEN ); + caf::PdmUiNativeCheckBoxEditor::configureFieldForEditor( &loadAndShowSoil ); CAF_PDM_InitFieldNoDefault( &m_holoLensExportFolder, "holoLensExportFolder", "HoloLens Export Folder", "", "", "" ); m_holoLensExportFolder.uiCapability()->setUiLabelPosition( caf::PdmUiItemInfo::TOP ); @@ -247,7 +250,7 @@ RiaPreferences::RiaPreferences() "", "", "" ); - holoLensDisableCertificateVerification.uiCapability()->setUiLabelPosition( caf::PdmUiItemInfo::HIDDEN ); + caf::PdmUiNativeCheckBoxEditor::configureFieldForEditor( &holoLensDisableCertificateVerification ); CAF_PDM_InitField( &csvTextExportFieldSeparator, "csvTextExportFieldSeparator", @@ -264,7 +267,7 @@ RiaPreferences::RiaPreferences() "", "", "" ); - m_showProjectChangedDialog.uiCapability()->setUiLabelPosition( caf::PdmUiItemInfo::HIDDEN ); + caf::PdmUiNativeCheckBoxEditor::configureFieldForEditor( &m_showProjectChangedDialog ); CAF_PDM_InitFieldNoDefault( &m_readerSettings, "readerSettings", "Reader Settings", "", "", "" ); m_readerSettings = new RifReaderSettings; @@ -277,10 +280,10 @@ RiaPreferences::RiaPreferences() m_timeFormat = RiaQDateTimeTools::supportedTimeFormats().front(); CAF_PDM_InitField( &m_showProgressBar, "showProgressBar", true, "Show Progress Bar", "", "", "" ); - m_showProgressBar.uiCapability()->setUiLabelPosition( caf::PdmUiItemInfo::HIDDEN ); + caf::PdmUiNativeCheckBoxEditor::configureFieldForEditor( &m_showProgressBar ); CAF_PDM_InitField( &m_useUndoRedo, "useUndoRedo", true, "Enable Undo/Redo for Property Editor changes", "", "", "" ); - m_useUndoRedo.uiCapability()->setUiLabelPosition( caf::PdmUiItemInfo::HIDDEN ); + caf::PdmUiNativeCheckBoxEditor::configureFieldForEditor( &m_useUndoRedo ); CAF_PDM_InitFieldNoDefault( &m_plotTemplateFolders, "plotTemplateFolders", "Plot Template Folder(s)", "", "", "" ); m_plotTemplateFolders.uiCapability()->setUiEditorTypeName( caf::PdmUiFilePathEditor::uiEditorTypeName() ); @@ -291,7 +294,7 @@ RiaPreferences::RiaPreferences() "", "", "" ); - m_searchPlotTemplateFoldersRecursively.uiCapability()->setUiLabelPosition( caf::PdmUiItemInfo::HIDDEN ); + caf::PdmUiNativeCheckBoxEditor::configureFieldForEditor( &m_searchPlotTemplateFoldersRecursively ); CAF_PDM_InitFieldNoDefault( &m_defaultPlotTemplate, "defaultPlotTemplate", "Default Plot Template", "", "", "" ); @@ -303,7 +306,7 @@ RiaPreferences::RiaPreferences() CAF_PDM_InitField( &m_pageBottomMargin, "pageBottomMargin", defaultMarginSize( m_pageSize() ), "Bottom Margin", "", "", "" ); CAF_PDM_InitField( &m_openExportedPdfInViewer, "openExportedPdfInViewer", false, "Open Exported PDF in Viewer", "", "", "" ); - m_openExportedPdfInViewer.uiCapability()->setUiLabelPosition( caf::PdmUiItemInfo::HIDDEN ); + caf::PdmUiNativeCheckBoxEditor::configureFieldForEditor( &m_openExportedPdfInViewer ); CAF_PDM_InitField( &m_gtestFilter, "gtestFilter", QString(), "Unit Test Filter (gtest)", "", "", "" ); @@ -355,7 +358,6 @@ void RiaPreferences::defineEditorAttribute( const caf::PdmFieldHandle* field, caf::PdmUiEditorAttribute* attribute ) { m_readerSettings->defineEditorAttribute( field, uiConfigName, attribute ); - m_summaryPreferences->defineEditorAttribute( field, uiConfigName, attribute ); { caf::PdmUiFilePathEditorAttribute* myAttr = dynamic_cast( attribute ); @@ -369,23 +371,7 @@ void RiaPreferences::defineEditorAttribute( const caf::PdmFieldHandle* field, } } - if ( field == &octaveShowHeaderInfoWhenExecutingScripts || field == &autocomputeDepthRelatedProperties || - field == &loadAndShowSoil || field == &m_useShaders || field == &m_showHud || - field == &m_appendClassNameToUiText || field == &m_appendFieldKeywordToToolTipText || - field == &m_showTestToolbar || field == &m_includeFractureDebugInfoFile || - field == &showLasCurveWithoutTvdWarning || field == &holoLensDisableCertificateVerification || - field == &m_showProjectChangedDialog || field == &m_searchPlotTemplateFoldersRecursively || - field == &m_showLegendBackground || field == &m_showViewIdInProjectTree || field == &m_enableFaultsByDefault || - field == &m_showProgressBar || field == &m_openExportedPdfInViewer || field == &m_showInfoBox || - field == &m_showGridBox || field == &m_useUndoRedo ) - { - caf::PdmUiCheckBoxEditorAttribute* myAttr = dynamic_cast( attribute ); - if ( myAttr ) - { - myAttr->m_useNativeCheckBoxLabel = true; - } - } - else if ( field == &m_holoLensExportFolder ) + if ( field == &m_holoLensExportFolder ) { caf::PdmUiFilePathEditorAttribute* myAttr = dynamic_cast( attribute ); if ( myAttr ) @@ -397,7 +383,10 @@ void RiaPreferences::defineEditorAttribute( const caf::PdmFieldHandle* field, field == &defaultPlotFontSize ) { caf::PdmUiComboBoxEditorAttribute* myAttr = dynamic_cast( attribute ); - myAttr->minimumContentsLength = 2; + if ( myAttr ) + { + myAttr->minimumContentsLength = 2; + } } if ( field == &m_multiLateralWellPattern ) { diff --git a/ApplicationLibCode/Application/RiaPreferencesSummary.cpp b/ApplicationLibCode/Application/RiaPreferencesSummary.cpp index 81a09adf7a..f5a7dd416d 100644 --- a/ApplicationLibCode/Application/RiaPreferencesSummary.cpp +++ b/ApplicationLibCode/Application/RiaPreferencesSummary.cpp @@ -70,6 +70,9 @@ RiaPreferencesSummary::RiaPreferencesSummary() "", "", "" ); + + caf::PdmUiNativeCheckBoxEditor::configureFieldForEditor( &m_summaryRestartFilesShowImportDialog ); + CAF_PDM_InitField( &m_summaryImportMode, "summaryImportMode", SummaryRestartFilesImportModeType( RiaPreferencesSummary::SummaryRestartFilesImportMode::IMPORT ), @@ -114,7 +117,7 @@ RiaPreferencesSummary::RiaPreferencesSummary() "", "If not present, create summary file with extension '*.LODSMRY'", "" ); - m_createOptimizedSummaryDataFile.uiCapability()->setUiLabelPosition( caf::PdmUiItemInfo::HIDDEN ); + caf::PdmUiNativeCheckBoxEditor::configureFieldForEditor( &m_createOptimizedSummaryDataFile ); CAF_PDM_InitField( &m_useOptimizedSummaryDataFile, "useOptimizedSummaryDataFile", @@ -123,7 +126,7 @@ RiaPreferencesSummary::RiaPreferencesSummary() "", "If present, import summary files with extension '*.LODSMRY'", "" ); - m_useOptimizedSummaryDataFile.uiCapability()->setUiLabelPosition( caf::PdmUiItemInfo::HIDDEN ); + caf::PdmUiNativeCheckBoxEditor::configureFieldForEditor( &m_useOptimizedSummaryDataFile ); CAF_PDM_InitField( &m_createH5SummaryDataFile, "createH5SummaryDataFile", @@ -132,7 +135,7 @@ RiaPreferencesSummary::RiaPreferencesSummary() "", "If not present, create summary file with extension '*.h5'", "" ); - m_createH5SummaryDataFile.uiCapability()->setUiLabelPosition( caf::PdmUiItemInfo::HIDDEN ); + caf::PdmUiNativeCheckBoxEditor::configureFieldForEditor( &m_createH5SummaryDataFile ); CAF_PDM_InitField( &m_checkH5FileTimeStamp, "checkH5FileTimeStamp", @@ -141,7 +144,7 @@ RiaPreferencesSummary::RiaPreferencesSummary() "", "Compare timestamp of h5 and SMSPEC, and recreate h5 when required", "" ); - m_checkH5FileTimeStamp.uiCapability()->setUiLabelPosition( caf::PdmUiItemInfo::HIDDEN ); + caf::PdmUiNativeCheckBoxEditor::configureFieldForEditor( &m_checkH5FileTimeStamp ); CAF_PDM_InitField( &m_createH5SummaryFileThreadCount, "createH5SummaryFileThreadCount", @@ -160,7 +163,7 @@ RiaPreferencesSummary::RiaPreferencesSummary() "", "", "" ); - m_showSummaryTimeAsLongString.uiCapability()->setUiLabelPosition( caf::PdmUiItemInfo::HIDDEN ); + caf::PdmUiNativeCheckBoxEditor::configureFieldForEditor( &m_showSummaryTimeAsLongString ); CAF_PDM_InitField( &m_useMultipleThreadsWhenLoadingSummaryCases, "useMultipleThreadsWhenLoadingSummaryCases", @@ -169,7 +172,7 @@ RiaPreferencesSummary::RiaPreferencesSummary() "", "", "" ); - m_useMultipleThreadsWhenLoadingSummaryCases.uiCapability()->setUiLabelPosition( caf::PdmUiItemInfo::HIDDEN ); + caf::PdmUiNativeCheckBoxEditor::configureFieldForEditor( &m_useMultipleThreadsWhenLoadingSummaryCases ); } //-------------------------------------------------------------------------------------------------- @@ -328,25 +331,6 @@ RiaPreferencesSummary::SummaryHistoryCurveStyleMode RiaPreferencesSummary::defau return m_defaultSummaryHistoryCurveStyle(); } -//-------------------------------------------------------------------------------------------------- -/// -//-------------------------------------------------------------------------------------------------- -void RiaPreferencesSummary::defineEditorAttribute( const caf::PdmFieldHandle* field, - QString uiConfigName, - caf::PdmUiEditorAttribute* attribute ) -{ - if ( field == &m_createOptimizedSummaryDataFile || field == &m_showSummaryTimeAsLongString || - field == &m_useMultipleThreadsWhenLoadingSummaryCases || field == &m_summaryRestartFilesShowImportDialog || - field == &m_useOptimizedSummaryDataFile || field == &m_createH5SummaryDataFile || field == &m_checkH5FileTimeStamp ) - { - auto myAttr = dynamic_cast( attribute ); - if ( myAttr ) - { - myAttr->m_useNativeCheckBoxLabel = true; - } - } -} - //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/Application/RiaPreferencesSummary.h b/ApplicationLibCode/Application/RiaPreferencesSummary.h index d9880f519d..df5cdbf373 100644 --- a/ApplicationLibCode/Application/RiaPreferencesSummary.h +++ b/ApplicationLibCode/Application/RiaPreferencesSummary.h @@ -81,10 +81,6 @@ public: SummaryHistoryCurveStyleMode defaultSummaryHistoryCurveStyle() const; - void defineEditorAttribute( const caf::PdmFieldHandle* field, - QString uiConfigName, - caf::PdmUiEditorAttribute* attribute ) override; - protected: void defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering& uiOrdering ) override; QList calculateValueOptions( const caf::PdmFieldHandle* fieldNeedingOptions, diff --git a/ApplicationLibCode/Commands/ExportCommands/RicExportToLasFileResampleUi.cpp b/ApplicationLibCode/Commands/ExportCommands/RicExportToLasFileResampleUi.cpp index 697158af00..1490b1a4f6 100644 --- a/ApplicationLibCode/Commands/ExportCommands/RicExportToLasFileResampleUi.cpp +++ b/ApplicationLibCode/Commands/ExportCommands/RicExportToLasFileResampleUi.cpp @@ -67,12 +67,12 @@ RicExportToLasFileResampleUi::RicExportToLasFileResampleUi( void ) CAF_PDM_InitFieldNoDefault( &curveUnitConversion, "CurveUnitConversion", "Curve Units", "", "", "" ); CAF_PDM_InitField( &activateResample, "ActivateResample", false, "Resample Curve Data", "", "", "" ); - activateResample.uiCapability()->setUiLabelPosition( caf::PdmUiItemInfo::HIDDEN ); + caf::PdmUiNativeCheckBoxEditor::configureFieldForEditor( &activateResample ); CAF_PDM_InitField( &resampleInterval, "ResampleInterval", 1.0, "Resample Interval [m]", "", "", "" ); CAF_PDM_InitField( &exportTvdrkb, "ExportTvdrkb", false, "Export TVDRKB", "", "", "" ); - exportTvdrkb.uiCapability()->setUiLabelPosition( caf::PdmUiItemInfo::HIDDEN ); + caf::PdmUiNativeCheckBoxEditor::configureFieldForEditor( &exportTvdrkb ); CAF_PDM_InitFieldNoDefault( &m_tvdrkbOffsets, "tvdrkbOffsets", "", "", "", "" ); @@ -156,15 +156,6 @@ void RicExportToLasFileResampleUi::defineEditorAttribute( const caf::PdmFieldHan myAttr->m_selectDirectory = true; } } - - if ( field == &exportTvdrkb || field == &activateResample ) - { - caf::PdmUiCheckBoxEditorAttribute* myAttr = dynamic_cast( attribute ); - if ( myAttr ) - { - myAttr->m_useNativeCheckBoxLabel = true; - } - } } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/FileInterface/RifReaderSettings.cpp b/ApplicationLibCode/FileInterface/RifReaderSettings.cpp index 995b8e30e2..5b34f14184 100644 --- a/ApplicationLibCode/FileInterface/RifReaderSettings.cpp +++ b/ApplicationLibCode/FileInterface/RifReaderSettings.cpp @@ -31,10 +31,10 @@ RifReaderSettings::RifReaderSettings() CAF_PDM_InitObject( "RifReaderSettings", "", "", "" ); CAF_PDM_InitField( &importFaults, "importFaults", true, "Import Faults", "", "", "" ); - importFaults.uiCapability()->setUiLabelPosition( caf::PdmUiItemInfo::HIDDEN ); + caf::PdmUiNativeCheckBoxEditor::configureFieldForEditor( &importFaults ); CAF_PDM_InitField( &importNNCs, "importSimulationNNCs", true, "Import NNCs", "", "", "" ); - importNNCs.uiCapability()->setUiLabelPosition( caf::PdmUiItemInfo::HIDDEN ); + caf::PdmUiNativeCheckBoxEditor::configureFieldForEditor( &importNNCs ); CAF_PDM_InitField( &includeInactiveCellsInFaultGeometry, "includeInactiveCellsInFaultGeometry", @@ -43,10 +43,10 @@ RifReaderSettings::RifReaderSettings() "", "", "" ); - includeInactiveCellsInFaultGeometry.uiCapability()->setUiLabelPosition( caf::PdmUiItemInfo::HIDDEN ); + caf::PdmUiNativeCheckBoxEditor::configureFieldForEditor( &includeInactiveCellsInFaultGeometry ); CAF_PDM_InitField( &importAdvancedMswData, "importAdvancedMswData", false, "Import Advanced MSW Data", "", "", "" ); - importAdvancedMswData.uiCapability()->setUiLabelPosition( caf::PdmUiItemInfo::HIDDEN ); + caf::PdmUiNativeCheckBoxEditor::configureFieldForEditor( &importAdvancedMswData ); CAF_PDM_InitField( &useResultIndexFile, "useResultIndexFile", @@ -59,10 +59,10 @@ RifReaderSettings::RifReaderSettings() "significantly.", "" ); - useResultIndexFile.uiCapability()->setUiLabelPosition( caf::PdmUiItemInfo::HIDDEN ); + caf::PdmUiNativeCheckBoxEditor::configureFieldForEditor( &useResultIndexFile ); CAF_PDM_InitField( &skipWellData, "skipWellData", false, "Skip Import of Simulation Well Data", "", "", "" ); - skipWellData.uiCapability()->setUiLabelPosition( caf::PdmUiItemInfo::HIDDEN ); + caf::PdmUiNativeCheckBoxEditor::configureFieldForEditor( &skipWellData ); CAF_PDM_InitField( &includeFileAbsolutePathPrefix, "includeFileAbsolutePathPrefix", @@ -74,24 +74,6 @@ RifReaderSettings::RifReaderSettings() "" ); } -//-------------------------------------------------------------------------------------------------- -/// -//-------------------------------------------------------------------------------------------------- -void RifReaderSettings::defineEditorAttribute( const caf::PdmFieldHandle* field, - QString uiConfigName, - caf::PdmUiEditorAttribute* attribute ) -{ - if ( field == &importFaults || field == &importAdvancedMswData || field == &importNNCs || - field == &useResultIndexFile || field == &skipWellData || field == &includeInactiveCellsInFaultGeometry ) - { - caf::PdmUiCheckBoxEditorAttribute* myAttr = dynamic_cast( attribute ); - if ( myAttr ) - { - myAttr->m_useNativeCheckBoxLabel = true; - } - } -} - //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/FileInterface/RifReaderSettings.h b/ApplicationLibCode/FileInterface/RifReaderSettings.h index d4ec4e25f4..326835b455 100644 --- a/ApplicationLibCode/FileInterface/RifReaderSettings.h +++ b/ApplicationLibCode/FileInterface/RifReaderSettings.h @@ -44,9 +44,5 @@ public: caf::PdmField skipWellData; private: - void defineEditorAttribute( const caf::PdmFieldHandle* field, - QString uiConfigName, - caf::PdmUiEditorAttribute* attribute ) override; - void defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering& uiOrdering ) override; }; diff --git a/ApplicationLibCode/ProjectDataModel/AnalysisPlots/RimAnalysisPlot.cpp b/ApplicationLibCode/ProjectDataModel/AnalysisPlots/RimAnalysisPlot.cpp index 274ab3b99b..12b7521859 100644 --- a/ApplicationLibCode/ProjectDataModel/AnalysisPlots/RimAnalysisPlot.cpp +++ b/ApplicationLibCode/ProjectDataModel/AnalysisPlots/RimAnalysisPlot.cpp @@ -118,7 +118,7 @@ RimAnalysisPlot::RimAnalysisPlot() CAF_PDM_InitFieldNoDefault( &m_referenceCase, "ReferenceCase", "Reference Case", "", "", "" ); CAF_PDM_InitField( &m_useAutoPlotTitle, "IsUsingAutoName", true, "Auto", "", "", "" ); - m_useAutoPlotTitle.uiCapability()->setUiLabelPosition( caf::PdmUiItemInfo::HIDDEN ); + caf::PdmUiNativeCheckBoxEditor::configureFieldForEditor( &m_useAutoPlotTitle ); CAF_PDM_InitField( &m_description, "PlotDescription", QString( "Analysis Plot" ), "Title", "", "", "" ); m_description.uiCapability()->setUiLabelPosition( caf::PdmUiItemInfo::HIDDEN ); @@ -138,7 +138,7 @@ RimAnalysisPlot::RimAnalysisPlot() m_showPlotLegends = false; CAF_PDM_InitField( &m_useTopBarsFilter, "UseTopBarsFilter", false, "Show Only Top", "", "", "" ); - m_useTopBarsFilter.uiCapability()->setUiLabelPosition( caf::PdmUiItemInfo::HIDDEN ); + caf::PdmUiNativeCheckBoxEditor::configureFieldForEditor( &m_useTopBarsFilter ); CAF_PDM_InitField( &m_maxBarCount, "MaxBarCount", 20, "Bar Count", "", "", "" ); m_maxBarCount.uiCapability()->setUiLabelPosition( caf::PdmUiItemInfo::HIDDEN ); @@ -146,7 +146,7 @@ RimAnalysisPlot::RimAnalysisPlot() // Bar text CAF_PDM_InitField( &m_useBarText, "UseBarText", true, "Activate Bar Labels", "", "", "" ); - m_useBarText.uiCapability()->setUiLabelPosition( caf::PdmUiItemInfo::HIDDEN ); + caf::PdmUiNativeCheckBoxEditor::configureFieldForEditor( &m_useBarText ); CAF_PDM_InitField( &m_useCaseInBarText, "UseCaseInBarText", true, "Case Name", "", "", "" ); CAF_PDM_InitField( &m_useEnsembleInBarText, "UseEnsembleInBarText", false, "Ensemble", "", "", "" ); @@ -557,23 +557,6 @@ void RimAnalysisPlot::defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering uiOrdering.skipRemainingFields( true ); } -//-------------------------------------------------------------------------------------------------- -/// -//-------------------------------------------------------------------------------------------------- -void RimAnalysisPlot::defineEditorAttribute( const caf::PdmFieldHandle* field, - QString uiConfigName, - caf::PdmUiEditorAttribute* attribute ) -{ - if ( field == &m_useTopBarsFilter || field == &m_useBarText || field == &m_showPlotTitle || field == &m_useAutoPlotTitle ) - { - auto attrib = dynamic_cast( attribute ); - if ( attrib ) - { - attrib->m_useNativeCheckBoxLabel = true; - } - } -} - //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/ProjectDataModel/AnalysisPlots/RimAnalysisPlot.h b/ApplicationLibCode/ProjectDataModel/AnalysisPlots/RimAnalysisPlot.h index 78a28b2666..0803d91d08 100644 --- a/ApplicationLibCode/ProjectDataModel/AnalysisPlots/RimAnalysisPlot.h +++ b/ApplicationLibCode/ProjectDataModel/AnalysisPlots/RimAnalysisPlot.h @@ -98,9 +98,6 @@ private: void fieldChangedByUi( const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue ) override; void defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering& uiOrdering ) override; - void defineEditorAttribute( const caf::PdmFieldHandle* field, - QString uiConfigName, - caf::PdmUiEditorAttribute* attribute ) override; caf::PdmFieldHandle* userDescriptionField() override; QList calculateValueOptions( const caf::PdmFieldHandle* fieldNeedingOptions,