PyPI - topologicpy - Versions diffs - 0.4.96__tar.gz → 0.4.97__tar.gz - Mend

@@ -2906,6 +2906,21 @@ class Wire(Topology):
         """
         from topologicpy.Vertex import Vertex
+        def compute_u(u):
+            def count_decimal_places(number):
+                try:
+                    # Convert the number to a string to analyze decimal places
+                    num_str = str(number)
+                    # Split the number into integer and decimal parts
+                    integer_part, decimal_part = num_str.split('.')
+                    # Return the length of the decimal part
+                    return len(decimal_part)
+                except ValueError:
+                    # If there's no decimal part, return 0
+                    return 0
+            dp = count_decimal_places(u)
+            u = -(int(u) - u)
+            return round(u,dp)
         if not isinstance(wire, topologic.Wire):
             print("Wire.VertexByDistance - Error: The input wire parameter is not a valid topologic wire. Returning None.")
@@ -2918,9 +2933,9 @@ class Wire(Topology):
             return Wire.StartVertex(wire)
         if abs(distance - wire_length) < tolerance:
             return Wire.EndVertex(wire)
-        if abs(distance) > wire_length:
-            print("Wire.VertexByDistance - Error: The input distance parameter is larger than the wire's length. Returning None.")
-            return None
+        # if abs(distance) > wire_length:
+        #     print("Wire.VertexByDistance - Error: The input distance parameter is larger than the wire's length. Returning None.")
+        #     return None
         if not Wire.IsManifold(wire):
             print("Wire.VertexAtParameter - Error: The input wire parameter is non-manifold. Returning None.")
             return None
@@ -2929,17 +2944,18 @@ class Wire(Topology):
         if not isinstance(origin, topologic.Vertex):
             print("Wire.VertexByDistance - Error: The input origin parameter is not a valid topologic vertex. Returning None.")
             return None
-        if not Wire.IsInternal(wire, origin, tolerance=tolerance):
+        if not Vertex.IsInternal(origin, wire, tolerance=tolerance):
             print("Wire.VertexByDistance - Error: The input origin parameter is not internal to the input wire parameter. Returning None.")
             return None
-        if distance < 0:
-            if Wire.VertexDistance(wire, Wire.StartVertex(wire), origin) < abs(distance):
-                print("Wire.VertexByDistance - Error: The resulting vertex would fall outside the wire. Returning None.")
-                return None
-        else:
-            if Wire.VertexDistance(wire, Wire.EndVertex(wire), origin) < distance:
-                print("Wire.VertexByDistance - Error: The resulting vertex would fall outside the wire. Returning None.")
-                return None
+        # if distance < 0:
+        #     if Wire.VertexDistance(wire, Wire.StartVertex(wire), origin) < abs(distance):
+        #         print("Wire.VertexByDistance - Error: The resulting vertex would fall outside the wire. Returning None.")
+        #         return None
+        # else:
+        #     if Wire.VertexDistance(wire, Wire.EndVertex(wire), origin) < distance:
+        #         print("Wire.VertexDistance:", Wire.VertexDistance(wire, Wire.EndVertex(wire), origin))
+        #         print("Wire.VertexByDistance - Error: The resulting vertex would fall outside the wire. Returning None.")
+        #         return None
         if Vertex.Distance(Wire.StartVertex(wire), origin) < tolerance:
             u = distance/wire_length
@@ -2948,7 +2964,8 @@ class Wire(Topology):
         else:
             d = Wire.VertexDistance(wire, origin) + distance
             u = d/wire_length
-        return Wire.VertexByParameter(wire, u=u)
+        return Wire.VertexByParameter(wire, u=compute_u(u))
     @staticmethod
     def VertexByParameter(wire: topologic.Wire, u: float = 0) -> topologic.Vertex:

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: topologicpy
-Version: 0.4.96
+Version: 0.4.97
 Summary: An Advanced Spatial Modelling and Analysis Software Library for Architecture, Engineering, and Construction.
 Author-email: Wassim Jabi <wassim.jabi@gmail.com>
 Project-URL: Homepage, https://github.com/wassimj/TopologicPy

@@ -3,7 +3,7 @@ requires = ["setuptools>=61"]
 build-backend = "setuptools.build_meta"
 [project]
 name = "topologicpy"
-version = "0.4.96"
+version = "0.4.97"
 authors = [
   { name="Wassim Jabi", email="wassim.jabi@gmail.com" },
 ]

@@ -659,18 +659,18 @@ class Shell(Topology):
         """
-        from topologicpy.Wire import Wire
+        from topologicpy.Vertex import Vertex
         if not isinstance(shell, topologic.Shell):
             return None
         if not isinstance(vertex, topologic.Vertex):
             return None
         boundary = Shell.ExternalBoundary(shell, tolerance=tolerance)
-        if Wire.IsInternal(wire=boundary, vertex=vertex, tolerance=tolerance):
+        if Vertex.IsInternal(vertex, boundary, tolerance=tolerance):
             return True
         internal_boundaries = Shell.InternalBoundaries(shell, tolerance=tolerance)
         for ib in internal_boundaries:
-            if Wire.IsInternal(wire=ib, vertex=vertex, tolerance=tolerance):
+            if Vertex.IsInternal(vertex, ib, tolerance=tolerance):
                 return True
         return False

@@ -914,7 +914,15 @@ class Topology():
                 return None
         # Edge:
         elif isinstance(topologyA, topologic.Edge):
-            if isinstance(topologyB, topologic.Shell):
+            if isinstance(topologyB, topologic.Wire):
+                vertices = Topology.Vertices(topologyB)
+                edges = Topology.Edges(topologyB)
+                intersections = [topologyA.Intersect(x) for x in vertices]
+                intersections += [topologyA.Intersect(x) for x in edges]
+                intersections = [x for x in intersections if not x == None]
+                if len(intersections) == 0:
+                    return None
+            elif isinstance(topologyB, topologic.Shell):
                 vertices = Topology.Vertices(topologyB)
                 edges = Topology.Edges(topologyB)
                 faces = Topology.Faces(topologyB)

@@ -18,7 +18,7 @@ import sys
 import os, re
 from sys import platform
-__version__ = '0.4.96'
+__version__ = '0.4.97'
 __version_info__ = tuple([ int(num) for num in __version__.split('.')])
 if platform == 'win32':

topologicpy 0.4.96__tar.gz → 0.4.97__tar.gz

topologicpy 0.4.96tar.gz → 0.4.97tar.gz