aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--wqflask/wqflask/marker_regression/marker_regression_gn1.py12
1 files changed, 6 insertions, 6 deletions
diff --git a/wqflask/wqflask/marker_regression/marker_regression_gn1.py b/wqflask/wqflask/marker_regression/marker_regression_gn1.py
index a68c9586..8a593ec4 100644
--- a/wqflask/wqflask/marker_regression/marker_regression_gn1.py
+++ b/wqflask/wqflask/marker_regression/marker_regression_gn1.py
@@ -28,8 +28,8 @@ import time
import string
from math import *
import piddle as pid
-import piddlePIL as pil
-from piddle import Font
+# import piddlePIL as pil
+# from piddle import Font
import sys,os
import cPickle
import httplib, urllib
@@ -553,7 +553,7 @@ class MarkerRegression(object):
# showLocusForm = webqtlUtil.genRandStr("fm_")
#else:
showLocusForm = ""
- intCanvas = pil.PILCanvas(size=(self.graphWidth, self.graphHeight))
+ intCanvas = pid.PILCanvas(size=(self.graphWidth, self.graphHeight))
gifmap = self.plotIntMapping(intCanvas, startMb = self.startMb, endMb = self.endMb, showLocusForm= showLocusForm)
self.gifmap = gifmap.__str__()
@@ -565,7 +565,7 @@ class MarkerRegression(object):
#Scales plot differently for high resolution
if self.draw2X:
- intCanvasX2 = pil.PILCanvas(size=(self.graphWidth*2,self.graphHeight*2))
+ intCanvasX2 = pid.PILCanvas(size=(self.graphWidth*2,self.graphHeight*2))
gifmapX2 = self.plotIntMapping(intCanvasX2, startMb = self.startMb, endMb = self.endMb, showLocusForm= showLocusForm, zoom=2)
intCanvasX2.save(os.path.join(webqtlConfig.GENERATED_IMAGE_DIR, self.filename+"X2"), format='png')
#DLintImgX2=HT.Href(text='Download',url = '/image/'+self.filename+'X2.png', Class='smallsize', target='_blank')
@@ -2260,7 +2260,7 @@ class MarkerRegression(object):
chrFontZoom = 2
else:
chrFontZoom = 1
- chrLabelFont=Font(ttf="verdana",size=24*chrFontZoom,bold=0)
+ chrLabelFont=pid.Font(ttf="verdana",size=24*chrFontZoom,bold=0)
for i, _chr in enumerate(self.genotype):
if (i % 2 == 0):
@@ -2584,7 +2584,7 @@ class MarkerRegression(object):
#########################################
# Permutation Graph
#########################################
- myCanvas = pil.PILCanvas(size=(400,300))
+ myCanvas = pid.PILCanvas(size=(400,300))
if 'lod_score' in self.qtlresults[0] and self.LRS_LOD == "LRS":
perm_output = [value*4.16 for value in self.perm_output]
elif 'lod_score' not in self.qtlresults[0] and self.LRS_LOD == "LOD":