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

#5116 Well Measurement: select RimWellMeasurementInView when picking in 3d view.

Browse Source
This commit is contained in:
Kristian Bendiksen 2020-01-10 11:52:57 +01:00
parent 33693932b6
commit 49dd2ad307
3 changed files with 40 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
ApplicationCode/Commands/WellPathCommands/RicWellPathPickEventHandler.cpp
View File

@ -26,6 +26,8 @@
#include "RimPerforationInterval.h" #include "RimPerforationInterval.h"
#include "RimWellMeasurement.h" #include "RimWellMeasurement.h"
#include "RimWellMeasurementCollection.h" #include "RimWellMeasurementCollection.h"
#include "RimWellMeasurementInView.h"
#include "RimWellMeasurementInViewCollection.h"
#include "RimWellPath.h" #include "RimWellPath.h"
#include "RimWellPathAttribute.h" #include "RimWellPathAttribute.h"
#include "RimWellPathAttributeCollection.h" #include "RimWellPathAttributeCollection.h"
@ -159,7 +161,23 @@ bool RicWellPathPickEventHandler::handle3dPickEvent( const Ric3dPickEvent& event
} }
RiuMainWindow::instance()->setResultInfo( measurementText ); RiuMainWindow::instance()->setResultInfo( measurementText );
RiuMainWindow::instance()->selectAsCurrentItem( collection );
Rim3dView* rimView = RiaApplication::instance()->activeReservoirView();
if ( rimView )
{
// Find the RimWellMeasurementInView which matches the selection
std::vector<RimWellMeasurementInViewCollection*> wellMeasurementInViewCollections;
rimView->descendantsIncludingThisOfType( wellMeasurementInViewCollections );
if ( !wellMeasurementInViewCollections.empty() )
{
RimWellMeasurementInView* wellMeasurementInView =
wellMeasurementInViewCollections[0]->getWellMeasurementInView( measurement );
if ( wellMeasurementInView )
{
RiuMainWindow::instance()->selectAsCurrentItem( wellMeasurementInView );
}
}
}
} }
} }

18
ApplicationCode/ProjectDataModel/RimWellMeasurementInViewCollection.cpp
View File

@ -142,3 +142,21 @@ void RimWellMeasurementInViewCollection::syncWithChangesInWellMeasurementCollect
updateConnectedEditors(); updateConnectedEditors();
} }
} }
//--------------------------------------------------------------------------------------------------
/// Get the "in-view" measurement corresponding to a give measurement.
//--------------------------------------------------------------------------------------------------
RimWellMeasurementInView*
RimWellMeasurementInViewCollection::getWellMeasurementInView( const RimWellMeasurement* measurement ) const
{
for ( RimWellMeasurementInView* wellMeasurementInView : measurements() )
{
if ( wellMeasurementInView->measurementKind() == measurement->kind() )
{
return wellMeasurementInView;
}
}
// No match
return nullptr;
}

3
ApplicationCode/ProjectDataModel/RimWellMeasurementInViewCollection.h
View File

@ -24,6 +24,7 @@
#include <vector> #include <vector>
class RimWellMeasurementInView; class RimWellMeasurementInView;
class RimWellMeasurement;
class RimWellMeasurementInViewCollection : public RimCheckableNamedObject class RimWellMeasurementInViewCollection : public RimCheckableNamedObject
{ {
@ -37,6 +38,8 @@ public:
void syncWithChangesInWellMeasurementCollection(); void syncWithChangesInWellMeasurementCollection();
RimWellMeasurementInView* getWellMeasurementInView( const RimWellMeasurement* measurement ) const;
protected: protected:
void defineUiTreeOrdering( caf::PdmUiTreeOrdering& uiTreeOrdering, QString uiConfigName = "" ) override; void defineUiTreeOrdering( caf::PdmUiTreeOrdering& uiTreeOrdering, QString uiConfigName = "" ) override;
void fieldChangedByUi( const caf::PdmFieldHandle* changedField, void fieldChangedByUi( const caf::PdmFieldHandle* changedField,