From 37b2056931cc7ee9d8785658a013010489372247 Mon Sep 17 00:00:00 2001 From: miles Date: Tue, 9 Apr 2013 22:04:18 +0000 Subject: [PATCH] View Ontology Changes: -jump to gene button is now working in the ontology map - Bug detected in HeatMap: jump to cluster and jump to gene buttons are no longer working svn path=/; revision=461 --- Personnel/miles/Web Page/heatMap.php | 3 -- Personnel/miles/Web Page/viewOntology.php | 35 ++++++++++++++++++++--- 2 files changed, 31 insertions(+), 7 deletions(-) diff --git a/Personnel/miles/Web Page/heatMap.php b/Personnel/miles/Web Page/heatMap.php index 31fe170..fda8828 100644 --- a/Personnel/miles/Web Page/heatMap.php +++ b/Personnel/miles/Web Page/heatMap.php @@ -408,7 +408,6 @@ canvas.addEventListener('mouseup', showInfo, false); function getGeneLoc() { url = "getGeneLoc.php?gene=" + document.jumpToGene.gene.value + ""; - alert(url); var xmlhttp; if (window.XMLHttpRequest) {// code for IE7+, Firefox, Chrome, Opera, Safari @@ -420,7 +419,6 @@ function getGeneLoc() { } xmlhttp.onreadystatechange=function() { if (xmlhttp.readyState==4 && xmlhttp.status==200) { - alert(xmlhttp.responseText); var txt = xmlhttp.responseText; var clusterID = parseInt(txt.split(",")[0]); var speciesName = txt.split(",")[1]; @@ -438,7 +436,6 @@ function getGeneLoc() { s = i; } } - alert("Species Index: " + s + " Cluster Index: " + c); heatMap.strokeStyle="#9DE24F"; heatMap.lineWidth=3; heatMap.strokeRect(leftOffset + s*cellSize -1, topOffset -1,cellSize,cellSize); diff --git a/Personnel/miles/Web Page/viewOntology.php b/Personnel/miles/Web Page/viewOntology.php index b4ed98f..3ca0b4f 100644 --- a/Personnel/miles/Web Page/viewOntology.php +++ b/Personnel/miles/Web Page/viewOntology.php @@ -16,6 +16,26 @@ Note: The colors have no relevance to the data, they simply serve to distinguish +
+ + +
+ + + + + @@ -203,10 +223,6 @@ Your browser does not support the canvas element. - - - -
@@ -573,6 +589,17 @@ function redrawOntologies() { drawMap(true); } +function getGeneLoc() { + var gene = document.jumpToGene.gene.value; + var row = findIndex(gene,genes); + if(row == -1) { + alert("That gene is not in this result set!"); + return; + } + document.getElementById("topScrollDiv").scrollTop = row*cellSize; + drawMap(); +} + -- 2.34.1