From 95a797509caae727ae204861e5aa9402fdd9ecc4 Mon Sep 17 00:00:00 2001
From: Pjotr Prins
Date: Tue, 26 Apr 2016 11:29:42 +0000
Subject: Interval mapping: fix font and image path

---
 wqflask/wqflask/marker_regression/marker_regression_gn1.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/wqflask/wqflask/marker_regression/marker_regression_gn1.py b/wqflask/wqflask/marker_regression/marker_regression_gn1.py
index 11e312b2..97e4b934 100644
--- a/wqflask/wqflask/marker_regression/marker_regression_gn1.py
+++ b/wqflask/wqflask/marker_regression/marker_regression_gn1.py
@@ -42,6 +42,7 @@ from utility import webqtlUtil
 from utility import helper_functions
 from utility import Plot
 from wqflask.interval_analyst import GeneUtil
+from base.webqtlConfig import TMPDIR, GENERATED_TEXT_DIR, GENERATED_IMAGE_DIR
 
 #########################################
 #      Inteval Mapping Plot Page
@@ -930,7 +931,7 @@ class MarkerRegression(object):
         bootScale = bootScale[:-1] + [highestPercent]
 
         bootOffset = 50*fontZoom
-        bootScaleFont=Font(ttf="verdana",size=13*fontZoom,bold=0)
+        bootScaleFont=pid.Font(ttf="verdana",size=13*fontZoom,bold=0)
         canvas.drawRect(canvas.size[0]-bootOffset,yZero-bootHeightThresh,canvas.size[0]-bootOffset-15*zoom,yZero,fillColor = pid.yellow)
         canvas.drawLine(canvas.size[0]-bootOffset+4, yZero, canvas.size[0]-bootOffset, yZero, color=pid.black)
         canvas.drawString('0%' ,canvas.size[0]-bootOffset+10,yZero+5,font=bootScaleFont,color=pid.black)
@@ -2581,7 +2582,7 @@ class MarkerRegression(object):
 
         Plot.plotBar(myCanvas, perm_output, XLabel=self.LRS_LOD, YLabel='Frequency', title=' Histogram of Permutation Test')
         filename= webqtlUtil.genRandStr("Reg_")
-        myCanvas.save(webqtlConfig.IMGDIR+filename, format='gif')
+        myCanvas.save(GENERATED_IMAGE_DIR+filename, format='gif')
 
         return filename
 
-- 
cgit v1.2.3