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

Cleanup obsolete code

Browse Source
This commit is contained in:
Magne Sjaastad
2024-02-12 09:27:02 +01:00
parent 5fdf30d124
commit 16896212d4
7 changed files with 21 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
ApplicationLibCode/Commands/WellPathCommands/PointTangentManipulator/RicPolylineTarget3dEditor.cpp
View File

@@ -21,10 +21,7 @@
#include "RicPointTangentManipulator.h"
#include "Rim3dView.h"
#include "RimAnnotationCollectionBase.h"
#include "RimCase.h"
#include "RimPolylineTarget.h"
#include "RimUserDefinedPolylinesAnnotation.h"
#include "RiuViewer.h"
@@ -57,7 +54,7 @@ RicPolylineTarget3dEditor::~RicPolylineTarget3dEditor()
ownerRiuViewer->removeStaticModel( m_cvfModel.p() );
}
RimPolylineTarget* oldTarget = dynamic_cast<RimPolylineTarget*>( pdmObject() );
auto* oldTarget = dynamic_cast<RimPolylineTarget*>( pdmObject() );
if ( oldTarget )
{
oldTarget->targetPointUiCapability()->removeFieldEditor( this );
@@ -71,11 +68,11 @@ RicPolylineTarget3dEditor::~RicPolylineTarget3dEditor()
//--------------------------------------------------------------------------------------------------
void RicPolylineTarget3dEditor::configureAndUpdateUi( const QString& uiConfigName )
{
RimPolylineTarget* target = dynamic_cast<RimPolylineTarget*>( pdmObject() );
RiuViewer* ownerRiuViewer = dynamic_cast<RiuViewer*>( ownerViewer() );
Rim3dView* view = mainOrComparisonView();
auto* target = dynamic_cast<RimPolylineTarget*>( pdmObject() );
RiuViewer* ownerRiuViewer = dynamic_cast<RiuViewer*>( ownerViewer() );
Rim3dView* view = mainOrComparisonView();
if ( !target || !target->isEnabled() || !view )
if ( !target || !view )
{
if ( m_cvfModel.notNull() ) m_cvfModel->removeAllParts();
@@ -97,11 +94,12 @@ void RicPolylineTarget3dEditor::configureAndUpdateUi( const QString& uiConfigNam
ownerRiuViewer->addStaticModelOnce( m_cvfModel.p(), isInComparisonView() );
}
cvf::ref<caf::DisplayCoordTransform> dispXf = view->displayCoordTransform();
double handleSize = 0.7 * view->characteristicCellSize();
cvf::ref<caf::DisplayCoordTransform> dispXf = view->displayCoordTransform();
const double handleScalingFactor = 0.7;
const double handleSize = handleScalingFactor * view->characteristicCellSize();
m_manipulator->setOrigin( dispXf->transformToDisplayCoord( target->targetPointXYZ() ) );
// m_manipulator->setTangent(target->tangent());
m_manipulator->setHandleSize( handleSize );
m_cvfModel->removeAllParts();
m_manipulator->appendPartsToModel( m_cvfModel.p() );
@@ -114,7 +112,7 @@ void RicPolylineTarget3dEditor::configureAndUpdateUi( const QString& uiConfigNam
//--------------------------------------------------------------------------------------------------
void RicPolylineTarget3dEditor::cleanupBeforeSettingPdmObject()
{
RimPolylineTarget* oldTarget = dynamic_cast<RimPolylineTarget*>( pdmObject() );
auto* oldTarget = dynamic_cast<RimPolylineTarget*>( pdmObject() );
if ( oldTarget )
{
oldTarget->targetPointUiCapability()->removeFieldEditor( this );
@@ -126,8 +124,8 @@ void RicPolylineTarget3dEditor::cleanupBeforeSettingPdmObject()
//--------------------------------------------------------------------------------------------------
void RicPolylineTarget3dEditor::slotUpdated( const cvf::Vec3d& origin, const cvf::Vec3d& tangent )
{
RimPolylineTarget* target = dynamic_cast<RimPolylineTarget*>( pdmObject() );
Rim3dView* view = mainOrComparisonView();
auto* target = dynamic_cast<RimPolylineTarget*>( pdmObject() );
Rim3dView* view = mainOrComparisonView();
if ( !target || !view )
{
@@ -140,9 +138,7 @@ void RicPolylineTarget3dEditor::slotUpdated( const cvf::Vec3d& origin, const cvf
domainOrigin.z() = -domainOrigin.z();
QVariant originVariant = caf::PdmValueFieldSpecialization<cvf::Vec3d>::convert( domainOrigin );
target->enableFullUpdate( false );
caf::PdmUiCommandSystemProxy::instance()->setUiValueToField( target->targetPointUiCapability(), originVariant );
target->enableFullUpdate( true );
}
//--------------------------------------------------------------------------------------------------
@@ -150,7 +146,7 @@ void RicPolylineTarget3dEditor::slotUpdated( const cvf::Vec3d& origin, const cvf
//--------------------------------------------------------------------------------------------------
void RicPolylineTarget3dEditor::slotSelectedIn3D()
{
RimPolylineTarget* target = dynamic_cast<RimPolylineTarget*>( pdmObject() );
auto* target = dynamic_cast<RimPolylineTarget*>( pdmObject() );
if ( !target )
{
return;
@@ -164,7 +160,7 @@ void RicPolylineTarget3dEditor::slotSelectedIn3D()
//--------------------------------------------------------------------------------------------------
void RicPolylineTarget3dEditor::slotDragFinished()
{
RimPolylineTarget* target = dynamic_cast<RimPolylineTarget*>( pdmObject() );
auto* target = dynamic_cast<RimPolylineTarget*>( pdmObject() );
if ( target )
{
target->triggerVisualizationUpdate();

3
ApplicationLibCode/Commands/WellPathCommands/PointTangentManipulator/RicPolylineTarget3dEditor.h
View File

@@ -25,13 +25,14 @@ class RicPointTangentManipulator;
#include "cvfObject.h"
#include "cvfVector3.h"
#include <QPointer>
namespace cvf
{
class ModelBasicList;
}
class QString;
#include <QPointer>
class RicPolylineTarget3dEditor : public Ric3dObjectEditorHandle
{

18
ApplicationLibCode/ProjectDataModel/Annotations/RimPolylineTarget.cpp
View File

@@ -29,9 +29,7 @@ CAF_PDM_SOURCE_INIT( RimPolylineTarget, "PolylineTarget" );
///
//--------------------------------------------------------------------------------------------------
RimPolylineTarget::RimPolylineTarget()
: m_isFullUpdateEnabled( true )
{
CAF_PDM_InitField( &m_isEnabled, "IsEnabled", true, "" );
CAF_PDM_InitFieldNoDefault( &m_targetPointXyd, "TargetPointXyd", "Point" );
}
@@ -42,14 +40,6 @@ RimPolylineTarget::~RimPolylineTarget()
{
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool RimPolylineTarget::isEnabled() const
{
return m_isEnabled;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
@@ -84,14 +74,6 @@ caf::PdmUiFieldHandle* RimPolylineTarget::targetPointUiCapability()
return m_targetPointXyd.uiCapability();
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimPolylineTarget::enableFullUpdate( bool enable )
{
m_isFullUpdateEnabled = enable;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------

5
ApplicationLibCode/ProjectDataModel/Annotations/RimPolylineTarget.h
View File

@@ -38,14 +38,11 @@ public:
RimPolylineTarget();
~RimPolylineTarget() override;
bool isEnabled() const;
void setAsPointTargetXYD( const cvf::Vec3d& point );
void setAsPointXYZ( const cvf::Vec3d& point );
cvf::Vec3d targetPointXYZ() const;
caf::PdmUiFieldHandle* targetPointUiCapability();
void enableFullUpdate( bool enable );
void triggerVisualizationUpdate() const;
@@ -54,7 +51,5 @@ private:
void fieldChangedByUi( const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue ) override;
private:
bool m_isFullUpdateEnabled;
caf::PdmField<bool> m_isEnabled;
caf::PdmField<cvf::Vec3d> m_targetPointXyd;
};

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

@@ -867,7 +867,7 @@ void RimPolygonFilter::updateCells()
std::vector<cvf::Vec3d> points;
for ( auto& target : m_targets )
{
if ( target->isEnabled() ) points.push_back( target->targetPointXYZ() );
points.push_back( target->targetPointXYZ() );
}
// We need at least three points to make a closed polygon, or just 2 for a polyline
@@ -898,7 +898,7 @@ cvf::ref<RigPolyLinesData> RimPolygonFilter::polyLinesData() const
std::vector<cvf::Vec3d> line;
for ( const RimPolylineTarget* target : m_targets )
{
if ( target->isEnabled() ) line.push_back( target->targetPointXYZ() );
line.push_back( target->targetPointXYZ() );
}
pld->setPolyLine( line );

4
ApplicationLibCode/ProjectDataModel/RimPolylinePickerInterface.cpp
View File

@@ -39,9 +39,9 @@ std::pair<RimPolylineTarget*, RimPolylineTarget*>
foundTarget = true;
}
if ( wt->isEnabled() && !after && foundTarget ) after = wt;
if ( !after && foundTarget ) after = wt;
if ( wt->isEnabled() && !foundTarget ) before = wt;
if ( !foundTarget ) before = wt;
}
return { before, after };

2
ApplicationLibCode/ProjectDataModel/Seismic/RimSeismicSection.cpp
View File

@@ -600,7 +600,7 @@ cvf::ref<RigTexturedSection> RimSeismicSection::texturedSection()
for ( int i = 0; i < (int)m_targets.size(); i++ )
{
if ( m_targets[i]->isEnabled() ) points.push_back( m_targets[i]->targetPointXYZ() );
points.push_back( m_targets[i]->targetPointXYZ() );
}
updateTextureSectionFromPoints( points, zmin, zmax );
}