diff options
| -rw-r--r-- | wqflask/wqflask/marker_regression/marker_regression_gn1.py | 14 | ||||
| -rw-r--r-- | wqflask/wqflask/templates/marker_regression_gn1.html | 3 | ||||
| -rwxr-xr-x | wqflask/wqflask/views.py | 6 |
3 files changed, 6 insertions, 17 deletions
diff --git a/wqflask/wqflask/marker_regression/marker_regression_gn1.py b/wqflask/wqflask/marker_regression/marker_regression_gn1.py index 5467f4f1..2939a566 100644 --- a/wqflask/wqflask/marker_regression/marker_regression_gn1.py +++ b/wqflask/wqflask/marker_regression/marker_regression_gn1.py @@ -515,8 +515,10 @@ class MarkerRegression(object): else: showLocusForm = "" intCanvas = pid.PILCanvas(size=(self.graphWidth,self.graphHeight)) - gifmap = self.plotIntMapping(intCanvas, startMb = self.startMb, endMb = self.endMb, showLocusForm= showLocusForm) - print("AFTER PLOTINTMAPPING") + gifmap = self.plotIntMapping(intCanvas, startMb = self.startMb, endMb = self.endMb, showLocusForm= showLocusForm) + + self.gifmap = gifmap.__str__() + #print("GIFMAP:", gifmap.__str__()) self.filename= webqtlUtil.genRandStr("Itvl_") intCanvas.save(os.path.join(webqtlConfig.IMGDIR, self.filename), format='jpeg') @@ -528,8 +530,6 @@ class MarkerRegression(object): gifmapX2 = self.plotIntMapping(intCanvasX2, startMb = self.startMb, endMb = self.endMb, showLocusForm= showLocusForm, zoom=2) intCanvasX2.save(os.path.join(webqtlConfig.IMGDIR, self.filename+"X2"), format='png') #DLintImgX2=HT.Href(text='Download',url = '/image/'+self.filename+'X2.png', Class='smallsize', target='_blank') - - print("AFTER GN1 PLOT") #textUrl = self.writeQTL2Text(fd, self.filename) @@ -635,8 +635,6 @@ class MarkerRegression(object): #self.dict['title'] = "Mapping" - print("AT END OF GN1 MAPPING") - def writeQTL2Text(self, filename): if self.multipleInterval: return "" @@ -1870,7 +1868,6 @@ class MarkerRegression(object): #"Significant" and "Suggestive" Drawing Routine # ======= Draw the thick lines for "Significant" and "Suggestive" ===== (crowell: I tried to make the SNPs draw over these lines, but piddle wouldn't have it...) - print("DRAW SUGGESTIVE/SIGNFICANT LINES") if self.permChecked and not self.multipleInterval: significantY = yZero - self.significance*LRSHeightThresh/LRSMax suggestiveY = yZero - self.suggestive*LRSHeightThresh/LRSMax @@ -1909,7 +1906,6 @@ class MarkerRegression(object): if zoom == 2: lrsEdgeWidth = 2 * lrsEdgeWidth - print("DRAW QTL RESULT CURVE") LRSCoordXY = [] AdditiveCoordXY = [] @@ -2033,8 +2029,6 @@ class MarkerRegression(object): canvas.drawPolygon(LRSCoordXY,edgeColor=thisLRSColor,closed=0, edgeWidth=lrsEdgeWidth, clipX=(xLeftOffset, xLeftOffset + plotWidth)) - print("AFTER QTL CURVE") - ###draw additive scale if not self.multipleInterval and self.additiveChecked: additiveScaleFont=pid.Font(ttf="verdana",size=16*zoom,bold=0) diff --git a/wqflask/wqflask/templates/marker_regression_gn1.html b/wqflask/wqflask/templates/marker_regression_gn1.html index 6b657e3e..8f1df94f 100644 --- a/wqflask/wqflask/templates/marker_regression_gn1.html +++ b/wqflask/wqflask/templates/marker_regression_gn1.html @@ -11,7 +11,8 @@ </div> <div id="chart_container"> <div class="qtlcharts" id="topchart"> - <img src="/static/output/{{ filename }}.jpeg"> + {{ gifmap|safe }} + <img src="/static/output/{{ filename }}.jpeg" usemap="#WebQTLImageMap"> </div> </div> <div style="width:60%;"> diff --git a/wqflask/wqflask/views.py b/wqflask/wqflask/views.py index 0a8d6191..2a426eda 100755 --- a/wqflask/wqflask/views.py +++ b/wqflask/wqflask/views.py @@ -382,14 +382,8 @@ def marker_regression_page(): #for item in template_vars.__dict__.keys(): # print(" ---**--- {}: {}".format(type(template_vars.__dict__[item]), item)) - - #causeerror - print("TESTING GN1!!!") gn1_template_vars = marker_regression_gn1.MarkerRegression(result).__dict__ - print("gn1_template_vars:", gn1_template_vars) - #causeerror - #qtl_length = len(result['js_data']['qtl_results']) #print("qtl_length:", qtl_length) |