From: miles <miles@localhost>
Date: Thu, 1 Nov 2012 18:30:39 +0000 (+0000)
Subject: updated Heatmap.jar to reflect the same color scheme as the website.
X-Git-Url: http://gitweb.planteome.org/?a=commitdiff_plain;h=1a6423efb64784f1a7db3a631b28d0c5f33ef728;p=old-jaiswallab-svn%2F.git

updated Heatmap.jar to reflect the same color scheme as the website.
species elimination working.

svn path=/; revision=405
---

diff --git a/Personnel/miles/Web Page/.heatMap.php.kate-swp b/Personnel/miles/Web Page/.heatMap.php.kate-swp
index e40f5aa..91325d2 100644
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.jar b/Personnel/miles/Web Page/Heatmap.jar
index 0a9dbd4..10fac21 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 09bc8c3..8e6d1ee 100644
--- a/Personnel/miles/Web Page/heatMap.php	
+++ b/Personnel/miles/Web Page/heatMap.php	
@@ -439,24 +439,10 @@ 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 $input; ?>";
+  document.infoForm.param.value = "unset DISPLAY && java -Djava.awt.headless=true -jar Heatmap.jar \"image" + "<?php echo $excludedSpecies?>" + ";" + "<?php echo $input; ?> \"";
   document.infoForm.submit();
 }
 
-function resubmitSpecies() {
-var eliminatedSpecies = "";
-<?php
-  for($i = 0; $i < sizeof($originalSpecies); $i++) {
-    echo "if(document.redraw.ch" . $i . ".checked) { \n";
-    echo "eliminatedSpecies = eliminatedSpecies + \" \" + document.redraw.ch" . $i . ".value;\n";
-    echo "} \n";
-  }
-?>
-  document.redraw.excluded.value = eliminatedSpecies;
-  alert(eliminatedSpecies);
-  document.redraw.submit();
-}
-
 drawMap(true);
 
 canvas.addEventListener('mouseup', showInfo, false);
@@ -471,5 +457,7 @@ canvas.addEventListener('mouseup', showInfo, false);
 2. Possibility of putting exclude species forms 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
 -->
\ No newline at end of file