topologicpy 0.7.28__py3-none-any.whl → 0.7.30__py3-none-any.whl

topologicpy/Wire.py

@@ -310,7 +310,7 @@ class Wire(Topology):
         return Wire.ByEdges(edges, tolerance=tolerance)
 
     @staticmethod
-    def ByOffset(wire, offset: float = 1.0, offsetKey: str = "offset", bisectors: bool = False, tolerance: float = 0.0001,  silent: bool = False):
+    def ByOffset(wire, offset: float = 1.0, offsetKey: str = "offset", stepOffsetA: float = 0, stepOffsetB: float = 0, stepOffsetKeyA: str = "stepOffsetA", stepOffsetKeyB: str = "stepOffsetB", bisectors: bool = False, tolerance: float = 0.0001,  silent: bool = False):
         """
         Creates an offset wire from the input wire. A positive offset value results in an offset to the interior of an anti-clockwise wire.
 
@@ -322,6 +322,14 @@ class Wire(Topology):
             The desired offset distance. The default is 1.0.
         offsetKey : str , optional
             The edge dictionary key under which to find the offset value. If a value cannot be found, the offset input parameter value is used instead. The default is "offset".
+        stepOffsetA : float , optional
+            The amount to offset along the previous edge when transitioning between parallel edges with different offsets. The default is 0.
+        stepOffsetB : float , optional
+            The amount to offset along the next edge when transitioning between parallel edges with different offsets. The default is 0.
+        stepOffsetKeyA : str , optional
+            The vertex dictionary key under which to find the step offset A value. If a value cannot be found, the stepOffsetA input parameter value is used instead. The default is "stepOffsetA".
+        stepOffsetKeyB : str , optional
+            The vertex dictionary key under which to find the step offset B value. If a value cannot be found, the stepOffsetB input parameter value is used instead. The default is "stepOffsetB".
         bisectors : bool , optional
             If set to True, The bisectors (seams) edges will be included in the returned wire. The default is False.
         tolerance : float , optional
@@ -355,8 +363,6 @@ class Wire(Topology):
         temp_normal = Face.Normal(temp_face)
         flat_wire = Topology.Flatten(wire, direction=temp_normal, origin=origin)
         normal = Face.Normal(temp_face)
-        if normal[2] < 0:
-            wire = Wire.Reverse(wire, transferDictionaries=True)
         flat_wire = Topology.Flatten(wire, direction=normal, origin=origin)
         edges = Topology.Edges(flat_wire)
         offsets = []
@@ -394,8 +400,20 @@ class Wire(Topology):
                 else:
                     connection = Edge.Connection(prev_edge, o_edge_a)
                     if Topology.IsInstance(connection, "Edge"):
-                        v1_1 = Edge.StartVertex(connection)
-                        v1_2 = Edge.EndVertex(connection)
+                        d = Topology.Dictionary(v_a)
+                        d_stepOffsetA = Dictionary.ValueAtKey(d, stepOffsetKeyA)
+                        if d_stepOffsetA == None:
+                            d_stepOffsetA = stepOffsetA
+                        d_stepOffsetB = Dictionary.ValueAtKey(d, stepOffsetKeyB)
+                        if d_stepOffsetB == None:
+                            d_stepOffsetB = stepOffsetB
+                        v1_1 = Topology.TranslateByDirectionDistance(Edge.EndVertex(prev_edge),
+                                                                     direction = Vector.Reverse(Edge.Direction(prev_edge)),
+                                                                     distance = d_stepOffsetA)
+                                                                                                
+                        v1_2 = Topology.TranslateByDirectionDistance(Edge.StartVertex(o_edge_a),
+                                                                     direction = Edge.Direction(o_edge_a),
+                                                                     distance = d_stepOffsetB)
                         bisectors_list.append(Edge.ByVertices(v_a, v1_1))
                         bisectors_list.append(Edge.ByVertices(v_a, v1_2))
                         final_vertices.append(v1_1)

topologicpy/version.py

@@ -1 +1 @@
-__version__ = '0.7.28'
+__version__ = '0.7.30'

{topologicpy-0.7.28.dist-info → topologicpy-0.7.30.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: topologicpy
-Version: 0.7.28
+Version: 0.7.30
 Summary: An Advanced Spatial Modelling and Analysis Software Library for Architecture, Engineering, and Construction.
 Author-email: Wassim Jabi <wassim.jabi@gmail.com>
 License: MIT License

{topologicpy-0.7.28.dist-info → topologicpy-0.7.30.dist-info}/RECORD

@@ -24,11 +24,11 @@ topologicpy/Sun.py,sha256=_gZfVyH0SDLQmmt775UeeAJ_BtwXO1STQnUMV1qkU0s,37161
 topologicpy/Topology.py,sha256=Z-zddTGL_wkQmhrkXlredpQxx7Myd4Xp-yNw2d95iks,361647
 topologicpy/Vector.py,sha256=WQQUbwrg7VKImtxuBUi2i-FRiPT77WlrzLP05gdXKM8,33079
 topologicpy/Vertex.py,sha256=xnCoPG7BTKBG-JU3C0e11KcpDJbDt9t1Ahj4f5Ul13I,71151
-topologicpy/Wire.py,sha256=mxwx6170ylBnSP2CRAuUZ6xWtISR-frAG5QAVMtS_ZE,147316
+topologicpy/Wire.py,sha256=cCdaQzjiDQWSZ7it0V1i114-6Swjh4rv8hTHgRiEf7Y,149195
 topologicpy/__init__.py,sha256=D7ky87CAQMiS2KE6YLvcTLkTgA2PY7rASe6Z23pjp9k,872
-topologicpy/version.py,sha256=wuEtkjyrjapFyP-8kysuud97ywxtz0wWW7TfbCk_q1g,23
-topologicpy-0.7.28.dist-info/LICENSE,sha256=BRNw73R2WdDBICtwhI3wm3cxsaVqLTAGuRwrTltcfxs,1068
-topologicpy-0.7.28.dist-info/METADATA,sha256=5Q_QWybjO0mzQG8ikrtZ6g9s2IQ3n1-0l4at8o8yJeI,10916
-topologicpy-0.7.28.dist-info/WHEEL,sha256=rWxmBtp7hEUqVLOnTaDOPpR-cZpCDkzhhcBce-Zyd5k,91
-topologicpy-0.7.28.dist-info/top_level.txt,sha256=J30bDzW92Ob7hw3zA8V34Jlp-vvsfIkGzkr8sqvb4Uw,12
-topologicpy-0.7.28.dist-info/RECORD,,
+topologicpy/version.py,sha256=CbJ3GQqlDb-M7QMe4MLNpbEUMiZs9eF7jGbgZtwVIIc,23
+topologicpy-0.7.30.dist-info/LICENSE,sha256=BRNw73R2WdDBICtwhI3wm3cxsaVqLTAGuRwrTltcfxs,1068
+topologicpy-0.7.30.dist-info/METADATA,sha256=0JnIk0hsi9_YxehWfEHHrP_vXgPLtSkOHSRxzfL2Oac,10916
+topologicpy-0.7.30.dist-info/WHEEL,sha256=Wyh-_nZ0DJYolHNn1_hMa4lM7uDedD_RGVwbmTjyItk,91
+topologicpy-0.7.30.dist-info/top_level.txt,sha256=J30bDzW92Ob7hw3zA8V34Jlp-vvsfIkGzkr8sqvb4Uw,12
+topologicpy-0.7.30.dist-info/RECORD,,

{topologicpy-0.7.28.dist-info → topologicpy-0.7.30.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (71.0.4)
+Generator: setuptools (71.1.0)
 Root-Is-Purelib: true
 Tag: py3-none-any