Changeset 24218

Timestamp:

May 18, 2009, 7:19:28 PM (17 years ago)

Author:

eugene

Message:

add links to jpegs, add detRegisteredImfile.d

Location:

trunk/ippMonitor

Files:

• Makefile.in (modified) (1 diff)
• def/detNormalizedImfile.d (modified) (1 diff)
• def/detRegisteredImfile.d (added)
• def/detResidImfile.d (modified) (1 diff)
• def/detRun.d (modified) (1 diff)
• def/detStackedImfile.d (modified) (2 diffs)

trunk/ippMonitor/Makefile.in

@@ -61 +61 @@
 $(DESTWWW)/detNormalizedImfile.php \
 $(DESTWWW)/detNormalizedStatImfile.php \
+$(DESTWWW)/detRegisteredImfile.php \
 $(DESTWWW)/detProcessedImfile.php \
 $(DESTWWW)/detProcessedExp.php \

trunk/ippMonitor/def/detNormalizedImfile.d

@@ -1 @@
-TABLE detNormalizedImfile
+TABLE detNormalizedImfile, detRun
 TITLE detNormalizedImfile
 FILE  detNormalizedImfile.php
 MENU  ipp.imfiles.dat
 
-#     field         size  format  name     show   link to     extras
-FIELD det_id,          7, %s,     det_id
-FIELD class_id,        8, %s,     class_id
-FIELD bg,              8, %s,     backgnd
-FIELD bg_stdev,        8, %s,     stdev
-FIELD bg_mean_stdev,   8, %s,     [stdev]
-FIELD iteration,       5, %s,     iteration
-#FIELD uri,           20, %s,     uri
-#FIELD path_base,     20, %s,     path_base
+WHERE detNormalizedImfile.det_id = detRun.det_id
 
-TAIL PHP insert_image ('PPIMAGE.JPEG1');
-TAIL PHP insert_log ('LOG.EXP');
+ARGS  ARG1 detNormalizedImfile.det_id=$detNormalizedImfile.det_id
+ARGS  ARG1 detNormalizedImfile.iteration=$detNormalizedImfile.iteration
+ARGS  ARG1 detNormalizedImfile.class_id=$detNormalizedImfile.class_id
+ARGS  ARG1 camera=$detRun.camera
+ARGS  ARG1 basename=$detNormalizedImfile.path_base
+ARGS  ARG1 class=$detNormalizedImfile.class_id
+
+#     field                             size  format  name      show   link to                  extras
+FIELD detNormalizedImfile.det_id,          7, %s,     det_id
+FIELD detNormalizedImfile.iteration,       5, %s,     iter
+FIELD detNormalizedImfile.class_id,        8, %s,     class_id, value, detNormalizedImfile.php, ARG1
+FIELD detNormalizedImfile.fault,           5, %d,     fault
+FIELD detNormalizedImfile.bg,              8, %f,     backgnd
+FIELD detNormalizedImfile.bg_stdev,        8, %f,     stdev
+FIELD detNormalizedImfile.bg_mean_stdev,   8, %f,     [stdev]
+FIELD detNormalizedImfile.path_base,      10, %s,     path_base
+FIELD detRun.camera,                      10, %s,     camera, none
+
+TAIL PHP insert_log ('LOG.IMFILE');

trunk/ippMonitor/def/detResidImfile.d

@@ -20 +20 @@
 FIELD detResidImfile.fault,         5, %s,      fault
 FIELD detResidImfile.path_base,     5, %s,      path_base
-FIELD detResidImfile.uri,           5, %s,      uri
+FIELD detResidImfile.uri,           5, %s,      uri, none
 
 TAIL PHP insert_image ('PPIMAGE.JPEG1');

trunk/ippMonitor/def/detRun.d

@@ -14 +14 @@
 ARGS  ARG4 detResidExp.iteration=$iteration
 
-ARGS  ARG5 det_id=$det_id
+ARGS  ARG5 detStackedImfile.det_id=$det_id
+ARGS  ARG6 detNormalizedImfile.det_id=$det_id
+ARGS  ARG7 detRegisteredImfile.det_id=$det_id
 
-#     field       size  format  name            show         link to                extras
-FIELD det_id,        5, %s,     det ID,       value,       detRunSummary.php,     ARG1
+#     field       size  format  name         show       link to                   extras
+FIELD det_id,        5, %s,     det ID,      value,     detRunSummary.php,        ARG1
 FIELD iteration,     3, %s,     iter
 FIELD det_type,     12, %s,     type
 FIELD state,         5, %s,     state
-FIELD *,             5, %s,     choose,       value=input, detInputExp.php,       ARG2
-FIELD *,             5, %s,     choose,       value=proc,  detProcessedExp.php,   ARG3
-FIELD *,             5, %s,     choose,       value=stack, detStackedImfile.php,  ARG5
-FIELD *,             5, %s,     choose,       value=resid, detResidExp.php,       ARG4
+FIELD *,             5, %s,     IN,          value=IN,   detInputExp.php,          ARG2
+FIELD *,             5, %s,     P,           value=P,   detProcessedExp.php,      ARG3
+FIELD *,             5, %s,     D,           value=D,   detResidExp.php,          ARG4
+FIELD *,             5, %s,     S,           value=S,   detStackedImfile.php,     ARG5
+FIELD *,             5, %s,     N,           value=N,   detNormalizedImfile.php,  ARG6
+FIELD *,             5, %s,     R,           value=R,   detRegisteredImfile.php,  ARG7
 FIELD mode,          5, %s,     mode
-FIELD filter,       10, %s,     filter     
+FIELD filter,        5, %s,     filter     
 FIELD registered,   19, %s,     registered 
 FIELD use_begin,    19, %s,     use_begin  

trunk/ippMonitor/def/detStackedImfile.d

@@ -7 +7 @@
 
 # XXX change uri to path_base in db
-ARGS  ARG1 detStackedImfile.det_id=$det_id
-ARGS  ARG1 detStackedImfile.iteration=$iteration
+ARGS  ARG1 detStackedImfile.det_id=$detStackedImfile.det_id
+ARGS  ARG1 detStackedImfile.iteration=$detStackedImfile.iteration
+ARGS  ARG1 detStackedImfile.class_id=$detStackedImfile.class_id
 ARGS  ARG1 camera=$detRun.camera
 ARGS  ARG1 basename=$detStackedImfile.uri
+ARGS  ARG1 class=$detStackedImfile.class_id
 
-#     field         size  format  name      show  link to     extras
+#     field                         size  format  name        show  link to     extras
 FIELD detStackedImfile.det_id,         7,  %s,    det_id
-FIELD detStackedImfile.iteration,      5,  %s,    iteration
+FIELD detStackedImfile.iteration,      5,  %s,    iter
 FIELD detStackedImfile.class_id,       8,  %s,    class_id,   value, detStackedImfile.php, ARG1
 FIELD detStackedImfile.fault,          5,  %d,    fault
@@ -20 +22 @@
 FIELD detStackedImfile.bg_stdev,       8,  %f,    stdev
 FIELD detStackedImfile.bg_mean_stdev,  8,  %f,    [stdev]
-FIELD detStackedImfile.uri,           20,  %s,    uri
-# FIELD recipe, 20,   recipe
+FIELD detStackedImfile.uri,           10,  %s,    uri
+FIELD detRun.camera,                  10, %s,     camera, none
 
 TD_CLASS list_off $fault > 0
 
-TAIL PHP insert_log ('LOG.EXP');
+TAIL PHP insert_log ('LOG.IMFILE');