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 e40f5aaf85866d66c8a43f9a200c57a6e29b6c27..91325d2cbe2ab8f1ae634af16cc6ee49fb324e07 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.jar b/Personnel/miles/Web Page/Heatmap.jar
index 0a9dbd42719e4ac962483ad92a60cccdc7b0e6fa..10fac217484aa4a54c3d68aac2e29e473f91493c 100644 (file)
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 09bc8c34ca89f94715f17b237da9cbb8aa2ba6cc..8e6d1ee7e26347b3782c7863e20fcd59fd9e055a 100644 (file)
--- 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