OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-25 18:55:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

#11693 Add enum to control zoom operation when case is changed

Browse Source
This commit is contained in:
Magne Sjaastad
2024-09-19 13:15:51 +02:00
parent 864d20bf0d
commit c65e15fad1
2 changed files with 33 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
ApplicationLibCode/ProjectDataModel/RimEclipseView.cpp
View File

@@ -129,8 +129,24 @@
#include "cvfViewport.h"
#include "cvfqtUtils.h"
#include <QApplication>
#include <climits>
namespace caf
{
template <>
void caf::AppEnum<RimEclipseView::RimCaseChangeBehaviour>::setUp()
{
addItem( RimEclipseView::RimCaseChangeBehaviour::KEEP_CURRENT_SETTINGS, "KEEP_CURRENT_SETTINGS", "Keep Current View Settings" );
addItem( RimEclipseView::RimCaseChangeBehaviour::STORE_VIEW_SETTINGS_FOR_CASE,
"STORE_VIEW_SETTINGS_FOR_CASE",
"Store View Settings for Case" );
addItem( RimEclipseView::RimCaseChangeBehaviour::ZOOM_TO_FIT, "ZOOM_TO_FIT", "Zoom to Fit" );
setDefault( RimEclipseView::RimCaseChangeBehaviour::KEEP_CURRENT_SETTINGS );
}
} // namespace caf
CAF_PDM_XML_SOURCE_INIT( RimEclipseView, "ReservoirView" );
//--------------------------------------------------------------------------------------------------
///
@@ -150,7 +166,7 @@ RimEclipseView::RimEclipseView()
CAF_PDM_InitFieldNoDefault( &m_customEclipseCase_OBSOLETE, "CustomEclipseCase", "Custom Case" );
CAF_PDM_InitScriptableFieldNoDefault( &m_eclipseCase, "EclipseCase", "Eclipse Case" );
CAF_PDM_InitField( &m_storeViewSettingsPerCase, "StoreViewSettingsPerCase", false, "Store View Settings for Case" );
CAF_PDM_InitFieldNoDefault( &m_caseChangeBehaviour, "CaseChangeBehaviour", "Zoom Operation When Changing Case" );
CAF_PDM_InitScriptableFieldWithScriptKeywordNoDefault( &m_cellResult, "GridCellResult", "CellResult", "Cell Result", ":/CellResult.png" );
m_cellResult = new RimEclipseCellColors();
@@ -465,13 +481,16 @@ void RimEclipseView::fieldChangedByUi( const caf::PdmFieldHandle* changedField,
updateGridBoxData();
updateAnnotationItems();
if ( m_storeViewSettingsPerCase() )
if ( m_caseChangeBehaviour() == RimEclipseView::RimCaseChangeBehaviour::STORE_VIEW_SETTINGS_FOR_CASE )
{
auto currentEclipseCase = dynamic_cast<RimEclipseCase*>( oldValue.value<caf::PdmPointer<PdmObjectHandle>>().rawPtr() );
storeCurrentAndApplyNewCameraPosition( currentEclipseCase, m_eclipseCase );
}
else
else if ( m_caseChangeBehaviour() == RimEclipseView::RimCaseChangeBehaviour::ZOOM_TO_FIT )
{
// Required to update the view after the case change. zoomAll() is not working without this.
QApplication::processEvents();
zoomAll();
}
@@ -1981,7 +2000,7 @@ void RimEclipseView::defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering&
caf::PdmUiGroup* dataSourceGroup = uiOrdering.addNewGroup( "Data Source" );
dataSourceGroup->add( &m_eclipseCase );
dataSourceGroup->add( &m_storeViewSettingsPerCase );
dataSourceGroup->add( &m_caseChangeBehaviour );
}
Rim3dView::defineUiOrdering( uiConfigName, uiOrdering );
@@ -2073,8 +2092,6 @@ QList<caf::PdmOptionItemInfo> RimEclipseView::calculateValueOptions( const caf::
{
QList<caf::PdmOptionItemInfo> options;
options.push_back( caf::PdmOptionItemInfo( "None", nullptr ) );
for ( auto eclCase : RimEclipseCaseTools::allEclipseGridCases() )
{
options.push_back( caf::PdmOptionItemInfo( eclCase->caseUserDescription(), eclCase, false, eclCase->uiIconProvider() ) );

12
ApplicationLibCode/ProjectDataModel/RimEclipseView.h
View File

@@ -87,6 +87,14 @@ class RimEclipseView : public RimGridView
{
CAF_PDM_HEADER_INIT;
public:
enum class RimCaseChangeBehaviour
{
ZOOM_TO_FIT,
KEEP_CURRENT_SETTINGS,
STORE_VIEW_SETTINGS_FOR_CASE
};
public:
RimEclipseView();
~RimEclipseView() override;
@@ -228,8 +236,8 @@ private:
protected:
cvf::ref<cvf::ModelBasicList> m_faultReactVizModel;
caf::PdmPtrField<RimEclipseCase*> m_eclipseCase;
caf::PdmField<bool> m_storeViewSettingsPerCase;
caf::PdmPtrField<RimEclipseCase*> m_eclipseCase;
caf::PdmField<caf::AppEnum<RimCaseChangeBehaviour>> m_caseChangeBehaviour;
private:
caf::PdmField<bool> m_showInvalidCells;