Browse Source

optical updates

Thomas Thuemmler 1 week ago
parent
commit
131a44eed2
2 changed files with 20 additions and 18 deletions
  1. 6 4
      SDS_status_functions.php
  2. 14 14
      SDS_status_main.php

+ 6 - 4
SDS_status_functions.php

@@ -57,15 +57,17 @@
         echo '</b></font></a></div>';
     }
 
-    function placeBox($posY, $posX, $text, $width, $size, $color) {
-        echo '<div align="center" style="background-color:' . $color . '; border-style:solid; border-width:2px; border-color:#000000; width:' . $width . 'px; position:absolute; top:' . $posY . 'px; left:' . $posX . 'px">';
+    function placeBox($posY, $posX, $text, $width, $size, $color, $borderwidth = 2) {
+
+        echo '<div align="center" style="background-color:' . $color . '; border-style:solid; border-width:' . $borderwidth . 'px; border-color:#000000; width:'$
         echo '<font size="' . $size . '" color=#000000><b>';
         echo $text;
         echo '</b></font></div>';
     }
 
-    function placeBoxRight($posY, $posX, $text, $width, $size, $color) {
-        echo '<div align="right" style="background-color:' . $color . '; border-style:solid; border-width:2px; border-color:#000000; width:' . $width . 'px; position:absolute; top:' . $posY . 'px; left:' . $posX . 'px">';
+    function placeBoxRight($posY, $posX, $text, $width, $size, $color, $borderwidth = 2) {
+ 
+        echo '<div align="right" style="background-color:' . $color . '; border-style:solid; border-width:' . $borderwidth . 'px; border-color:#000000; width:' $
         echo '<font size="' . $size . '" color=#000000><b>';
         echo $text;
         echo '</b></font></div>';

+ 14 - 14
SDS_status_main.php

@@ -668,10 +668,10 @@ if (($MSmode == 5) or ($MSmode == 4))
 	      if ($REU0201[2]['ppmdev'] > 5e-6) $color3 = "#FFA0A0";
 	      if ($REU0201[3]['ppmdev'] > 5e-6) $color4 = "#FFA0A0";
 	      
-	      placeBox($Yoffset+60, $Xoffset+115, "10s", 35, 1, $color1);
-	      placeBox($Yoffset+60, $Xoffset+80, "20s", 35, 1, $color2);
-	      placeBox($Yoffset+60, $Xoffset+45, "1m", 35, 1, $color3);
-	      placeBox($Yoffset+60, $Xoffset+10, "5m", 35, 1, $color4);
+	      placeBox($Yoffset+60, $Xoffset+115, "10s", 35, 1, $color1,0);
+	      placeBox($Yoffset+60, $Xoffset+80, "20s", 35, 1, $color2,0);
+	      placeBox($Yoffset+60, $Xoffset+45, "1m", 35, 1, $color3,0);
+	      placeBox($Yoffset+60, $Xoffset+10, "5m", 35, 1, $color4,0);
 	      
 	      echo '<h4 style="font-family: inherit; font-weight: plain; font-style: normal;">HV status timestamp 0201: ' . $extraction_time_HV . '</h4>';
 	    }
@@ -734,10 +734,10 @@ if (($MSmode == 5) or ($MSmode == 4))
 	      if ($REU0301[2]['ppmdev'] > 5e-6) $color3 = "#FFA0A0";
 	      if ($REU0301[3]['ppmdev'] > 5e-6) $color4 = "#FFA0A0";
 	      
-	      placeBox($Yoffset+60, $Xoffset+115, "10s", 35, 1, $color1);
-	      placeBox($Yoffset+60, $Xoffset+80, "20s", 35, 1, $color2);
-	      placeBox($Yoffset+60, $Xoffset+45, "1m", 35, 1, $color3);
-	      placeBox($Yoffset+60, $Xoffset+10, "5m", 35, 1, $color4);
+	      placeBox($Yoffset+60, $Xoffset+115, "10s", 35, 1, $color1,0);
+	      placeBox($Yoffset+60, $Xoffset+80, "20s", 35, 1, $color2,0);
+	      placeBox($Yoffset+60, $Xoffset+45, "1m", 35, 1, $color3,0);
+	      placeBox($Yoffset+60, $Xoffset+10, "5m", 35, 1, $color4,0);
 	      
 	      echo '<h4 style="font-family: inherit; font-weight: plain; font-style: normal;">HV status timestamp 0301: ' . $extraction_time_HV . '</h4>';
 	    }
@@ -1362,14 +1362,14 @@ if ($PSmode == 5)
         // mean of 4023, 4033, 4043
         $link = $adeiChannel[29][0] . "," . $adeiChannel[29][1] . "," . $adeiChannel[29][2];
         $value = ($adeiValue[29][0] + $adeiValue[29][1] + $adeiValue[29][2])/3.0;
-        $color = "#CCCCCC";
+        $color = "#B1B1B1";
         if ($value < 800)
             {
-                $draw_x = 153;
-                $draw_y = 344;
-                placeBoxRight($draw_y, $draw_x,sprintf('%.1F &#176;C', $value), 65, 2, $color);
-                placePicWithLink($draw_y+2, $draw_x+5, "newTemperature.png", 15, "Average temperature of pre spectrometer vessel sensors 4023..33..43.", $link);
-            }
+                $draw_x = 159;
+                $draw_y = 350;
+                placeBoxRight($draw_y, $draw_x,sprintf('%.1F &#176;C', $value), 55, 1, $color,0);
+                placePicWithLink($draw_y, $draw_x+7, "newTemperature.png", 10, "Average temperature of pre spectrometer vessel sensors 4023..33..43.", $link);
+	    }
     }
 
 if ($PSmode != 5)