Merge pull request #38 from AdityaSavara/minor-improvements

Minor improvements

Author: AdityaSavara

JSONGrapher/JSONRecordCreator.py

@@ -1,6 +1,7 @@
 import json
 import JSONGrapher.styles.layout_styles_library
 import JSONGrapher.styles.trace_styles_collection_library
+import JSONGrapher.version
 #TODO: put an option to suppress warnings from JSONRecordCreator
 
 
@@ -607,6 +608,7 @@ def __init__(self, comments="", graph_title="", datatype="", data_objects_list =
 
         self.fig_dict.update( {
             "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 {

JSONGrapher/__init__.py

@@ -1,3 +1,4 @@
 #Try to do things a bit like https://github.com/python/cpython/blob/master/Lib/collections/__init__.py
 #Except instead of putting things here directly in __init__, we'll import them so they are accessible by importing the module.
 from JSONGrapher.JSONRecordCreator import *
+from JSONGrapher.version import *

JSONGrapher/test.json

@@ -1,11 +1,12 @@
 {
     "comments": "Tree Growth Data collected from the US National Arboretum",
     "datatype": "Tree_Growth_Curve",
+    "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 4.1",
     "data": [
         {
             "uid": "123",
             "name": "Series A",
-            "trace_type": "spline",
+            "trace_style": "spline",
             "x": [
                 1,
                 2,

JSONGrapher/version.py

@@ -0,0 +1 @@
+__version__ = '4.1'

README.md

@@ -1,6 +1,9 @@
 [![Anaconda-Server Badge](https://anaconda.org/conda-forge/jsongrapher/badges/version.svg)](https://anaconda.org/conda-forge/jsongrapher) [![Anaconda-Server Badge](https://badge.fury.io/py/jsongrapher.svg)](https://badge.fury.io/py/jsongrapher)
 
 # JSONGrapher (python)
+
+Imagine a world where a person can simply drag a datafile into a graphing utility and a plot will be made, including scientific units, and more plots can be dragged in from data from other sources (and other units) to compare all of the data together, in an interactive graph.
+
 Create interactive plots just by drag-and-drop of JSON records. Share the json files for easy plotting by others. JSONGrapher automatically plots multiple records together, for comparison, and will automaticlaly convert units between records to plot the data sets together. For example, if one record is in kg/s and another in g/s, JSONGrapher will do the conversion automatically to plot both records together for comparison. Tools and examples are included for how to create JSON records.
 
 To use python JSONGrapher, first install it using conda or pip:<br>

examples/example_10_bubble_plot/Rate_Constant_bubble.json

@@ -1,5 +1,6 @@
 {
     "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 3.0",
     "datatype": "Arrhenius_plot_3D",
     "data": [
         {

examples/example_10_bubble_plot/Rate_Constant_bubble_equation_only.json

@@ -1,5 +1,6 @@
 {
     "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 3.0",
     "datatype": "Arrhenius_plot_3D",
     "data": [
         {

examples/example_10_bubble_plot/example_10_bubble_plot_from_equation.py

@@ -29,7 +29,8 @@
 Record_for_bubble_plot = JSONRecordCreator.create_new_JSONGrapherRecord()
 #We'll keep the layout as the default, not default3d since the 3rd dimension doesn't come out of the page.
 Record_for_bubble_plot.set_layout_style("default")
-#As usual, it is a good practice to first set our graph title and axes labels.
+#As usual, it is a good practice to first set our datatype, graph title, and axes labels.
+Record_for_bubble_plot.set_datatype("Arrhenius_plot_3D")
 Record_for_bubble_plot.set_graph_title("Bubble plot for Ea vs Temperature Behavior for a Rate Constant")
 Record_for_bubble_plot.set_x_axis_label_including_units(example_equation_dict['x_variable'])
 Record_for_bubble_plot.set_y_axis_label_including_units(example_equation_dict['y_variable'])

examples/example_11_local_python_calls/343_equilibrium.json

@@ -1,5 +1,6 @@
 {
     "comments": "// A JSON record can have any name, and any extension (such as .txt or .json). For example, CO2AdsorptionNaX.json. The datatype field defines which schema to use. The user can create custom fields to store additional information. Remember to add a comma at the end of any fields added.",
+    "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 3.0",
     "datatype": "CO2__Adsorption_Isotherm",
     "data": [
         {

examples/example_11_local_python_calls/343_kinetic.json

@@ -1,5 +1,6 @@
 {
     "comments": "// A JSON record can have any name, and any extension (such as .txt or .json). For example, CO2AdsorptionNaX.json. The datatype field defines which schema to use. The user can create custom fields to store additional information. Remember to add a comma at the end of any fields added.",
+    "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 3.0",
     "datatype": "CO2__Adsorption_Isotherm",
     "data": [
         {