Changeset 28718 for trunk/ippMonitor/raw/warpProcessedExp_Images.php

Timestamp:

Jul 27, 2010, 11:53:25 AM (16 years ago)

Author:

Serge CHASTEL

Message:

Change for 3x2 table display

File:

• trunk/ippMonitor/raw/warpProcessedExp_Images.php (modified) (5 diffs)

trunk/ippMonitor/raw/warpProcessedExp_Images.php

@@ -319 +319 @@
     $warpIdCollection[$warpId] = array();
     $skyCellValue = preg_replace("|skycell[.]|","",$row[23]);
-    $warpIdCollection[$warpId]["11"] = $skyCellValue;
+    $warpIdCollection[$warpId]["12"] = $skyCellValue;
 /*     echo "<tr><td>Skycell is [$skyCellValue]</td></tr>"; */
 
@@ -344 +344 @@
     echo "<td class=\"$class\">\n";
     echo "<table border=\"1\"><tr>\n";
-    echo "  <td class=\"ul2x2\" id=\"$warpId.00\">$noImageValue</td>\n";
-    echo "  <td class=\"ur2x2\" id=\"$warpId.01\">$noImageValue</td>\n";
+/*     echo "  <td class=\"ul3x2\" id=\"$warpId.00\">$noImageValue</td>\n"; */
+    echo "  <td class=\"ul3x2\" id=\"$warpId.00\"></td>\n";
+    echo "  <td class=\"uc3x2\" id=\"$warpId.01\">$noImageValue</td>\n";
+    echo "  <td class=\"ur3x2\" id=\"$warpId.02\">$noImageValue</td>\n";
     echo "</tr><tr>\n";
-    echo "  <td class=\"ll2x2\" id=\"$warpId.10\">$noImageValue</td>\n";
-    echo "  <td class=\"lr2x2\" id=\"$warpId.11\">$noImageValue</td></tr></table>\n";
+/*     echo "  <td class=\"ll3x2\" id=\"$warpId.10\">$noImageValue</td>\n"; */
+    echo "  <td class=\"ll3x2\" id=\"$warpId.10\"></td>\n";
+    echo "  <td class=\"lc3x2\" id=\"$warpId.11\">$noImageValue</td>\n";
+    echo "  <td class=\"lr3x2\" id=\"$warpId.12\">$noImageValue</td>\n";
+    echo "</tr></table>\n";
     echo "</td>\n";
     $link = "getimage.php" . "?menu=ipp.science.dat&" . $ID['link'];
@@ -359 +364 @@
     echo "<td class=\"$class\">\n";
     echo "<table border=\"1\"><tr>\n";
-    echo "  <td class=\"ul2x2\" id=\"t$warpId.00\">No image</td>\n";
-    echo "  <td class=\"ur2x2\" id=\"t$warpId.01\">No image</td>\n";
+/*     echo "  <td class=\"ul3x2\" id=\"t$warpId.00\">No image</td>\n"; */
+    echo "  <td class=\"ul3x2\" id=\"t$warpId.00\"></td>\n";
+    echo "  <td class=\"uc3x2\" id=\"t$warpId.01\">No image</td>\n";
+    echo "  <td class=\"ur3x2\" id=\"t$warpId.02\">No image</td>\n";
     echo "</tr><tr>\n";
-    echo "  <td class=\"ll2x2\" id=\"t$warpId.10\">No image</td>\n";
-    echo "  <td class=\"lr2x2\" id=\"t$warpId.11\">No image</td></tr></table>\n";
+/*     echo "  <td class=\"ll3x2\" id=\"t$warpId.10\">No image</td>\n"; */
+    echo "  <td class=\"ll3x2\" id=\"t$warpId.10\"></td>\n";
+    echo "  <td class=\"lc3x2\" id=\"t$warpId.11\">No image</td>\n";
+    echo "  <td class=\"lr3x2\" id=\"t$warpId.12\">No image</td>\n";
+    echo "</tr></table>\n";
     echo "</td>\n";
 
     $cellContent = "<a href=\\\"$link\\\"> <img src=\\\"getimage.php?name=$row[22].$row[23]&rule=PPSKYCELL.JPEG2&camera=$row[11]&class_id=NONE\\\"> </a>";
-    echo "<script type=\"text/javascript\">changeCell(\"$warpId.11\", \"$cellContent\");</script>";
+    echo "<script type=\"text/javascript\">changeCell(\"$warpId.12\", \"$cellContent\");</script>";
     $imageNameValue = ($row[23]=="noimage" ?
                        "No image" : $row[23]);
-    echo "<script type=\"text/javascript\">changeCell(\"t$warpId.11\", \"$imageNameValue\");</script>";
+    echo "<script type=\"text/javascript\">changeCell(\"t$warpId.12\", \"$imageNameValue\");</script>";
 
     //resume with "regular" columns
@@ -394 +404 @@
     // Update table cell content
 /*     echo "<tr><td>$warpId in warpIdCollection</td></tr>"; */
-    $lrValue =  $warpIdCollection[$warpId]["11"];
+    $lrValue =  $warpIdCollection[$warpId]["12"];
     $skyCellValue = preg_replace("|skycell[.]|","",$row[23]);
 /*     echo "<tr><td>Current skycell is [$skyCellValue] / LowerRight is [$lrValue]</td></tr>"; */
@@ -406 +416 @@
 
     if ($skyCellValue == $lrValue + 1) {
-/*       echo "<tr><td>Update LowerLeft</td></tr>"; */
-      $warpIdCollection[$warpId]["10"] = $skyCellValue;
-      echo "<script type=\"text/javascript\">changeCell(\"$warpId.10\", \"$cellContent\");</script>";
-      echo "<script type=\"text/javascript\">changeCell(\"t$warpId.10\", \"$row[23]\");</script>";
+      $warpIdCollection[$warpId]["11"] = $skyCellValue;
+      echo "<script type=\"text/javascript\">changeCell(\"$warpId.11\", \"$cellContent\");</script>";
+      echo "<script type=\"text/javascript\">changeCell(\"t$warpId.11\", \"$row[23]\");</script>";
     } else {
-      if (!isSet($warpIdCollection[$warpId]["01"])) {
-/*      echo "<tr><td>Update UpperRight</td></tr>"; */
-        $warpIdCollection[$warpId]["01"] = $skyCellValue;
-        echo "<script type=\"text/javascript\">changeCell(\"$warpId.01\", \"$cellContent\");</script>";
-        echo "<script type=\"text/javascript\">changeCell(\"t$warpId.01\", \"$row[23]\");</script>";
+      if ($skyCellValue == $lrValue + 2) {
+        $warpIdCollection[$warpId]["10"] = $skyCellValue;
+        echo "<script type=\"text/javascript\">changeCell(\"$warpId.10\", \"$cellContent\");</script>";
+        echo "<script type=\"text/javascript\">changeCell(\"t$warpId.10\", \"$row[23]\");</script>";
       } else {
-        $urValue = $warpIdCollection[$warpId]["01"];
-        $warpIdCollection[$warpId]["00"] = $skyCellValue;
-        if ($urValue + 1 != $skyCellValue) {
-          $expected = $urValue + 1;
-          $actual = $skyCellValue;
-          echo "<script type=\"text/javascript\">changeCell(\"$warpId.00\", \"Problem in UpperLeft corner: expected $expected but was $actual\");</script>";
-          echo "<tr><td>Problem in UpperLeft!</td></tr>";
+        if (!isSet($warpIdCollection[$warpId]["02"])) {
+          /*    echo "<tr><td>Update UpperRight</td></tr>"; */
+          $warpIdCollection[$warpId]["02"] = $skyCellValue;
+          echo "<script type=\"text/javascript\">changeCell(\"$warpId.02\", \"$cellContent\");</script>";
+          echo "<script type=\"text/javascript\">changeCell(\"t$warpId.02\", \"$row[23]\");</script>";
         } else {
-/*        echo "<tr><td>Update UpperLeft</td></tr>"; */
-          echo "<script type=\"text/javascript\">changeCell(\"$warpId.00\", \"$cellContent\");</script>";
-          echo "<script type=\"text/javascript\">changeCell(\"t$warpId.00\", \"$row[23]\");</script>";
+          $urValue = $warpIdCollection[$warpId]["02"];
+          if ($urValue + 1 == $skyCellValue) {
+            echo "<script type=\"text/javascript\">changeCell(\"$warpId.01\", \"$cellContent\");</script>";
+            echo "<script type=\"text/javascript\">changeCell(\"t$warpId.01\", \"$row[23]\");</script>";
+          } else {
+            if ($urValue + 2 == $skyCellValue) {
+              echo "<script type=\"text/javascript\">changeCell(\"$warpId.00\", \"$cellContent\");</script>";
+              echo "<script type=\"text/javascript\">changeCell(\"t$warpId.00\", \"$row[23]\");</script>";
+            } else {
+              $expected = $urValue + 1;
+              $actual = $skyCellValue;
+              echo "<script type=\"text/javascript\">changeCell(\"$warpId.00\", \"Problem in UpperLeft corner: expected $expected but was $actual\");</script>";
+              echo "<tr><td>Problem in Upper part!</td></tr>";
+            }
+          } 
         }
       }
     }
   }
-
-
 }