Changeset 152 for trunk/matml/webselector

Timestamp:

01/28/2005 01:37:50 PM (7 years ago)

Author:

kstemen

Message:

Scaling, categorization, and selecting materials have been fixed since Jorge's submission. All code should use db_get_plot_single_values now, but the old function is still around.

Location:

trunk/matml/webselector/php

Files:

• Caliban.otf (modified) (previous)
• Caliban.ttf (modified) (previous)
• CaslonRoman.ttf (modified) (previous)
• clicked.inc (deleted)
• dbquery.php.inc (modified) (23 diffs)
• plot.php (modified) (7 diffs)
• select_other.php (modified) (9 diffs)
• select.php (modified) (7 diffs)
• setvars.inc.php (added)
• vixar.ttf (modified) (previous)

trunk/matml/webselector/php/dbquery.php.inc

@@ -116 +116 @@
           }
 
-
       }
       elseif($power < -1){      
@@ -147 +146 @@
         $ret=new Unit(
             "$name",
-            $this->num_name*$other->num_name,
-            $this->scale*$other->scale
+            pow($this->num_name,$power),
+            pow($this->scale,$power)
         );
         return $ret;
@@ -154 +153 @@
     function equals($other)
     {
-        return abs($this->num_name-$other)<.00000001;
+        if(is_object($other))
+            $num_name=$other->num_name;
+        else
+            $num_name=$other;
+        return abs($this->num_name-$num_name)<.00000001;
     }
 }
@@ -189 +192 @@
     //average value out of all the matches
     var $avg_value;
-    var $num_unit;
+    var $unit;
     //number of matches
     var $count;
@@ -195 +198 @@
     {
         $this->avg_value=0;
-        $this->num_unit=0;
+        $this->unit=0;
         $this->count=0;
     }
@@ -204 +207 @@
     global $unit_infos;
     global $dom;
-    $scale=1;
     if(get_class($units_element)=="DOMNodeList")
         $units_element=$units_element->item(0);
     if($units_element)
     {
-        $num_unit=1;
+        $return_unit=new Unit(
+            "",
+            1,
+            1
+        );
         $factor=$units_element->getAttribute("factor");
         if($factor)
-            $scale*=$factor;
+            $return_unit->scale*=$factor;
         //$units=$units_element->get_elements_by_tagname("Unit");
         $units=$units_element->getElementsByTagName("Unit");
@@ -226 +232 @@
             if(!$unit_info)
                 echo "Error: unknown unit $name\n";
-            $scale*=pow($unit_info->scale,$power);
-            $num_unit*=pow($unit_info->num_name,$power);
+            $return_unit=$return_unit->mul($unit_info->pow($power));
         }
     }
     else
-        $num_unit=0;
-    return array($scale,$num_unit);
+        $return_unit=null;
+    return $return_unit;
 }
 
@@ -243 +248 @@
   
    $equivalencies=array(
-       array_flip(array("Young's Modulus","Modulus of Elasticity","Tensile Modulus")),
+       array_flip(array("Young's Modulus","Youngs Modulus","Modulus of Elasticity","Tensile Modulus")),
        array_flip(array("Tensile Strength, Yield","Yield Strength","Tensile Strength @ Yield")),
        array_flip(array("Heat Capacity","Specific Heat"))
@@ -303 +308 @@
         {
             $units=$detail->getElementsByTagName("Units");
-            list($scale,$num_unit)=parse_units($units);
-            if(!$data->num_unit)
-                $data->num_unit=$num_unit;
+            $unit=parse_units($units);
+            if(!$data->unit)
+                $data->unit=$unit;
             else
             {
-                force_unit_match($Matid,new Unit("unknown",$num_unit,$scale),$data);
+                force_unit_match($Matid,$unit,$data);
             }
 
@@ -316 +321 @@
             {
                 $data->count++;
-                $data->avg_value+=$property_data->nodeValue*$scale;
+                $data->avg_value+=$property_data->nodeValue*$unit->scale;
             }
         }
@@ -369 +374 @@
 function force_unit_match($material,$unit,&$property_data)
 {
+    global $unit_infos;
     //Convert BTUs per degree F to Joules per degree C
-    $BTUs_per_degree_F=2*3*3/(7*7)/17;
-    $power=get_factor_power($property_data->num_unit,$BTUs_per_degree_F);
-    $property_data->num_unit*=pow($BTUs_per_degree_F,-$power)*pow(
-        2*3*3/(7*7)/11,$power);
+    $BTUs_per_degree_F=$unit_infos['BTU']->div($unit_infos['°F']);
+    $Joules_per_degree_C=$unit_infos['J']->div($unit_infos['°C']);
+    $power=get_factor_power($property_data->unit->num_name,$BTUs_per_degree_F->num_name);
+    $BTUs_to_Joules=$Joules_per_degree_C->div($BTUs_per_degree_F);
+    $BTUs_to_Joules->scale=1899.1009999999999/1000;
+    $property_data->unit=$property_data->unit->mul($BTUs_to_Joules->pow($power));
     $property_data->avg_value*=pow(
-         1899.1009999999999/1000,$power);
-
-    if(!$unit->equals($property_data->num_unit))
-    {
-        $power=get_factor_power($property_data->num_unit,13);
-        if($unit->equals($property_data->num_unit*pow(13,-$power)*pow(2*3/(7*7),$power)))
+        $BTUs_to_Joules->scale,$power);
+
+    if(!$unit->equals($property_data->unit))
+    {
+        $power=get_factor_power($property_data->unit->num_name,13);
+        if($unit->equals($property_data->unit->num_name*pow(13,-$power)*pow(2*3/(7*7),$power)))
         {
             //it uses pound as a force
-            $property_data->num_unit*=pow(13,-$power)*pow(2*3/(7*7),$power);
-            $property_data->avg_value*=pow(4.44822162*1000,$power);
+            $newtons_per_pound=$unit_infos['N']->div($unit_infos['lb']);
+            $newtons_per_pound->scale=4.44822162*1000;
+            $newtons_per_pound=$newtons_per_pound->pow($power);
+
+            $property_data->unit=$property_data->unit->mul($newtons_per_pound);
+            $property_data->avg_value*=$newtons_per_pound->scale;
             return true;
         }
-        if($unit->equals($property_data->num_unit*pow(13,-$power)*pow(2,$power)))
+        if($unit->equals($property_data->unit->num_name*pow(13,-$power)*pow(2,$power)))
         {
             //it uses pound as a mass
-            $property_data->num_unit*=pow(13,-$power)*pow(2,$power);
-            $property_data->avg_value*=pow(453.59237,$power);
+            $grams_per_pound=$unit_infos['g']->div($unit_infos['lb']);
+            $grams_per_pound->scale=453.59237;
+            $grams_per_pound=$grams_per_pound->pow($power);
+            $property_data->unit=$property_data->unit->mul($grams_per_pound);
+            $property_data->avg_value*=$grams_per_pound->scale;
             return true;
         }
-        echo "Error: unit mismatch ($unit->name $unit->num_name vs $property_data->num_unit) in $material\n";
+        echo "Error: unit mismatch ($unit->name vs ".$property_data->unit->name.") and ($unit->num_name vs ".$property_data->unit->num_name.") in $material\n";
         return false;
     }
@@ -474 +489 @@
     $valuese = array();
     $categories = array();
+    $filenames = array();
   
     $handle = opendir('materials');
@@ -530 +546 @@
                         
                 }
+                $filenames[]="materials/$file";
             }
         }
@@ -568 +585 @@
   }
 
-  return array(&$valuesX, &$valuesY, &$names, $xlabel, $ylabel, $categories);
-
+  $ret=array(&$valuesX, &$valuesY, &$names, $xlabel, $ylabel, $categories);
+  $ret["filenames"]=$filenames;
+  return $ret;
 }
 
@@ -580 +598 @@
 
 
-     $query = array();
+     $query = array("Matid"=>"Material Name");
      $power = array();
      $NXqueries = array();
      $NYqueries = array();
 
-     $xml_name = array(
-                        "Density" => "Density",
-                        "E"       => "Young's Modulus",
-                        "Cp"      => "Heat Capacity",
-                        "K"       => "Thermal Conductivity",
-                        "YS"      => "Yield Strength"
-                        );
-
-
      $prop_units = array(
                          "Density" => $unit_infos["g"]->div($unit_infos["cc"]),
-                         "E"       => $unit_infos["MPa"],
-                         "YS"      => $unit_infos["MPa"],
-                         "Cp"      => $unit_infos["J"]->div($unit_infos["g"]->mul($unit_infos["°C"])),
-                         "K"      => $unit_infos["W"]->div($unit_infos["m"]->mul($unit_infos["K"])),
+                         "Young's Modulus"       => $unit_infos["MPa"],
+                         "Youngs Modulus"       => $unit_infos["MPa"],
+                         "Yield Strength"      => $unit_infos["MPa"],
+                         "Heat Capacity"      => $unit_infos["J"]->div($unit_infos["g"]->mul($unit_infos["°C"])),
+                         "Thermal Conductivity"      => $unit_infos["W"]->div($unit_infos["m"]->mul($unit_infos["K"])),
                          );
 
@@ -610 +620 @@
     foreach( $property_listx as $property=>$pow){
       $index++;
-      $query["Xquery$index"]="$xml_name[$property]";
+      $query["Xquery$index"]=$property;
       $power["Xquery$index"]= $pow;
       $final_units["Xquery$index"] = $prop_units["$property"];
 
       if( $pow > 1){
-        $xlabel_num = "$xml_name[$property]^$pow *";
+        $xlabel_num = "$property^$pow *";
       }
       elseif($pow == 1){
-        $xlabel_num = "$xml_name[$property]*";
+        $xlabel_num = "$property*";
       }
       elseif($pow == -1){
-        $xlabel_den = "$xml_name[$property]*";
+        $xlabel_den = "$property*";
       }
       elseif($pow < -1){      
-        $xlabel_den = "$xml_name[$property]^".abs($pow)."*";
+        $xlabel_den = "$property^".abs($pow)."*";
       }
 
@@ -635 +645 @@
     foreach( $property_listy as $property=>$pow){
       $index++;
-      $query["Yquery$index"]="$xml_name[$property]";
+      $query["Yquery$index"]=$property;
       $power["Yquery$index"]= $pow;
       $final_units["Yquery$index"] = $prop_units["$property"];
 
       if( $pow > 1){
-        $ylabel_num = "$xml_name[$property]^$pow *";
+        $ylabel_num = "$property^$pow *";
       }
       elseif($pow == 1){
-        $ylabel_num = "$xml_name[$property]*";
+        $ylabel_num = "$property*";
       }
       elseif($pow == -1){
-        $ylabel_den = "$xml_name[$property]*";
+        $ylabel_den = "$property*";
       }
       elseif($pow < -1){      
-        $ylabel_den = "$xml_name[$property]^".abs($pow)."*";
+        $ylabel_den = "$property^".abs($pow)."*";
       }
       
@@ -659 +669 @@
     // Prepare final units
  
-
     $first = 0;
     foreach($NXqueries as $Nquery){
@@ -711 +720 @@
     $valuese = array();
     $categories = array();
+    $filenames = array();
   
     $handle = opendir('materials');
@@ -782 +792 @@
 
                 foreach( $NXqueries as $Nquery){
-                  $cont *= ( pow($values["$Nquery"]->avg_value,$power["$Nquery"]) /$final_units["$Nquery"]->scale);
+                  $final_unit=$final_units["$Nquery"]->pow($power["$Nquery"]);
+                  $cont *= ( pow($values["$Nquery"]->avg_value,$power["$Nquery"]) /$final_unit->scale);
                 }
                 $valuesX[]=$cont;
@@ -789 +800 @@
 
                 foreach( $NYqueries as $Nquery){
-                  $cont *= ( pow($values["$Nquery"]->avg_value,$power["$Nquery"]) /$final_units["$Nquery"]->scale);
+                  $final_unit=$final_units["$Nquery"]->pow($power["$Nquery"]);
+                  $cont *= ( pow($values["$Nquery"]->avg_value,$power["$Nquery"]) /$final_unit->scale);
                 }
                 $valuesY[]=$cont;
@@ -805 +817 @@
                 // Something else for category
                 $categories[]=$category;
+                $filenames[]="materials/$file";
 
             }
@@ -819 +832 @@
  
 
-    return array(&$valuesX, &$valuesY, &$names, $xlabel, $ylabel, $categories);
-
+  $ret=array(&$valuesX, &$valuesY, &$names, $xlabel, $ylabel, $categories);
+  $ret["filenames"]=$filenames;
+  return $ret;
 }
 

trunk/matml/webselector/php/plot.php

@@ -2 +2 @@
 include("functions.php.inc");
 include("dbquery.php.inc");
+include("setvars.inc.php");
 
 //by "likavcan at NOSPAN sturak nospan dot sk" at from php.net 
@@ -28 +29 @@
 }
 
-function calc_tickscale($max_value,$min_ticks,$max_labels)
-{
-    //First see how many labels we can get in
-    $tickscale=pow(10,floor(log($max_value,10)));
-    while($max_value/$tickscale*10<=$max_labels)
-        $tickscale/=10;
-    //That's as far as we can break up the labels for powers of 10.
-    //Maybe we can break it up by 5 or 2
-    $ticks=$max_value/$tickscale;
-    $divisions=1;
-    if($ticks*5<=$max_labels)
-        $divisions=5;
-    else if($ticks*2<=$max_labels)
-        $divisions=2;
-    $tickscale/=$divisions;
-    $ticks*=$divisions;
-
-    //Label interval is how many ticks to have before a label
-    $label_interval=1;
-    if($ticks*$divisions<$min_ticks&&$divisions!=1)
-    {
-        //the tickscale needs to be broken up more for the ticks
-        //(but not labels). Gotta undo the last factor then for the ticks.
-        $label_interval=10/$divisions;
-        $tickscale/=10/$divisions;
-    }
-
-    //Do we still need to break the ticks up more?
-    while($max_value/$tickscale<$min_ticks)
-    {
-        if($max_value/$tickscale*2>=$min_ticks)
-        {
-            $label_interval*=2;
-            $tickscale/=2;
-            break;
-        }
-        if($max_value/$tickscale*5>=$min_ticks)
-        {
-            $label_interval*=5;
-            $tickscale/=5;
-            break;
-        }
-        $label_interval*=10;
-        $tickscale/=10;
-    }
-    return array($tickscale,$label_interval);
-}
-
-//Request arguments
-
-if(isset($_REQUEST['plot']))
-    $plottype = $_REQUEST['plot'];
-else
-    $plottype = 'EvsYield';
-if(isset($_REQUEST['log']))
-    $log = $_REQUEST['log'];
-else
-    $log = 0;
-if(isset($_REQUEST['selected']))
-    $selected = $_REQUEST['selected'];
-else
-    $selected = '';
-$categorizations=array(array(""=>0),array("Metals"=>0,"Polymers"=>1,"Ceramics"=>2,"Fibers"=>1));
-if(isset($_REQUEST['categorization']))
-    $categorization=$categorizations[$_REQUEST['categorization']];
-else
-    $categorization=$categorizations[0];
-
-
-
-if(isset($_REQUEST["numvars"])){
-  $numvars=$_REQUEST['numvars'];
-}
-
-$matstring = "";
-$property_listx = array();
-$property_listy = array();
-for($i=1;$i<=4;$i++){
-  if(isset($_REQUEST["propname".$i])){
-    $propname[$i]=$_REQUEST['propname'.$i];
-  }
-  if(isset($_REQUEST["xpow".$i])){
-    $xpow[$i]=$_REQUEST['xpow'.$i];
-  }
-  if(isset($_REQUEST["ypow".$i])){
-    $ypow[$i]=$_REQUEST['ypow'.$i];
-  }
-
-  if($xpow[$i] != 0){
-    $property_listx["$propname[$i]"] = "$xpow[$i]";
-  }
-  if($ypow[$i] != 0){
-    $property_listy["$propname[$i]"] = "$ypow[$i]";
-  }
-
-}
-// print_r($ypow);
-// echo "<br><br>";
-// print_r($property_listx);
-// echo "<br><br>";
-// print_r($property_listy);
-
-
-
-
-//get the values from the database with these function
-if($plottype == "free")
-     list($valuesX, $valuesY, $names, $xlabel, $ylabel, $categories) = db_get_plot_single_values($property_listx, $property_listy, $log, $categorization);
-     else
-     list($valuesX, $valuesY, $names, $xlabel, $ylabel, $categories) = db_get_plot_values($plottype, $log, $categorization);
-
-
-
-// print_r($valuesX);
-// echo "<br>";
-// print_r($valuesY);
-
-// return;
-
 $number_mat = count($names);
-
 
 $Iwidth=600;
@@ -167 +48 @@
 $grey   = ImageColorAllocate($image, 220, 220, 220);
 $black  = ImageColorAllocate($image, 0, 0, 0);
-$category_colors=array(ImageColorAllocate($image, 0, 0, 255),ImageColorAllocate($image, 255, 0, 0),ImageColorAllocate($image, 0, 255, 0));
-$selected_color   = ImageColorAllocate($image, 255, 255, 255);
+$category_raw_colors=array(array(0, 0, 255),array(255, 0, 0),array(0, 255, 0),array(255,255,255));
+$category_colors=array();
+for($index=0; $index<count($category_raw_colors)-1; $index++)
+{
+    $raw_color=$category_raw_colors[$index];
+    $category_colors[$index]=ImageColorAllocate($image,$raw_color[0],$raw_color[1],$raw_color[2]);
+}
+$raw_color=$category_raw_colors[$index];
+$selected_color=ImageColorAllocate($image,$raw_color[0],$raw_color[1],$raw_color[2]);
 
 $bgcolor   = ImageColorAllocate($image, 0xe5, 0xe8, 0xb2);
@@ -177 +65 @@
 
 //Figure out extra left border for y axis values
-if($log == 1){
+if($_SESSION['log'] == 1){
 }
 else{
@@ -204 +92 @@
 
 // Broken Log scale Attempt
-if($log == 1){
+if($_SESSION['log'] == 1){
 
   $maxx = log(max($valuesX));
@@ -270 +158 @@
 
 
-  if($log == 1){
+  if($_SESSION['log'] == 1){
     $x = $x_initial + $width_bar * (log($valuesX[$i])  + abs($minx) );
     $y = $y_initial - $height_bar * (log($valuesY[$i]) + abs($miny) );
@@ -283 +171 @@
   // echo "X: $valuesX[$i] Y: $valuesY[$i]<br>";
 
-    if($selected==$names[$i])
+    if(isset($_SESSION['selected_info'])&&$_SESSION['selected_info']['Material Name']==$names[$i])
         $color=$selected_color;
     else

trunk/matml/webselector/php/select_other.php

@@ +1 @@
+<?php
+include("dbquery.php.inc");
+include "setvars.inc.php";
+?>
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 <!--  <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Strict//EN" "http://www.w3.org/TR/html4/strict.dtd"> -->
@@ -29 +33 @@
 <br>
 <?
-if(isset($_REQUEST["plot"]))
+
+echo "<a href=\"select_other.php?clicked=\"><img width=600 height=450 src=\"plot.php\" ismap style=\"border-style: none\"></a>"
+?>
+<div class="content">
+<br>
+<br>
+<?
+echo"<table>\n";
+echo"<tr>\n";
+
+$category="Selected";
+$number=count($category_raw_colors)-1;
+echo "<td>\n";
+echo "<table>\n";
+echo "<tr>\n";
+echo "<td>\n";
+$color=$category_raw_colors[$number];
+echo sprintf("<table border=1 width=8 height=8 bgcolor=#%02X%02X%02X></table>\n",$color[0],$color[1],$color[2]);
+echo "</td>\n";
+echo "<td>\n";
+echo "&nbsp;&nbsp;$category\n";
+echo "</td>\n";
+echo "</tr>\n";
+echo "</table>\n";
+echo "</td>\n";
+
+foreach($category_raw_colors as $number=>$color)
 {
-    $plot = $_REQUEST["plot"];
+    $matching_category_names=array_keys($categorizations[$_SESSION['categorization']],$number);
+    if(!count($matching_category_names))
+        continue;
+    echo "<td>\n";
+    echo "<table>\n";
+    echo "<tr>\n";
+    echo "<td>\n";
+    echo sprintf("<table border=1 width=8 height=8 bgcolor=#%02X%02X%02X></table>\n",$color[0],$color[1],$color[2]);
+    echo "</td>\n";
+    echo "<td>\n&nbsp;&nbsp;";
+    for($i=0; $i<count($matching_category_names); $i++)
+    {
+        $category=$matching_category_names[$i];
+        if($category=="")
+            $category="All Others";
+        if($i>0)
+            echo ", ";
+        echo "$category";
+    }
+    echo "</td>\n";
+    echo "</tr>\n";
+    echo "</table>\n";
+    echo "</td>\n";
 }
-else
+echo "</tr>";
+echo "</table>";
+
+if(isset($_SESSION['selected_info']))
 {
-    $plot = "free";
-}
-if(isset($_REQUEST["selected"]))
-{
-    $selected = $_REQUEST["selected"];
-}
-else
-    $selected = "";
-if(isset($_REQUEST["categorization"]))
-    $categorization=$_REQUEST['categorization'];
-else
-    $categorization=0;
-include("clicked.inc");
-if(isset($_REQUEST["clicked"]))
-{
-    list($clickX,$clickY)=explode(",",substr($_REQUEST["clicked"],1));
-    clicked();
-}
-
-if(isset($_REQUEST["numvars"])){
-  $numvars=$_REQUEST['numvars'];
-}
-
-$matstring = "";
-for($i=1;$i<=4;$i++){
-  if(isset($_REQUEST["propname".$i])){
-    $propname[$i]=$_REQUEST['propname'.$i];
-  }
-  if(isset($_REQUEST["xpow".$i])){
-    $xpow[$i]=$_REQUEST['xpow'.$i];
-  }
-  if(isset($_REQUEST["ypow".$i])){
-    $ypow[$i]=$_REQUEST['ypow'.$i];
-  }
-  $matstring .= "&propname$i=$propname[$i]";
-  $matstring .= "&xpow$i=$xpow[$i]";
-  $matstring .= "&ypow$i=$ypow[$i]";
-}
-
-$matstring .= "&numvars=$numvars";
-
-
-if($selected)
-    get_selected_data();
-
-echo "<a href=\"select.php?plot=$plot&selected=".urlencode($selected)."&categorization=$categorization&clicked=\"><img width=600 height=450 src=\"plot.php?plot=$plot&selected=".urlencode($selected)."$matstring"."&categorization=$categorization\" ismap style=\"border-style: none\"></a>"
-?>
-<div class="content">
-<br>
-<br>
-<?
-if($selected)
-{
+echo "<br>";
 echo "<table>\n";
 echo "<tr>\n<td colspan=3 align=center><h3>Selected Material Information</h3></td>\n</tr>\n";
-echo "<tr><td>Name</td><td width=20></td><td>$selected</td></tr>\n";
-echo "<tr><td>$xlabel</td><td></td><td>$selected_xval</td></tr>\n";
-echo "<tr><td>$ylabel</td><td></td><td>$selected_yval</td></tr>\n";
+echo "<tr><td>Name</td><td width=20></td><td>".$_SESSION['selected_info']['Material Name']."</td></tr>\n";
+echo "<tr><td>$xlabel</td><td></td><td>".$_SESSION['selected_info'][$xlabel]."</td></tr>\n";
+echo "<tr><td>$ylabel</td><td></td><td>".$_SESSION['selected_info'][$ylabel]."</td></tr>\n";
+echo "<tr><td>MatML file</td><td></td><td><A TARGET=_blank HREF=\"".$_SESSION['selected_info']['MatML Filename']."\">".$_SESSION['selected_info']['MatML Filename']."</A></td></tr>\n";
+$selected_source=$_SESSION['selected_info']['Material Data Source'];
+if($selected_source!="")
+    echo "<tr><td>Data Source</td><td></td><td><A TARGET=_blank HREF=\"$selected_source\">$selected_source</A></td></tr>\n";
 echo "</table>\n";
 }
@@ -113 +120 @@
 <select name="propname1">
 <option value="Density" selected>Density</option>
-<option value="Cp">Heat Capacity</option> 
-<option value="K">Thermal Conductivity</option>
-<option value="YS">Yield Strength</option> 
-<option value="E">Young's Modulus</option> <!--'-->
+<option value="Heat Capacity">Heat Capacity</option> 
+<option value="Thermal Conductivity">Thermal Conductivity</option>
+<option value="Yield Strength">Yield Strength</option> 
+<option value="Youngs Modulus">Young's Modulus</option> <!--'-->
 </select>
 </td><td align="center"><input type="text" size="3" value="1" name="xpow1"></input></td><td align="center"><input type="text" size="3" value="0" name="ypow1"></td></tr>
@@ -122 +129 @@
 <select name="propname2">
 <option value="Density">Density</option>
-<option value="Cp">Heat Capacity</option> 
-<option value="K">Thermal Conductivity</option>
-<option value="YS">Yield Strength</option> 
-<option value="E" selected>Young's Modulus</option> <!--'-->
+<option value="Heat Capacity">Heat Capacity</option> 
+<option value="Thermal Conductivity">Thermal Conductivity</option>
+<option value="Yield Strength">Yield Strength</option> 
+<option value="Youngs Modulus" selected>Young's Modulus</option> <!--'-->
 </select>
 </td><td align="center"><input type="text" size="3" value="0" name="xpow2"></input></td><td align="center"><input type="text" size="3" value="1" name="ypow2"></td></tr>
@@ -131 +138 @@
 <select name="propname3">
 <option value="Density">Density</option>
-<option value="Cp">Heat Capacity</option> 
-<option value="K">Thermal Conductivity</option>
-<option value="YS">Yield Strength</option> 
-<option value="E">Young's Modulus</option> <!--'-->
+<option value="Heat Capacity">Heat Capacity</option> 
+<option value="Thermal Conductivity">Thermal Conductivity</option>
+<option value="Yield Strength">Yield Strength</option> 
+<option value="Youngs Modulus" selected>Young's Modulus</option> <!--'-->
 </select>
 </td><td align="center"><input type="text" size="3" value="0" name="xpow3"></input></td><td align="center"><input type="text" size="3" value="0" name="ypow3"></td></tr>
@@ -140 +147 @@
 <select name="propname4">
 <option value="Density">Density</option>
-<option value="Cp">Heat Capacity</option> 
-<option value="K">Thermal Conductivity</option>
-<option value="YS">Yield Strength</option> 
-<option value="E">Young's Modulus</option> <!--'-->
+<option value="Heat Capacity">Heat Capacity</option> 
+<option value="Thermal Conductivity">Thermal Conductivity</option>
+<option value="Yield Strength">Yield Strength</option> 
+<option value="Youngs Modulus" selected>Young's Modulus</option> <!--'-->
 </select>
 </td><td align="center"><input type="text" size="3" value="0" name="xpow4"></input></td><td align="center"><input type="text" size="3" value="0" name="ypow4"></td></tr>
@@ -156 +163 @@
 <td align="left">
 <?
-$categorizations=array("None","Metals, Polymers, and Ceramics");
+$categorization_names=array("None","Metals, Polymers, and Ceramics");
 $left="<input type=\"radio\" name=\"categorization\" value=\"";
 $right = "\">";
@@ -162 +169 @@
 
 
-foreach($categorizations as $index=>$name){
+foreach($categorization_names as $index=>$name){
 
   echo $left;
@@ -169 +176 @@
 
   
-  if($index == $categorization){
+  if($index == $_SESSION['categorization']){
     echo "\" checked>";
   }

trunk/matml/webselector/php/select.php

@@ +1 @@
+<?php
+include("dbquery.php.inc");
+include "setvars.inc.php";
+?>
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 <!--  <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Strict//EN" "http://www.w3.org/TR/html4/strict.dtd"> -->
@@ -29 +33 @@
 <br>
 <?
-if(isset($_REQUEST["plot"]))
+//include("clicked.inc");
+
+echo "<a href=\"select.php?clicked=\"><img width=600 height=450 src=\"plot.php\" ismap style=\"border-style: none\"></a>"
+?>
+<div class="content">
+<br>
+<br>
+<?
+echo"<table>\n";
+echo"<tr>\n";
+
+$category="Selected";
+$number=count($category_raw_colors)-1;
+echo "<td>\n";
+echo "<table>\n";
+echo "<tr>\n";
+echo "<td>\n";
+$color=$category_raw_colors[$number];
+echo sprintf("<table border=1 width=8 height=8 bgcolor=#%02X%02X%02X></table>\n",$color[0],$color[1],$color[2]);
+echo "</td>\n";
+echo "<td>\n";
+echo "&nbsp;&nbsp;$category\n";
+echo "</td>\n";
+echo "</tr>\n";
+echo "</table>\n";
+echo "</td>\n";
+
+foreach($category_raw_colors as $number=>$color)
 {
-    $plot = $_REQUEST["plot"];
-}
-else
+    $matching_category_names=array_keys($categorizations[$_SESSION['categorization']],$number);
+    if(!count($matching_category_names))
+        continue;
+    echo "<td>\n";
+    echo "<table>\n";
+    echo "<tr>\n";
+    echo "<td>\n";
+    echo sprintf("<table border=1 width=8 height=8 bgcolor=#%02X%02X%02X></table>\n",$color[0],$color[1],$color[2]);
+    echo "</td>\n";
+    echo "<td>\n&nbsp;&nbsp;";
+    for($i=0; $i<count($matching_category_names); $i++)
+    {
+        $category=$matching_category_names[$i];
+        if($category=="")
+            $category="All Others";
+        if($i>0)
+            echo ", ";
+        echo "$category";
+    }
+    echo "</td>\n";
+    echo "</tr>\n";
+    echo "</table>\n";
+    echo "</td>\n";
+}
+echo "</tr>";
+echo "</table>";
+
+if(isset($_SESSION['selected_info']))
 {
-    $plot = "EvsD";
-}
-if(isset($_REQUEST["selected"]))
-{
-    $selected = $_REQUEST["selected"];
-}
-else
-    $selected = "";
-if(isset($_REQUEST["categorization"]))
-    $categorization=$_REQUEST['categorization'];
-else
-    $categorization=0;
-include("clicked.inc");
-if(isset($_REQUEST["clicked"]))
-{
-    list($clickX,$clickY)=explode(",",substr($_REQUEST["clicked"],1));
-    clicked();
-}
-if($selected)
-    get_selected_data();
-
-echo "<a href=\"select.php?plot=$plot&selected=".urlencode($selected)."&categorization=$categorization&clicked=\"><img width=600 height=450 src=\"plot.php?plot=$plot&selected=".urlencode($selected)."&categorization=$categorization\" ismap style=\"border-style: none\"></a>"
-?>
-<div class="content">
-<br>
-<br>
-<?
-if($selected)
-{
+echo "<br>";
 echo "<table>\n";
 echo "<tr>\n<td colspan=3 align=center><h3>Selected Material Information</h3></td>\n</tr>\n";
-echo "<tr><td>Name</td><td width=20></td><td>$selected</td></tr>\n";
-echo "<tr><td>$xlabel</td><td></td><td>$selected_xval</td></tr>\n";
-echo "<tr><td>$ylabel</td><td></td><td>$selected_yval</td></tr>\n";
+echo "<tr><td>Name</td><td width=20></td><td>".$_SESSION['selected_info']['Material Name']."</td></tr>\n";
+echo "<tr><td>$xlabel</td><td></td><td>".$_SESSION['selected_info'][$xlabel]."</td></tr>\n";
+echo "<tr><td>$ylabel</td><td></td><td>".$_SESSION['selected_info'][$ylabel]."</td></tr>\n";
+echo "<tr><td>MatML file</td><td></td><td><A TARGET=_blank HREF=\"".$_SESSION['selected_info']['MatML Filename']."\">".$_SESSION['selected_info']['MatML Filename']."</A></td></tr>\n";
+$selected_source=$_SESSION['selected_info']['Material Data Source'];
+if($selected_source!="")
+    echo "<tr><td>Data Source</td><td></td><td><A TARGET=_blank HREF=\"$selected_source\">$selected_source</A></td></tr>\n";
 echo "</table>\n";
 }
@@ -85 +117 @@
 <td align="left">
 <?
-echo "<input type=\"hidden\" name=\"selected\" value=\"$selected\">\n";
-
 $plotypes = array("EvsD","EvsYield","EovDvsYieldovD","KvsDCp");
 $plotnames = array(
@@ -106 +136 @@
 
   
-  if($type == $plot){
+  if($type == $_SESSION['plottype']){
     echo "\" checked>";
   }
@@ -125 +155 @@
 <td align="left">
 <?
-$categorizations=array("None","Metals, Polymers, and Ceramics");
+$categorization_names=array("None","Metals, Polymers, and Ceramics");
 $left="<input type=\"radio\" name=\"categorization\" value=\"";
 $right = "\">";
@@ -131 +161 @@
 
 
-foreach($categorizations as $index=>$name){
+foreach($categorization_names as $index=>$name){
 
   echo $left;
@@ -138 +168 @@
 
   
-  if($index == $categorization){
+  if($index == $_SESSION['categorization']){
     echo "\" checked>";
   }