jsongrapher 4.2__py3-none-any.whl → 4.3__py3-none-any.whl

JSONGrapher/JSONRecordCreator.py

@@ -610,13 +610,13 @@ class JSONGrapherRecord:
             "comments": comments,  # Top-level comments
             "jsongrapher": "To plot this file, go to www.jsongrapher.com and drag this file into your browser, or use the python version of JSONGrapher. File created with python Version " + JSONGrapher.version.__version__,
             "datatype": datatype,  # Top-level datatype (datatype)
-            "data": data_objects_list if data_objects_list else [],  # Data series list
             "layout": layout if layout else {
                 "title": {"text": graph_title},
                 "xaxis": {"title": {"text": x_axis_label_including_units}},
                 "yaxis": {"title": {"text": y_axis_label_including_units}}
-                   }
-                }
+                   },
+            "data": data_objects_list if data_objects_list else []  # Data series list                
+            }
             )
 
         if plot_style !="":
@@ -1940,7 +1940,8 @@ def apply_plot_style_to_plotly_dict(fig_dict, plot_style=None):
     if str(plot_style["layout_style"]).lower() != 'none': #take no action if received "None" or NoneType
         if plot_style["layout_style"] == '': #in this case, we're going to use the default.
             plot_style["layout_style"] = 'default'
-            print("Warning: No layout_style provided and 'z' field found in first data series. For 'bubble' plots, it is recommended to set layout_style to 'default'. For 'mesh3d' graphs and 'scatter3d' graphs, it is recommended to set layout_style to 'default3d'. Set layout_style to 'none' or another layout_style to avoid this warning.")
+            if "z" in fig_dict["data"][0]:
+                print("Warning: No layout_style provided and 'z' field found in first data series. For 'bubble2d' plots, it is recommended to set layout_style to 'default'. For 'mesh3d' graphs and 'scatter3d' graphs, it is recommended to set layout_style to 'default3d'. Set layout_style to 'none' or another layout_style to avoid this warning.")
         fig_dict = remove_layout_style_from_plotly_dict(fig_dict=fig_dict)
         fig_dict = apply_layout_style_to_plotly_dict(fig_dict=fig_dict, layout_style_to_apply=plot_style["layout_style"])
     #Code logic for trace_styles_collection style.
@@ -2260,7 +2261,7 @@ def apply_trace_style_to_single_data_series(data_series, trace_styles_collection
     #Block of code to clean color values for 3D plots and 2D plots. It can't be just from the style dictionary because we need to point to data.
     def clean_color_values(list_of_values, variable_string_for_warning):
         if None in list_of_values:
-            print("Warning: A colorscale based on" + variable_string_for_warning + "was requested. None values were found. They are being replaced with 0 values. It is recommended to provide data without None values.")
+            print("Warning: A colorscale based on " + variable_string_for_warning + " was requested. None values were found. They are being replaced with 0 values. It is recommended to provide data without None values.")
             color_values = [0 if value is None else value for value in list_of_values]
         else:
             color_values = list_of_values
@@ -2338,7 +2339,7 @@ def prepare_bubble_sizes(data_series):
     if "max_bubble_size" in data_series:
         max_bubble_size = data_series["max_bubble_size"]
     else:
-        max_bubble_size = 10       
+        max_bubble_size = 100       
     scaled_sizes = normalized_sizes*max_bubble_size
     data_series["marker"]["size"] = scaled_sizes.tolist() #from numpy array back to list.
     
@@ -3101,11 +3102,10 @@ def convert_to_3d_layout(layout):
     new_layout = copy.deepcopy(layout)
 
     # Add the axis fields inside `scene` first
-    new_layout["scene"] = {
-        "xaxis": layout.get("xaxis", {}),
-        "yaxis": layout.get("yaxis", {}),
-        "zaxis": layout.get("zaxis", {})
-    }
+    scene = new_layout.setdefault("scene", {}) #Create a new dict if not present, otherwise use existing one.
+    scene["xaxis"] = layout.get("xaxis", {})
+    scene["yaxis"] = layout.get("yaxis", {})
+    scene["zaxis"] = layout.get("zaxis", {})
 
     # Remove the original axis fields from the top-level layout
     new_layout.pop("xaxis", None)

JSONGrapher/styles/layout_styles_library.py

@@ -17,6 +17,7 @@ styles_library = {
         },
         "default3d": {
             "layout": {
+                "scene": {"aspectmode":"cube"},
                 "title": {"font": {"size": 32}, "x": 0.5},
                 "xaxis": {"title": {"font": {"size": 12}}, "tickfont": {"size": 12}},
                 "yaxis": {"title": {"font": {"size": 12}}, "tickfont": {"size": 12}},

JSONGrapher/version.py

@@ -1 +1 @@
-__version__ = '4.2'
+__version__ = '4.3'

{jsongrapher-4.2.dist-info → jsongrapher-4.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: jsongrapher
-Version: 4.2
+Version: 4.3
 Summary: The python version of JSONGrapher with tools for creating JSONGrapher Records.
 Home-page: https://github.com/AdityaSavara/jsongrapher-py
 Author: Aditya Savara

{jsongrapher-4.2.dist-info → jsongrapher-4.3.dist-info}/RECORD

@@ -1,4 +1,4 @@
-JSONGrapher/JSONRecordCreator.py,sha256=Wu5gCafri9g4bAAcyAJwlAoTLkExx7ssxjnQYcuGPUg,215343
+JSONGrapher/JSONRecordCreator.py,sha256=aH8BGgBP62IiFaapvazQrw3QQMOYpieHSPC3DSG7hYU,215493
 JSONGrapher/UnitPytesting.py,sha256=xizJ-2fg9C5oNMFJyfavbBLMusayE9KWQiYIRrQQd4A,4363
 JSONGrapher/UnitpyCustomUnitsTesting.py,sha256=Rwq5p8HXN0FP54lRFgLTV0kgJ9TpcFaD3_C0MEOoEzw,1297
 JSONGrapher/__init__.py,sha256=fA3R6paWq3uskiLe3OglQZY_uJOejZHMFKdyX0dXWjo,310
@@ -6,14 +6,14 @@ JSONGrapher/drag_and_drop_gui.py,sha256=-7QJHLhzadHotWhONH4inerMaZ_xuwoTQSMRF_MP
 JSONGrapher/equation_creator.py,sha256=VFu6dFo-C0wDf1N3e0CyCBI-53cCUrp3oe0umdMLofs,17968
 JSONGrapher/equation_evaluator.py,sha256=Cm7UK5vWa6fT0OylD9f22_eR8zUvxY_Sy_W6n6N9bew,37012
 JSONGrapher/units_list.py,sha256=ROrlAsD66oPozZmOaE65xjNUEg3CxkSmA8iPE2_ihYI,34438
-JSONGrapher/version.py,sha256=bUff73G-qXNfPT8kDpDG9cWR4Adm49E9fp682pqJfbI,19
+JSONGrapher/version.py,sha256=33TCwzu1vLlcE-5NggQ3w1vpfrXmhHEq1sI09FQrr5w,19
 JSONGrapher/styles/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-JSONGrapher/styles/layout_styles_library.py,sha256=vGb1tE_ETY-Blj2frt8ddHA976ADFSCoabjzKn2ZNYU,3051
+JSONGrapher/styles/layout_styles_library.py,sha256=adGZNVAj_VysYX-9x1NqxDnhIQFtKsMW8swGaY30ocs,3100
 JSONGrapher/styles/trace_styles_collection_library.py,sha256=DUbbO8jTlhn2q-lOY1XYGkHV1RbJX-P5Z1SUCM0qo6M,5952
-jsongrapher-4.2.data/data/LICENSE.txt,sha256=7Guw_pmj_H4sApnM7fld2L4HH6CP-3ZYdFoOXtHFx0Y,1489
-jsongrapher-4.2.data/data/README.md,sha256=u9uRPF0T12Pl6M6qjEleXZoB41ye0VTQPCJpEdldwNU,8157
-jsongrapher-4.2.dist-info/LICENSE.txt,sha256=7Guw_pmj_H4sApnM7fld2L4HH6CP-3ZYdFoOXtHFx0Y,1489
-jsongrapher-4.2.dist-info/METADATA,sha256=SmJRCR_Mh6cYNpdGZnB1AsA8C-k-iBD8Cvd_PcFojCo,9231
-jsongrapher-4.2.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
-jsongrapher-4.2.dist-info/top_level.txt,sha256=5f7Ui2hCKCPTQOjD540WKghKNYOvUDNfdpnDbIlAD3Y,12
-jsongrapher-4.2.dist-info/RECORD,,
+jsongrapher-4.3.data/data/LICENSE.txt,sha256=7Guw_pmj_H4sApnM7fld2L4HH6CP-3ZYdFoOXtHFx0Y,1489
+jsongrapher-4.3.data/data/README.md,sha256=u9uRPF0T12Pl6M6qjEleXZoB41ye0VTQPCJpEdldwNU,8157
+jsongrapher-4.3.dist-info/LICENSE.txt,sha256=7Guw_pmj_H4sApnM7fld2L4HH6CP-3ZYdFoOXtHFx0Y,1489
+jsongrapher-4.3.dist-info/METADATA,sha256=Toe-dZLjejoifd3cJbHOxsd7hlKTO7ZAWjc3osxyqME,9231
+jsongrapher-4.3.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
+jsongrapher-4.3.dist-info/top_level.txt,sha256=5f7Ui2hCKCPTQOjD540WKghKNYOvUDNfdpnDbIlAD3Y,12
+jsongrapher-4.3.dist-info/RECORD,,