Index: /trunk/MagicSoft/Mars/Changelog =================================================================== --- /trunk/MagicSoft/Mars/Changelog (revision 8465) +++ /trunk/MagicSoft/Mars/Changelog (revision 8466) @@ -24,4 +24,12 @@ - moved temporary directory for pstoimg to /tmp + * datacenter/db/plotdb.php, datacenter/db/plotinclude.php, + datacenter/db/menu.js : + - implemented possibility to plot datasets by inserting dataset + number as Set1 + + * datacenter/db/plot.php: + - implemented variables for colours + Index: /trunk/MagicSoft/Mars/datacenter/db/menu.js =================================================================== --- /trunk/MagicSoft/Mars/datacenter/db/menu.js (revision 8465) +++ /trunk/MagicSoft/Mars/datacenter/db/menu.js (revision 8466) @@ -150,2 +150,14 @@ } +function showset2() +{ + var el = document.getElementById("set2"); + el.style.display="inline"; +} + +function hideset2() +{ + var el = document.getElementById("set2"); + el.style.display="none"; +} + Index: /trunk/MagicSoft/Mars/datacenter/db/plot.php =================================================================== --- /trunk/MagicSoft/Mars/datacenter/db/plot.php (revision 8465) +++ /trunk/MagicSoft/Mars/datacenter/db/plot.php (revision 8466) @@ -55,12 +55,17 @@ $labelfont="arialdb.ttf"; $labelsize=10; +//colours +$colour=0x000000; +$setcolour=0x0080ff; +$set2colour=0xff0000; + if ($_GET["plot"]=="val") { $column2=$_GET[$primary."Col2"]; - $c->addScatterLayer($val2, $val1, $column, CircleSymbol, $small, 0x000000, 0x000000); + $c->addScatterLayer($val2, $val1, $column, CircleSymbol, $small, $colour, $colour); if (!empty($_GET["Set"])) - $c->addScatterLayer($Setval2, $Setval1, $column, CircleSymbol, $large, 0x0080ff, 0x0080ff); + $c->addScatterLayer($Setval2, $Setval1, $column, CircleSymbol, $large, $setcolour, $setcolour); if (!empty($_GET["Set2"])) - $c->addScatterLayer($Set2val2, $Set2val1, $column, CircleSymbol, $large, 0xff0000, 0xff0000); + $c->addScatterLayer($Set2val2, $Set2val1, $column, CircleSymbol, $large, $set2colour, $set2colour); $c->yAxis->setTitle($column, $axisfont, $axissize); $c->xAxis->setTitle($column2, $axisfont, $axissize); @@ -69,9 +74,9 @@ else { - $c->addScatterLayer($prim, $val1, $column, CircleSymbol, $small, 0x000000, 0x000000); + $c->addScatterLayer($prim, $val1, $column, CircleSymbol, $small, $colour, $colour); if (!empty($_GET["Set"])) - $c->addScatterLayer($Setprim, $Setval1, $column, CircleSymbol, $large, 0x0080ff, 0x0080ff); + $c->addScatterLayer($Setprim, $Setval1, $column, CircleSymbol, $large, $setcolour, $setcolour); if (!empty($_GET["Set2"])) - $c->addScatterLayer($Set2prim, $Set2val1, $column, CircleSymbol, $large, 0xff0000, 0xff0000); + $c->addScatterLayer($Set2prim, $Set2val1, $column, CircleSymbol, $large, $set2colour, $set2colour); $c->yAxis->setTitle($column, $axisfont, $axissize); $c->xAxis->setTitle($primary, $axisfont, $axissize); Index: /trunk/MagicSoft/Mars/datacenter/db/plotdb.php =================================================================== --- /trunk/MagicSoft/Mars/datacenter/db/plotdb.php (revision 8465) +++ /trunk/MagicSoft/Mars/datacenter/db/plotdb.php (revision 8466) @@ -1,4 +1,32 @@ ", $query); + $result=mysql_query($query, $db_id); + + $sequences=""; + while ($row = mysql_fetch_row($result)) + $sequences.= $row[0] . " "; + + mysql_free_result($result); + mysql_close($db_id); + + $text=""; + if (!empty($sequences)) + $text.= str_replace(" ", "+", trim($sequences)); + return $text; + } + function PrintDiv($host, $user, $pw, $db, $column, $tables, $num) { @@ -81,4 +109,6 @@ if (empty($_GET["Set2"])) $_GET["Set2"]=""; + if (empty($_GET["set"])) + $_GET["set"]=""; printf("
\n\n"); @@ -139,9 +169,16 @@ printf("
\n"); - - printf("
Set1: \n", $_GET["Set"]); - printf("
Set2: \n", $_GET["Set2"]); - - printf("


\n"); + printf("
\n"); + + printf("  sequences  \n", $_GET["set"]=="sequences" ? "checked" : ""); + printf("  datasets
\n", $_GET["set"]=="datasets" ? "checked" : ""); + + printf("
Set1: \n
\n
\n", $_GET["Set"]); + if (empty($_GET["set"]) || $_GET["set"]=="sequences") + printf("
Set2: \n
\n
\n", $_GET["Set2"]); + else + printf("\n
\n", $_GET["Set2"]); + + printf("

\n"); printf("
\n"); @@ -154,5 +191,15 @@ $img="plot.php?par=hallo"; foreach($_GET as $var => $val) + { + if ($var=="Set2" && $_GET["set"]=="datasets") + continue; + if ($var=="Set" && $_GET["set"]=="datasets" && !empty($val)) + { + $img.= "&Set=" . GetSequencesFromDataSet("1"); + $img.= "&Set2=" . GetSequencesFromDataSet("2"); + continue; + } $img.="&".$var ."=".$val; + } // printf("link: %s
", $img); printf("plot", $img); @@ -161,16 +208,31 @@ printf("\n"); printf("some remarks:\n\n"); + printf("
  • In Set1 and Set2 Sets can be given:
    \n "); + printf("If 'sequences' is selected e.g. on sequences in Set1 (displayed in blue) and off sequences in Set2 \n"); + printf("(diplayed in red).
    \n "); + printf("If 'datasets' is selected you can enter a dataset number as Set1. The on data is displayed in blue, \n"); + printf("the off data in red.
    \n"); + printf("   Please give the numbers with space as separator (e.g. 40004 40022).
    \n\n"); + printf("
  • 0 is not accepted in the ranges fields, please write .0 or 00
    • \n"); + printf("
  • Be aware, that plotting timestamps, e.g. fRunStart, and strings, e.g. fComment doesn't work.
    • \n"); + printf("\n\n\n"); /* - printf("\n"); + printf("\n"); $query=GetQuery($tables, $joins, ""); - printf("Q: %s", $query); + printf("Q: %s
    ", $query); + if (!empty($_GET["Set"])) + { + $query=GetQuery($tables, $joins, "Set"); + printf("Q: %s
    ", $query); + } + if (!empty($_GET["Set2"])) + { + $query=GetQuery($tables, $joins, "Set2"); + printf("Q: %s
    ", $query); + } + printf(""); */