mirrors/build123d
1
Fork 0
mirror of https://github.com/gumyr/build123d.git synced 2026-01-03 07:42:50 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

shape_core.py -> move to OCP>7.8 hash method

Browse source
This commit is contained in:
jdegenstein 2025-01-11 13:42:57 -06:00 • committed by GitHub
parent ae80b27c9b
commit b93538c311
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 5 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

22
src/build123d/topology/shape_core.py
View file

@ -167,7 +167,6 @@ if TYPE_CHECKING: # pragma: no cover
from .composite import Compound # pylint: disable=R0801 from .composite import Compound # pylint: disable=R0801
from build123d.build_part import BuildPart # pylint: disable=R0801 from build123d.build_part import BuildPart # pylint: disable=R0801
HASH_CODE_MAX = 2147483647
Shapes = Literal["Vertex", "Edge", "Wire", "Face", "Shell", "Solid", "Compound"] Shapes = Literal["Vertex", "Edge", "Wire", "Face", "Shell", "Solid", "Compound"]
TrimmingTool = Union[Plane, "Shell", "Face"] TrimmingTool = Union[Plane, "Shell", "Face"]
TOPODS = TypeVar("TOPODS", bound=TopoDS_Shape) TOPODS = TypeVar("TOPODS", bound=TopoDS_Shape)
@ -805,8 +804,10 @@ class Shape(NodeMixin, Generic[TOPODS]):
return NotImplemented return NotImplemented
def __hash__(self) -> int: def __hash__(self) -> int:
"""Return has code""" """Return hash code"""
return self.hash_code() if self.wrapped is None:
return 0
return hash(self.wrapped)
def __rmul__(self, other): def __rmul__(self, other):
"""right multiply for positioning operator *""" """right multiply for positioning operator *"""
@ -1181,19 +1182,6 @@ class Shape(NodeMixin, Generic[TOPODS]):
self.__class__.cast(s) for s in get_top_level_topods_shapes(self.wrapped) self.__class__.cast(s) for s in get_top_level_topods_shapes(self.wrapped)
) )
def hash_code(self) -> int:
"""Returns a hashed value denoting this shape. It is computed from the
TShape and the Location. The Orientation is not used.
Args:
Returns:
"""
if self.wrapped is None:
return 0
return self.wrapped.HashCode(HASH_CODE_MAX)
def intersect( def intersect(
self, *to_intersect: Shape | Axis | Plane self, *to_intersect: Shape | Axis | Plane
) -> None | Self | ShapeList[Self]: ) -> None | Self | ShapeList[Self]:
@ -2852,7 +2840,7 @@ def _topods_entities(shape: TopoDS_Shape, topo_type: Shapes) -> list[TopoDS_Shap
while explorer.More(): while explorer.More():
item = explorer.Current() item = explorer.Current()
out[item.HashCode(HASH_CODE_MAX)] = ( out[hash(item)] = (
item # needed to avoid pseudo-duplicate entities item # needed to avoid pseudo-duplicate entities
) )
explorer.Next() explorer.Next()