IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 12025 for trunk/ippTools/src


Ignore:
Timestamp:
Feb 23, 2007, 4:26:06 PM (19 years ago)
Author:
jhoblitt
Message:

filename rename form pXtool -> [foo]tool

perl -pi -e 's/p0/reg/g' *.[ch]
perl -pi -e 's/p1/guide/g' *.[ch]
perl -pi -e 's/p2/chip/g' *.[ch]
perl -pi -e 's/p3/cam/g' *.[ch]
perl -pi -e 's/p4/warp/g' *.[ch]
perl -pi -e 's/p5/diff/g' *.[ch]
perl -pi -e 's/p6/stack/g' *.[ch]

Location:
trunk/ippTools/src
Files:
23 edited

Legend:

Unmodified
Added
Removed

  • trunk/ippTools/src/Makefile.am

    r11997 r12025  
    2222        dettool.h \
    2323        detselect.h \
    24         p0tool.h \
    25         p1tool.h \
    26         p2tool.h \
    27         p3tool.h \
    28         p4tool.h \
    29         p5tool.h \
    30         p6tool.h \
     24        regtool.h \
     25        guidetool.h \
     26        chiptool.h \
     27        camtool.h \
     28        warptool.h \
     29        difftool.h \
     30        stacktool.h \
    3131        pxadmin.h \
    3232        pxinject.h \
    … …  
    6060regtool_LDADD = $(PSLIB_LIBS) $(PSMODULES_LIBS) $(IPPDB_LIBS) libpxtools.la
    6161regtool_SOURCES = \
    62     p0tool.c \
    63     p0toolConfig.c
     62    regtool.c \
     63    regtoolConfig.c
    6464
    6565guidetool_CFLAGS = $(PSLIB_CFLAGS) $(PSMODULES_CFLAGS) $(IPPDB_CFLAGS)
    6666guidetool_LDADD = $(PSLIB_LIBS) $(PSMODULES_LIBS) $(IPPDB_LIBS) libpxtools.la
    6767guidetool_SOURCES = \
    68     p1tool.c \
    69     p1toolConfig.c
     68    guidetool.c \
     69    guidetoolConfig.c
    7070
    7171chiptool_CFLAGS = $(PSLIB_CFLAGS) $(PSMODULES_CFLAGS) $(IPPDB_CFLAGS)
    7272chiptool_LDADD = $(PSLIB_LIBS) $(PSMODULES_LIBS) $(IPPDB_LIBS) libpxtools.la
    7373chiptool_SOURCES = \
    74     p2tool.c \
    75     p2toolConfig.c
     74    chiptool.c \
     75    chiptoolConfig.c
    7676
    7777camtool_CFLAGS = $(PSLIB_CFLAGS) $(PSMODULES_CFLAGS) $(IPPDB_CFLAGS)
    7878camtool_LDADD = $(PSLIB_LIBS) $(PSMODULES_LIBS) $(IPPDB_LIBS) libpxtools.la
    7979camtool_SOURCES = \
    80     p3tool.c \
    81     p3toolConfig.c
     80    camtool.c \
     81    camtoolConfig.c
    8282
    8383warptool_CFLAGS = $(PSLIB_CFLAGS) $(PSMODULES_CFLAGS) $(IPPDB_CFLAGS)
    8484warptool_LDADD = $(PSLIB_LIBS) $(PSMODULES_LIBS) $(IPPDB_LIBS) libpxtools.la
    8585warptool_SOURCES = \
    86     p4tool.c \
    87     p4toolConfig.c
     86    warptool.c \
     87    warptoolConfig.c
    8888
    8989difftool_CFLAGS = $(PSLIB_CFLAGS) $(PSMODULES_CFLAGS) $(IPPDB_CFLAGS)
    9090difftool_LDADD = $(PSLIB_LIBS) $(PSMODULES_LIBS) $(IPPDB_LIBS) libpxtools.la
    9191difftool_SOURCES = \
    92     p5tool.c \
    93     p5toolConfig.c
     92    difftool.c \
     93    difftoolConfig.c
    9494
    9595stacktool_CFLAGS = $(PSLIB_CFLAGS) $(PSMODULES_CFLAGS) $(IPPDB_CFLAGS)
    9696stacktool_LDADD = $(PSLIB_LIBS) $(PSMODULES_LIBS) $(IPPDB_LIBS) libpxtools.la
    9797stacktool_SOURCES = \
    98     p6tool.c \
    99     p6toolConfig.c
     98    stacktool.c \
     99    stacktoolConfig.c
    100100
    101101pxadmin_CFLAGS = $(PSLIB_CFLAGS) $(PSMODULES_CFLAGS) $(IPPDB_CFLAGS)

  • trunk/ippTools/src/camtool.c

    r12024 r12025  
    11/*
    2  * p3tool.c
     2 * camtool.c
    33 *
    44 * Copyright (C) 2006  Joshua Hoblitt
    … …  
    2525
    2626#include "pxtools.h"
    27 #include "p3tool.h"
     27#include "camtool.h"
    2828
    2929static bool pendingexpMode(pxConfig *config);

  • trunk/ippTools/src/camtool.h

    r11997 r12025  
    11/*
    2  * p3tool.h
     2 * camtool.h
    33 *
    44 * Copyright (C) 2006  Joshua Hoblitt

  • trunk/ippTools/src/camtoolConfig.c

    r12024 r12025  
    11/*
    2  * p3toolConfig.c
     2 * camtoolConfig.c
    33 *
    44 * Copyright (C) 2006  Joshua Hoblitt
    … …  
    2626
    2727#include "pxtools.h"
    28 #include "p3tool.h"
     28#include "camtool.h"
    2929
    3030pxConfig *camtoolConfig(pxConfig *config, int argc, char **argv)

  • trunk/ippTools/src/chiptool.c

    r12024 r12025  
    2727
    2828#include "pxtools.h"
    29 #include "p2tool.h"
     29#include "chiptool.h"
    3030
    3131static bool queuerawexpMode(pxConfig *config);

  • trunk/ippTools/src/chiptool.h

    r11997 r12025  
    11/*
    2  * p2tool.h
     2 * chiptool.h
    33 *
    44 * Copyright (C) 2006  Joshua Hoblitt

  • trunk/ippTools/src/chiptoolConfig.c

    r11997 r12025  
    11/*
    2  * p2toolConfig.c
     2 * chiptoolConfig.c
    33 *
    44 * Copyright (C) 2006  Joshua Hoblitt
    … …  
    2525
    2626#include "pxtools.h"
    27 #include "p2tool.h"
     27#include "chiptool.h"
    2828
    2929pxConfig *chiptoolConfig(pxConfig *config, int argc, char **argv) {

  • trunk/ippTools/src/difftool.c

    r12024 r12025  
    11/*
    2  * p5tool.c
     2 * difftool.c
    33 *
    44 * Copyright (C) 2007  Joshua Hoblitt
    … …  
    2929
    3030#include "pxtools.h"
    31 #include "p5tool.h"
     31#include "difftool.h"
    3232
    3333static bool definerunMode(pxConfig *config);

  • trunk/ippTools/src/difftool.h

    r11997 r12025  
    11/*
    2  * p5tool.h
     2 * difftool.h
    33 *
    44 * Copyright (C) 2007  Joshua Hoblitt

  • trunk/ippTools/src/difftoolConfig.c

    r12024 r12025  
    11/*
    2  * p5toolConfig.c
     2 * difftoolConfig.c
    33 *
    44 * Copyright (C) 2007  Joshua Hoblitt
    … …  
    2525
    2626#include "pxtools.h"
    27 #include "p5tool.h"
     27#include "difftool.h"
    2828
    2929pxConfig *difftoolConfig(pxConfig *config, int argc, char **argv)

  • trunk/ippTools/src/guidetool.c

    r12024 r12025  
    11/*
    2  * p1tool.c
     2 * guidetool.c
    33 *
    44 * Copyright (C) 2006  Joshua Hoblitt
    … …  
    2525
    2626#include "pxtools.h"
    27 #include "p1tool.h"
     27#include "guidetool.h"
    2828
    2929static bool pendingMode(pxConfig *config);

  • trunk/ippTools/src/guidetool.h

    r11997 r12025  
    11/*
    2  * p1tool.h
     2 * guidetool.h
    33 *
    44 * Copyright (C) 2006  Joshua Hoblitt

  • trunk/ippTools/src/guidetoolConfig.c

    r12024 r12025  
    11/*
    2  * p1toolConfig.c
     2 * guidetoolConfig.c
    33 *
    44 * Copyright (C) 2006  Joshua Hoblitt

  • trunk/ippTools/src/pxinjectConfig.c

    r11854 r12025  
    175175        int n = 0;
    176176        bool status = false;
    177         if ((n = psMetadataLookupS32(&status, config->args, "-p1_version"))) {
    178             if (!psMetadataAddS32(config->where, PS_LIST_TAIL, "p1_version", 0, "==", n)) {
    179                 psError(PS_ERR_UNKNOWN, false, "failed to add item p1_version");
     177        if ((n = psMetadataLookupS32(&status, config->args, "-guide_version"))) {
     178            if (!psMetadataAddS32(config->where, PS_LIST_TAIL, "guide_version", 0, "==", n)) {
     179                psError(PS_ERR_UNKNOWN, false, "failed to add item guide_version");
    180180                psFree(config);
    181181                return NULL;

  • trunk/ippTools/src/regtool.c

    r12024 r12025  
    11/*
    2  * p0tool.c
     2 * regtool.c
    33 *
    44 * Copyright (C) 2006  Joshua Hoblitt
    … …  
    2525
    2626#include "pxtools.h"
    27 #include "p0tool.h"
     27#include "regtool.h"
    2828
    2929static bool pendingimfileMode(pxConfig *config);
    … …  
    3838
    3939
    40 // static p1PendingExpRow *newToP1PendingExp(newExpRow *newExp);
     40// static guidePendingExpRow *newToP1PendingExp(newExpRow *newExp);
    4141static chipPendingExpRow *newTochipPendingExp(pxConfig *config, newExpRow *newExp);
    4242static chipPendingImfileRow *rawImfileTochipPendingImfile(pxConfig *config, rawImfileRow *rawImfile);
    … …  
    168168
    169169    // negate simple so the default is true
    170     if (!ippdbPrintMetadatas(stdout, output, "p0PendingImfile", !simple)) {
     170    if (!ippdbPrintMetadatas(stdout, output, "regPendingImfile", !simple)) {
    171171        psError(PXTOOLS_ERR_PROG, false, "failed to print array");
    172172        psFree(output);
    … …  
    540540
    541541    // negate simple so the default is true
    542     if (!ippdbPrintMetadatas(stdout, output, "p0PendingExp", !simple)) {
     542    if (!ippdbPrintMetadatas(stdout, output, "regPendingExp", !simple)) {
    543543        psError(PXTOOLS_ERR_PROG, false, "failed to print array");
    544544        psFree(output);
    … …  
    894894
    895895# if 0
    896 static p1PendingExpRow *newToP1PendingExp(newExpRow *newExp)
    897 {
    898     return p1PendingExpRowAlloc(
     896static guidePendingExpRow *newToP1PendingExp(newExpRow *newExp)
     897{
     898    return guidePendingExpRowAlloc(
    899899        newExp->exp_tag,
    900900        newExp->camera,
    … …  
    931931        exp->exp_tag,
    932932        0x0,            // chip version XXX calc version number
    933         0xdeadbeef,     // p1 version
     933        0xdeadbeef,     // guide version
    934934        label,
    935935        "my recipe",
    … …  
    947947        rawImfile->exp_tag,
    948948        0x0,          // chip version XXX calc version number
    949         0xdeadbeef,   // p1 version
     949        0xdeadbeef,   // guide version
    950950        rawImfile->class_id,
    951951        "my recipe",

  • trunk/ippTools/src/regtool.h

    r11997 r12025  
    11/*
    2  * p0tool.h
     2 * regtool.h
    33 *
    44 * Copyright (C) 2006  Joshua Hoblitt

  • trunk/ippTools/src/regtoolConfig.c

    r11997 r12025  
    11/*
    2  * p0toolConfig.c
     2 * regtoolConfig.c
    33 *
    44 * Copyright (C) 2006  Joshua Hoblitt
    … …  
    2626
    2727#include "pxtools.h"
    28 #include "p0tool.h"
     28#include "regtool.h"
    2929
    3030pxConfig *regtoolConfig(pxConfig *config, int argc, char **argv)

  • trunk/ippTools/src/stacktool.c

    r12024 r12025  
    11/*
    2  * p6tool.c
     2 * stacktool.c
    33 *
    44 * Copyright (C) 2007  Joshua Hoblitt
    … …  
    2929
    3030#include "pxtools.h"
    31 #include "p6tool.h"
     31#include "stacktool.h"
    3232
    3333static bool definerunMode(pxConfig *config);

  • trunk/ippTools/src/stacktool.h

    r11997 r12025  
    11/*
    2  * p6tool.h
     2 * stacktool.h
    33 *
    44 * Copyright (C) 2007  Joshua Hoblitt

  • trunk/ippTools/src/stacktoolConfig.c

    r11997 r12025  
    11/*
    2  * p6toolConfig.c
     2 * stacktoolConfig.c
    33 *
    44 * Copyright (C) 2007  Joshua Hoblitt
    … …  
    2525
    2626#include "pxtools.h"
    27 #include "p6tool.h"
     27#include "stacktool.h"
    2828
    2929pxConfig *stacktoolConfig(pxConfig *config, int argc, char **argv) {
    … …  
    5656    psMetadataAddStr(definerunArgs, PS_LIST_TAIL, "-tess_id",  0,
    5757            "define tessellation ID (required)", NULL);
    58     psMetadataAddStr(definerunArgs, PS_LIST_TAIL, "-p4_id",
     58    psMetadataAddStr(definerunArgs, PS_LIST_TAIL, "-warp_id",
    5959             PS_META_DUPLICATE_OK,
    60              "include this p4 ID (multiple OK, required)", NULL);
     60             "include this warp ID (multiple OK, required)", NULL);
    6161
    6262    psMetadataAddBool(definerunArgs, PS_LIST_TAIL, "-simple",  0,
    … …  
    6565    // -updaterun
    6666    psMetadata *updaterunArgs = psMetadataAlloc();
    67     psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-p6_id", 0,
    68             "define p6 ID (required)", NULL);
     67    psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-stack_id", 0,
     68            "define stack ID (required)", NULL);
    6969    psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-state", 0,
    7070            "set state (required)", NULL);
    … …  
    7878    // -addinputskyfile
    7979    psMetadata *addinputskyfileArgs = psMetadataAlloc();
    80     psMetadataAddStr(addinputskyfileArgs, PS_LIST_TAIL, "-p6_id", 0,
    81             "define p6 ID (required)", NULL);
    82     psMetadataAddStr(addinputskyfileArgs, PS_LIST_TAIL, "-p4_id", 0,
    83             "define p4 ID (required)", NULL);
     80    psMetadataAddStr(addinputskyfileArgs, PS_LIST_TAIL, "-stack_id", 0,
     81            "define stack ID (required)", NULL);
     82    psMetadataAddStr(addinputskyfileArgs, PS_LIST_TAIL, "-warp_id", 0,
     83            "define warp ID (required)", NULL);
    8484
    8585    // -inputskyfile
    8686    psMetadata *inputskyfileArgs = psMetadataAlloc();
    87     psMetadataAddStr(inputskyfileArgs, PS_LIST_TAIL, "-p6_id", 0,
    88             "search by p6 ID (required)", NULL);
    89     psMetadataAddStr(inputskyfileArgs, PS_LIST_TAIL, "-p4_id", 0,
    90             "search by p4 ID (required)", NULL);
     87    psMetadataAddStr(inputskyfileArgs, PS_LIST_TAIL, "-stack_id", 0,
     88            "search by stack ID (required)", NULL);
     89    psMetadataAddStr(inputskyfileArgs, PS_LIST_TAIL, "-warp_id", 0,
     90            "search by warp ID (required)", NULL);
    9191    psMetadataAddU64(inputskyfileArgs, PS_LIST_TAIL, "-limit",  0,
    9292            "limit result set to N items", 0);
    … …  
    9696    // -tosum
    9797    psMetadata *tosumArgs = psMetadataAlloc();
    98     psMetadataAddStr(tosumArgs, PS_LIST_TAIL, "-p6_id", 0,
    99             "search by p6 ID (required)", NULL);
    100     psMetadataAddStr(tosumArgs, PS_LIST_TAIL, "-p4_id", 0,
    101             "search by p4 ID (required)", NULL);
     98    psMetadataAddStr(tosumArgs, PS_LIST_TAIL, "-stack_id", 0,
     99            "search by stack ID (required)", NULL);
     100    psMetadataAddStr(tosumArgs, PS_LIST_TAIL, "-warp_id", 0,
     101            "search by warp ID (required)", NULL);
    102102    psMetadataAddU64(tosumArgs, PS_LIST_TAIL, "-limit",  0,
    103103            "limit result set to N items", 0);
    … …  
    107107    // -addsumskyfile
    108108    psMetadata *addsumskyfileArgs = psMetadataAlloc();
    109     psMetadataAddStr(addsumskyfileArgs, PS_LIST_TAIL, "-p6_id", 0,
    110             "define p4 ID (required)", NULL);
     109    psMetadataAddStr(addsumskyfileArgs, PS_LIST_TAIL, "-stack_id", 0,
     110            "define warp ID (required)", NULL);
    111111    psMetadataAddStr(addsumskyfileArgs, PS_LIST_TAIL, "-uri", 0,
    112112            "define URI of file (required)", 0);
    … …  
    118118    // -sumskyfile
    119119    psMetadata *sumskyfileArgs= psMetadataAlloc();
    120     psMetadataAddStr(sumskyfileArgs, PS_LIST_TAIL, "-p6_id", 0,
    121             "search by p6 ID (required)", NULL);
    122     psMetadataAddStr(sumskyfileArgs, PS_LIST_TAIL, "-p4_id", 0,
    123             "search by p4 ID (required)", NULL);
     120    psMetadataAddStr(sumskyfileArgs, PS_LIST_TAIL, "-stack_id", 0,
     121            "search by stack ID (required)", NULL);
     122    psMetadataAddStr(sumskyfileArgs, PS_LIST_TAIL, "-warp_id", 0,
     123            "search by warp ID (required)", NULL);
    124124    psMetadataAddU64(sumskyfileArgs, PS_LIST_TAIL, "-limit",  0,
    125125            "limit result set to N items", 0);
    … …  
    225225    psString str = NULL;
    226226    bool status = false;
    227     if ((str = psMetadataLookupStr(&status, config->args, "-p4_id"))) {
    228         if (!psMetadataAddS32(config->where, PS_LIST_TAIL, "p4_id", 0, "==", (psS32)atoi(str))) {
    229             psError(PS_ERR_UNKNOWN, false, "failed to add item p4_id");
     227    if ((str = psMetadataLookupStr(&status, config->args, "-warp_id"))) {
     228        if (!psMetadataAddS32(config->where, PS_LIST_TAIL, "warp_id", 0, "==", (psS32)atoi(str))) {
     229            psError(PS_ERR_UNKNOWN, false, "failed to add item warp_id");
    230230            psFree(config);
    231231            return NULL;

  • trunk/ippTools/src/warptool.c

    r12024 r12025  
    11/*
    2  * p4tool.c
     2 * warptool.c
    33 *
    44 * Copyright (C) 2006  Joshua Hoblitt
    … …  
    2929
    3030#include "pxtools.h"
    31 #include "p4tool.h"
     31#include "warptool.h"
    3232
    3333static bool definerunMode(pxConfig *config);

  • trunk/ippTools/src/warptool.h

    r11997 r12025  
    11/*
    2  * p4tool.h
     2 * warptool.h
    33 *
    44 * Copyright (C) 2006  Joshua Hoblitt

  • trunk/ippTools/src/warptoolConfig.c

    r12024 r12025  
    11/*
    2  * p4toolConfig.c
     2 * warptoolConfig.c
    33 *
    44 * Copyright (C) 2006  Joshua Hoblitt
    … …  
    2525
    2626#include "pxtools.h"
    27 #include "p4tool.h"
     27#include "warptool.h"
    2828
    2929pxConfig *warptoolConfig(pxConfig *config, int argc, char **argv) {
Note: See TracChangeset for help on using the changeset viewer.