Polygon filter updates (#7216)

* Rename polylinefilter to polygonfilter
* Update icon name, too
* Some GUI adjustments
* Remove obsolete code that came back in a merge somewhere.
Disable auto-enable polygon filter after picking corner points.
* Add option to delete a point in polygon filter point editor by extending generic picker interface
* Rename enum, too.
* Improved filter naming

Co-authored-by: Magne Sjaastad <magne.sjaastad@ceetronsolutions.com>
This commit is contained in:
jonjenssen
2021-01-15 19:16:01 +01:00
committed by GitHub
parent 7c42b4ae7b
commit 96fc6cd358
32 changed files with 288 additions and 504 deletions

View File

@@ -1,6 +1,6 @@
/////////////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2018- Equinor ASA
// Copyright (C) 2020 Equinor ASA
//
// ResInsight is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
@@ -15,15 +15,18 @@
// for more details.
//
/////////////////////////////////////////////////////////////////////////////////
#include "RicDeletePolylineTargetFeature.h"
CAF_CMD_SOURCE_INIT( RicDeletePolylineTargetFeature, "RicDeletePolylineTargetFeature" );
#include "RimPolylinePickerInterface.h"
#include "RimPolylineTarget.h"
#include "RimUserDefinedPolylinesAnnotation.h"
#include "cafSelectionManager.h"
#include <QAction>
CAF_CMD_SOURCE_INIT( RicDeletePolylineTargetFeature, "RicDeletePolylineTargetFeature" );
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
@@ -50,7 +53,7 @@ void RicDeletePolylineTargetFeature::onActionTriggered( bool isChecked )
if ( !targets.empty() )
{
RimUserDefinedPolylinesAnnotation* polylineDef = nullptr;
RimPolylinePickerInterface* polylineDef = nullptr;
targets[0]->firstAncestorOrThisOfTypeAsserted( polylineDef );
for ( auto target : targets )