Changeset 8199

Timestamp:

11/01/06 19:28:24 (18 years ago)

Author:

Daniela Dorner

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/datacenter/db

Files:

• include.php (modified) (6 diffs)
• magicdefs.php (modified) (3 diffs)

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

@@ -430 +430 @@
     $sigma = array
         (
-         5    => "#FF9900",
-         3    => "#FFFF66",
-         2    => "#33CC00",
-         1    => "#006600",
+         1    => "#33CC00",
+         2    => "#FFFF66",
+         3    => "#FF9900",
+         5    => "#FF0000",
         );
-    $offlimitcolour="#FF0000";
+    $okcolour="#006600";
 
 
@@ -484 +484 @@
         if ($form)
         {
-//            printf("<td>%s</td>",$row0["Sequ"]."ON");
-//            printf("<td>%s</td>",$row0["Sequ"]."Off");
             CheckBox2($row0["Sequ"], "ON","");
             CheckBox2($row0["Sequ"], "Off","");
@@ -496 +494 @@
                 printf("  <td align='right'>");
 
+            $colour='#000000';
             //determine color of text in cell
             if (!empty($limitsmean))
@@ -503 +502 @@
                     $mean=$key2 . "Mean";
                     $rms2=$key2 . "Rms";
-                    if ($key==$alias[$element2] && !empty($_GET[$mean]))
+                    if ($key==$alias[$element2] && !empty($_GET[$mean]) && !empty($_GET[$rms2]))
                     {
-                        if (!empty($_GET[$rms2]))
+                        $colour=$okcolour;
+                        foreach ($sigma as $margin => $newcolour)
                         {
-                            $colour=$offlimitcolour;
-                            foreach ($sigma as $margin => $newcolour)
-                            {
-                                $min=$_GET[$mean] - ($margin * $_GET[$rms2]);
-                                $max=$_GET[$mean] + ($margin * $_GET[$rms2]);
-                                if ($min < $element && $element < $max)
-                                    $colour=$newcolour;
-                            }
-                            printf("<font color='%s' style='font-weight:bold'>", $colour);
+                            $min=$_GET[$mean] - ($margin * $_GET[$rms2]);
+                            $max=$_GET[$mean] + ($margin * $_GET[$rms2]);
+                            if (!($min < $element && $element < $max))
+                                $colour=$newcolour;
                         }
                     }
@@ -528 +523 @@
                     if ($key==$alias[$element2] && !empty($_GET[$limit1]))
                     {
-                        $colour=$offlimitcolour;
-                        if ($_GET[$limit1] <= $element)
-                            $colour=$sigma[1];
-                        else
-                        {
-                            if (!empty($_GET[$limit2]))
-                            {
-                                if ($_GET[$limit2] <= $element)
-                                    $colour=$sigma[5];
-                            }
-                        }
-                        printf("<font color='%s' style='font-weight:bold'>", $colour);
+                        if ($colour=='#000000')
+                            $colour=$okcolour;
+
+                        if (!empty($_GET[$limit2]) && $_GET[$limit2] > $element)
+                                $colour=$sigma[5];
+
+                        if ($_GET[$limit1] > $element && $_GET[$limit2] <= $element)
+                            $colour=$sigma[3];
                     }
                 }
@@ -552 +543 @@
                     if ($key==$alias[$element2] && !empty($_GET[$limit1]))
                     {
-                        $colour=$offlimitcolour;
-                        if ($_GET[$limit1] >= $element)
-                            $colour=$sigma[1];
-                        else
-                        {
-                            if (!empty($_GET[$limit2]))
-                            {
-                                if ($_GET[$limit2] >= $element)
-                                    $colour=$sigma[5];
-                            }
-                        }
-                        printf("<font color='%s' style='font-weight:bold'>", $colour);
+                        if ($colour=='#000000')
+                            $colour=$okcolour;
+
+                        if (!empty($_GET[$limit2]) && $_GET[$limit2] < $element)
+                                $colour=$sigma[5];
+
+                        if ($_GET[$limit1] < $element && $_GET[$limit2] >= $element)
+                            $colour=$sigma[3];
                     }
                 }
             }
+            if ($colour!='#000000' && (!empty($limitsmean) || !empty($limitsmin) || !empty($limitsmax)))
+                printf("<font color='%s' style='font-weight:bold'>", $colour);
 
             //fill text in cell
             printf("&nbsp;%s&nbsp;</td>\n", str_replace("&ws;", " ", str_replace(" ", "&nbsp;", $element)));
+
+            if ($colour!='#000000' && (!empty($limitsmean) || !empty($limitsmin) || !empty($limitsmax)))
+                printf("</font>");
         }
         printf(" </tr>\n");

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

@@ -47 +47 @@
      "fPulsePosLimit"    => "fMeanPulsePosInner",
      "fRunTimeLimit"     => "fRunTime/60",
+     "fRelTimeMinLimit"  => "fEffOnTime/fRunTime",
     );
 
@@ -56 +57 @@
      "fIMCLimit"         => "fIsolatedMaxCluster",
      "fMaxHumLimit"      => "fMaxHumidity",
-     "fRelTimeLimit"     => "fEffOnTime/fRunTime",
+     "fRelTimeMaxLimit"  => "fEffOnTime/fRunTime",
     );
 
@@ -297 +298 @@
      "fZdMinLimit"                      => "ZdMin",
      "fZdMaxLimit"                      => "ZdMax",
-     "fRelTimeLimit"                    => "Rel.Ontime",
+     "fRelTimeMaxLimit"                 => "Rel.Ontime",
+     "fRelTimeMinLimit"                 => "Rel.Ontime",
      "fEMin"                            => "Emin",
      "fEMax"                            => "Emax",