Changeset 9295 for trunk/MagicSoft/Mars/datacenter

Timestamp:

02/03/09 17:33:11 (16 years ago)

Author:

aparavac

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/datacenter/db

Files:

• plot.php (modified) (1 diff)
• plotdb.php (modified) (6 diffs)

trunk/MagicSoft/Mars/datacenter/db/plot.php

@@ -41 +41 @@
 
 //set up plot
-$c= new XYChart(640,400);//, 0xeeeeee, 0x000000, 1);
+if (empty($_GET["x"]))
+    $x=640;
+else
+    $x=$_GET["x"];
+if (empty($_GET["y"]))
+    $y=400;
+else
+    $y=$_GET["y"];
+
+$c= new XYChart($x,$y);//, 0xeeeeee, 0x000000, 1);
+$c->setPlotArea(70, 45, $x-100, $y-100, 0xffffff, -1, 0xcccccc, 0xccccccc);
+//$c= new XYChart(440,250);//, 0xeeeeee, 0x000000, 1);
+//$c->setPlotArea(70, 45, 340, 150, 0xffffff, -1, 0xcccccc, 0xccccccc);
 //$c->setRoundedFrame();
-$c->setPlotArea(70, 45, 540, 300, 0xffffff, -1, 0xcccccc, 0xccccccc);
 
 //size of the symbols

trunk/MagicSoft/Mars/datacenter/db/plotdb.php

@@ -36 +36 @@
             || ($_GET["prim"]==$column && $num==3)
             || ($_GET["prim"]==$column && $num==4)
-            || ($_GET["prim"]==$column && $_GET["plot"]=="val" && $num==2))
+            || ($_GET["prim"]==$column && $_GET["plot"]=="val" && $num==2)
+            || (empty($_GET["prim"]) && $column=="fSequenceFirst"))
             printf("<div id='%s%s' style='display:inline'>\n", $column, $num);
         else
@@ -112 +113 @@
         $_GET["set"]="";
 
-    printf("<center>\n<table cellpadding='0'>\n");
-    printf("<tr><td align='left'>\n");
+    if (empty($_GET["x"]))
+        $totalx=640+410;
+    else
+        $totalx=$_GET["x"]+410;
+    
+    printf("<center>\n<table cellpadding='0' width='%s'>\n", $totalx);
+    printf("<tr><td align='left' width='410px'>\n");
     printf("<form style='margin-bottom:0;' action='plotdb.php' METHOD='GET'>\n");
 
     printf("&nbsp;<input type='radio' name='plot' value='prim' onclick='hidepulldown2()' %s> vs primary &nbsp;", $_GET["plot"]=="prim" ? "checked" : "");
-    printf("&nbsp;<input type='radio' name='plot' value='val' onclick='showpulldown2()' %s> vs value <br><br>", $_GET["plot"]=="val" ? "checked" : "");
+    printf("&nbsp;<input type='radio' name='plot' value='val' onclick='showpulldown2()' %s> vs value <br><br>", ($_GET["plot"]=="val" || empty($_GET["plot"])) ? "checked" : "");
 
     printf("<table>\n");
@@ -144 +150 @@
     foreach($prims as $primary => $column)
         PrintDiv($host, $user, $pw, $db, $column, $tables, "2");
-    if ($_GET["plot"]=="val")
+//    if ($_GET["plot"]=="val")
+    if ($_GET["plot"]=="val" || empty($_GET["plot"]))
         printf(" </td><td valign='top'>\n <div id='Range2' style='display:inline'>\n ");
     else
@@ -180 +187 @@
         printf("<div id='set2' style='display:none'>Set2: <input name='Set2' type='text' size='20' maxlength='150' value='%s'>\n</div>\n<br>\n", $_GET["Set2"]);
 
-    printf("<br><input class='Width' type='submit' value='Query Plot'><br>\n");
+    printf("<br>Plot format: &nbsp; x = <select name='x' size='1'>\n");
+    $x = array( 740, 640, 540, 440);
+    foreach($x as $key => $el)
+        if ($_GET["x"]==$el || (empty($_GET["x"]) && $el==640))
+            printf("<option value='%s' selected>%s</option>\n", $el, $el);
+        else
+            printf("<option value='%s'>%s</option>\n", $el, $el);
+    printf("</select>\n ");
+
+    printf("&nbsp; y = <select name='y' size='1'>\n");
+    $y= array( 600, 500, 400, 300);
+    foreach($y as $key => $el)
+        if ($_GET["y"]==$el || (empty($_GET["y"]) && $el==400))
+            printf("<option value='%s' selected>%s</option>\n", $el, $el);
+        else
+            printf("<option value='%s'>%s</option>\n", $el, $el);
+    printf("</select>\n");
+
+    printf("<br><br><input class='Width' type='submit' value='Query Plot'> &nbsp;\n");
     printf("<input class='Width' type='button' value='Reset' onClick='self.location.href=\"plotdb.php\"'><br>\n");
 
@@ -186 +211 @@
     printf("</td>\n");
 
-    printf("<td align='right' width='640px' height='400px'>\n");
+//    printf("<td align='right' width='640px' height='400px'>\n");
+    printf("<td align='right'>\n");
     if (!empty($_GET))
     {
@@ -207 +233 @@
     printf("</td></tr>\n");
     printf("<tr><td colspan='2'>\n");
-    printf("some remarks:\n<ul>");
+    printf("<br>some remarks:\n<ul>");
     printf("<li>For Runs plotting the whole range (i.e. without giving a range or when giving a too large range) \n");
     printf("doesn't work with ChartDirector.</li>\n");