ncplot 0.3.8__tar.gz → 0.3.10__tar.gz

{ncplot-0.3.8 → ncplot-0.3.10}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ncplot
-Version: 0.3.8
+Version: 0.3.10
 Summary: Interactive viewing of NetCDF data
 Home-page: https://github.com/pmlmodelling/ncplot
 Author: Robert Wilson

{ncplot-0.3.8 → ncplot-0.3.10}/ncplot/plot.py

@@ -165,7 +165,7 @@ def in_notebook(out=None):
     return "ipykernel" in sys.modules
 
 
-def view(x, vars=None, autoscale=True, out=None, server = None, **kwargs):
+def view(x, vars=None, autoscale=True, out=None, **kwargs):
     """
     Plot the contents of a NetCDF out
 
@@ -175,6 +175,9 @@ def view(x, vars=None, autoscale=True, out=None, server = None, **kwargs):
         xarray object or file  path
     vars : list or str
         Variables you want to plot. Everything will be plotted if this is not supplied
+    autoscale : bool
+        Set to False if you do not want the colour scales to vary. Defaults to True, which sets
+        scales based on minimum and maximum values.
 
     out : str
         Name of file if you want to store output
@@ -244,12 +247,11 @@ def view(x, vars=None, autoscale=True, out=None, server = None, **kwargs):
 
     coord_list = list(ds.coords)
 
-    #if vars is None:
-        #vars = [x for x in list(ds.data_vars) if x not in coord_list]
-    
-
 
     for cc in coord_list:
+        new_coords = list(ds.coords)
+        if cc not in new_coords:
+            continue
         if len(ds[cc].values.ravel()) <= 1:
             if cc in list(ds.dims):
                 ds = ds.squeeze(cc, drop=True)
@@ -479,11 +481,15 @@ def view(x, vars=None, autoscale=True, out=None, server = None, **kwargs):
 
     coord_list = list(ds.coords)
 
+    
     for cc in coord_list:
+        new_coords = list(ds.coords)
+        if cc not in new_coords:
+            continue
         if len(ds[cc].values.ravel()) <= 1:
             if cc in list(ds.dims):
                 ds = ds.squeeze(cc, drop=True)
-
+                
     coord_list = list(ds.coords)
 
     coord_list = [x for x in coord_list if x in list(ds.dims)]
@@ -547,11 +553,6 @@ def view(x, vars=None, autoscale=True, out=None, server = None, **kwargs):
         t = Thread(target=ctrc)
         t.start()
 
-        # create a panel server if server specified
-
-        bokeh_server = pn.panel(intplot, sizing_mode="stretch_both", websocket_origin = server).show(
-            threaded=False
-        )
         return None
 
     # heat map where 2 coords have more than 1 value, not a spatial map
@@ -692,9 +693,6 @@ def view(x, vars=None, autoscale=True, out=None, server = None, **kwargs):
 
             t = Thread(target=ctrc)
             t.start()
-            bokeh_server = pn.panel(intplot, sizing_mode="stretch_both").show(
-                threaded=False
-            )
             return None
 
     # heat map where 3 coords have more than 1 value, and one of them is time. Not a spatial map though
@@ -808,9 +806,6 @@ def view(x, vars=None, autoscale=True, out=None, server = None, **kwargs):
 
                     t = Thread(target=ctrc)
                     t.start()
-                    bokeh_server = pn.panel(intplot, sizing_mode="stretch_both").show(
-                        threaded=False
-                    )
                     return None
 
     if (n_times > 1) and (n_points < 2) and (n_levels <= 1):
@@ -860,9 +855,6 @@ def view(x, vars=None, autoscale=True, out=None, server = None, **kwargs):
         t = Thread(target=ctrc)
         t.start()
 
-        bokeh_server = pn.panel(intplot, sizing_mode="stretch_both").show(
-            threaded=False
-        )
         return None
 
     if (n_points > 1) and (n_levels >= 1) and (type(vars) is list):
@@ -929,9 +921,6 @@ def view(x, vars=None, autoscale=True, out=None, server = None, **kwargs):
 
         t = Thread(target=ctrc)
         t.start()
-        bokeh_server = pn.panel(intplot, sizing_mode="stretch_both").show(
-            threaded=False
-        )
         return None
 
     if n_points > 1:
@@ -1039,9 +1028,6 @@ def view(x, vars=None, autoscale=True, out=None, server = None, **kwargs):
 
             t = Thread(target=ctrc)
             t.start()
-            bokeh_server = pn.panel(intplot, sizing_mode="stretch_both").show(
-                threaded=False
-            )
             return None
 
         else:
@@ -1135,9 +1121,6 @@ def view(x, vars=None, autoscale=True, out=None, server = None, **kwargs):
 
             t = Thread(target=ctrc)
             t.start()
-            bokeh_server = pn.panel(intplot, sizing_mode="stretch_both").show(
-                threaded=False
-            )
 
             return None
 

{ncplot-0.3.8 → ncplot-0.3.10}/setup.py

@@ -37,7 +37,7 @@ extras_require: dict() = {
 extras_require["complete"] = ["geoviews"]
 
 setup(name='ncplot',
-      version='0.3.8',
+      version='0.3.10',
       description=DESCRIPTION,
       long_description=long_description,
       long_description_content_type='text/markdown',