topologicpy 0.8.43__py3-none-any.whl → 0.8.44__py3-none-any.whl

topologicpy/Color.py

@@ -19,6 +19,40 @@ import math
 
 class Color:
 
+    def AddHex(*colors):
+        """
+        Adds the input hexadecimal color codes channel-wise, clipping each channel to a max of 255.
+
+        Parameters
+        ----------
+        colors : *list or str
+            The input list of hexadecimal colors.
+
+        Returns
+        -------
+        str
+            The resulting hex color after addition (e.g., "#FF88FF").
+        """
+        import inspect
+        from topologicpy.Helper import Helper
+        
+        def add(hex1, hex2):
+            # Remove "#" if present
+            hex1 = hex1.lstrip('#')
+            hex2 = hex2.lstrip('#')
+
+            # Convert to RGB integers
+            r1, g1, b1 = int(hex1[0:2], 16), int(hex1[2:4], 16), int(hex1[4:6], 16)
+            r2, g2, b2 = int(hex2[0:2], 16), int(hex2[2:4], 16), int(hex2[4:6], 16)
+
+            # Add each channel, clip to 255
+            r = min(r1 + r2, 255)
+            g = min(g1 + g2, 255)
+            b = min(b1 + b2, 255)
+
+            # Return as hex string
+            return f"#{r:02X}{g:02X}{b:02X}"
+
     @staticmethod
     def AnyToHex(color):
         """
@@ -35,6 +69,8 @@ class Color:
             A hexadecimal color string in the format '#RRGGBB'.
         """
         return_hex = None
+        if isinstance(color, list) and all(isinstance(item, str) for item in color):
+            return Color.Average(color)
         if isinstance(color, list):
             if len(color) == 4: # Probably CMYK
                 if all(0 <= x <= 1 for x in color[:4]):
@@ -56,7 +92,7 @@ class Color:
         return return_hex.upper()
     
     @staticmethod
-    def AverageHex(*colors, silent: bool = False):
+    def Average(*colors, silent: bool = False):
         """
         Averages the input list of hex colors.
 

topologicpy/Topology.py

@@ -944,7 +944,7 @@ class Topology():
 
 
     @staticmethod
-    def Inherit(targets, sources, keys: list = None, tolerance: float = 0.0001, silent: bool = False):
+    def Inherit(targets, sources, keys: list = None, exclusive: bool = True, tolerance: float = 0.0001, silent: bool = False):
         """
         Transfers dictionary information from topologiesB to topologiesA based on co-location of internal vertices.
 
@@ -954,6 +954,8 @@ class Topology():
             The list of target topologies that will inherit the dictionaries.
         sources : list of topologic_core. Topology
             The list of source topologies from which to inherit dictionary information.
+        exclusive : bool , optional
+            If set to True, a target will inherit information only from the first eligible source. The default is True.
         tolerance : float , optional
             The desired tolerance. The default is 0.0001.
         silent : bool , optional
@@ -983,17 +985,19 @@ class Topology():
             iv = Topology.InternalVertex(top_a, tolerance=tolerance, silent=silent)
             d_a = Topology.Dictionary(top_a, silent=silent)
             found = False
-            for top_b in topologies_b:
+            for j, top_b in enumerate(topologies_b):
                 if Vertex.IsInternal(iv, top_b, tolerance=tolerance, silent=silent):
                     d_b = Topology.Dictionary(top_b)
                     if isinstance(keys, list):
                         values = Dictionary.ValuesAtKeys(d_b, keys, silent=silent)
-                        d_c = Dictionary.SetValuesAtKeys(d_a, keys, values, silent=silent)
+                        d_c = Dictionary.ByKeysValues(keys, values)
+                        d_a = Dictionary.ByMergedDictionaries(d_a, d_c, silent=silent)
                     else:
-                        d_c = Dictionary.SetValuesAtKeys(d_a, Dictionary.Keys(d_b, silent=silent), Dictionary.Values(d_b, silent=silent))
-                    top_a = Topology.SetDictionary(top_a, d_c, silent=silent)
+                        d_a = Dictionary.ByMergedDictionaries(d_a, d_b, silent=silent)
+                    top_a = Topology.SetDictionary(top_a, d_a, silent=silent)
                     found = True
-                    break
+                    if exclusive:
+                        break
             if found == False:
                 if not silent:
                     print("Topology.Inherit - Warning: Could not find a source for target number: "+str(i+1)+". Consider increasing the tolerance value.")
@@ -4432,9 +4436,9 @@ class Topology():
             if not silent:
                 print("Topology.Explode - Error: the input axes parameter is not a valid string. Returning None.")
             return None
-        if Topology.IsInstance(topology, "Topology"):
-            # Hack to fix a weird bug that seems to be a problem with OCCT memory handling.
-            topology = Topology.ByJSONString(Topology.JSONString([topology]))[0]
+        # if Topology.IsInstance(topology, "Topology"):
+        #     # Hack to fix a weird bug that seems to be a problem with OCCT memory handling.
+        #     topology = Topology.ByJSONString(Topology.JSONString([topology]))[0]
         axes = axes.lower()
         x_flag = "x" in axes
         y_flag = "y" in axes

topologicpy/version.py

@@ -1 +1 @@
-__version__ = '0.8.43'
+__version__ = '0.8.44'

{topologicpy-0.8.43.dist-info → topologicpy-0.8.44.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: topologicpy
-Version: 0.8.43
+Version: 0.8.44
 Summary: An AI-Powered Spatial Modelling and Analysis Software Library for Architecture, Engineering, and Construction.
 Author-email: Wassim Jabi <wassim.jabi@gmail.com>
 License: AGPL v3 License

{topologicpy-0.8.43.dist-info → topologicpy-0.8.44.dist-info}/RECORD

@@ -5,7 +5,7 @@ topologicpy/CSG.py,sha256=uDkOSmc8m1V_k7T3UCerODhOSyYNO4FRDzoOqt0kEt8,15590
 topologicpy/Cell.py,sha256=M4Xv4gabSgtKYYA-Wh0lgYEbRNRVF9zr4DYejOXJc-4,176278
 topologicpy/CellComplex.py,sha256=c2B3mF1c3iwOfT-V0JWt9qNcFdd6DPR0aBOE2UnZTn4,61165
 topologicpy/Cluster.py,sha256=wvfMAx6aPrSAt5nQ4--KnqD4EK9MGjch6Dg985WF7JQ,58748
-topologicpy/Color.py,sha256=FcR0-__giyGQqvgiOrG8GkA65arHbiS33Si-QbUADPI,23362
+topologicpy/Color.py,sha256=OTtXo9htNuOqZaZZpfK5BoLsJFJssauk3jbHzIBnWx8,24518
 topologicpy/Context.py,sha256=G3CwMvN8Jw2rnQRwB-n4MaQq_wLS0vPimbXKwsdMJ80,3055
 topologicpy/DGL.py,sha256=HQXy9iDnrvWGDxaBfe5pRbweQ2zLBvAf6UdjfhKkQYI,139041
 topologicpy/Dictionary.py,sha256=sPskW5bopbDzLz6MGKm8lN_OeyeAgsqdLvwwNcG0J3g,44690
@@ -25,14 +25,14 @@ topologicpy/ShapeGrammar.py,sha256=UVb8VPwVKd6V3zDTNzpBecQPgYo1EjSsS10XJ8k5YcI,2
 topologicpy/Shell.py,sha256=fx0WTndC8blkvWe38nKsJsI_AmklOA0qsjU0gbZp4b4,90501
 topologicpy/Speckle.py,sha256=-eiTqJugd7pHiHpD3pDUcDO6CGhVyPV14HFRzaqEoaw,18187
 topologicpy/Sun.py,sha256=_VBBAUIDhvpkp72JBZlv7k9qx9jYubm3yM56UZ1Nc6c,36837
-topologicpy/Topology.py,sha256=tl5VTJIG3lZfIZ88nN9-tzE571gc8FxFqDF4t_Yuekw,471333
+topologicpy/Topology.py,sha256=-9hsN1PSvhH7qDo1HXjd545xteRZZY7-fxtxoBtU1Tw,471584
 topologicpy/Vector.py,sha256=X12eqskn28bdB7sLY1EZhq3noPYzPbNEgHPb4a959ss,42302
 topologicpy/Vertex.py,sha256=RlGQnxQSb_kAus3tJgXd-v-Ptubtt09PQPA9IMwfXmI,84835
 topologicpy/Wire.py,sha256=sJE8qwqYOomvN3snMWmj2P2-Sq25ul_OQ95YFz6DFUw,230553
 topologicpy/__init__.py,sha256=RMftibjgAnHB1vdL-muo71RwMS4972JCxHuRHOlU428,928
-topologicpy/version.py,sha256=hF3_b4wm6P2C7FhxNisjLlDWfDYZXkMWBDfjYGulhT4,23
-topologicpy-0.8.43.dist-info/licenses/LICENSE,sha256=FK0vJ73LuE8PYJAn7LutsReWR47-Ooovw2dnRe5yV6Q,681
-topologicpy-0.8.43.dist-info/METADATA,sha256=5dzgC4p5xWYC7uU9VOqvU-PT1fTDCOqSl_5uGk97oZQ,10535
-topologicpy-0.8.43.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-topologicpy-0.8.43.dist-info/top_level.txt,sha256=J30bDzW92Ob7hw3zA8V34Jlp-vvsfIkGzkr8sqvb4Uw,12
-topologicpy-0.8.43.dist-info/RECORD,,
+topologicpy/version.py,sha256=H1GigrgdekxMys9lmJxIRnIFrNk4zrmX7xz5PrqPdxE,23
+topologicpy-0.8.44.dist-info/licenses/LICENSE,sha256=FK0vJ73LuE8PYJAn7LutsReWR47-Ooovw2dnRe5yV6Q,681
+topologicpy-0.8.44.dist-info/METADATA,sha256=YU_ze05mFUZrce4XzGuVddWEEOzOM_oTPndhJHejKC0,10535
+topologicpy-0.8.44.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+topologicpy-0.8.44.dist-info/top_level.txt,sha256=J30bDzW92Ob7hw3zA8V34Jlp-vvsfIkGzkr8sqvb4Uw,12
+topologicpy-0.8.44.dist-info/RECORD,,