View Ontology Changes:

        -linking to ontology term is now working
HeatMap Changes:
        -Minor refactoring

svn path=/; revision=444

diff --git a/Personnel/miles/Web Page/.heatMap.php.kate-swp b/Personnel/miles/Web Page/.heatMap.php.kate-swp
index 91325d2cbe2ab8f1ae634af16cc6ee49fb324e07..cdab41bcaa81197e9dccbee1fd69c5a5a6068b82 100644 (file)
Binary files a/Personnel/miles/Web Page/.heatMap.php.kate-swp and b/Personnel/miles/Web Page/.heatMap.php.kate-swp differ

diff --git a/Personnel/miles/Web Page/heatMap.php b/Personnel/miles/Web Page/heatMap.php
index 6e7b4809839442537e1a7ec0b02e49bb75ce9f61..ae3df3e638e38a4f7690e0f94ca652d1f6b686f6 100644 (file)
--- a/Personnel/miles/Web Page/heatMap.php
+++ b/Personnel/miles/Web Page/heatMap.php
@@ -349,19 +349,19 @@ function showInfo(event) {
   var y = event.clientY + document.body.scrollTop + document.documentElement.scrollTop - canvas.offsetTop;
 
   if((x<leftOffset) && (y>topOffset)) {
-    var index = Math.floor((y-topOffset)/cellSize) + Math.floor(scrolledTop/25);
+    var index = Math.floor((y-topOffset)/cellSize) + Math.floor(scrolledTop/cellSize);
     var cluster = allClusterIDs[index];
     getClusterInfo(cluster, index);
   }
   if((y<topOffset) && (x>leftOffset) && (y<leftOffset+maxCols*cellSize)) {
-    var index = Math.floor((x-leftOffset)/cellSize) + Math.floor(scrolledLeft/25);
+    var index = Math.floor((x-leftOffset)/cellSize) + Math.floor(scrolledLeft/cellSize);
     var species = allSpecies[index];
     getSpeciesInfo(species);
   }
   if((y>topOffset) && ((y+scrolledTop)<(topOffset + cellSize*clusterCount)) && (x>leftOffset) && ((x+scrolledLeft)<leftOffset + speciesCount*cellSize)) {
-    var clusterIndex = Math.floor((y-topOffset)/cellSize) + Math.floor(scrolledTop/25);
+    var clusterIndex = Math.floor((y-topOffset)/cellSize) + Math.floor(scrolledTop/cellSize);
     var cluster = allClusterIDs[clusterIndex];
-    var index = Math.floor((x-leftOffset)/cellSize) + Math.floor(scrolledLeft/25);
+    var index = Math.floor((x-leftOffset)/cellSize) + Math.floor(scrolledLeft/cellSize);
     var species = allSpecies[index];
     getBoxInfo(cluster, species, clusterIndex, index);
   }
@@ -398,7 +398,7 @@ function jumpToCluster() {
   alert("No such cluster exists for this result set!");
   return;
   }
-  document.getElementById("scrollDiv").scrollTop = (cluster-1)*25;
+  document.getElementById("scrollDiv").scrollTop = (cluster-1)*cellSize;
   drawMap();
 }
 
@@ -445,7 +445,7 @@ function getGeneLoc() {
       alert("Species Index: " + s + " Cluster Index: " + c);
       heatMap.strokeStyle="#9DE24F";
       heatMap.lineWidth=3;
-      heatMap.strokeRect(leftOffset + s*25 -1, topOffset -1,cellSize,cellSize);
+      heatMap.strokeRect(leftOffset + s*cellSize -1, topOffset -1,cellSize,cellSize);
       heatMap.lineWidth=1;
       heatMap.strokeStyle="#000000";
     }

diff --git a/Personnel/miles/Web Page/viewOntology.php b/Personnel/miles/Web Page/viewOntology.php
index f954208d063f75da49dc5a734db34d6c8d9955ad..a8a9ffb7ac431b9fd93d0c582ed27b4127084e40 100644 (file)
--- a/Personnel/miles/Web Page/viewOntology.php
+++ b/Personnel/miles/Web Page/viewOntology.php
@@ -37,7 +37,7 @@ for($i = 0; $i < sizeof($genes); $i++) {
   $logic = $logic . $toAdd;
 }
 
-$query="select concat(acc, \": \", name),term_type from (select distinct name, acc,term_type from (select term_id from gene_product left join association on association.gene_product_id=gene_product.id " . $logic . ") as mytable left join term on term_id=term.id order by acc) as secondTable";
+$query="select concat(acc, \"- \", name),term_type from (select distinct name, acc,term_type from (select term_id from gene_product left join association on association.gene_product_id=gene_product.id " . $logic . ") as mytable left join term on term_id=term.id order by acc) as secondTable";
 $results=mysql_query($query);
 
 $i = 0;
@@ -61,7 +61,7 @@ for($i = 0; $i < sizeof($genes); $i++) {
   $logic = $logic . $toAdd;
 }
 
-$query = "select full_name,term_id,concat(acc, \": \", name),evnum from (select full_name,term_id,count(*) as evnum from gene_product left join association on association.gene_product_id=gene_product.id " . $logic . "group by full_name,term_id order by full_name,term_id) as temp left join term on term.id=term_id order by full_name,acc";
+$query = "select full_name,term_id,concat(acc, \"- \", name),evnum from (select full_name,term_id,count(*) as evnum from gene_product left join association on association.gene_product_id=gene_product.id " . $logic . "group by full_name,term_id order by full_name,term_id) as temp left join term on term.id=term_id order by full_name,acc";
 $results=mysql_query($query);
 
 $t = 0;
@@ -129,6 +129,12 @@ Your browser does not support the canvas element.
 <canvas id="nothing" width="<?php echo 85 + sizeof($terms)*15 ?>" height="1"> </canvas>
 </div>
 
+<form action="http://plantontology.org/amigo/go.cgi" name="frontForm" id="frontForm">
+    <input type="hidden" name="action" value="query">
+    <input type="hidden" name="view" value="details">
+    <input type="hidden" name="session_id" value="7096b1364253011">
+    <input type="hidden" name="query" value="" id="query">
+</form>
 
 <script type="text/javascript">
 
@@ -173,6 +179,7 @@ var maxCols = Math.floor((<?php echo $width ?>-leftOffset)/cellSize);
 
 var borderWidth = 1;
 
+canvas.addEventListener('mouseup', showInfo, false);
 
 function drawTerms(startTerm) {
   //black for text
@@ -272,30 +279,34 @@ function drawMap(init) {
 drawMap(true);
 
 
-/*
+
 function showInfo(event) {
   var x = event.clientX + document.body.scrollLeft + document.documentElement.scrollLeft - canvas.offsetLeft;
   var y = event.clientY + document.body.scrollTop + document.documentElement.scrollTop - canvas.offsetTop;
 
-  if((x<leftOffset) && (y>topOffset)) {
-    var index = Math.floor((y-topOffset)/cellSize) + Math.floor(scrolledTop/cellSize);
-    var gene = genes[index];
-    getGeneInfo(gene, index);
-  }
+//   if((x<leftOffset) && (y>topOffset)) {
+//     var index = Math.floor((y-topOffset)/cellSize) + Math.floor(scrolledTop/cellSize);
+//     var gene = genes[index];
+//     getGeneInfo(gene, index);
+//   }
   if((y<topOffset) && (x>leftOffset) && (y<leftOffset+maxCols*cellSize)) {
     var index = Math.floor((x-leftOffset)/cellSize) + Math.floor(scrolledLeft/cellSize);
-    var species = allSpecies[index];
-    getSpeciesInfo(species);
-  }
-  if((y>topOffset) && ((y+scrolledTop)<(topOffset + cellSize*clusterCount)) && (x>leftOffset) && ((x+scrolledLeft)<leftOffset + speciesCount*cellSize)) {
-    var clusterIndex = Math.floor((y-topOffset)/cellSize) + Math.floor(scrolledTop/cellSize);
-    var cluster = allClusterIDs[clusterIndex];
-    var index = Math.floor((x-leftOffset)/cellSize) + Math.floor(scrolledLeft/cellSize);
-    var species = allSpecies[index];
-    getBoxInfo(cluster, species, clusterIndex, index);
+    var term = terms[index].split("-")[0];
+    getTermInfo(term);
   }
-}*/
+//   if((y>topOffset) && ((y+scrolledTop)<(topOffset + cellSize*clusterCount)) && (x>leftOffset) && ((x+scrolledLeft)<leftOffset + speciesCount*cellSize)) {
+//     var clusterIndex = Math.floor((y-topOffset)/cellSize) + Math.floor(scrolledTop/cellSize);
+//     var cluster = allClusterIDs[clusterIndex];
+//     var index = Math.floor((x-leftOffset)/cellSize) + Math.floor(scrolledLeft/cellSize);
+//     var species = allSpecies[index];
+//     getBoxInfo(cluster, species, clusterIndex, index);
+//   }
+}
 
+function getTermInfo(term) {
+  document.frontForm.query.value = term;
+  document.frontForm.submit();
+  }
 
 
 </script>