[cig-commits] r16054 - cs/portal/trunk/northridge/SeismoWebPortal

[luis at geodynamics.org]

Author: luis
Date: 2009-11-30 00:27:28 -0800 (Mon, 30 Nov 2009)
New Revision: 16054

Modified:
   cs/portal/trunk/northridge/SeismoWebPortal/gmt.py
Log:
Allow ImageMagick to be installed separately from GMT.


Modified: cs/portal/trunk/northridge/SeismoWebPortal/gmt.py
===================================================================
--- cs/portal/trunk/northridge/SeismoWebPortal/gmt.py	2009-11-30 06:25:01 UTC (rev 16053)
+++ cs/portal/trunk/northridge/SeismoWebPortal/gmt.py	2009-11-30 08:27:28 UTC (rev 16054)
@@ -13,6 +13,7 @@
 
 GMT_ROOT = os.path.join(settings.MEDIA_ROOT, 'SeismoWebPortal', 'gmt')
 gmt_bin = join(os.environ['WEBPORTAL_GMT_ROOT'], "bin")
+imagemagick_bin = join(os.environ['WEBPORTAL_IMAGEMAGICK_ROOT'], "bin")
 netCDF_lib = join(os.environ['WEBPORTAL_NETCDF_ROOT'], "lib")
 
 
@@ -43,7 +44,7 @@
         raise Http404
 
     # Convert the PostScript to a GIF file.
-    spawn("/usr/bin/convert",
+    spawn(join(imagemagick_bin, "convert"),
           '+antialias',
           '-fill', '#00F', '-draw', 'color 0,0 floodfill', '-transparent', '#00F',
           '-trim', '+repage',