Tooltip update

csw11004 · Aug 14, 2015 · fc9e4cc · fc9e4cc
1 parent 6da2578
commit fc9e4cc
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 25 deletions.
diff --git a/VQI_GenomeBrowser.js b/VQI_GenomeBrowser.js
@@ -995,7 +995,17 @@ function VQI_GenomeBrowser(id, serviceURL) {
         selection.qtip({
             content: {
                 text: function(event, api) {
-                    $.ajax({
+                    var min,max;
+                    if(type === "exon"){
+                        min = $( this ).prop("__data__")[0];
+                        max = $( this ).prop("__data__")[1];
+                    }
+                    else
+                    {
+                        min = $( this ).prop("__data__")[indexArray.start];
+                        max = $( this ).prop("__data__")[indexArray.end];
+                    }
+                    return $.ajax({
                         url: serviceURL,
                         type: 'POST',
                         dataType: "json",
@@ -1004,20 +1014,19 @@ function VQI_GenomeBrowser(id, serviceURL) {
                             "chrom": chrom_curr,
                             "trackName" : name,
                             "type" : type,
-                            "xCoordinate" : event.pageX - 60,
-                            "scale": scale,
+                            "min" : min,
+                            "max": max,
                             'fileHandle': fileHandle
                         }
                     })
                     .then(function(content) {
                         // Set the tooltip content upon successful retrieval
-                        api.set('content.text', content);
+                        return content;
                     }, function(xhr, status, error) {
                         // Upon failure... set the tooltip content to the status and error value
                         api.set('content.text', status + ': ' + error);
                     });
 
-                    return 'Loading...'; // Set some initial text
                 }
             },
             position: {

diff --git a/dynamic_loading.php b/dynamic_loading.php
@@ -51,7 +51,7 @@
         ajaxReturn($result);
     }
     else if (isset($_POST["loadTooltip"])){
-        $result = loadTooltip($_POST["chrom"],$_POST["trackName"], $_POST["type"], $_POST["xCoordinate"],$_POST["scale"],$_POST["fileHandle"]);
+        $result = loadTooltip($_POST["chrom"],$_POST["trackName"], $_POST["type"], $_POST["min"],$_POST["max"],$_POST["fileHandle"]);
         ajaxReturn($result);
     }
     else {
@@ -499,27 +499,23 @@
         return $returnArray;
     } 
 
-    function loadTooltip($chrom,$trackName, $type, $xCoordinate, $scale, $fileHandle){
+    function loadTooltip($chrom,$trackName, $type, $min, $max, $fileHandle){
         //return $chrom.$trackName.$type.$xCoordinate.$scale.$fileHandle;
 
         if($trackName == "cpg"){
-            return loadCPGTooltip($chrom,$type, $xCoordinate,$scale,$fileHandle);
+            return loadCPGTooltip($chrom,$type, $min,$max,$fileHandle);
         }
         else if($trackName == 'HG19'){
-            return loadHG19Tooltip($chrom,$type, $xCoordinate,$scale,$fileHandle);
+            return loadHG19Tooltip($chrom,$type, $min,$max,$fileHandle);
         }
         else{
-            return loadBEDTooltip($chrom,$type, $xCoordinate,$scale,$fileHandle);
+            return loadBEDTooltip($chrom,$type, $min,$max,$fileHandle);
         }
     }
 
-    function loadCPGTooltip($chrom,$type, $xCoordinate,$scale,$fileHandle){
+    function loadCPGTooltip($chrom,$type, $min,$max,$fileHandle){
         $db_name = $GLOBALS['db_name'];
         $link = $GLOBALS['DBlink'];
-
-        $min = $xCoordinate*$scale - $scale/2;
-        $max = $xCoordinate*$scale + $scale/2;
-
 
         $sql = "SELECT `START`, `END` FROM {$db_name}.{$fileHandle}";
         $sql .= " WHERE `CHROM` = '".$chrom."'";
@@ -541,13 +537,9 @@
         return $type.": ".$compString;
     }
 
-    function loadHG19Tooltip($chrom,$type, $xCoordinate,$scale,$fileHandle){
+    function loadHG19Tooltip($chrom,$type, $min,$max,$fileHandle){
         $db_name = $GLOBALS['db_name'];
         $link = $GLOBALS['DBlink'];
-
-        $min = $xCoordinate*$scale - $scale/2;
-        $max = $xCoordinate*$scale + $scale/2;
-
 
         $sql = "SELECT `txStart`, `txEnd`, `name2`, `exonStarts`, `exonEnds` FROM {$db_name}.{$fileHandle}";
         $sql .= " WHERE `chrom` = '".$chrom."'";
@@ -579,13 +571,9 @@
         return $type.": ".$compString;
     }
 
-    function loadBEDTooltip($chrom,$type, $xCoordinate,$scale,$fileHandle){
+    function loadBEDTooltip($chrom,$type, $min,$max,$fileHandle){
         $db_name = $GLOBALS['db_name'];
         $link = $GLOBALS['DBlink'];
-
-        $min = $xCoordinate*$scale - $scale/2;
-        $max = $xCoordinate*$scale + $scale/2;
-
 
         $sql = "SELECT `CHROM_START`, `CHROM_END`, `GENESYMBOL` FROM {$db_name}.{$fileHandle}";
         $sql .= " WHERE `CHROM` = '".$chrom."'";