Index: /trunk/ippMonitor/raw/czartool_labels.php
===================================================================
--- /trunk/ippMonitor/raw/czartool_labels.php	(revision 42179)
+++ /trunk/ippMonitor/raw/czartool_labels.php	(revision 42180)
@@ -285,5 +285,5 @@
 // nebulous dbs
 showDatabaseStatus($HOST_NEBULOUS, $USER_NEBULOUS, $PASSWORD_NEBULOUS, $LABEL_NEBULOUS);
-showReplicationsStatus($REPL_HOST_NEBULOUS, $REPL_USER_NEBULOUS, $REPL_PASSWORD_NEBULOUS, $REPL_LABEL_NEBULOUS);
+//showReplicationsStatus($REPL_HOST_NEBULOUS, $REPL_USER_NEBULOUS, $REPL_PASSWORD_NEBULOUS, $REPL_LABEL_NEBULOUS);
 showReplicationsStatus($REPL_HOST_NEBULOUS_SECONDARY, $REPL_USER_NEBULOUS_SECONDARY, $REPL_PASSWORD_NEBULOUS_SECONDARY, $REPL_LABEL_NEBULOUS_SECONDARY);
 showReplicationsStatus($REPL_HOST_NEBULOUS_TERTIARY, $REPL_USER_NEBULOUS_TERTIARY, $REPL_PASSWORD_NEBULOUS_TERTIARY, $REPL_LABEL_NEBULOUS_TERTIARY);
@@ -364,8 +364,14 @@
    # gnuplots
    # time series plot
-   echo "<img src=\"czartool_getplot.php?mode=$selectedMode&type=t&label=$selectedLabel&proj=$proj&stage=$selectedStage&plottype=linear\"><br><br>";
-   echo "<img src=\"czartool_getplot.php?mode=$selectedMode&type=t&label=$selectedLabel&proj=$proj&stage=$selectedStage&plottype=log\"><br><br>";
+#   echo "<img src=\"czartool_getplot.php?mode=$selectedMode&type=t&label=$selectedLabel&proj=$proj&stage=$selectedStage&plottype=linear\"><br><br>";
+#   echo "<img src=\"czartool_getplot.php?mode=$selectedMode&type=t&label=$selectedLabel&proj=$proj&stage=$selectedStage&plottype=log\"><br><br>";
    # rate series plot
-   echo "<img src=\"czartool_getplot.php?mode=$selectedMode&type=rt&label=$selectedLabel&proj=$proj&stage=$selectedStage&plottype=linear\"><br><br>";
+#   echo "<img src=\"czartool_getplot.php?mode=$selectedMode&type=rt&label=$selectedLabel&proj=$proj&stage=$selectedStage&plottype=linear\"><br><br>";
+   #for dev version
+   # google chart
+   # time series plot
+   echo Gettimeseries($czardb, $selectedMode, $selectedLabel, $proj, $selectedStage);
+   # rate series plot
+   echo Getrate($czardb, $selectedMode, $selectedLabel, $proj, $selectedStage);
 } else {
    # google chart
@@ -375,4 +381,5 @@
    echo Getrate($czardb, $selectedMode, $selectedLabel, $proj, $selectedStage);
 }
+
 
 # data quality timeseries
@@ -1720,4 +1727,5 @@
 
     $sql = "select format(used/total*100,1), usable from cluster_space order by timestamp desc limit 1;";
+
     if ($debug) {echo "$sql<br>";}
     $qry = $db->query($sql);
@@ -1830,12 +1838,12 @@
 
     #also find the median zeropoint
-    foreach($DQarray as $row) {
-        $zpt[]    = $row[3];
-    }
-
-    sort($zpt);
-    $count = sizeof($zpt);   // cache the count
-    $index = floor($count/2);  // cache the index
-    $zpt_med = $zpt[$index];
+#    foreach($DQarray as $row) {
+#        $zpt[]    = $row[3];
+#    }
+
+#    sort($zpt);
+#    $count = sizeof($zpt);   // cache the count
+#    $index = floor($count/2);  // cache the index
+#    $zpt_med = $zpt[$index];
 
     #echo "<script type=\"text/javascript\" src=\"https://www.gstatic.com/charts/loader.js\"></script>";
@@ -1927,7 +1935,10 @@
     echo "        data.addColumn('datetime', 'Time');";
     echo "        data.addColumn('number', 'zeropoint');";
+    echo "        data.addColumn({'type': 'string', 'role': 'style'});";
     echo "        data.addColumn({'type': 'string', 'role': 'tooltip', 'p': {'html': true}});";
     echo "        data.addColumn({id:'i0', type:'number', role:'interval'});";
+    echo "        data.addColumn({id:'i0','type': 'string', 'role': 'style'});";
     echo "        data.addColumn({id:'i0', type:'number', role:'interval'});";
+    echo "        data.addColumn({id:'i0','type': 'string', 'role': 'style'});";
     echo "   data.addRows([";
     foreach($DQarray as $row) {
@@ -1940,8 +1951,10 @@
         $zp_low = $zp-$zp_stdev;
         $zp_high = $zp+$zp_stdev;
+        $col_string = '#0000ff';
+        $zpt_off = 0.;
 
         $tt_string1 = sprintf('time: %s\n zeropoint: %s\n filter: %s\n exp_time: %s\n comment: %s', $timestamp, $zp,$row[5],$row[6],$row[7]);
 #	new Date(Year, Month, Day, Hours, Minutes, Seconds, Milliseconds)
-       echo "[new Date($dat[0], $dat[1]-1, $dat[2], $tm[0], $tm[1]), $zp,'$tt_string1', $zp_low, $zp_high],";
+       echo "[new Date($dat[0], $dat[1]-1, $dat[2], $tm[0], $tm[1]), $zp,'$col_string','$tt_string1', $zp_low,'$col_string', $zp_high,'$col_string'],";
     }
 
@@ -1958,9 +1971,8 @@
    echo "               alignment: 'center',";
    echo "              },";
-   echo "     lineWidth: 2, ";
    echo "     series: {";
-   echo "         0: { color: '#0000ff', lineWidth: 3 },      ";
+   echo "         0: { color: '#0000ff'},      ";
    echo "              },";
-   echo "     intervals: { 'style':'line' },  ";
+   echo "     intervals: { color: 'grey','style':'points', pointSize: 1 },  ";
    echo "     hAxis: {  ";
    echo "             title: 'Date/Time (HST)',";
@@ -1974,5 +1986,5 @@
    echo "     fontSize: 12,";
    echo "   };";
-   echo "   var chart = new google.visualization.LineChart(document.getElementById('dqzp_div'));";
+   echo "   var chart = new google.visualization.ScatterChart(document.getElementById('dqzp_div'));";
    echo "   chart.draw(data, options);";
    echo " }";
@@ -1997,7 +2009,8 @@
     echo "        data.addColumn('datetime', 'Time');";
     echo "        data.addColumn('number', 'zeropoint');";
+    echo "        data.addColumn({'type': 'string', 'role': 'style'});";
     echo "        data.addColumn({'type': 'string', 'role': 'tooltip', 'p': {'html': true}});";
     echo "        data.addColumn({id:'i0', type:'number', role:'interval'});";
-    echo "        data.addColumn({id:'i0', type:'number', role:'interval'});";
+    echo "        data.addColumn({id:'i1', type:'number', role:'interval'});";
     echo "   data.addRows([";
     foreach($DQarray as $row) {
@@ -2008,10 +2021,27 @@
         $zp    = $row[3];
         $zp_stdev = $row[4];
-        $zp_low = $zp-$zp_stdev;
-        $zp_high = $zp+$zp_stdev;
+        $zp_low = $zp_stdev;
+        $zp_high = $zp_stdev;
+        $col_string = '#0000ff';
+        $zpt_off = 0.;
+
+        #if(substr($row[5],0,1) == 'g') {$col_string = 'blue'; $zpt_off = $zp - 24.563;}
+        #if(substr($row[5],0,1) == 'r') {$col_string = 'red'; $zpt_off = $zp - 24.740;}
+        #if(substr($row[5],0,1) == 'i') {$col_string = '#6a3d9a'; $zpt_off = $zp - 24.611;}
+        #if(substr($row[5],0,1) == 'z') {$col_string = 'green'; $zpt_off = $zp - 24.250;}
+        #if(substr($row[5],0,1) == 'y') {$col_string = 'cyan'; $zpt_off = $zp - 23.320;}
+        #if(substr($row[5],0,1) == 'w') {$col_string = 'grey'; $zpt_off = $zp - 26.300;}
+
+        #define new zeropoints
+        if(substr($row[5],0,1) == 'g') {$col_string = 'blue'; $zpt_off = $zp - 25.013;}
+        if(substr($row[5],0,1) == 'r') {$col_string = 'red'; $zpt_off = $zp - 24.840;}
+        if(substr($row[5],0,1) == 'i') {$col_string = '#6a3d9a'; $zpt_off = $zp - 24.711;}
+        if(substr($row[5],0,1) == 'z') {$col_string = 'green'; $zpt_off = $zp - 24.30;}
+        if(substr($row[5],0,1) == 'y') {$col_string = 'cyan'; $zpt_off = $zp - 23.57;}
+        if(substr($row[5],0,1) == 'w') {$col_string = 'grey'; $zpt_off = $zp - 26.000;}
 
         $tt_string1 = sprintf('time: %s\n zeropoint: %s\n filter: %s\n exp_time: %s\n comment: %s', $timestamp, $zp,$row[5],$row[6],$row[7]);
 #	new Date(Year, Month, Day, Hours, Minutes, Seconds, Milliseconds)
-       echo "[new Date($dat[0], $dat[1]-1, $dat[2], $tm[0], $tm[1]), $zp,'$tt_string1', $zp_low, $zp_high],";
+       echo "[new Date($dat[0], $dat[1]-1, $dat[2], $tm[0], $tm[1]), $zpt_off,'$col_string','$tt_string1', $zp_low, $zp_high],";
     }
 
@@ -2028,9 +2058,9 @@
    echo "               alignment: 'center',";
    echo "              },";
-   echo "     lineWidth: 2, ";
+   echo "     pointSize: 3, ";
    echo "     series: {";
-   echo "         0: { color: '#0000ff', lineWidth: 3 },      ";
+   echo "         0: { color: '#0000ff'},      ";
    echo "              },";
-   echo "     intervals: { 'style':'line' },  ";
+   echo "     intervals: { color: 'grey','style':'points', pointSize: 1 },  ";
    echo "     hAxis: {  ";
    echo "             title: 'Date/Time (HST)',";
@@ -2039,11 +2069,11 @@
    echo "     },";
    echo "     vAxis: {  ";
-   echo "                  title: 'Zeropoint (mag)',";
-   echo "     viewWindow: {   min: $zpt_med-0.2, max: $zpt_med+0.2    },  ";
+   echo "                  title: 'Zeropoint offset (mag)',";
+   echo "     viewWindow: {   min: -0.5, max: 0.5    },  ";
    echo "     },";
    echo "     chartArea: {left:80, top:50, right:20, bottom:50},";
    echo "     fontSize: 12,";
    echo "   };";
-   echo "   var chart = new google.visualization.LineChart(document.getElementById('dqzp_zoom_div'));";
+   echo "   var chart = new google.visualization.ScatterChart(document.getElementById('dqzp_zoom_div'));";
    echo "   chart.draw(data, options);";
    echo " }";
@@ -2060,5 +2090,4 @@
     echo "<center>loading plot in $total_time seconds<br></center>";
 }
-
 
 ###########################################################################
@@ -2968,3 +2997,2 @@
 
 ?>
-