From: miles <miles@localhost>
Date: Tue, 6 Nov 2012 00:52:45 +0000 (+0000)
Subject: Species inclusion now working for webpage only. Clear box added.
X-Git-Url: http://gitweb.planteome.org/?a=commitdiff_plain;h=bd8dacfa330445b6e73e2c2f323fe13070a0cf8a;p=old-jaiswallab-svn%2F.git

Species inclusion now working for webpage only. Clear box added.

svn path=/; revision=406
---

diff --git a/Personnel/miles/Web Page/Heatmap.jar b/Personnel/miles/Web Page/Heatmap.jar
index 10fac21..7b1c942 100644
Binary files a/Personnel/miles/Web Page/Heatmap.jar and b/Personnel/miles/Web Page/Heatmap.jar differ
diff --git a/Personnel/miles/Web Page/heatMap.php b/Personnel/miles/Web Page/heatMap.php
index 8e6d1ee..333eb9b 100644
--- a/Personnel/miles/Web Page/heatMap.php	
+++ b/Personnel/miles/Web Page/heatMap.php	
@@ -9,9 +9,9 @@ $originalSpecies;
 if(isset($_POST['originalSpecies'])) {
 $originalSpecies = explode(" ", $_POST['originalSpecies']);
 }
-$excludedSpecies = "";
+$includedSpecies = "";
 if(isset($_POST['excluded'])) {
-  $excludedSpecies = $_POST['excluded'];
+  $includedSpecies = $_POST['excluded'];
   }
 
 $input = "";
@@ -27,7 +27,7 @@ if(!preg_match("/[a-zA-Z0-9\.]/", substr($input,-1))) {
   }
 }
 
-$finalInput = "webpage " . $excludedSpecies . ";" . $input;
+$finalInput = "webpage " . $includedSpecies . ";" . $input;
 //echo $finalInput;
 
 exec("java -Djava.awt.headless=true -jar Heatmap.jar " . "\"" . $finalInput . "\"", $output);
@@ -109,7 +109,7 @@ $height = 25 * $clusterCount + 200;
 <br> <br> <br> <br> <br>
 
 
-The following species have been excluded from the heat map: <?php echo $excludedSpecies; ?>
+The following species have been included in the heat map: <?php echo $includedSpecies; ?>
 
 
 <br> <br>
@@ -124,6 +124,11 @@ Click on a species name, cluster number, or cell for more information.
 
 
 <!--
+THE ACTUAL QUERY
+<?php echo $finalInput ?>
+
+
+
 <br> <br>
 If you do not wish to view any of the species in the final heat map, click on the checkbox next to the correct species names and then click 'submit' to reload the heat map.
 <br> <br>
@@ -439,7 +444,7 @@ function jumpToCluster() {
 
 function generateImage() {
   document.infoForm.action="download.php";
-  document.infoForm.param.value = "unset DISPLAY && java -Djava.awt.headless=true -jar Heatmap.jar \"image" + "<?php echo $excludedSpecies?>" + ";" + "<?php echo $input; ?> \"";
+  document.infoForm.param.value = "unset DISPLAY && java -Djava.awt.headless=true -jar Heatmap.jar \"image" + "<?php echo $includedSpecies?>" + ";" + "<?php echo $input; ?>\"";
   document.infoForm.submit();
 }
 
@@ -453,11 +458,10 @@ canvas.addEventListener('mouseup', showInfo, false);
 
 
 <!--
-1. Possibility of species exclusion dynamically from heatMap.php
-2. Possibility of putting exclude species forms in a table on Main Page
+1. Tables
+2. Possibility of putting species checkboxes in a table on Main Page
 3. Updating links given by Pankaj
-4. Improve downloaded image to match with heat map generated
-    Eliminate Species not asked for
-    Improved color analysis system
-5. Improve efficiency of species elimination call
+4. Investigate misbehaving gene: BRADI1G00460.1
+5. Fix species inclusion in downloaded image
+6. Make key move with size of heatmap
 -->
\ No newline at end of file