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

Create quick access objects when opening project and some objects

Browse Source 
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:
Magne Sjaastad
2024-10-18 14:50:10 +02:00
parent 2e305bd762
commit 2befcf6417
15 changed files with 182 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ApplicationLibCode/ProjectDataModel/CellFilters/RimCellFilterCollection.cpp
View File

@@ -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;
}

15
ApplicationLibCode/ProjectDataModel/CellFilters/RimCellRangeFilter.cpp
View File

@@ -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;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------

5
ApplicationLibCode/ProjectDataModel/CellFilters/RimCellRangeFilter.h
View File

@@ -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;

19
ApplicationLibCode/ProjectDataModel/CellFilters/RimEclipsePropertyFilter.cpp
View File

@@ -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;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------

5
ApplicationLibCode/ProjectDataModel/CellFilters/RimEclipsePropertyFilter.h
View File

@@ -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;

1
ApplicationLibCode/ProjectDataModel/QuickAccess/RimQuickAccessCollection.cpp
View File

@@ -21,6 +21,7 @@
#include "RiaApplication.h"
#include "RimFieldQuickAccess.h"
#include "RimFieldQuickAccessGroup.h"
#include "RimFieldQuickAccessInterface.h"
#include "RimFieldReference.h"
#include "RimGridView.h"

2
ApplicationLibCode/ProjectDataModel/RimContextCommandBuilder.cpp
View File

@@ -1101,6 +1101,8 @@ caf::CmdFeatureMenuBuilder RimContextCommandBuilder::commandsFromSelection()
menuBuilder << "RicPasteAsciiDataCurveFeature";
menuBuilder << "RicPasteSummaryCaseFeature";
menuBuilder.addSeparator();
menuBuilder << "RicAddFieldToQuickAccessFeature";
menuBuilder.addSeparator();
menuBuilder << "RicCopyReferencesToClipboardFeature";
menuBuilder << "RicLinkViewFeature";

11
ApplicationLibCode/ProjectDataModel/RimEclipseView.cpp
View File

@@ -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;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------

9
ApplicationLibCode/ProjectDataModel/RimEclipseView.h
View File

@@ -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;

3
ApplicationLibCode/ProjectDataModel/RimEclipseViewCollection.cpp
View File

@@ -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();