Changeset 6261 for trunk/ippTools/src/pxtools.h

Timestamp:

Jan 30, 2006, 6:08:56 PM (20 years ago)

Author:

jhoblitt

Message:

merge p0/2 types -> pxMode/pxConfig
add initial p0 support: p0search, p0 tables, p0 funcs

File:

• trunk/ippTools/src/pxtools.h (modified) (2 diffs)

trunk/ippTools/src/pxtools.h

@@ -16 +16 @@
 
 typedef enum {
-    P0_MODE_NONE,                               
-    P0_MODE_PENDING,                            // grab from new
-    P0_MODE_UPDATE,                         // grab from new, create raw
-} p0mode;
+    PX_MODE_NONE,                       // grab from raw, output for ppImage
+    PX_MODE_QUICK,                      // grab from raw, output for ppImage
+    PX_MODE_UPDATE,                     // grab from new, create raw
+    PX_MODE_DEFINE,                     // grab from raw, create pending
+    PX_MODE_PENDING,                    // grab from pending, output for ppImage
+    PX_MODE_DONE,                       // set the current state
+    PX_MODE_CREATE,                     // set the current state
+    PX_MODE_DELETE,                     // set the current state
+    PX_MODE_RECREATE,                   // set the current state
+} pxMode;
 
 typedef struct {
-    p0mode mode;
-    psTime *start;
-    psTime *stop;
-    psMetadata *camera;
-    psDB *database;
-    psMetadata *site;
-    psMetadata *recipe;
-    psMetadata *arguments;
-    char *camera_name;
-    char *filter;
-    char *exp_id;
-    char *class;
-    char *class_id;
-    char *url;
-    psMetadata *where;
-} p0Config;
-
-typedef enum {
-    P2_MODE_NONE,                       // grab from raw, output for ppImage
-    P2_MODE_QUICK,                      // grab from raw, output for ppImage
-    P2_MODE_DEFINE,                     // grab from raw, create pending
-    P2_MODE_PENDING,                    // grab from pending, output for ppImage
-//    P2_MODE_UPDATE,                   // set the current state
-    P2_MODE_DONE,                       // set the current state
-    P2_MODE_CREATE,                     // set the current state
-    P2_MODE_DELETE,                     // set the current state
-    P2_MODE_RECREATE,           // set the current state
-} p2mode;
-
-typedef struct {
-    p2mode mode;
+    pxMode mode;
     psTime *start;
     psTime *stop;
@@ -133 +109 @@
 bool p2PendingFramePrint(FILE *stream, pxConfig *config, psArray *frames);
 psArray *p2PendingFrameSearch(pxConfig *config);
+
+bool newFramePrint(FILE *stream, pxConfig *config, psArray *frames);
+psArray *newFrameSearch(pxConfig *config);
+
+bool p0searchConfig(pxConfig *config, int argc, char **argv);