fixed bug that occured when driftfile was not present

Author: straussmaximilian

distribution/picasso.iss

@@ -1,7 +1,7 @@
 [Setup]
 AppName=Picasso
 AppPublisher=Jungmann Lab, Max Planck Institute of Biochemistry
-AppVersion=0.2.0
+AppVersion=0.2.1
 DefaultDirName={pf}\Picasso
 DefaultGroupName=Picasso
 OutputBaseFilename="Picasso-Windows-64bit"

picasso/gui/render.py

@@ -1759,23 +1759,24 @@ def add(self, path, render=True):
         drift = None
         #Try to load a driftfile:
         if 'Last driftfile' in info[-1]:
-            path = info[-1]['Last driftfile']
-            try:
-                with open(path, 'r') as f:
-                    drifttxt = np.loadtxt(f)
-                drift_x = drifttxt[:,0]
-                drift_y = drifttxt[:,1]
-
-                if drifttxt.shape[1] == 3:
-                    drift_z = drifttxt[:,2]
-                    drift = (drift_x, drift_y,drift_z)
-                    drift = np.rec.array(drift, dtype=[('x', 'f'), ('y', 'f'),('z', 'f')])
-                else:
-                    drift = (drift_x, drift_y)
-                    drift = np.rec.array(drift, dtype=[('x', 'f'), ('y', 'f')])
-            except:
-                #drift already initialized before
-                pass
+            driftpath = info[-1]['Last driftfile']
+            if driftpath is not None:
+                try:
+                    with open(driftpath, 'r') as f:
+                        drifttxt = np.loadtxt(f)
+                    drift_x = drifttxt[:,0]
+                    drift_y = drifttxt[:,1]
+
+                    if drifttxt.shape[1] == 3:
+                        drift_z = drifttxt[:,2]
+                        drift = (drift_x, drift_y,drift_z)
+                        drift = np.rec.array(drift, dtype=[('x', 'f'), ('y', 'f'),('z', 'f')])
+                    else:
+                        drift = (drift_x, drift_y)
+                        drift = np.rec.array(drift, dtype=[('x', 'f'), ('y', 'f')])
+                except:
+                    #drift already initialized before
+                    pass
 
         self._drift.append(drift)
         self._driftfiles.append(None)

setup.py

@@ -2,7 +2,7 @@
 
 setup(
     name='picasso',
-    version='0.2.0',
+    version='0.2.1',
     author='Joerg Schnitzbauer, Maximilian T. Strauss',
     author_email='joschnitzbauer (at) gmail.com, straussmaximilian (at) gmail.com',
     url='https://gitlab.com/jungmannlab/picasso',