topologicpy 0.4.63__tar.gz → 0.4.64__tar.gz

{topologicpy-0.4.63/src/topologicpy.egg-info → topologicpy-0.4.64}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: topologicpy
-Version: 0.4.63
+Version: 0.4.64
 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

{topologicpy-0.4.63 → topologicpy-0.4.64}/pyproject.toml

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

{topologicpy-0.4.63 → topologicpy-0.4.64}/src/topologicpy/Graph.py

@@ -5015,7 +5015,7 @@ class Graph:
     @staticmethod
     def Show(graph, vertexColor="black", vertexSize=6, vertexLabelKey=None, vertexGroupKey=None, vertexGroups=[], showVertices=True, showVertexLegend=False, edgeColor="black", edgeWidth=1, edgeLabelKey=None, edgeGroupKey=None, edgeGroups=[], showEdges=True, showEdgeLegend=False, colorScale='viridis', renderer="notebook",
              width=950, height=500, xAxis=False, yAxis=False, zAxis=False, axisSize=1, backgroundColor='rgba(0,0,0,0)', marginLeft=0, marginRight=0, marginTop=20, marginBottom=0,
-             camera=None, target=None, up=None, tolerance=0.0001):
+             camera=[-1.25, -1.25, 1.25], center=[0, 0, 0], up=[0, 0, 1], projection="perspective", tolerance=0.0001):
         """
         Shows the graph using Plotly.
 
@@ -5094,11 +5094,14 @@ class Graph:
         marginBottom : int , optional
             The size in pixels of the bottom margin. The default value is 0.
         camera : list , optional
-            The desired location of the camera. The default is [0,0,0].
-        target : list , optional
-            The desired camera target. The default is [0,0,0].
+            The desired location of the camera). The default is [-1.25,-1.25,1.25].
+        center : list , optional
+            The desired center (camera target). The default is [0,0,0].
         up : list , optional
             The desired up vector. The default is [0,0,1].
+        projection : str , optional
+            The desired type of projection. The options are "orthographic" or "perspective". It is case insensitive. The default is "perspective"
+
         tolerance : float , optional
             The desired tolerance. The default is 0.0001.
         
@@ -5116,7 +5119,7 @@ class Graph:
         data= Plotly.DataByGraph(graph, vertexColor=vertexColor, vertexSize=vertexSize, vertexLabelKey=vertexLabelKey, vertexGroupKey=vertexGroupKey, vertexGroups=vertexGroups, showVertices=showVertices, showVertexLegend=showVertexLegend, edgeColor=edgeColor, edgeWidth=edgeWidth, edgeLabelKey=edgeLabelKey, edgeGroupKey=edgeGroupKey, edgeGroups=edgeGroups, showEdges=showEdges, showEdgeLegend=showEdgeLegend, colorScale=colorScale)
         fig = Plotly.FigureByData(data, width=width, height=height, xAxis=xAxis, yAxis=yAxis, zAxis=zAxis, axisSize=axisSize, backgroundColor=backgroundColor,
                                   marginLeft=marginLeft, marginRight=marginRight, marginTop=marginTop, marginBottom=marginBottom, tolerance=tolerance)
-        Plotly.Show(fig, renderer=renderer, camera=camera, target=target, up=up)
+        Plotly.Show(fig, renderer=renderer, camera=camera, center=center, up=up, projection=projection)
 
     @staticmethod
     def Size(graph):

{topologicpy-0.4.63 → topologicpy-0.4.64}/src/topologicpy/Plotly.py

@@ -40,6 +40,7 @@ except:
 try:
     import plotly
     import plotly.graph_objects as go
+    import plotly.offline as ofl
 except:
     print("Plotly - Installing required plotly library.")
     try:
@@ -49,6 +50,7 @@ except:
     try:
         import plotly
         import plotly.graph_objects as go
+        import plotly.offline as ofl
     except:
         raise Exception("Plotly - Error: Could not import plotly.")
 
@@ -1450,8 +1452,7 @@ class Plotly:
              
              width=950, height=500,
              xAxis=False, yAxis=False, zAxis=False, axisSize=1, backgroundColor='rgba(0,0,0,0)',
-             marginLeft=0, marginRight=0, marginTop=20, marginBottom=0, camera=[1.25, 1.25, 1.25],
-             target=[0, 0, 0], up=[0, 0, 1], renderer="notebook", showScale=False,
+             marginLeft=0, marginRight=0, marginTop=20, marginBottom=0, showScale=False,
              
              cbValues=[], cbTicks=5, cbX=-0.15, cbWidth=15, cbOutlineWidth=0, cbTitle="",
              cbSubTitle="", cbUnits="", colorScale="Viridis", mantissa=6, tolerance=0.0001):
@@ -1582,7 +1583,7 @@ class Plotly:
         marginBottom : int , optional
             The size in pixels of the bottom margin. The default value is 0.
         camera : list , optional
-            The desired location of the camera). The default is [0,0,0].
+            The desired location of the camera). The default is [-1.25,-1.25,1.25].
         center : list , optional
             The desired center (camera target). The default is [0,0,0].
         up : list , optional
@@ -1831,7 +1832,7 @@ class Plotly:
         return True
     
     @staticmethod
-    def SetCamera(figure, camera=[1.25, 1.25, 1.25], target=[0, 0, 0], up=[0, 0, 1]):
+    def SetCamera(figure, camera=[-1.25, -1.25, 1.25], center=[0, 0, 0], up=[0, 0, 1], projection="perspective"):
         """
         Sets the camera for the input figure.
 
@@ -1840,11 +1841,13 @@ class Plotly:
         figure : plotly.graph_objs._figure.Figure
             The input plotly figure.
         camera : list , optional
-            The desired location of the camera. The default is [0,0,0].
-        target : list , optional
-            The desired camera target. The default is [0,0,0].
+            The desired location of the camera. The default is [-1.25,-1.25,1.25].
+        center : list , optional
+            The desired center (camera target). The default is [0,0,0].
         up : list , optional
             The desired up vector. The default is [0,0,1].
+        projection : str , optional
+            The desired type of projection. The options are "orthographic" or "perspective". It is case insensitive. The default is "perspective"
         
         Returns
         -------
@@ -1853,21 +1856,27 @@ class Plotly:
 
         """
         if not isinstance(camera, list):
-            camera = [1.25, 1.25, 1.25]
-        if not isinstance(target, list):
-            target = [0,0,0]
+            camera = [-1.25, -1.25, 1.25]
+        if not isinstance(center, list):
+            center = [0,0,0]
         if not isinstance(up, list):
             up = [0,0,1]
+        projection = projection.lower()
+        if projection in "orthographic":
+            projection = "orthographic"
+        else:
+            projection = "perspective"
         scene_camera = dict(
         up=dict(x=up[0], y=up[1], z=up[2]),
         eye=dict(x=camera[0], y=camera[1], z=camera[2]),
-        center=dict(x=target[0], y=target[1], z=target[2])
+        center=dict(x=center[0], y=center[1], z=center[2]),
+        projection=dict(type=projection)
         )
         figure.update_layout(scene_camera=scene_camera)
         return figure
 
     @staticmethod
-    def Show(figure, camera=[-1.25, -1.25, 1.25], target=[0, 0, 0], up=[0, 0, 1], renderer="notebook"):
+    def Show(figure, camera=[-1.25, -1.25, 1.25], center=[0, 0, 0], up=[0, 0, 1], renderer="notebook", projection="perspective"):
         """
         Shows the input figure.
 
@@ -1877,12 +1886,15 @@ class Plotly:
             The input plotly figure.
         camera : list , optional
             The desired location of the camera. The default is [0,0,0].
-        target : list , optional
-            The desired camera target. The default is [0,0,0].
+        center : list , optional
+            The desired center (camera target). The default is [0,0,0].
         up : list , optional
             The desired up vector. The default is [0,0,1].
         renderer : str , optional
             The desired rendered. See Plotly.Renderers(). The default is "notebook".
+        projection : str, optional
+            The desired type of projection. The options are "orthographic" or "perspective". It is case insensitive. The default is "perspective"
+
         
         Returns
         -------
@@ -1898,10 +1910,9 @@ class Plotly:
         if not renderer.lower() in Plotly.Renderers():
             print("Plotly.Show - Error: The input renderer is not in the approved list of renderers. Returning None.")
             return None
-        if not camera == None and not target == None and not up == None:
-            figure = Plotly.SetCamera(figure, camera=camera, target=target, up=up)
+        if not camera == None and not center == None and not up == None:
+            figure = Plotly.SetCamera(figure, camera=camera, center=center, up=up, projection=projection)
         if renderer.lower() == "offline":
-            import plotly.offline as ofl
             ofl.plot(figure)
         else:
             figure.show(renderer=renderer)

{topologicpy-0.4.63 → topologicpy-0.4.64}/src/topologicpy/Topology.py

@@ -5439,7 +5439,7 @@ class Topology():
              width=950, height=500,
              xAxis=False, yAxis=False, zAxis=False, axisSize=1, backgroundColor='rgba(0,0,0,0)',
              marginLeft=0, marginRight=0, marginTop=20, marginBottom=0, camera=[-1.25, -1.25, 1.25],
-             target=[0, 0, 0], up=[0, 0, 1], renderer="notebook", showScale=False,
+             center=[0, 0, 0], up=[0, 0, 1], projection="perspective", renderer="notebook", showScale=False,
              
              cbValues=[], cbTicks=5, cbX=-0.15, cbWidth=15, cbOutlineWidth=0, cbTitle="",
              cbSubTitle="", cbUnits="", colorScale="Viridis", mantissa=6, tolerance=0.0001):
@@ -5570,11 +5570,13 @@ class Topology():
         marginBottom : int , optional
             The size in pixels of the bottom margin. The default value is 0.
         camera : list , optional
-            The desired location of the camera). The default is [0,0,0].
+            The desired location of the camera). The default is [-1.25,-1.25,1.25].
         center : list , optional
             The desired center (camera target). The default is [0,0,0].
         up : list , optional
             The desired up vector. The default is [0,0,1].
+        projection : str , optional
+            The desired type of projection. The options are "orthographic" or "perspective". It is case insensitive. The default is "perspective"
         renderer : str , optional
             The desired renderer. See Plotly.Renderers(). The default is "notebook".
         intensityKey : str , optional
@@ -5613,11 +5615,14 @@ class Topology():
         from topologicpy.Cluster import Cluster
         from topologicpy.Plotly import Plotly
         from topologicpy.Helper import Helper
+        from topologicpy.Graph import Graph
         
         if isinstance(topologies, tuple):
             topologies = Helper.Flatten(list(topologies))
         if isinstance(topologies, list):
             new_topologies = [t for t in topologies if isinstance(t, topologic.Topology)]
+            graphs = [Graph.Topology(g) for g in topologies if isinstance(g, topologic.Graph)]
+            new_topologies += graphs
         if len(new_topologies) == 0:
             print("Topology.Show - Error: the input topologies parameter does not contain any valid topology. Returning None.")
             return None
@@ -5653,7 +5658,7 @@ class Topology():
                                      tolerance=tolerance)
         if showScale:
             figure = Plotly.AddColorBar(figure, values=cbValues, nTicks=cbTicks, xPosition=cbX, width=cbWidth, outlineWidth=cbOutlineWidth, title=cbTitle, subTitle=cbSubTitle, units=cbUnits, colorScale=colorScale, mantissa=mantissa)
-        Plotly.Show(figure=figure, renderer=renderer, camera=camera, target=target, up=up)
+        Plotly.Show(figure=figure, renderer=renderer, camera=camera, center=center, up=up, projection=projection)
 
     @staticmethod
     def SortBySelectors(topologies, selectors, exclusive=False, tolerance=0.0001):

{topologicpy-0.4.63 → topologicpy-0.4.64}/src/topologicpy/__init__.py

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

{topologicpy-0.4.63 → topologicpy-0.4.64/src/topologicpy.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: topologicpy
-Version: 0.4.63
+Version: 0.4.64
 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