mirror of
https://github.com/OPM/ResInsight.git
synced 2025-02-25 18:55:39 -06:00
Create quick access objects when opening project and some objects
Create quick access for Eclipse view, IJK slice filters and property filters Create quick access objects for existing projects automatically
This commit is contained in:
@@ -59,6 +59,7 @@ set(COMMAND_REFERENCED_CMAKE_FILES
|
||||
PlotBuilderCommands/CMakeLists_files.cmake
|
||||
PolygonCommands/CMakeLists_files.cmake
|
||||
Sumo/CMakeLists_files.cmake
|
||||
ToolCommands/CMakeLists_files.cmake
|
||||
)
|
||||
|
||||
# Include source file lists from *.cmake files
|
||||
|
@@ -21,6 +21,7 @@
|
||||
|
||||
#include "RiaResultNames.h"
|
||||
|
||||
#include "QuickAccess/RimQuickAccessCollection.h"
|
||||
#include "RimEclipseCellColors.h"
|
||||
#include "RimEclipsePropertyFilter.h"
|
||||
#include "RimEclipsePropertyFilterCollection.h"
|
||||
@@ -28,9 +29,10 @@
|
||||
#include "RimEclipseView.h"
|
||||
#include "RimViewController.h"
|
||||
|
||||
#include "Riu3DMainWindowTools.h"
|
||||
|
||||
#include "cafSelectionManager.h"
|
||||
|
||||
#include "Riu3DMainWindowTools.h"
|
||||
#include "cvfAssert.h"
|
||||
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
@@ -64,6 +66,8 @@ void RicEclipsePropertyFilterFeatureImpl::addPropertyFilter( RimEclipsePropertyF
|
||||
propertyFilterCollection->propertyFiltersField().push_back( propertyFilter );
|
||||
setDefaults( propertyFilter );
|
||||
|
||||
RimQuickAccessCollection::instance()->addQuickAccessFields( propertyFilter );
|
||||
|
||||
propertyFilterCollection->reservoirView()->scheduleGeometryRegen( PROPERTY_FILTERED );
|
||||
propertyFilterCollection->reservoirView()->scheduleCreateDisplayModelAndRedraw();
|
||||
|
||||
@@ -82,6 +86,8 @@ void RicEclipsePropertyFilterFeatureImpl::insertPropertyFilter( RimEclipseProper
|
||||
propertyFilterCollection->propertyFiltersField().insertAt( static_cast<int>( index ), propertyFilter );
|
||||
setDefaults( propertyFilter );
|
||||
|
||||
RimQuickAccessCollection::instance()->addQuickAccessFields( propertyFilter );
|
||||
|
||||
propertyFilterCollection->reservoirView()->scheduleGeometryRegen( PROPERTY_FILTERED );
|
||||
propertyFilterCollection->reservoirView()->scheduleCreateDisplayModelAndRedraw();
|
||||
|
||||
|
@@ -0,0 +1,10 @@
|
||||
set(SOURCE_GROUP_HEADER_FILES
|
||||
${CMAKE_CURRENT_LIST_DIR}/RicAddFieldToQuickAccessFeature.h
|
||||
)
|
||||
|
||||
set(SOURCE_GROUP_SOURCE_FILES
|
||||
${CMAKE_CURRENT_LIST_DIR}/RicAddFieldToQuickAccessFeature.cpp
|
||||
)
|
||||
|
||||
list(APPEND COMMAND_CODE_HEADER_FILES ${SOURCE_GROUP_HEADER_FILES})
|
||||
list(APPEND COMMAND_CODE_SOURCE_FILES ${SOURCE_GROUP_SOURCE_FILES})
|
@@ -0,0 +1,64 @@
|
||||
/////////////////////////////////////////////////////////////////////////////////
|
||||
//
|
||||
// Copyright (C) 2024- Equinor ASA
|
||||
//
|
||||
// ResInsight is free software: you can redistribute it and/or modify
|
||||
// it under the terms of the GNU General Public License as published by
|
||||
// the Free Software Foundation, either version 3 of the License, or
|
||||
// (at your option) any later version.
|
||||
//
|
||||
// ResInsight is distributed in the hope that it will be useful, but WITHOUT ANY
|
||||
// WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
||||
// FITNESS FOR A PARTICULAR PURPOSE.
|
||||
//
|
||||
// See the GNU General Public License at <http://www.gnu.org/licenses/gpl.html>
|
||||
// for more details.
|
||||
//
|
||||
/////////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
#include "RicAddFieldToQuickAccessFeature.h"
|
||||
|
||||
#include "QuickAccess/RimFieldReference.h"
|
||||
#include "QuickAccess/RimQuickAccessCollection.h"
|
||||
|
||||
#include "Riu3DMainWindowTools.h"
|
||||
|
||||
#include "cafPdmUiPropertyViewDialog.h"
|
||||
#include "cafSelectionManagerTools.h"
|
||||
|
||||
#include <QAction>
|
||||
|
||||
CAF_CMD_SOURCE_INIT( RicAddFieldToQuickAccessFeature, "RicAddFieldToQuickAccessFeature" );
|
||||
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
void RicAddFieldToQuickAccessFeature::onActionTriggered( bool isChecked )
|
||||
{
|
||||
auto objects = caf::selectedObjectsByType<caf::PdmObject*>();
|
||||
if ( objects.empty() ) return;
|
||||
|
||||
auto firstObject = objects.front();
|
||||
if ( !firstObject ) return;
|
||||
|
||||
RimFieldReference fieldRef;
|
||||
fieldRef.setObject( firstObject );
|
||||
|
||||
caf::PdmUiPropertyViewDialog propertyDialog( Riu3DMainWindowTools::mainWindowWidget(), &fieldRef, "Select Field for Quick Access", "" );
|
||||
propertyDialog.setWindowIcon( QIcon( ":/pin.svg" ) );
|
||||
|
||||
if ( propertyDialog.exec() == QDialog::Accepted )
|
||||
{
|
||||
RimQuickAccessCollection::instance()->addQuickAccessField( fieldRef );
|
||||
RimQuickAccessCollection::instance()->updateAllRequiredEditors();
|
||||
}
|
||||
}
|
||||
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
void RicAddFieldToQuickAccessFeature::setupActionLook( QAction* actionToSetup )
|
||||
{
|
||||
actionToSetup->setText( "Add Field To Quick Access" );
|
||||
actionToSetup->setIcon( QIcon( ":/pin.svg" ) );
|
||||
}
|
@@ -0,0 +1,33 @@
|
||||
/////////////////////////////////////////////////////////////////////////////////
|
||||
//
|
||||
// Copyright (C) 2024- Equinor ASA
|
||||
//
|
||||
// ResInsight is free software: you can redistribute it and/or modify
|
||||
// it under the terms of the GNU General Public License as published by
|
||||
// the Free Software Foundation, either version 3 of the License, or
|
||||
// (at your option) any later version.
|
||||
//
|
||||
// ResInsight is distributed in the hope that it will be useful, but WITHOUT ANY
|
||||
// WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
||||
// FITNESS FOR A PARTICULAR PURPOSE.
|
||||
//
|
||||
// See the GNU General Public License at <http://www.gnu.org/licenses/gpl.html>
|
||||
// for more details.
|
||||
//
|
||||
/////////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
#pragma once
|
||||
|
||||
#include "cafCmdFeature.h"
|
||||
|
||||
//==================================================================================================
|
||||
///
|
||||
//==================================================================================================
|
||||
class RicAddFieldToQuickAccessFeature : public caf::CmdFeature
|
||||
{
|
||||
CAF_CMD_HEADER_INIT;
|
||||
|
||||
protected:
|
||||
void onActionTriggered( bool isChecked ) override;
|
||||
void setupActionLook( QAction* actionToSetup ) override;
|
||||
};
|
@@ -18,6 +18,7 @@
|
||||
|
||||
#include "RimCellFilterCollection.h"
|
||||
|
||||
#include "QuickAccess/RimQuickAccessCollection.h"
|
||||
#include "Rim3dView.h"
|
||||
#include "RimCase.h"
|
||||
#include "RimCellFilter.h"
|
||||
@@ -426,6 +427,9 @@ RimCellRangeFilter* RimCellFilterCollection::addNewCellRangeFilter( RimCase* src
|
||||
addFilter( pFilter );
|
||||
pFilter->setGridIndex( gridIndex );
|
||||
pFilter->setDefaultValues( sliceDirection, defaultSlice );
|
||||
|
||||
RimQuickAccessCollection::instance()->addQuickAccessFields( pFilter );
|
||||
|
||||
onFilterUpdated( pFilter );
|
||||
return pFilter;
|
||||
}
|
||||
|
@@ -23,6 +23,7 @@
|
||||
#include "RiaApplication.h"
|
||||
#include "RigActiveCellInfo.h"
|
||||
#include "RigReservoirGridTools.h"
|
||||
|
||||
#include "Rim3dView.h"
|
||||
#include "RimCase.h"
|
||||
#include "RimTools.h"
|
||||
@@ -168,6 +169,20 @@ void RimCellRangeFilter::computeAndSetValidValues()
|
||||
updateIconState();
|
||||
}
|
||||
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
std::map<QString, std::vector<caf::PdmFieldHandle*>> RimCellRangeFilter::quickAccessFields()
|
||||
{
|
||||
std::map<QString, std::vector<caf::PdmFieldHandle*>> fields;
|
||||
|
||||
if ( cellCountI == 1 ) fields[""].push_back( &startIndexI );
|
||||
if ( cellCountJ == 1 ) fields[""].push_back( &startIndexJ );
|
||||
if ( cellCountK == 1 ) fields[""].push_back( &startIndexK );
|
||||
|
||||
return fields;
|
||||
}
|
||||
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
|
@@ -20,6 +20,7 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include "QuickAccess/RimFieldQuickAccessInterface.h"
|
||||
#include "RimCellFilter.h"
|
||||
|
||||
#include "cafPdmFieldCvfVec3d.h"
|
||||
@@ -39,7 +40,7 @@ class StructGridInterface;
|
||||
///
|
||||
///
|
||||
//==================================================================================================
|
||||
class RimCellRangeFilter : public RimCellFilter
|
||||
class RimCellRangeFilter : public RimCellFilter, public RimFieldQuickAccessInterface
|
||||
{
|
||||
CAF_PDM_HEADER_INIT;
|
||||
|
||||
@@ -59,6 +60,8 @@ public:
|
||||
|
||||
void updateCompundFilter( cvf::CellRangeFilter* cellRangeFilter, int gridIndex ) override;
|
||||
|
||||
std::map<QString, std::vector<caf::PdmFieldHandle*>> quickAccessFields() override;
|
||||
|
||||
protected:
|
||||
void fieldChangedByUi( const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue ) override;
|
||||
void defineEditorAttribute( const caf::PdmFieldHandle* field, QString uiConfigName, caf::PdmUiEditorAttribute* attribute ) override;
|
||||
|
@@ -192,8 +192,8 @@ void RimEclipsePropertyFilter::setToDefaultValues()
|
||||
|
||||
computeResultValueRange();
|
||||
|
||||
m_lowerBound = m_minimumResultValue;
|
||||
m_upperBound = m_maximumResultValue;
|
||||
m_lowerBound.setValueWithFieldChanged( m_minimumResultValue );
|
||||
m_upperBound.setValueWithFieldChanged( m_maximumResultValue );
|
||||
|
||||
m_selectedCategoryValues = m_categoryValues;
|
||||
m_useCategorySelection = true;
|
||||
@@ -247,6 +247,21 @@ void RimEclipsePropertyFilter::defineUiOrdering( QString uiConfigName, caf::PdmU
|
||||
updateRangeLabel();
|
||||
}
|
||||
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
std::map<QString, std::vector<caf::PdmFieldHandle*>> RimEclipsePropertyFilter::quickAccessFields()
|
||||
{
|
||||
std::map<QString, std::vector<caf::PdmFieldHandle*>> fields;
|
||||
|
||||
auto name = "Property Filter : " + m_resultDefinition->resultVariableUiName();
|
||||
|
||||
fields[name].push_back( &m_lowerBound );
|
||||
fields[name].push_back( &m_upperBound );
|
||||
|
||||
return fields;
|
||||
}
|
||||
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
|
@@ -20,6 +20,7 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include "QuickAccess/RimFieldQuickAccessInterface.h"
|
||||
#include "RimPropertyFilter.h"
|
||||
|
||||
#include "cafPdmChildField.h"
|
||||
@@ -31,7 +32,7 @@ class RimEclipseResultDefinition;
|
||||
///
|
||||
///
|
||||
//==================================================================================================
|
||||
class RimEclipsePropertyFilter : public RimPropertyFilter
|
||||
class RimEclipsePropertyFilter : public RimPropertyFilter, public RimFieldQuickAccessInterface
|
||||
{
|
||||
CAF_PDM_HEADER_INIT;
|
||||
|
||||
@@ -56,6 +57,8 @@ public:
|
||||
|
||||
void updateUiFieldsFromActiveResult();
|
||||
|
||||
std::map<QString, std::vector<caf::PdmFieldHandle*>> quickAccessFields() override;
|
||||
|
||||
private:
|
||||
void defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering& uiOrdering ) override;
|
||||
void defineUiTreeOrdering( caf::PdmUiTreeOrdering& uiTreeOrdering, QString uiConfigName ) override;
|
||||
|
@@ -21,6 +21,7 @@
|
||||
#include "RiaApplication.h"
|
||||
|
||||
#include "RimFieldQuickAccess.h"
|
||||
#include "RimFieldQuickAccessGroup.h"
|
||||
#include "RimFieldQuickAccessInterface.h"
|
||||
#include "RimFieldReference.h"
|
||||
#include "RimGridView.h"
|
||||
|
@@ -1101,6 +1101,8 @@ caf::CmdFeatureMenuBuilder RimContextCommandBuilder::commandsFromSelection()
|
||||
menuBuilder << "RicPasteAsciiDataCurveFeature";
|
||||
menuBuilder << "RicPasteSummaryCaseFeature";
|
||||
menuBuilder.addSeparator();
|
||||
menuBuilder << "RicAddFieldToQuickAccessFeature";
|
||||
menuBuilder.addSeparator();
|
||||
menuBuilder << "RicCopyReferencesToClipboardFeature";
|
||||
|
||||
menuBuilder << "RicLinkViewFeature";
|
||||
|
@@ -1756,6 +1756,17 @@ std::vector<RigEclipseResultAddress> RimEclipseView::additionalResultsForResultI
|
||||
return m_additionalResultsForResultInfo()->additionalResultAddresses();
|
||||
}
|
||||
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
std::map<QString, std::vector<caf::PdmFieldHandle*>> RimEclipseView::quickAccessFields()
|
||||
{
|
||||
std::map<QString, std::vector<caf::PdmFieldHandle*>> fields;
|
||||
fields[""].push_back( &m_eclipseCase );
|
||||
|
||||
return fields;
|
||||
}
|
||||
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
|
@@ -20,6 +20,9 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include "QuickAccess/RimFieldQuickAccessInterface.h"
|
||||
#include "RimGridView.h"
|
||||
|
||||
#include "cafAppEnum.h"
|
||||
#include "cafPdmChildField.h"
|
||||
#include "cafPdmField.h"
|
||||
@@ -34,8 +37,6 @@
|
||||
#include "cafPdmFieldCvfColor.h"
|
||||
#include "cafPdmFieldCvfMat4d.h"
|
||||
|
||||
#include "RimGridView.h"
|
||||
|
||||
class RigActiveCellInfo;
|
||||
class RigCaseCellResultsData;
|
||||
class RigGridBase;
|
||||
@@ -83,7 +84,7 @@ class OverlayItem;
|
||||
///
|
||||
///
|
||||
//==================================================================================================
|
||||
class RimEclipseView : public RimGridView
|
||||
class RimEclipseView : public RimGridView, public RimFieldQuickAccessInterface
|
||||
{
|
||||
CAF_PDM_HEADER_INIT;
|
||||
|
||||
@@ -174,6 +175,8 @@ public:
|
||||
|
||||
std::vector<RigEclipseResultAddress> additionalResultsForResultInfo() const;
|
||||
|
||||
std::map<QString, std::vector<caf::PdmFieldHandle*>> quickAccessFields() override;
|
||||
|
||||
protected:
|
||||
void initAfterRead() override;
|
||||
void defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering& uiOrdering ) override;
|
||||
|
@@ -23,6 +23,7 @@
|
||||
|
||||
#include "RigCaseCellResultsData.h"
|
||||
|
||||
#include "QuickAccess/RimQuickAccessCollection.h"
|
||||
#include "Rim3dView.h"
|
||||
#include "RimCase.h"
|
||||
#include "RimCellEdgeColors.h"
|
||||
@@ -109,6 +110,8 @@ RimEclipseView* RimEclipseViewCollection::addView( RimEclipseCase* eclipseCase )
|
||||
|
||||
m_views.push_back( view );
|
||||
|
||||
RimQuickAccessCollection::instance()->addQuickAccessFields( view );
|
||||
|
||||
view->loadDataAndUpdate();
|
||||
|
||||
updateConnectedEditors();
|
||||
|
Reference in New Issue
Block a user