Changeset 121 for trunk/matml/webselector

Timestamp:

10/26/2004 05:24:02 PM (7 years ago)

Author:

kstemen

Message:

Added categorization.

Location:

trunk/matml/webselector

Files:

• php/Caliban.otf (added)
• php/Caliban.ttf (added)
• php/CaslonBold.ttf (added)
• php/CaslonRoman.ttf (added)
• php/clicked.inc (added)
• php/dbquery.php.inc (modified) (4 diffs)
• php/functions.php.inc (modified) (3 diffs)
• php/materials (added)
• php/materials/AISI 1022 Steel, hot rolled, 1.xml (added)
• php/materials/AISI 1548 Steel, annealed, col.xml (added)
• php/materials/AISI Type 410 Stainless Steel,.xml (added)
• php/materials/Allegheny Ludlum Martensitic S.xml (added)
• php/materials/Aluminum 1199-O.xml (added)
• php/materials/Ametek High Purity Nickel Stri.xml (added)
• php/materials/ASTM A606 HSLA Steel, Cold Rol.xml (added)
• php/materials/ASTM A606 HSLA Steel, Hot Roll1.xml (added)
• php/materials/ASTM A606 HSLA Steel, Hot Roll.xml (added)
• php/materials/Carpenter 20Cb-3__ Stainless S.xml (added)
• php/materials/Carpenter Hiperco__ Alloy 50 F.xml (added)
• php/materials/Carpenter HyMu _80___ Electron.xml (added)
• php/materials/Carpenter MP35N_ Ni-Co-Cr-Mo A.xml (added)
• php/materials/Ceraflex 3Y Thin Zirconia Cera.xml (added)
• php/materials/Ciba Tactix__ 123 Epoxy.xml (added)
• php/materials/Ciba Tactix__ 138 Epoxy.xml (added)
• php/materials/DuPont Kevlar__ 149 Fiber, dia.xml (added)
• php/materials/DuPont Kevlar__ 49 Aramid Fibe.xml (added)
• php/materials/EMS-Grivory Grilon A28NZ Nylon.xml (added)
• php/materials/GE Advanced Ceramics Boralloy_.xml (added)
• php/materials/GE Plastics LEXAN 500 Polycarb.xml (added)
• php/materials/GE Plastics LEXAN 503 Polycarb.xml (added)
• php/materials/GE Plastics Lexan__ Polycarbon.xml (added)
• php/materials/GE Plastics SUPEC G401 PPS (No.xml (added)
• php/materials/GE Plastics ULTEM 6000 Polyeth.xml (added)
• php/materials/Hard Lead (96Pb-4Sb), UNS L529.xml (added)
• php/materials/Haynes__ 188 alloy, hot rolled.xml (added)
• php/materials/ICHS Fiberfax__ Alumina-Silica.xml (added)
• php/materials/Industeel SOLEIL A2 13% Cr Hig.xml (added)
• php/materials/Lead, Pb.xml (added)
• php/materials/Magnesium HM21A-T8, Sheet and .xml (added)
• php/materials/Magnesium M1A Forgings.xml (added)
• php/materials/Nickelvac__ X-750 Nickel Super.xml (added)
• php/materials/PolyOne Edgetek__ NN-10KV_000 .xml (added)
• php/materials/Sam Yang TRILOY__ 200 General .xml (added)
• php/materials/Sapco Silicon Nitride, Si 3 N.xml (added)
• php/materials/Sapco Si.SiC Silicon Carbide.xml (added)
• php/materials/Special Metals DURANICKEL__ 30.xml (added)
• php/materials/Special Metals Nickel 200.xml (added)
• php/materials/Special Metals Nickel 270.xml (added)
• php/materials/Special Metals NIMONIC™ .xml (added)
• php/materials/Steatite (Magnesium Silicon Ox.xml (added)
• php/materials/Thornel__ Carbon Fiber T-300 3.xml (added)
• php/materials/Ticona Celanese__ Nylon 1000 N.xml (added)
• php/materials/TIMETAL__ 1100 Titanium Alloy .xml (added)
• php/materials/Titanium Grade 2.xml (added)
• php/materials/Titanium, Ti.xml (added)
• php/materials/UNS C81100, Copper Casting All.xml (added)
• php/materials/UNS C83600, Copper Casting All.xml (added)
• php/materials/UNS C90300, Copper Casting All.xml (added)
• php/materials/UNS C96400, Copper Casting All.xml (added)
• php_parser (deleted)
• php/php_errors.txt (added)
• php/plot.php (modified) (4 diffs)
• php/select.php (modified) (2 diffs)
• php/style.css (modified) (2 diffs)

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

@@ -1 @@
-<?
-function db_get_plot_values($plottype, $log){ 
-
-include("db.php.inc");
+<?php
+class Unit
+{
+    var $name;
+    var $num_name;
+    //Multiple existing value by scale to get num_name
+    var $scale;
+    function Unit($name,$num_name,$scale)
+    {
+        $this->name=$name;
+        $this->num_name=$num_name;
+        $this->scale=$scale;
+    }
+    function name_split()
+    {
+        $ret=explode("/",$this->name);
+        if(!isset($ret[1]))
+            $ret[1]="";
+        return $ret;
+    }
+    function div($other)
+    {
+        $mine=$this->name_split();
+        $eirs=$other->name_split();
+        if($mine[0]&&$eirs[1])
+            $mine[0].="-$eirs[1]";
+        else
+            $mine[0].=$eirs[1];
+        if($mine[1]&&$eirs[0])
+            $mine[1].="-$eirs[0]";
+        else
+            $mine[1].=$eirs[0];
+        if(!$mine[1])
+            $name=$mine[0];
+        else
+            $name="$mine[0]/$mine[1]";
+        $ret=new Unit(
+            $name,
+            $this->num_name/$other->num_name,
+            $this->scale/$other->scale
+        );
+        return $ret;
+    }
+    function mul($other)
+    {
+        $mine=$this->name_split();
+        $eirs=$other->name_split();
+        if($mine[0]&&$eirs[0])
+            $mine[0].="-$eirs[0]";
+        else
+            $mine[0].=$eirs[0];
+        if($mine[1]&&$eirs[1])
+            $mine[1].="-$eirs[1]";
+        else
+            $mine[1].=$eirs[1];
+        if(!$mine[1])
+            $name=$mine[0];
+        else
+            $name="$mine[0]/$mine[1]";
+        $ret=new Unit(
+            "$name",
+            $this->num_name*$other->num_name,
+            $this->scale*$other->scale
+        );
+        return $ret;
+    }
+    function equals($other)
+    {
+        return abs($this->num_name-$other)<.00000001;
+    }
+}
+
+$unit_infos=array(
+    "g"=>new Unit("g",2,1),
+    "m"=>new Unit("m",3,1),
+    "K"=>new Unit("K",5,1),
+    "s"=>new Unit("s",7,1),
+    "°C"=>new Unit("°C",11,1),
+    "lb"=>new Unit("lb",13,1),
+    "°F"=>new Unit("°F",17,1),
+    //kg m s2
+    "N"=>new Unit("N",2*3/(7*7),1000),
+    //1 pound = 4.44822162 Newtons
+    "p"=>new Unit("p",2*3/(7*7),4.44822162*1000),
+    "in"=>new Unit("in",3,0.0254),
+    "cm"=>new Unit("cm",3,.01),
+    //kg*m*m/(s^3)
+    "W"=>new Unit("W",2*3*3/(7*7*7),1000),
+    //N m-2
+    "Pa"=>new Unit("Pa",2*3/(7*7)/(3*3),1000),
+    "MPa"=>new Unit("MPa",2*3/(7*7)/(3*3),1000000*1000),
+    "cc"=>new Unit("cc",3*3*3,.01*.01*.01),
+    //1 kg × 1 m2 × 1 s-2
+    "J"=>new Unit("J",2*3*3/(7*7),1000),
+    "BTU"=>new Unit("BTU",2*3*3/(7*7),1055*1000),
+    "hr"=>new Unit("hr",7,60*60),
+    "ft"=>new Unit("ft",3,12*0.0254)
+);
+
+class PropertyData
+{
+    //average value out of all the matches
+    var $avg_value;
+    var $num_unit;
+    //number of matches
+    var $count;
+    function PropertyData()
+    {
+        $this->avg_value=0;
+        $this->num_unit=0;
+        $this->count=0;
+    }
+}
+
+function parse_units($units_element)
+{
+    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;
+        $factor=$units_element->getAttribute("factor");
+        if($factor)
+            $scale*=$factor;
+        //$units=$units_element->get_elements_by_tagname("Unit");
+        $units=$units_element->getElementsByTagName("Unit");
+        foreach($units as $unit)
+        {
+            $name=$unit->getElementsByTagName("Name");
+            $name=$name->item(0);
+            $name=$name->nodeValue;
+            $power=$unit->getAttribute("power");
+            if(!$power)
+                $power=1;
+            $unit_info=$unit_infos[$name];
+            if(!$unit_info)
+                echo "Error: unknown unit $name\n";
+            $scale*=pow($unit_info->scale,$power);
+            $num_unit*=pow($unit_info->num_name,$power);
+        }
+    }
+    else
+        $num_unit=0;
+    return array($scale,$num_unit);
+}
+
+function get_property_data($filename,$property_names)
+{
+    global $dom;
+   $dom=new DOMDocument;
+   $dom->loadXML(file_get_contents($filename));
+   $context=new DOMXPath($dom);
+  
+   $equivalencies=array(
+       array_flip(array("Young's Modulus","Modulus of Elasticity","Tensile Modulus")),
+       array_flip(array("Tensile Strength, Yield","Yield Strength","Tensile Strength @ Yield")),
+       array_flip(array("Heat Capacity","Specific Heat"))
+    );
+   $translation_string="\"abcdefghijklmnopqrstuvwxyz'\",'ABCDEFGHIJKLMNOPQRSTUVWXYZ'";
+   $ret=array();
+    $details=$context->query("/MatML_Doc/Material/BulkDetails/Name/text()");
+   $item=$details->item(0);
+   $Matid=$item->nodeValue;
+   foreach($property_names as $key=>$property_name)
+   {
+       $found=false;
+       foreach($equivalencies as $equivalency)
+       {
+            if(array_key_exists($property_name,$equivalency))
+            {
+                $name_condition="";
+                foreach($equivalency as $equiv=>$value)
+                {
+                    if($name_condition!="")
+                        $name_condition.=" or ";
+                    $name_condition.="translate(Name,$translation_string)='".strtoupper(strtr($equiv,array("'"=>"")))."'";
+                }
+                $found=true;
+                break;
+            }
+        }
+        if($property_name=="Material Name")
+        {
+           $ret[$key]=$Matid;
+           continue;
+        }
+        else if($property_name=="Material Categories")
+        {
+            $categories=array();
+            $queried=$context->query("/MatML_Doc/Material/BulkDetails/Class/Name/text()");
+            foreach($queried as $category)
+            {
+                $categories[]=$category->nodeValue;
+            }
+            $queried=$context->query("/MatML_Doc/Material/BulkDetails/Subclass/Name/text()");
+            foreach($queried as $category)
+            {
+                $categories[]=$category->nodeValue;
+            }
+            $ret[$key]=$categories;
+            continue;
+        }
+        else if(!$found)
+        {
+           $name_condition="translate(Name,$translation_string)='".strtoupper($property_name)."'";
+        }
+        $details=$context->query("/MatML_Doc/Metadata/PropertyDetails[$name_condition]");
+       $data=new PropertyData;
+       if(!$details->length)
+            continue;
+        foreach($details as $detail)
+        {
+            $units=$detail->getElementsByTagName("Units");
+            list($scale,$num_unit)=parse_units($units);
+            if(!$data->num_unit)
+                $data->num_unit=$num_unit;
+            else
+            {
+                force_unit_match($Matid,new Unit("unknown",$num_unit,$scale),$data);
+            }
+
+            $propid=$detail->getAttribute("id");
+            $property_datas=$context->query("/MatML_Doc/Material/BulkDetails/PropertyData[@property='$propid']/Data");
+            foreach($property_datas as $property_data)
+            {
+                $data->count++;
+                $data->avg_value+=$property_data->nodeValue*$scale;
+            }
+        }
+        if($data->count)
+            $data->avg_value/=$data->count;
+        $ret[$key]=$data;
+   }
+   return $ret;
+}
+
+function fractionalize($number)
+{
+    $integer=floor($number);
+    $decimal=$number-$integer;
+    if($decimal<.00000001)
+        return array($integer,1);
+    if($decimal>.99999999)
+        return array($integer+1,1);
+    $denominator=fractionalize(1/$decimal);
+    $denominator=$denominator[0];
+    return array(round($number*$denominator),$denominator);
+}
+
+function get_factor_power($number,$factor)
+{
+    $power=0;
+    list($numerator,$denominator)=fractionalize($number);
+    if($numerator==0)
+        return 0;
+    list($fn,$fd)=fractionalize($factor);
+    while(($numerator % $fn)==0 && ($denominator % $fd) == 0)
+    {
+        $numerator/=$fn;
+        $denominator/=$fd;
+        $power++;
+    }
+    if($power||$denominator==1)
+        return $power;
+    while(($numerator % $fd)==0 && ($denominator % $fn) == 0)
+    {
+        $numerator/=$fd;
+        $denominator/=$fn;
+        $power--;
+    }
+    return $power;
+}
+
+function force_unit_match($material,$unit,&$property_data)
+{
+    //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);
+    $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)))
+        {
+            //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);
+            return true;
+        }
+        if($unit->equals($property_data->num_unit*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);
+            return true;
+        }
+        echo "Error: unit mismatch ($unit->name $unit->num_name vs $property_data->num_unit) in $material\n";
+        return false;
+    }
+    return true;
+}
+
+function db_get_plot_values($plottype, $log, $category_options){ 
+    global $unit_infos;
 
   // So far only 4 plot types
@@ -14 +321 @@
   //$utsys = "0";
   
-  // I am not very proud of the following nasty hacks but we needed this working ASAP for the pilot
-  
-  
-  // Query values from DB
-  
-  // THESE QUERIES are just for testing purpouses
-  
-  // Yield strength
-  
-  $query["yield"] = "select matid,propname,value,units from properties where lower(propname) like lower('Yield strength%') or lower(propname) like lower('%Strength%Yield%') or lower(propname) like lower('Tensile%Strength%Yield%')";
-  
-  // Density
-  $query["density"] = "select matid,value,units from properties where lower(propname) like lower('%density%')";
-  
-  // Young's Modulus
-  $query["young"] = "select matid,value,units from properties where lower(propname) like lower('%Modulus of Elasticity%')";
-  
-  // Thermal conductivity
-  $query["thermcond"] = " select matid,value,units from properties where lower(propname) like lower('%thermal%conductivity')";
-  
-  // Heat capacity (only for 3)
-  $query["Cp"] = "select matid,value,units from properties where lower(propname) like lower('%heat%capacity%') or lower(propname) like lower('%specific%heat%')";
-  
-  
-  // select value,matname from materials as m,properties as p where m.matid=p.matid and propid='pr1'
-  
-  switch($plottype){
-    
-  case "EvsYield":
-    $Yquery = pg_query($conn,$query["young"]);
-    $Xquery = pg_query($conn,$query["yield"]);
+  
+    switch($plottype){
+    
+    case "EvsYield":
+        $query=array(
+            "Yquery"=>"Young's Modulus",
+            "Xquery"=>"Tensile Strength, Yield",
+            "Matid"=>"Material Name"
+        );
+        $final_units=array(
+            "Yquery"=>$unit_infos["MPa"],
+            "Xquery"=>$unit_infos["MPa"]
+        );
    break;
    
   case "EovDvsYieldovD":
-    $Yquery = pg_query($conn,$query["young"]);
-    $Xquery = pg_query($conn,$query["yield"]);
-    $extra  = pg_query($conn,$query["density"]);
+        $query=array(
+            "Yquery"=>"Young's Modulus",
+            "Xquery"=>"Tensile Strength, Yield",
+            "extra"=>"Density",
+            "Matid"=>"Material Name"
+        );
+        $final_units=array(
+            "Yquery"=>$unit_infos["MPa"],
+            "Xquery"=>$unit_infos["MPa"],
+            "extra"=>$unit_infos["g"]->div($unit_infos["cc"])
+        );
     break;
     
   case "EvsD":
-    $Yquery = pg_query($conn,$query["young"]);
-    $Xquery = pg_query($conn,$query["density"]);
+        $query=array(
+            "Yquery"=>"Young's Modulus",
+            "Xquery"=>"Density",
+            "Matid"=>"Material Name"
+        );
+        $final_units=array(
+            "Yquery"=>$unit_infos["MPa"],
+            "Xquery"=>$unit_infos["g"]->div($unit_infos["cc"])
+        );
     break;
     
   case "KvsDCp":
-    $Yquery = pg_query($conn,$query["thermcond"]);
-    $Xquery = pg_query($conn,$query["Cp"]);
-    $extra  = pg_query($conn,$query["density"]);
+        $query=array(
+            "Yquery"=>"Thermal Conductivity",
+            "Xquery"=>"Heat Capacity",
+            "extra"=>"Density",
+            "Matid"=>"Material Name"
+        );
+        $final_units=array(
+            "Yquery"=>$unit_infos["W"]->div($unit_infos["m"]->mul($unit_infos["K"])),
+            "Xquery"=>$unit_infos["J"]->div($unit_infos["g"]->mul($unit_infos["°C"])),
+            "extra"=>$unit_infos["g"]->div($unit_infos["cc"])
+        );
     break;
   }
-  
-  
-  // Fetch values from DB and sort them in an array (actually 3 arrays)
-  
-  if($Yquery && $Xquery){
-    
+  $query["categories"]="Material Categories";
+  
     $valuesY = array();
     $valuesX = array();
-    $keysY = array();
-    $keysX = array();
-    $unitsY = array();
-    $unitsX = array();
-    
-    
-    
-    while( $rowx = pg_fetch_array ($Xquery) ){
-      
-      //fetching matid, value, units fields
-      
-      array_push($keysX,$rowx["matid"]);
-      array_push($valuesX,$rowx["value"]);
-      array_push($unitsX,$rowx["units"]);
-      
-    }
-    
-    
-    while( $rowy = pg_fetch_array($Yquery) ){
-      
-      //fetching matid, value, units fields
-      
-      array_push($keysY,$rowy["matid"]);
-      array_push($valuesY,$rowy["value"]);
-      array_push($unitsY,$rowy["units"]);
-    }
-    
-
-    
-    // Non very pretty hack for getting the common keys due to the lack
-    // of array_intersect_assoc prior PHP <= 4.3
-    // Hope this solves the problem for now, and don't slow down things too much
-    
-    $dataY =  array_combine($keysY, $valuesY);
-    $dataX =  array_combine($keysX, $valuesX);
-
-    $uniY  =  array_combine($keysY, $unitsY);
-    $uniX  =  array_combine($keysX, $unitsX);
-    
-    
-    $valuesX = array();
-    $valuesY = array();
-    $unitsX = array();
-    $unitsY = array();
-    
-    
-    $common_keys = array_intersect($keysX, $keysY);
-    
-   //   for (i in array resultante) { $valores[$llaves[$i]] }
-    
-    foreach($common_keys as $key){
-      
-      array_push($valuesY,$dataY[$key]); 
-      array_push($valuesX,$dataX[$key]); 
-      
-      array_push($unitsY,$uniY[$key]); 
-      array_push($unitsX,$uniX[$key]); 
-      
-      
-    }
-    
-  }
-  
-  
-  if($extra){
-    
     $valuese = array();
-    $keyse = array();
-    $unitse = array();
-    
-    while($rowextra = pg_fetch_array ($extra) ){
-   //fetching matid, value, units fields
-      
-      array_push($keyse,$rowextra["matid"]);
-      array_push($valuese,$rowextra["value"]);
-      array_push($unitse,$rowextra["units"]);
-    }
-    
-    
-    $datae =  array_combine($keyse, $valuese);
-    $unie  =  array_combine($keyse, $unitse);
-    
-    $valuese = array();
-    $unitse = array();
-                
-    $common_keys = array_intersect($common_keys, $keyse);
-    
-
-    //   for (i in array resultante) { $valores[$llaves[$i]] }
-    
-    foreach($common_keys as $key){
-      
-      array_push($valuesY,$dataY[$key]); 
-      array_push($valuesX,$dataX[$key]); 
-      array_push($valuese,$datae[$key]); 
-      
-      array_push($unitsY,$uniY[$key]); 
-      array_push($unitsX,$uniX[$key]); 
-      array_push($unitse,$unie[$key]); 
-    }
-  }
+    $categories = array();
+  
+    $handle = opendir('materials');
+
+    while (false !== ($file = readdir($handle))) {
+        if(preg_match("/\.xml?$/",$file)==1)
+        {
+            // Fetch values from DB and sort them in an array (actually 3 arrays)
+            $values=get_property_data("materials/$file",$query);
+
+            if(isset($values["Xquery"])&&
+                isset($values["Yquery"])
+            )
+            {
+                $values_categories=$values["categories"];
+                $values_categories[]="";
+                foreach($values_categories as $category)
+                {
+                    if(isset($category_options[$category]))
+                        break;
+                }
+                if(!isset($category_options[$category]))
+                    continue;
+                $category=$category_options[$category];
+                force_unit_match($values["Matid"],$final_units["Xquery"],$values["Xquery"]);
+                force_unit_match($values["Matid"],$final_units["Yquery"],$values["Yquery"]);
+                if(isset($query["extra"]))
+                {
+                    if(isset($values["extra"]))
+                    {
+                        force_unit_match($values["Matid"],$final_units["extra"],$values["extra"]);
+                        $valuesX[]=($values["Xquery"]->avg_value/$final_units["Xquery"]->scale);
+                        $valuesY[]=($values["Yquery"]->avg_value/$final_units["Yquery"]->scale);
+                        $valuese[]=$values["extra"]->avg_value/$final_units["extra"]->scale;
+                        $names[]=$values["Matid"];
+                        $categories[]=$category;
+                    }
+                }
+                else
+                {
+                        $valuesX[]=($values["Xquery"]->avg_value/$final_units["Xquery"]->scale);
+                        $valuesY[]=($values["Yquery"]->avg_value/$final_units["Yquery"]->scale);
+                        $names[]=$values["Matid"];
+                        $categories[]=$category;
+                }
+            }
+        }
+    }
+    closedir($handle);
   
   
   // Assign the actual useful data
-  // NOTE: I AM not checking the units yet
   
   // Labels and Units
@@ -185 +441 @@
     
   case "EvsYield":
-    $ylabel = "Young's Modulus ($unitsY[0])";
-    $xlabel = "Yield Strength ($unitsX[0])";
+    $ylabel = "Young's Modulus (".$final_units["Yquery"]->name.")";
+    $xlabel = "Yield Strength (".$final_units["Xquery"]->name.")";
     break;
     
   case "EvsD":
-    $ylabel = "Young's Modulus ($unitsY[0])";
-    $xlabel = "Density ($unitsX[0])";
+    $ylabel = "Young's Modulus (".$final_units["Yquery"]->name.")";
+    $xlabel = "Density (".$final_units["Xquery"]->name.")";
     break;
     
   case "EovDvsYieldovD":
-    $ylabel = "Young's Modulus / Density ($unitsY[0] / $unitse[0])";
-    $xlabel = "Yield Strength / Density ($unitsX[0] / $unitse[0])";
+    $ylabel = "Young's Modulus / Density (".$final_units["Yquery"]->name." / ".$final_units["extra"]->name.")";
+    $xlabel = "Yield Strength / Density (".$final_units["Xquery"]->name." / ".$final_units["extra"]->name.")";
     $valuesY = array_div($valuesY,$valuese);
     $valuesX = array_div($valuesX,$valuese);
@@ -202 +458 @@
     
   case "KvsDCp":
-    $ylabel = "Thermal Conductivity $unitsY[0]";
-    $xlabel = "Heat Capacity * Density ($unitsX[0] * $unitse[0])";
+    $ylabel = "Thermal Conductivity (".$final_units["Yquery"]->name.")";
+    $xlabel = "Heat Capacity * Density (".$final_units["Xquery"]->name." * ".$final_units["extra"]->name.")";
     $valuesX = array_mult($valuesX,$valuese);
     break;
   }
 
-
-  //Fetch the materials names
-  $in = "('" . implode("', '", $common_keys) . "')";
-  $name_query  = pg_query($conn, "select matname from materials where matid in $in");
-  
-  //echo "select matname from materials where matid in $in";
-  
-  if($name_query){
-    $names = array();
-    while( $namerow = pg_fetch_row ($name_query)){
-      array_push($names,$namerow[0]);
-    }
-  }
-
-  return array(&$valuesX, &$valuesY, &$names, $xlabel, $ylabel);
-
-}
-
+  return array(&$valuesX, &$valuesY, &$names, $xlabel, $ylabel, $categories);
+
+}
+
+//var_dump(db_get_plot_values("EvsD","")); 
 ?>

trunk/matml/webselector/php/functions.php.inc

@@ -1 +1 @@
 <?
+if(version_compare(phpversion(),"5.0.0","<"))
+{
 function array_combine($array_keys, $array_values) {
   $t      = array();
@@ -9 +11 @@
   }
   return $t;
+}
 }
 
@@ -36 +39 @@
 
 
-
 ?>

trunk/matml/webselector/php/plot.php

@@ -3 +3 @@
 include("dbquery.php.inc");
 
+//by "likavcan at NOSPAN sturak nospan dot sk" at from php.net 
+function arrow($im, $x1, $y1, $x2, $y2, $alength, $awidth, $color) {
+
+   $distance = sqrt(pow($x1 - $x2, 2) + pow($y1 - $y2, 2));
+
+   $dx = $x2 + ($x1 - $x2) * $alength / $distance;
+   $dy = $y2 + ($y1 - $y2) * $alength / $distance;
+   $k = $awidth / $alength;
+
+   $x2o = $x2 - $dx;
+   $y2o = $dy - $y2;
+
+   $x3 = $y2o * $k + $dx;
+   $y3 = $x2o * $k + $dy;
+
+   $x4 = $dx - $y2o * $k;
+   $y4 = $dy - $x2o * $k;
+
+   imageline($im, $x1, $y1, $dx, $dy, $color);
+   imageline($im, $x3, $y3, $x4, $y4, $color);
+   imageline($im, $x3, $y3, $x2, $y2, $color);
+   imageline($im, $x2, $y2, $x4, $y4, $color);
+
+}
+
+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
 
-$plottype = $_REQUEST['plot'];
+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];
 
 //get the values from the database with these function
-list($valuesX, $valuesY, $names, $xlabel, $ylabel) = db_get_plot_values($plottype, $log);
+list($valuesX, $valuesY, $names, $xlabel, $ylabel, $categories) = db_get_plot_values($plottype, $log, $categorization);
 
 $number_mat = count($names);
 
 
-$Isize = 450;
-
-$image = ImageCreate($Isize, $Isize);
+$Iwidth=600;
+$Iheight=450;
+
+$left_border=35;
+$top_border=1;
+$right_border=1;
+$bottom_border=50;
+
+$inside_border=5;
+$tick_length=4;
+$axis_value_label_size=12;
+
+$image = ImageCreate($Iwidth, $Iheight);
 
 $white  = ImageColorAllocate($image, 255, 255, 255);
 $grey   = ImageColorAllocate($image, 220, 220, 220);
 $black  = ImageColorAllocate($image, 0, 0, 0);
-$blue   = ImageColorAllocate($image, 0, 123, 255);
-
-
-ImageRectangle($image, 0, 0, 449, 449, $black);
-ImageFilledRectangle($image, 20, 20, 430, 430, $grey);
-ImageRectangle($image, 20, 20, 430, 430, $black);
+$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);
+
+$bgcolor   = ImageColorAllocate($image, 0xe5, 0xe8, 0xb2);
 
 // For using a nice font
-
-$font = "vixar.ttf";
-
-//$valuesX = array(0,10,20,30);
-//$valuesY = array(0,10,20,30);
-//$number_mat =array(1,10,20,30);
-// Hardcoded sizes for the plot, better to be left alone
-
-$width  = 380;
-$height = 380;
-
-$x_initial = 20;
-$y_initial = 380;
+$axis_value_font = "helcr.ttf";
+$font = "CaslonBold.ttf";
+
+//Figure out extra left border for y axis values
+if($log == 1){
+}
+else{
+    $ymax=max($valuesY);
+    $yscale = ($Iheight-$top_border-$bottom_border-2*$inside_border) / $ymax;
+
+    list($ytickscale,$ylabel_interval)=calc_tickscale($ymax,20,25);
+
+    $widest_label_width=0;
+    for($valueY=0; $valueY<$ymax; $valueY+=$ylabel_interval*$ytickscale)
+    {
+        $label_width=imagettfbbox($axis_value_label_size,0,$axis_value_font,$valueY);
+        $label_width=$label_width[2];
+        if($label_width>$widest_label_width)
+            $widest_label_width=$label_width;
+    }
+    $left_border+=$widest_label_width;
+}
+
+ImageFilledRectangle($image, 0, 0, $Iwidth, $Iheight, $bgcolor);
+//ImageRectangle($image, 0, 0, 449, 449, $black);
+ImageFilledRectangle($image, $left_border, $top_border, $Iwidth-$right_border-1, $Iheight-$bottom_border-1, $grey);
+//ImageRectangle($image, 20, 20, 430, 430, $black);
+arrow($image,$left_border,$Iheight-$bottom_border,$Iwidth-$right_border,$Iheight-$bottom_border,4,4,$black);
+arrow($image,$left_border,$Iheight-$bottom_border,$left_border,0,4,4,$black);
 
 // Broken Log scale Attempt
@@ -62 +170 @@
 }
 else{
-  $width_bar  = 0.90  * $width / max($valuesX);
-  $height_bar = 0.90 * $height / max($valuesY);
+    $xmax=max($valuesX);
+    $xscale  = ($Iwidth-$left_border-$right_border-2*$inside_border) / $xmax;
+
+    //Draw in the scale ticks on the axes
+    
+    //We'll estimate the widest label value as the width of xmax
+    //This isn't entirely correct because a decimal point can occur based
+    //on the divisions
+    $label_width=imagettfbbox($axis_value_label_size,0,$axis_value_font,floor($xmax));
+    $label_width=$label_width[2]+15; //+15 for padding
+    list($xtickscale,$xlabel_interval)=calc_tickscale($xmax,20,($Iwidth-$left_border-$right_border)/$label_width);
+
+    for($i=0,$valueX=0; $valueX<$xmax; $i++,$valueX+=$xtickscale)
+    {
+        $x = $left_border + $inside_border + $xscale * $valueX;
+        $y = $Iheight - $bottom_border;
+        $label_width=imagettfbbox($axis_value_label_size,0,$axis_value_font,$valueY);
+        $label_width=$label_width[2];
+        if($i%$xlabel_interval==0)
+        {
+            imageline($image, $x, $y-$tick_length/2, $x, $y+$tick_length, $black);
+            $label_width=imagettfbbox($axis_value_label_size,0,$axis_value_font,$valueX);
+            $label_height=-$label_width[7];
+            $label_width=$label_width[2];
+            imagettftext($image,$axis_value_label_size,0,$x-$label_width/2-1,$Iheight-$bottom_border+$label_height+$tick_length/2+4,$black,$axis_value_font,$valueX);
+        }
+        else
+            imageline($image, $x, $y-.5*$tick_length/2, $x, $y+.5*$tick_length, $black);
+    }
+    for($i=0,$valueY=0; $valueY<$ymax; $i++,$valueY+=$ytickscale)
+    {
+        $x = $left_border;
+        $y = $Iheight - $bottom_border - $inside_border - $yscale * $valueY;
+        if($y<10)
+            break;
+        if($i%$ylabel_interval==0)
+        {
+            imageline($image, $x+$tick_length/2, $y, $x-$tick_length, $y, $black);
+            $label_width=imagettfbbox($axis_value_label_size,0,$axis_value_font,$valueY);
+            $label_width=$label_width[2];
+            imagettftext($image,$axis_value_label_size,0,$left_border-$label_width-$tick_length/2-4,$y+6,$black,$axis_value_font,$valueY);
+        }
+        else
+            imageline($image, $x+.5*$tick_length/2, $y, $x-.5*$tick_length, $y, $black);
+    }
 }
 
@@ -76 +227 @@
   }
  else{
-    $x = $x_initial + $width_bar * $valuesX[$i];
-    $y = $y_initial - $height_bar * $valuesY[$i];
+    $x = $left_border + $inside_border + $xscale * $valuesX[$i];
+    $y = $Iheight - $bottom_border - $inside_border - $yscale * $valuesY[$i];
   }
   
@@ -84 +235 @@
   // echo "X: $valuesX[$i] Y: $valuesY[$i]<br>";
 
-
+    if($selected==$names[$i])
+        $color=$selected_color;
+    else
+        $color=$category_colors[$categories[$i]];
   ImageFilledRectangle($image, $x - 2, $y - 2, $x + 2, 
-                       $y + 2, $blue);
+                       $y + 2, $color);
   ImageRectangle($image, $x - 2, $y - 2, $x + 2, 
                  $y + 2, $black);
   
-  imagettftext($image, 14, 0, $x-25, $y-3, $black, $font, $names[$i]);
-}
-  imagettftext($image, 14, 0, .75 * $Isize/2, $Isize * 0.99, $black, $font, $xlabel);
-  imagettftext($image, 14, 90, 15 , 1.25*($Isize)/2, $black, $font, $ylabel);
+  //imagettftext($image, 14, 0, $x-25, $y-3, $black, $font, $names[$i]);
+}
+$label_width=imagettfbbox(14,0,$font,$xlabel);
+$label_width=$label_width[2];
+imagettftext($image, 14, 0, $left_border+($Iwidth-$left_border-$right_border)/2-$label_width/2, $Iheight-5, $black, $font, $xlabel);
+
+$label_width=imagettfbbox(14,0,$font,$ylabel);
+$label_width=$label_width[2];
+imagettftext($image, 14, 90, 17 , ($Iheight-$top_border-$bottom_border)/2+$label_width/2, $black, $font, $ylabel);
 
 Header("Content-Type: image/png");

trunk/matml/webselector/php/select.php

@@ -8 +8 @@
    <meta name="Keywords" content="Materials Engineering, Metallurgy, Materials Learning">
    <title>MatDL:: Materials Selector</title>
-<link rel="stylesheet" title="Default" href="style.css" type="text/css" media="screen">
 </head>
-<body>
-<h1><em>MatDL:: Plot</em></h1>
-<div id="main">
+<body bgcolor="#e5e8b2" style="font-family: arial,helevetica,verdana, sans-serif">
+<center>
+<table width="101%"  border="0" cellpadding="0" cellspacing="0">
+  <tr>
+    <th width="24%" bordercolor="#BDB583" bgcolor="#BDB583" scope="col"><div align="center"><img src="images/MATDL-LOGO.JPG" width="240" height="85" border="0" usemap="#Map" /></div></th>
+    <th width="49%" height="84" bordercolor="#BDB583" bgcolor="#BDB583" scope="col"><p>
+<b><em style="font-size: 40px">MatDL: MatML and Material Grapher</em></b>
+</p>    </th>
+    <th width="27%" colspan="2" bordercolor="#BDB583" bgcolor="#BDB583" scope="col"><div align="center"><img src="images/NSF+NSDL-LOGO.JPG" width="256" height="77" border="0" usemap="#Map3Map" />
+      <map name="Map3Map" id="Map32">
+        <area shape="rect" coords="-2,24,112,59" href="http://www.nsdl.org" />
+        <area shape="circle" coords="149,29,20" href="http://www.nsf.gov" />
+
+        <area shape="rect" coords="177,35,245,66" href="http://www.nist.gov" />
+      </map>
+      </div></th>
+  </tr>
+</table>
+<br>
 <?
-$plot = $_REQUEST["plot"];
+if(isset($_REQUEST["plot"]))
+{
+    $plot = $_REQUEST["plot"];
+}
+else
+{
+    $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();
 
-if(!isset($plot)){
-  $plot = "EvsD";
-}
-
-echo "<img src=\"plot.php?plot=$plot\">"
+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 "<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 "</table>\n";
+}
+?>
+<BR>
+<BR>
+<HR>
+<BR>
+<BR>
 <form action="select.php" method="get">
+<table>
+<tr>
+<th>Plot type</th>
+</tr>
+<tr>
+<td align="left">
 <?
+echo "<input type=\"hidden\" name=\"selected\" value=\"$selected\">\n";
+
 $plotypes = array("EvsD","EvsYield","EovDvsYieldovD","KvsDCp");
 $plotnames = array(
@@ -55 +115 @@
   echo $plotnames[$type];
 }
-?><br>
+?>
+</td></tr></table>
+<BR><BR>
+<table>
+<tr>
+<th>Categorization</th>
+</tr>
+<tr>
+<td align="left">
+<?
+$categorizations=array("None","Metals, Polymers, and Ceramics");
+$left="<input type=\"radio\" name=\"categorization\" value=\"";
+$right = "\">";
+
+
+
+foreach($categorizations as $index=>$name){
+
+  echo $left;
+  echo $index;
+
+
+  
+  if($index == $categorization){
+    echo "\" checked>";
+  }
+  else{
+    echo $right;
+  }
+
+  echo $name."<BR>\n";
+}
+?>
+</td></tr></table>
 <br>
 <input type="submit" value="Change Plot">
 </form>
 </div>
-
-</div>
+<HR>
+<table>
+<tr><td colspan=2 align=center>
+<h3>People</h3>
+</td></tr>
+<tr>
+<td>Kyle Stemen</td><td>Kent State University</td>
+</tr>
+<tr>
+<td>Jorge Vieyra</td><td>Massachusetts Institute of Technology</td> </tr>
+</tr>
+<tr>
+<td>Cathy Lowe</td><td>Kent State University</td> </tr>
+</tr>
+<tr>
+<td>Laura Bartolo</td><td>Kent State University</td> </tr>
+</tr>
+<tr>
+<td>Adam Powell</td><td>Massachusetts Institute of Technology</td> </tr>
+</tr>
+</table>
+<P>
+<BR>
+<h3>Grants</h3>
+NSF DUE-0333520<BR>
+NIST 70NANB30H1
+</center>
 </body>
 </html>

trunk/matml/webselector/php/style.css

@@ -16 +16 @@
      color: #000000;
      background: #e5e8b2 url(perico.png) no-repeat 0% 0%;
-     line-height: 150%;
+     /*line-height: 150%;*/
      
 }
@@ -36 +36 @@
 letter-spacing: 0.5em; 
 /*text-transform: lowercase;  */
-font: bold 30px sans-serif; 
-height: 28px; 
+/*font: bold sans-serif; */
+/*font-size: 30px;*/
+/*height: 28px; */
 vertical-align: middle; 
 white-space: nowrap;