This commit is contained in:
Matthias Koefferlein 2024-03-02 17:55:13 +01:00
parent 863935d664
commit c5433a349a
4 changed files with 22 additions and 22 deletions

View File

@ -367,73 +367,73 @@ AsIfFlatEdges::selected_interacting_pair (const Edges &other, size_t min_count,
EdgesDelegate * EdgesDelegate *
AsIfFlatEdges::selected_outside (const Region &other) const AsIfFlatEdges::selected_outside (const Region &other) const
{ {
return selected_interacting_generic (other, EdgesOutside, false, size_t (0), std::numeric_limits<size_t>::max ()); return selected_interacting_generic (other, EdgesOutside, false, size_t (1), std::numeric_limits<size_t>::max ());
} }
EdgesDelegate * EdgesDelegate *
AsIfFlatEdges::selected_not_outside (const Region &other) const AsIfFlatEdges::selected_not_outside (const Region &other) const
{ {
return selected_interacting_generic (other, EdgesOutside, true, size_t (0), std::numeric_limits<size_t>::max ()); return selected_interacting_generic (other, EdgesOutside, true, size_t (1), std::numeric_limits<size_t>::max ());
} }
std::pair<EdgesDelegate *, EdgesDelegate *> std::pair<EdgesDelegate *, EdgesDelegate *>
AsIfFlatEdges::selected_outside_pair (const Region &other) const AsIfFlatEdges::selected_outside_pair (const Region &other) const
{ {
return selected_interacting_pair_generic (other, EdgesOutside, size_t (0), std::numeric_limits<size_t>::max ()); return selected_interacting_pair_generic (other, EdgesOutside, size_t (1), std::numeric_limits<size_t>::max ());
} }
EdgesDelegate * EdgesDelegate *
AsIfFlatEdges::selected_inside (const Region &other) const AsIfFlatEdges::selected_inside (const Region &other) const
{ {
return selected_interacting_generic (other, EdgesInside, false, size_t (0), std::numeric_limits<size_t>::max ()); return selected_interacting_generic (other, EdgesInside, false, size_t (1), std::numeric_limits<size_t>::max ());
} }
EdgesDelegate * EdgesDelegate *
AsIfFlatEdges::selected_not_inside (const Region &other) const AsIfFlatEdges::selected_not_inside (const Region &other) const
{ {
return selected_interacting_generic (other, EdgesInside, true, size_t (0), std::numeric_limits<size_t>::max ()); return selected_interacting_generic (other, EdgesInside, true, size_t (1), std::numeric_limits<size_t>::max ());
} }
std::pair<EdgesDelegate *, EdgesDelegate *> std::pair<EdgesDelegate *, EdgesDelegate *>
AsIfFlatEdges::selected_inside_pair (const Region &other) const AsIfFlatEdges::selected_inside_pair (const Region &other) const
{ {
return selected_interacting_pair_generic (other, EdgesInside, size_t (0), std::numeric_limits<size_t>::max ()); return selected_interacting_pair_generic (other, EdgesInside, size_t (1), std::numeric_limits<size_t>::max ());
} }
EdgesDelegate * EdgesDelegate *
AsIfFlatEdges::selected_outside (const Edges &other) const AsIfFlatEdges::selected_outside (const Edges &other) const
{ {
return selected_interacting_generic (other, EdgesOutside, false, size_t (0), std::numeric_limits<size_t>::max ()); return selected_interacting_generic (other, EdgesOutside, false, size_t (1), std::numeric_limits<size_t>::max ());
} }
EdgesDelegate * EdgesDelegate *
AsIfFlatEdges::selected_not_outside (const Edges &other) const AsIfFlatEdges::selected_not_outside (const Edges &other) const
{ {
return selected_interacting_generic (other, EdgesOutside, true, size_t (0), std::numeric_limits<size_t>::max ()); return selected_interacting_generic (other, EdgesOutside, true, size_t (1), std::numeric_limits<size_t>::max ());
} }
std::pair<EdgesDelegate *, EdgesDelegate *> std::pair<EdgesDelegate *, EdgesDelegate *>
AsIfFlatEdges::selected_outside_pair (const Edges &other) const AsIfFlatEdges::selected_outside_pair (const Edges &other) const
{ {
return selected_interacting_pair_generic (other, EdgesOutside, size_t (0), std::numeric_limits<size_t>::max ()); return selected_interacting_pair_generic (other, EdgesOutside, size_t (1), std::numeric_limits<size_t>::max ());
} }
EdgesDelegate * EdgesDelegate *
AsIfFlatEdges::selected_inside (const Edges &other) const AsIfFlatEdges::selected_inside (const Edges &other) const
{ {
return selected_interacting_generic (other, EdgesInside, false, size_t (0), std::numeric_limits<size_t>::max ()); return selected_interacting_generic (other, EdgesInside, false, size_t (1), std::numeric_limits<size_t>::max ());
} }
EdgesDelegate * EdgesDelegate *
AsIfFlatEdges::selected_not_inside (const Edges &other) const AsIfFlatEdges::selected_not_inside (const Edges &other) const
{ {
return selected_interacting_generic (other, EdgesInside, true, size_t (0), std::numeric_limits<size_t>::max ()); return selected_interacting_generic (other, EdgesInside, true, size_t (1), std::numeric_limits<size_t>::max ());
} }
std::pair<EdgesDelegate *, EdgesDelegate *> std::pair<EdgesDelegate *, EdgesDelegate *>
AsIfFlatEdges::selected_inside_pair (const Edges &other) const AsIfFlatEdges::selected_inside_pair (const Edges &other) const
{ {
return selected_interacting_pair_generic (other, EdgesInside, size_t (0), std::numeric_limits<size_t>::max ()); return selected_interacting_pair_generic (other, EdgesInside, size_t (1), std::numeric_limits<size_t>::max ());
} }

View File

@ -137,32 +137,32 @@ public:
virtual RegionDelegate *selected_outside (const Region &other) const virtual RegionDelegate *selected_outside (const Region &other) const
{ {
return selected_interacting_generic (other, 1, false, Positive, size_t (0), std::numeric_limits<size_t>::max ()).first; return selected_interacting_generic (other, 1, false, Positive, size_t (1), std::numeric_limits<size_t>::max ()).first;
} }
virtual RegionDelegate *selected_not_outside (const Region &other) const virtual RegionDelegate *selected_not_outside (const Region &other) const
{ {
return selected_interacting_generic (other, 1, false, Negative, size_t (0), std::numeric_limits<size_t>::max ()).first; return selected_interacting_generic (other, 1, false, Negative, size_t (1), std::numeric_limits<size_t>::max ()).first;
} }
virtual std::pair<RegionDelegate *, RegionDelegate *> selected_outside_pair (const Region &other) const virtual std::pair<RegionDelegate *, RegionDelegate *> selected_outside_pair (const Region &other) const
{ {
return selected_interacting_generic (other, 1, false, PositiveAndNegative, size_t (0), std::numeric_limits<size_t>::max ()); return selected_interacting_generic (other, 1, false, PositiveAndNegative, size_t (1), std::numeric_limits<size_t>::max ());
} }
virtual RegionDelegate *selected_inside (const Region &other) const virtual RegionDelegate *selected_inside (const Region &other) const
{ {
return selected_interacting_generic (other, -1, true, Positive, size_t (0), std::numeric_limits<size_t>::max ()).first; return selected_interacting_generic (other, -1, true, Positive, size_t (1), std::numeric_limits<size_t>::max ()).first;
} }
virtual RegionDelegate *selected_not_inside (const Region &other) const virtual RegionDelegate *selected_not_inside (const Region &other) const
{ {
return selected_interacting_generic (other, -1, true, Negative, size_t (0), std::numeric_limits<size_t>::max ()).first; return selected_interacting_generic (other, -1, true, Negative, size_t (1), std::numeric_limits<size_t>::max ()).first;
} }
virtual std::pair<RegionDelegate *, RegionDelegate *> selected_inside_pair (const Region &other) const virtual std::pair<RegionDelegate *, RegionDelegate *> selected_inside_pair (const Region &other) const
{ {
return selected_interacting_generic (other, -1, true, PositiveAndNegative, size_t (0), std::numeric_limits<size_t>::max ()); return selected_interacting_generic (other, -1, true, PositiveAndNegative, size_t (1), std::numeric_limits<size_t>::max ());
} }
virtual RegionDelegate *selected_enclosing (const Region &other, size_t min_count, size_t max_count) const virtual RegionDelegate *selected_enclosing (const Region &other, size_t min_count, size_t max_count) const

View File

@ -121,7 +121,7 @@ public:
* @brief Implements edge-to-polygon interactions * @brief Implements edge-to-polygon interactions
*/ */
template<class TI> template<class TI>
class DB_PUBLIC_TEMPLATE edge_to_polygon_interacting_local_operation class DB_PUBLIC edge_to_polygon_interacting_local_operation
: public local_operation<db::Edge, TI, db::Edge> : public local_operation<db::Edge, TI, db::Edge>
{ {
public: public:

View File

@ -561,13 +561,13 @@ Class<db::CompoundRegionOperationNode> decl_CompoundRegionOperationNode ("db", "
gsi::constructor ("new_geometrical_boolean", &new_geometrical_boolean, gsi::arg ("op"), gsi::arg ("a"), gsi::arg ("b"), gsi::constructor ("new_geometrical_boolean", &new_geometrical_boolean, gsi::arg ("op"), gsi::arg ("a"), gsi::arg ("b"),
"@brief Creates a node representing a geometrical boolean operation between the inputs.\n" "@brief Creates a node representing a geometrical boolean operation between the inputs.\n"
) + ) +
gsi::constructor ("new_interacting", &new_interacting, gsi::arg ("a"), gsi::arg ("b"), gsi::arg ("inverse", false), gsi::arg ("min_count", size_t (0)), gsi::arg ("max_count", std::numeric_limits<size_t>::max (), "unlimited"), gsi::constructor ("new_interacting", &new_interacting, gsi::arg ("a"), gsi::arg ("b"), gsi::arg ("inverse", false), gsi::arg ("min_count", size_t (1)), gsi::arg ("max_count", std::numeric_limits<size_t>::max (), "unlimited"),
"@brief Creates a node representing an interacting selection operation between the inputs.\n" "@brief Creates a node representing an interacting selection operation between the inputs.\n"
) + ) +
gsi::constructor ("new_overlapping", &new_overlapping, gsi::arg ("a"), gsi::arg ("b"), gsi::arg ("inverse", false), gsi::arg ("min_count", size_t (0)), gsi::arg ("max_count", std::numeric_limits<size_t>::max (), "unlimited"), gsi::constructor ("new_overlapping", &new_overlapping, gsi::arg ("a"), gsi::arg ("b"), gsi::arg ("inverse", false), gsi::arg ("min_count", size_t (1)), gsi::arg ("max_count", std::numeric_limits<size_t>::max (), "unlimited"),
"@brief Creates a node representing an overlapping selection operation between the inputs.\n" "@brief Creates a node representing an overlapping selection operation between the inputs.\n"
) + ) +
gsi::constructor ("new_enclosing", &new_enclosing, gsi::arg ("a"), gsi::arg ("b"), gsi::arg ("inverse", false), gsi::arg ("min_count", size_t (0)), gsi::arg ("max_count", std::numeric_limits<size_t>::max (), "unlimited"), gsi::constructor ("new_enclosing", &new_enclosing, gsi::arg ("a"), gsi::arg ("b"), gsi::arg ("inverse", false), gsi::arg ("min_count", size_t (1)), gsi::arg ("max_count", std::numeric_limits<size_t>::max (), "unlimited"),
"@brief Creates a node representing an inside selection operation between the inputs.\n" "@brief Creates a node representing an inside selection operation between the inputs.\n"
) + ) +
gsi::constructor ("new_inside", &new_inside, gsi::arg ("a"), gsi::arg ("b"), gsi::arg ("inverse", false), gsi::constructor ("new_inside", &new_inside, gsi::arg ("a"), gsi::arg ("b"), gsi::arg ("inverse", false),