KeyError when isoelastics not defined for combination of axes (close #…

…177)

CHANGELOG

@@ -1,3 +1,6 @@
+0.8.1
+- Bugfixes:
+  - KeyError when isoelastics not defined for combination of axes (#177)
 0.8.0
 - Remember directory for searching missing measurement data
 - Bugfixes:

shapeout/gui/plot_contour.py

@@ -60,7 +60,6 @@ def contour_plot(measurements, levels=[0.5,0.95],
         try:
             isoel = isoelastics.default.get(**kwargs)
         except KeyError:
-            raise
             warnings.warn("Could not find matching isoelastics for"+
                           " Setting: x={}, y={}, method: {}".
                           format(xax, yax, kwargs["method"]))

shapeout/gui/plot_scatter.py

@@ -74,7 +74,6 @@ def scatter_plot(measurement,
         try:
             isoel = isoelastics.default.get(**kwargs)
         except KeyError:
-            raise
             warnings.warn("Could not find matching isoelastics for"+
                           " Setting: x={}, y={}, method: {}".
                           format(xax, yax, kwargs["method"]))

shapeout/session/rw.py

@@ -138,6 +138,7 @@ def save(path, rtdc_list):
     RTDCBase instances. 
     """
     tempdir = tempfile.mkdtemp()
+    returnWD = os.getcwd()
     os.chdir(tempdir)
     # Dump data into the temporary directory
     index_file = os.path.join(tempdir, "index.txt")
@@ -204,7 +205,6 @@ def save(path, rtdc_list):
         PolygonFilter.save_all(os.path.join(tempdir,
                                "PolygonFilters.poly"))
 
-    returnWD = os.getcwd()
     # Zip everything    
     with zipfile.ZipFile(path, mode='w') as arc:
         for root, _dirs, files in os.walk(tempdir):