mirror of
https://github.com/OPM/ResInsight.git
synced 2026-10-30 17:10:19 -05:00
#13890 Faults: Move fault distance results collection to the view
Reparent RimFaultDistanceResultCollection so it is owned directly by RimEclipseView instead of RimFaultInViewCollection, and show it as a top-level node next to the Faults node in the project tree. RimFaultDistanceResult::calculateValueOptions now reaches the fault list through the view (the fault collection is a sibling rather than an ancestor after the move). RicNewFaultDistanceResultFeature resolves the view from the selection and takes both the distance collection and the all-faults fallback from it. The scriptable API moves with the collection: add_fault_distance_result is now exposed on RimEclipseView (view.add_fault_distance_result(...)) via the new RimcEclipseView, replacing RimcFaultInViewCollection.
This commit is contained in:
1 parent
b78ef0d0a1
commit
31c1271034
10 files changed
+49
-60
No files matched your search
@@ -27,7 +27,6 @@
|
||||
|
||||
#include "RimEclipseFaultColors.h"
|
||||
#include "RimEclipseView.h"
|
||||
#include "RimFaultDistanceResultCollection.h"
|
||||
#include "RimFaultInView.h"
|
||||
#include "RimIntersectionCollection.h"
|
||||
#include "RimProject.h"
|
||||
@@ -106,9 +105,6 @@ RimFaultInViewCollection::RimFaultInViewCollection()
|
||||
|
||||
CAF_PDM_InitScriptableFieldNoDefault( &m_faults, "Faults", "Faults" );
|
||||
|
||||
CAF_PDM_InitScriptableFieldNoDefault( &m_distanceResults, "FaultDistanceResults", "" );
|
||||
m_distanceResults = new RimFaultDistanceResultCollection;
|
||||
|
||||
CAF_PDM_InitField( &m_showFaultsOutsideFilters_obsolete, "ShowFaultsOutsideFilters", true, "Show Faults Outside Filters" );
|
||||
m_showFaultsOutsideFilters_obsolete.xmlCapability()->setIOWritable( false );
|
||||
m_showFaultsOutsideFilters_obsolete.uiCapability()->setUiHidden( true );
|
||||
@@ -402,11 +398,6 @@ void RimFaultInViewCollection::defineUiTreeOrdering( caf::PdmUiTreeOrdering& uiT
|
||||
uiTreeOrdering.appendChild( uiTree );
|
||||
}
|
||||
|
||||
if ( m_distanceResults() && !m_distanceResults()->isEmpty() )
|
||||
{
|
||||
uiTreeOrdering.add( m_distanceResults() );
|
||||
}
|
||||
|
||||
for ( const auto& fault : m_faults )
|
||||
{
|
||||
uiTreeOrdering.add( fault );
|
||||
@@ -423,14 +414,6 @@ RimEclipseView* RimFaultInViewCollection::parentView() const
|
||||
return firstAncestorOrThisOfTypeAsserted<RimEclipseView>();
|
||||
}
|
||||
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
RimFaultDistanceResultCollection* RimFaultInViewCollection::faultDistanceResults() const
|
||||
{
|
||||
return m_distanceResults();
|
||||
}
|
||||
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
|
||||
Reference in new issue
Block a user