From 2aa704b18af095cbbd079bfd0517432e37213717 Mon Sep 17 00:00:00 2001 From: Magne Sjaastad Date: Wed, 6 Nov 2019 11:10:33 +0100 Subject: [PATCH 1/3] #4982 Preferences : Move Use Shaders to development tab --- .../Application/RiaGuiApplication.cpp | 2 +- .../Application/RiaPreferences.cpp | 22 +++++++++++++++---- ApplicationCode/Application/RiaPreferences.h | 8 ++++++- 3 files changed, 26 insertions(+), 6 deletions(-) diff --git a/ApplicationCode/Application/RiaGuiApplication.cpp b/ApplicationCode/Application/RiaGuiApplication.cpp index b2c00d2f93..0bcd685fe9 100644 --- a/ApplicationCode/Application/RiaGuiApplication.cpp +++ b/ApplicationCode/Application/RiaGuiApplication.cpp @@ -539,7 +539,7 @@ RimViewWindow* RiaGuiApplication::activePlotWindow() const //-------------------------------------------------------------------------------------------------- bool RiaGuiApplication::useShaders() const { - if ( !m_preferences->useShaders ) return false; + if ( !m_preferences->useShaders() ) return false; bool isShadersSupported = caf::Viewer::isShadersSupported(); if ( !isShadersSupported ) return false; diff --git a/ApplicationCode/Application/RiaPreferences.cpp b/ApplicationCode/Application/RiaPreferences.cpp index 608e1bde66..67d5912177 100644 --- a/ApplicationCode/Application/RiaPreferences.cpp +++ b/ApplicationCode/Application/RiaPreferences.cpp @@ -177,8 +177,8 @@ RiaPreferences::RiaPreferences( void ) "" ); showLasCurveWithoutTvdWarning.uiCapability()->setUiLabelPosition( caf::PdmUiItemInfo::HIDDEN ); - CAF_PDM_InitField( &useShaders, "useShaders", true, "Use Shaders", "", "", "" ); - useShaders.uiCapability()->setUiLabelPosition( caf::PdmUiItemInfo::HIDDEN ); + CAF_PDM_InitField( &m_useShaders, "useShaders", true, "Use Shaders", "", "", "" ); + m_useShaders.uiCapability()->setUiLabelPosition( caf::PdmUiItemInfo::HIDDEN ); CAF_PDM_InitField( &showHud, "showHud", false, "Show 3D Information", "", "", "" ); showHud.uiCapability()->setUiLabelPosition( caf::PdmUiItemInfo::HIDDEN ); CAF_PDM_InitField( &m_appendClassNameToUiText, "appendClassNameToUiText", false, "Show Class Names", "", "", "" ); @@ -360,7 +360,7 @@ void RiaPreferences::defineEditorAttribute( const caf::PdmFieldHandle* field, } if ( field == &octaveShowHeaderInfoWhenExecutingScripts || field == &autocomputeDepthRelatedProperties || - field == &loadAndShowSoil || field == &useShaders || field == &showHud || field == &m_appendClassNameToUiText || + field == &loadAndShowSoil || field == &m_useShaders || field == &showHud || field == &m_appendClassNameToUiText || field == &m_appendFieldKeywordToToolTipText || field == &m_showTestToolbar || field == &m_includeFractureDebugInfoFile || field == &showLasCurveWithoutTvdWarning || field == &holoLensDisableCertificateVerification || field == &m_showProjectChangedDialog || @@ -413,7 +413,6 @@ void RiaPreferences::defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering& viewsGroup->add( &navigationPolicy ); viewsGroup->add( &defaultScaleFactorZ ); viewsGroup->add( &showLegendBackground ); - viewsGroup->add( &useShaders ); viewsGroup->add( &showHud ); caf::PdmUiGroup* otherGroup = uiOrdering.addNewGroup( "Other" ); @@ -491,6 +490,8 @@ void RiaPreferences::defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering& uiOrdering.add( &m_showTestToolbar ); uiOrdering.add( &m_includeFractureDebugInfoFile ); uiOrdering.add( &m_holoLensExportFolder ); + + uiOrdering.add( &m_useShaders ); } uiOrdering.skipRemainingFields( true ); @@ -702,6 +703,19 @@ QString RiaPreferences::holoLensExportFolder() const return m_holoLensExportFolder(); } +//-------------------------------------------------------------------------------------------------- +/// +//-------------------------------------------------------------------------------------------------- +bool RiaPreferences::useShaders() const +{ + if ( !RiaApplication::enableDevelopmentFeatures() ) + { + return true; + } + + return m_useShaders(); +} + //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationCode/Application/RiaPreferences.h b/ApplicationCode/Application/RiaPreferences.h index 9dc52d1f4c..7ae4cfbe7b 100644 --- a/ApplicationCode/Application/RiaPreferences.h +++ b/ApplicationCode/Application/RiaPreferences.h @@ -35,10 +35,15 @@ // Include to make Pdm work for cvf::Color #include "cafPdmFieldCvfColor.h" +#include + #include class RifReaderSettings; +//-------------------------------------------------------------------------------------------------- +/// +//-------------------------------------------------------------------------------------------------- class RiaPreferences : public caf::PdmObject { CAF_PDM_HEADER_INIT; @@ -76,6 +81,7 @@ public: bool includeFractureDebugInfoFile() const; bool showProjectChangedDialog() const; QString holoLensExportFolder() const; + bool useShaders() const; const QString& dateFormat() const; const QString& timeFormat() const; @@ -124,7 +130,6 @@ public: // Pdm Fields caf::PdmField showLegendBackground; - caf::PdmField useShaders; caf::PdmField showHud; caf::PdmField lastUsedProjectFileName; @@ -165,6 +170,7 @@ private: caf::PdmField m_appendClassNameToUiText; caf::PdmField m_appendFieldKeywordToToolTipText; caf::PdmField m_showViewIdInProjectTree; + caf::PdmField m_useShaders; caf::PdmField m_showProjectChangedDialog; From 0b3e5ecf0c4d478c18c0c948fea13f0b9ecc5dd8 Mon Sep 17 00:00:00 2001 From: Magne Sjaastad Date: Wed, 6 Nov 2019 11:22:03 +0100 Subject: [PATCH 2/3] #4982 Preferences : Move Show 3D information to development tab --- .../Application/RiaGuiApplication.cpp | 10 +------ .../Application/RiaGuiApplication.h | 1 - .../Application/RiaPreferences.cpp | 26 ++++++++++++------- ApplicationCode/Application/RiaPreferences.h | 13 +++++----- .../ProjectDataModel/Rim3dView.cpp | 2 +- 5 files changed, 26 insertions(+), 26 deletions(-) diff --git a/ApplicationCode/Application/RiaGuiApplication.cpp b/ApplicationCode/Application/RiaGuiApplication.cpp index 0bcd685fe9..9a1b6f1bed 100644 --- a/ApplicationCode/Application/RiaGuiApplication.cpp +++ b/ApplicationCode/Application/RiaGuiApplication.cpp @@ -555,14 +555,6 @@ RiaGuiApplication::RINavigationPolicy RiaGuiApplication::navigationPolicy() cons return m_preferences->navigationPolicy(); } -//-------------------------------------------------------------------------------------------------- -/// -//-------------------------------------------------------------------------------------------------- -bool RiaGuiApplication::showPerformanceInfo() const -{ - return m_preferences->showHud; -} - //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- @@ -1529,7 +1521,7 @@ void RiaGuiApplication::applyGuiPreferences( const RiaPreferences* oldPreference if ( m_activeReservoirView && m_activeReservoirView->viewer() ) { m_activeReservoirView->viewer()->updateNavigationPolicy(); - m_activeReservoirView->viewer()->enablePerfInfoHud( m_preferences->showHud() ); + m_activeReservoirView->viewer()->enablePerfInfoHud( m_preferences->show3dInformation() ); } if ( useShaders() ) diff --git a/ApplicationCode/Application/RiaGuiApplication.h b/ApplicationCode/Application/RiaGuiApplication.h index 0ec592cccb..92046ae353 100644 --- a/ApplicationCode/Application/RiaGuiApplication.h +++ b/ApplicationCode/Application/RiaGuiApplication.h @@ -100,7 +100,6 @@ public: std::vector gridFileNames, const QString& snapshotFolderName ); bool useShaders() const; - bool showPerformanceInfo() const; RINavigationPolicy navigationPolicy() const; diff --git a/ApplicationCode/Application/RiaPreferences.cpp b/ApplicationCode/Application/RiaPreferences.cpp index 67d5912177..0aee026e6a 100644 --- a/ApplicationCode/Application/RiaPreferences.cpp +++ b/ApplicationCode/Application/RiaPreferences.cpp @@ -179,8 +179,8 @@ RiaPreferences::RiaPreferences( void ) CAF_PDM_InitField( &m_useShaders, "useShaders", true, "Use Shaders", "", "", "" ); m_useShaders.uiCapability()->setUiLabelPosition( caf::PdmUiItemInfo::HIDDEN ); - CAF_PDM_InitField( &showHud, "showHud", false, "Show 3D Information", "", "", "" ); - showHud.uiCapability()->setUiLabelPosition( caf::PdmUiItemInfo::HIDDEN ); + CAF_PDM_InitField( &m_showHud, "showHud", false, "Show 3D Information", "", "", "" ); + m_showHud.uiCapability()->setUiLabelPosition( caf::PdmUiItemInfo::HIDDEN ); CAF_PDM_InitField( &m_appendClassNameToUiText, "appendClassNameToUiText", false, "Show Class Names", "", "", "" ); m_appendClassNameToUiText.uiCapability()->setUiLabelPosition( caf::PdmUiItemInfo::HIDDEN ); CAF_PDM_InitField( &m_appendFieldKeywordToToolTipText, @@ -360,12 +360,12 @@ void RiaPreferences::defineEditorAttribute( const caf::PdmFieldHandle* field, } if ( field == &octaveShowHeaderInfoWhenExecutingScripts || field == &autocomputeDepthRelatedProperties || - field == &loadAndShowSoil || field == &m_useShaders || field == &showHud || field == &m_appendClassNameToUiText || - field == &m_appendFieldKeywordToToolTipText || field == &m_showTestToolbar || - field == &m_includeFractureDebugInfoFile || field == &showLasCurveWithoutTvdWarning || - field == &holoLensDisableCertificateVerification || field == &m_showProjectChangedDialog || - field == &m_searchPlotTemplateFoldersRecursively || field == &showLegendBackground || - field == &m_showSummaryTimeAsLongString || field == &m_showViewIdInProjectTree ) + 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 == &showLegendBackground || field == &m_showSummaryTimeAsLongString || field == &m_showViewIdInProjectTree ) { caf::PdmUiCheckBoxEditorAttribute* myAttr = dynamic_cast( attribute ); if ( myAttr ) @@ -413,7 +413,6 @@ void RiaPreferences::defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering& viewsGroup->add( &navigationPolicy ); viewsGroup->add( &defaultScaleFactorZ ); viewsGroup->add( &showLegendBackground ); - viewsGroup->add( &showHud ); caf::PdmUiGroup* otherGroup = uiOrdering.addNewGroup( "Other" ); otherGroup->add( &ssihubAddress ); @@ -492,6 +491,7 @@ void RiaPreferences::defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering& uiOrdering.add( &m_holoLensExportFolder ); uiOrdering.add( &m_useShaders ); + uiOrdering.add( &m_showHud ); } uiOrdering.skipRemainingFields( true ); @@ -716,6 +716,14 @@ bool RiaPreferences::useShaders() const return m_useShaders(); } +//-------------------------------------------------------------------------------------------------- +/// +//-------------------------------------------------------------------------------------------------- +bool RiaPreferences::show3dInformation() const +{ + return RiaApplication::enableDevelopmentFeatures() && m_showHud(); +} + //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationCode/Application/RiaPreferences.h b/ApplicationCode/Application/RiaPreferences.h index 7ae4cfbe7b..0ce7def5d6 100644 --- a/ApplicationCode/Application/RiaPreferences.h +++ b/ApplicationCode/Application/RiaPreferences.h @@ -82,6 +82,7 @@ public: bool showProjectChangedDialog() const; QString holoLensExportFolder() const; bool useShaders() const; + bool show3dInformation() const; const QString& dateFormat() const; const QString& timeFormat() const; @@ -130,8 +131,6 @@ public: // Pdm Fields caf::PdmField showLegendBackground; - caf::PdmField showHud; - caf::PdmField lastUsedProjectFileName; caf::PdmField autocomputeDepthRelatedProperties; @@ -167,10 +166,12 @@ private: private: caf::PdmChildField m_readerSettings; - caf::PdmField m_appendClassNameToUiText; - caf::PdmField m_appendFieldKeywordToToolTipText; - caf::PdmField m_showViewIdInProjectTree; - caf::PdmField m_useShaders; + + caf::PdmField m_appendClassNameToUiText; + caf::PdmField m_appendFieldKeywordToToolTipText; + caf::PdmField m_showViewIdInProjectTree; + caf::PdmField m_useShaders; + caf::PdmField m_showHud; caf::PdmField m_showProjectChangedDialog; diff --git a/ApplicationCode/ProjectDataModel/Rim3dView.cpp b/ApplicationCode/ProjectDataModel/Rim3dView.cpp index 12d466d37e..531f1d128d 100644 --- a/ApplicationCode/ProjectDataModel/Rim3dView.cpp +++ b/ApplicationCode/ProjectDataModel/Rim3dView.cpp @@ -265,7 +265,7 @@ void Rim3dView::updateViewWidgetAfterCreation() this->onResetLegendsInViewer(); m_viewer->updateNavigationPolicy(); - m_viewer->enablePerfInfoHud( RiaGuiApplication::instance()->showPerformanceInfo() ); + m_viewer->enablePerfInfoHud( RiaGuiApplication::instance()->preferences()->show3dInformation() ); m_viewer->mainCamera()->setViewMatrix( m_cameraPosition ); m_viewer->setPointOfInterest( m_cameraPointOfInterest() ); From dc983b5b84b0288bbe85597f4fcfd864a9bdf0cb Mon Sep 17 00:00:00 2001 From: Magne Sjaastad Date: Wed, 6 Nov 2019 11:32:17 +0100 Subject: [PATCH 3/3] #4982 Preferences : Add groups to System tab --- .../Application/RiaPreferences.cpp | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/ApplicationCode/Application/RiaPreferences.cpp b/ApplicationCode/Application/RiaPreferences.cpp index 0aee026e6a..8782189da4 100644 --- a/ApplicationCode/Application/RiaPreferences.cpp +++ b/ApplicationCode/Application/RiaPreferences.cpp @@ -480,18 +480,23 @@ void RiaPreferences::defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering& } else if ( RiaApplication::enableDevelopmentFeatures() && uiConfigName == RiaPreferences::tabNameSystem() ) { - uiOrdering.add( &m_appendClassNameToUiText ); - uiOrdering.add( &m_appendFieldKeywordToToolTipText ); - uiOrdering.add( &m_showViewIdInProjectTree ); + { + caf::PdmUiGroup* group = uiOrdering.addNewGroup( "Project Tree" ); + group->add( &m_appendClassNameToUiText ); + group->add( &m_appendFieldKeywordToToolTipText ); + group->add( &m_showViewIdInProjectTree ); + } + + { + caf::PdmUiGroup* group = uiOrdering.addNewGroup( "3D View" ); + group->add( &m_useShaders ); + group->add( &m_showHud ); + } uiOrdering.add( &m_showProjectChangedDialog ); - uiOrdering.add( &m_showTestToolbar ); uiOrdering.add( &m_includeFractureDebugInfoFile ); uiOrdering.add( &m_holoLensExportFolder ); - - uiOrdering.add( &m_useShaders ); - uiOrdering.add( &m_showHud ); } uiOrdering.skipRemainingFields( true );