bridges 3.4.5.dev1__tar.gz → 3.5.0.dev1__tar.gz

{bridges-3.4.5.dev1/bridges.egg-info → bridges-3.5.0.dev1}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: bridges
-Version: 3.4.5.dev1
+Version: 3.5.0.dev1
 Summary: Bridging Real-world Infrastructure Designed to Goal-align, Engage, and Stimulate, an NSF TUES
 Home-page: https://github.com/BridgesUNCC/bridges-python
 Author: BRIDGES
@@ -10,11 +10,19 @@ Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: OS Independent
 Requires-Python: >3.5.2
 Description-Content-Type: text/markdown
-License-File: LICENSE
 Requires-Dist: requests>=2.21.0
 Requires-Dist: webcolors>=1.8.1
 Requires-Dist: python-socketio[client]>=4.3.0
 Requires-Dist: SPARQLWrapper>=1.8.4
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: requires-dist
+Dynamic: requires-python
+Dynamic: summary
 
 # bridges-python
 

{bridges-3.4.5.dev1 → bridges-3.5.0.dev1}/bridges/bar_chart.py

@@ -27,7 +27,7 @@ class BarChart:
     displayed by hovering on a bar. One can append a string to the
     value using barchart.tooltip_suffix to specify units in the tooltip if desired.
     
-      @sa See tutorial on using BarChart at:
+    @sa See tutorial on using BarChart at:
        https://bridgesuncc.github.io/tutorials/BarChart.html
     """
 
@@ -37,7 +37,7 @@ class BarChart:
         self._c_label = ""
         self._v_label = ""
         self._title = ""
-        self._sub_title = ""
+        self._subtitle = ""
         self._tt_suffix = ""
         self._orientation = "horizontal"
         self._series_data = []
@@ -51,49 +51,49 @@ class BarChart:
     @property
     def title(self) -> str:
         """
-        Title of the plot
+        Get title of the plot
         """
         return self._title
 
     @title.setter
     def title(self, plot_title: str) -> None:
         """
-        Title of the plot
+        Set title of the plot
         """
         self._title = plot_title
 
     @property
-    def sub_title(self) -> str:
+    def subtitle(self) -> str:
         """
-        Subtitle of the plot
+        Get subtitle of the plot
         """
-        return self._sub_title
+        return self._subtitle
 
-    @sub_title.setter
-    def sub_title(self, plot_sub_title: str) -> None:
+    @subtitle.setter
+    def subtitle(self, plot_sub_title: str) -> None:
         """
-        Subtitle of the plot
+        Set subtitle of the plot
         """
-        self._sub_title = plot_sub_title
+        self._subtitle = plot_sub_title
 
     @property
     def value_label(self) -> str:
         """
-        Label for the value axis
+        Get label for the value axis
         """
         return self._v_label
 
     @value_label.setter
     def value_label(self, value_label: str) -> None:
         """
-        Label for the value axis
+        Set label for the value axis
         """
         self._v_label = value_label
 
     @property
     def categories_label(self) -> str:
         """
-        Label for the categories axis
+        Get label for the categories axis
         """
         return self._c_label
 
@@ -107,7 +107,7 @@ class BarChart:
     @property
     def orientation(self) -> str:
         """
-        Orientation of the bar chart.
+        Get orientation of the bar chart.
 
         Will always be either "horizontal" or "vertical"
         """
@@ -136,7 +136,7 @@ class BarChart:
     @tooltip_suffix.setter
     def tooltip_suffix(self, suffix: str) -> None:
         """
-        the tooltip suffix
+        Set the tooltip suffix
         
         This string is appended to the values in the hover tooltip.
         """
@@ -145,7 +145,7 @@ class BarChart:
     @property
     def categories(self) -> list[str]:
         """
-        Categories for this bar chart
+        Get categories for this bar chart
         """
         return self._cats
 

{bridges-3.4.5.dev1 → bridges-3.5.0.dev1}/bridges/bridges.py

@@ -1,5 +1,6 @@
 from bridges.connector import *
 from bridges import ColorGrid
+from bridges.us_map import *
 import os
 
 import json
@@ -32,8 +33,8 @@ class Bridges:
     @date 2015, 2016, 2017, 2018, 2019, 2020, 2021
     """
 
-    _MaxTitleSize = 50
-    _MaxDescSize = 250
+    _MaxTitleSize = 200
+    _MaxDescSize = 1000
     _projection_options = {"cartesian", "albersusa", "equirectangular", "window"}
     _debug = False
     
@@ -171,13 +172,18 @@ class Bridges:
     def set_map(self, map_info:list):
         """
         This method serializes all the state and county objects in the map_info for sending to the server
+        
+        See tutorial at https://bridgesuncc.github.io/tutorials/Map.html
+
         :param map_info: is a list of state objects with their counties
         :return: none
         """
+        if isinstance(map_info, Map):
+            self.set_map_overlay(map_info.get_overlay())
+            self.set_coord_system_type(map_info.get_projection())
         self.map = map_info
 
 
-
     def post_visualization_link(self, flag:bool):
         """
         This method controls (with a flag) if the visualization url is printed to the console or not.
@@ -192,6 +198,8 @@ class Bridges:
         Returns:
             None
         """
+        if isinstance(self.ds_handle, Map):
+            self.set_map(self.ds_handle)
         ds_str = ""
 
         if self.vis_type == "Tree" or self.vis_type == "BinaryTree" or self.vis_type == "AVLTree" or\
@@ -212,7 +220,7 @@ class Bridges:
             "map_overlay": self._map_overlay,
             "element_label_flag": self._element_label_flag,
             "link_label_flag": self._link_label_flag,
-            "map": self.map,
+            "map": (self.map.get_map_representation() if isinstance(self.map, Map) else self.map),
         }
         if self.window is not None and len(self.window) == 4:
             ds_dict['window'] = self.window

{bridges-3.4.5.dev1 → bridges-3.5.0.dev1}/bridges/color.py

@@ -235,12 +235,28 @@ class Color(object):
         col_name = None
         if args:
             errorcondition = True
-            if len(args) == 1 and type(args[0]) == list:
-                self.red = args[0][0]
-                self.green = args[0][1]
-                self.blue = args[0][2]
-                self.alpha = args[0][3]
-                errorcondition=False
+            if len(args) == 1:
+                thetype = type(args[0])
+                if thetype == list:
+                    self.red = args[0][0]
+                    self.green = args[0][1]
+                    self.blue = args[0][2]
+                    self.alpha = args[0][3]
+                    errorcondition=False
+                elif thetype is str:
+                    col_name = args[0]
+                    try:
+                        web_color = webcolors.name_to_rgb(col_name)
+                        self.set_color(web_color.red, web_color.green, web_color.blue)
+                        errorcondition=False
+                    except ValueError:
+                        raise ValueError(col_name + " is not a valid color name")
+                elif thetype is Color:
+                    self.red = args[0].red
+                    self.green = args[0].green
+                    self.blue = args[0].blue
+                    self.alpha = args[0].alpha
+                    errorcondition = False
             if len(args) == 4 or len(args) == 3:
                 self.red = args[0]
                 self.green = args[1]
@@ -248,21 +264,16 @@ class Color(object):
                 if len(args) == 4:
                     self.alpha = args[3]
                 errorcondition = False
-            elif len(args) == 1:
-                if type(args[0]) is str:
-                    col_name = args[0]
-                    errorcondition=False
-                elif type(args[0]) is Color:
-                    self.red = args[0].red
-                    self.green = args[0].green
-                    self.blue = args[0].blue
-                    self.alpha = args[0].alpha
-                    errorcondition = False
             if errorcondition:
                 raise ValueError("To use Color constructor pass 3 RGB values and a float alpha value or a color name or a Color object")
         elif kwargs:
             if 'col_name' in kwargs:
                 col_name = kwargs['col_name']
+                try:
+                    web_color = webcolors.name_to_rgb(col_name)
+                    self.set_color(web_color.red, web_color.green, web_color.blue)
+                except ValueError:
+                    raise ValueError(col_name + " is not a valid color name")
             if 'r' in kwargs:
                 self.red = kwargs['r']
             if 'red' in kwargs:
@@ -280,12 +291,6 @@ class Color(object):
             if 'alpha' in kwargs:
                 self.alpha = kwargs['alpha']
 
-        if col_name is not None:
-            try:
-                web_color = webcolors.name_to_rgb(col_name)
-                self.set_color(web_color.red, web_color.green, web_color.blue)
-            except ValueError:
-                raise ValueError(col_name + " is not a valid color name")
 
     def get_byte_representation(self) -> list:
         """
@@ -298,14 +303,24 @@ class Color(object):
         b = self.blue
         a = round(255 * self.alpha)
 
-        bytebuffer = list()
-        bytebuffer.append(r)
-        bytebuffer.append(g)
-        bytebuffer.append(b)
-        bytebuffer.append(a)
-
+        bytebuffer = [r,g,b,a]
+        
         return bytebuffer
 
+    def write_byte_representation(self, bytebuffer: list[int]) -> None:
+        """
+        Writes the RGBA values as list of ints from 0-255
+        Assumes bytebuffer is a list of size 4
+        """
+        bytebuffer[0] = self.red
+        bytebuffer[1] = self.green
+        bytebuffer[2] = self.blue
+        bytebuffer[3] = round(255 * self.alpha)
+
+
+        
+
+    
     def __eq__(self, other):
         """deep equality check, by value of each RGBA value"""
         if not isinstance(other, self.__class__):
@@ -315,3 +330,12 @@ class Color(object):
                 self.green == other.green and
                 self.blue == other.blue and
                 self.alpha == other.alpha)
+
+    
+    def _get_representation(self):
+        '''
+        Should not be needed externally.
+        This is used internally to derive BRIDGES JSON representation for colors
+        '''
+        return [str(self.red), str(self.green),
+                str(self.blue), str(self.alpha)]

{bridges-3.4.5.dev1 → bridges-3.5.0.dev1}/bridges/color_grid.py

@@ -83,6 +83,7 @@ class ColorGrid(Grid):
         total_count = 0
         pos = 0
         last = self.grid[0][0]
+        colorbuffer = [0, 0, 0, 0]
 
         while pos < self.grid_size[0] * self.grid_size[1]:
             posY = pos / self.grid_size[1]
@@ -98,27 +99,23 @@ class ColorGrid(Grid):
                 else:
                     total_count += count
                     img_bytes.append(count-1)
-                    last = last.get_byte_representation()
-
-                    for k in range(len(last)):
-                        img_bytes.append(last[k])
+                    last.write_byte_representation(colorbuffer)
+                    img_bytes.extend(colorbuffer)
 
                     count = 1
                     last = current
             if count == 256:
                 total_count += count
                 img_bytes.append(count-1)
-                last = last.get_byte_representation()
-                for k in range(len(last)):
-                    img_bytes.append(last[k])
+                last.write_byte_representation(colorbuffer)
+                img_bytes.extend(colorbuffer)
                 count = 0
             pos += 1
         total_count += count
         if count > 0:
             img_bytes.append(count-1)
-            last = last.get_byte_representation()
-            for k in range(len(last)):
-                img_bytes.append(last[k])
+            last.write_byte_representation(colorbuffer)
+            img_bytes.extend(colorbuffer)
 
         if total_count != self.grid_size[0] * self.grid_size[1]:
             print("Something broke in getRLE construction")
@@ -132,14 +129,14 @@ class ColorGrid(Grid):
             bytearray: representing the colors of grid cells
         """
         img_bytes = bytearray()
+        colorbuffer = [0, 0, 0, 0]
         for i in range(self.grid_size[0]):
             if self.grid[i] is not None:
                 for j in range(self.grid_size[1]):
                     if self.grid[i][j] is not None:
                         color = self.grid[i][j]
-                        color = color.get_byte_representation()
-                        for k in range(len(color)):
-                            img_bytes.append(color[k])
+                        color.write_byte_representation(colorbuffer)
+                        img_bytes.extend(colorbuffer)
         return img_bytes
 
     def get_data_structure_representation(self) -> dict:

{bridges-3.4.5.dev1 → bridges-3.5.0.dev1}/bridges/connector.py

@@ -9,11 +9,12 @@ class Connector:
     @brief This is a class for handling calls to the BRIDGES server to transmit JSON to the server and subsequent visualization. It is not intended for external use
     """
 
-    server_url_live = "http://bridges-cs.herokuapp.com"
+    server_url_live = "http://assignments.bridgesuncc.org"
     server_type = "application"
-    server_url_clone = "http://bridges-clone.herokuapp.com"
+    server_url_clone = "http://assignments-clone.bridgesuncc.org"
     server_url_local = "http://127.0.0.1:3000"
-    server_url_game = "http://bridges-games.herokuapp.com"
+    server_url_game = "http://games.bridgesuncc.org"
+    server_url_game_clone = "http://games-clone.bridgesuncc.org"
 
     key = ""
     username =""
@@ -38,7 +39,7 @@ class Connector:
         """
         @brief Set the server based on a keyword for url
         Args:
-            server: is one of the three string keywords('live', 'clone', 'local') that is passed to change the server that the bridges visualization will be sent to
+            server: is one of the three string keywords('live', 'clone', 'games', 'games-clone' 'local') that is passed to change the server that the bridges visualization will be sent to
         """
         self.set_server_url(server)
 
@@ -48,13 +49,14 @@ class Connector:
         @brief Set the server url (string) that is passed to change the server that the bridges visualization will be sent to
    
         Args: 
-            server: is one of the three strings ('live', 'clone', 'local')
+            server: is one of the three strings ('live', 'clone', 'games', 'games-clone', 'local')
         """
         switcher = {
-            "live": "http://bridges-cs.herokuapp.com",
-            "clone": "http://bridges-clone.herokuapp.com",
+            "live": "http://assignments.bridgesuncc.org",
+            "clone": "http://assignments-clone.bridgesuncc.org",
             "local": "http://127.0.0.1:3000",
-            "games": "http://bridges-games.herokuapp.com"
+            "games": "http://games.bridgesuncc.org",
+            "games-clone": "http://games-clone.bridgesuncc.org"
         }
         force = os.getenv("FORCE_BRIDGES_APISERVER", "")
         if (force != ""):

{bridges-3.4.5.dev1 → bridges-3.5.0.dev1}/bridges/data_src_dependent/cancer_incidence.py

@@ -12,7 +12,7 @@ class CancerIncidence:
     This object is generally not created by the user, to see how its created check 
     out bridges::data_src_dependent::data_source::get_cancer_incident_data()
       
-    http://www.cdc.gov/cancer/npcr/uscs/download_data.htm
+    https://www.cdc.gov/united-states-cancer-statistics/public-use/index.html
     Data: Courtesy of Corgis Datasets, 2017
    
     @author Kalpathi Subramanian

bridges-3.5.0.dev1/bridges/data_src_dependent/country.py

@@ -0,0 +1,99 @@
+from bridges.color import *
+
+class Country:
+    """
+    @brief his object stores a Country and links to information
+
+    This object is used alongside with the WorldMap object. Each country
+    has a stroke color and fill color.
+
+    See tutorial at  https://bridgesuncc.github.io/tutorials/Map.html
+    
+    @author Kalpathi Subramanian
+    @date  Last modified June 7, 2025
+    """
+
+    def __init__(self, country: str):
+        """
+        @brief Constructor for a specific state
+
+        @param state sets default values for the state
+        """
+        self._name = country
+        self._alpha2_id = ""
+        self._alpha3_id = ""
+        self._numeric3_id = 0
+        self._stroke_width = 1.
+        self._stroke_color = Color('green')
+        self._fill_color = Color('lightblue')
+
+    def __init__(self, name: str, alpha2: str, alpha3: str, numeric3: int):
+        """
+        @brief Constructor for a specific state
+
+        @param sets provided values for the country
+        """
+        self._name = name
+        self._alpha2_id = alpha2 
+        self._alpha3_id =  alpha3
+        self._numeric3_id = numeric3
+        self._stroke_width = 1.
+        self._stroke_color = Color('green')
+        self._fill_color = Color('lightblue')
+
+    @property
+    def name(self):
+        return self._name
+
+    @name.setter
+    def name(self, n):
+        self._name = n
+
+    @property
+    def alpha2_id(self):
+        return self._alpha2_id
+
+    @alpha2_id.setter
+    def alpha2_id(self, id):
+        self._alpha2_id = id 
+
+    @property
+    def alpha3_id(self):
+        return self._alpha3_id
+
+    @alpha3_id.setter
+    def alpha3_id(self, id):
+        self._alpha3_id = id 
+
+    @property
+    def numeric3_id(self):
+        return self._numeric3_id
+
+    @numeric3_id.setter
+    def numeric3_id(self, id):
+        self._numeric3_id = id 
+
+    @property
+    def stroke_color(self):
+        return self._stroke_color
+
+    @stroke_color.setter
+    def stroke_color(self, value):
+        self._stroke_color = value
+
+    @property
+    def stroke_width(self):
+        return self._stroke_width
+
+    @stroke_width.setter
+    def stroke_width(self, value):
+        self._stroke_width = value
+
+    @property
+    def fill_color(self):
+        return self._fill_color
+
+    @fill_color.setter
+    def fill_color(self, value):
+        self._fill_color = value
+