Merge branch 'develop'

Author: mfe

plotThatLut/plot_that_lut.py

@@ -58,8 +58,10 @@ def show_plot(fig, filename):
         split_filename = os.path.splitext(filename)
         filename = '{0}{1}'.format(split_filename[0],
                                    split_filename[1].replace(".", "_"))
+        currdir = os.path.dirname(os.path.abspath(__file__))
         export_path = 'img/export_{0}.png'.format(filename)
-        fig.savefig(export_path)
+        abs_export_path = '{0}/img/export_{1}.png'.format(currdir, filename)
+        fig.savefig(abs_export_path)
         return export_path
     else:
         matplotlib.pyplot.show()
@@ -175,9 +177,6 @@ def plot_cube(lutfile, cube_size, processor):
     return show_plot(fig, filename)
 
 
-
-
-
 def supported_formats():
     """Return supported formats
 

plotThatLut/plot_that_lut_web.py

@@ -7,6 +7,7 @@
 """
 
 from os import path
+import ntpath
 import sys
 import traceback
 
@@ -111,7 +112,9 @@ def __copyUploadedFile(upfile):
                 break
             all_data += data
         # copy uploaded file on the server
-        backup_filename = "uploads/{0}".format(upfile.filename)
+        backup_filename = "{0}/uploads/{1}".format(currdir,
+                                                   ntpath.basename(
+                                                   upfile.filename))
         saved_file = open(backup_filename, 'wb')
         saved_file.write(all_data)
         saved_file.close()