Skip to content

Commit

Permalink
Mark as obsolete
Browse files Browse the repository at this point in the history
  • Loading branch information
magnesj committed Feb 20, 2024
1 parent ee8743f commit 36d8b2f
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 9 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -88,11 +88,11 @@ RimPolygonFilter::RimPolygonFilter()
m_editPolygonButton.uiCapability()->setUiEditorTypeName( caf::PdmUiPushButtonEditor::uiEditorTypeName() );
m_editPolygonButton.uiCapability()->setUiLabelPosition( caf::PdmUiItemInfo::HIDDEN );

CAF_PDM_InitFieldNoDefault( &m_targets, "Targets", "Targets" );
m_targets.uiCapability()->setUiTreeChildrenHidden( true );
m_targets.uiCapability()->setUiTreeHidden( true );
m_targets.uiCapability()->setUiHidden( true );
m_targets.xmlCapability()->setIOWritable( false );
CAF_PDM_InitFieldNoDefault( &m_OBSOLETE_targets, "Targets", "Targets" );
m_OBSOLETE_targets.uiCapability()->setUiTreeChildrenHidden( true );
m_OBSOLETE_targets.uiCapability()->setUiTreeHidden( true );
m_OBSOLETE_targets.uiCapability()->setUiHidden( true );
m_OBSOLETE_targets.xmlCapability()->setIOWritable( false );

CAF_PDM_InitFieldNoDefault( &m_closePolygon, "ClosePolygon", "Closed Polygon" );
m_closePolygon.registerGetMethod( this, &RimPolygonFilter::isPolygonClosed );
Expand Down Expand Up @@ -162,24 +162,24 @@ void RimPolygonFilter::initAfterRead()
RimCellFilter::initAfterRead();

// Move existing polygons to global polygon
if ( !m_targets.empty() )
if ( !m_OBSOLETE_targets.empty() )
{
std::vector<cvf::Vec3d> points;
for ( const auto& target : m_targets )
for ( const auto& target : m_OBSOLETE_targets )
{
points.push_back( target->targetPointXYZ() );
}

auto polygon = RimPolygonTools::createNewPolygon();
polygon->setPointsInDomainCoords( points );

polygon->setIsClosed( true );

setPolygonAndConnectSignals( polygon );

auto polygonInView = RimPolygonTools::findPolygonInView( polygon, this );
if ( polygonInView )
{
// Call set polygon to make sure the well targets are updated
polygonInView->setPolygon( polygon );
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,6 @@ class RimPolygonFilter : public RimCellFilter

RimCellFilterIntervalTool m_intervalTool;

caf::PdmChildArrayField<RimPolylineTarget*> m_targets;
caf::PdmChildArrayField<RimPolylineTarget*> m_OBSOLETE_targets;
caf::PdmProxyValueField<bool> m_closePolygon;
};

0 comments on commit 36d8b2f

Please sign in to comment.