IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 25644


Ignore:
Timestamp:
Sep 28, 2009, 5:53:19 PM (17 years ago)
Author:
eugene
Message:

only display on request; use pmVisualAskUser

File:
1 edited

Legend:

Unmodified
Added
Removed

  • branches/eam_branches/20090715/psphot/src/psphotVisual.c

    r25620 r25644  
    175175    psphotVisualScaleImage (kapa, readout->image, "image", 0);
    176176
    177     // pause and wait for user input:
    178     // continue, save (provide name), ??
    179     char key[10];
    180     fprintf (stdout, "[c]ontinue? ");
    181     if (!fgets(key, 8, stdin)) {
    182         psWarning("Unable to read option");
    183     }
     177    pmVisualAskUser(NULL);
    184178    return true;
    185179}
    … …  
    206200    psphotVisualScaleImage (kapa, readout->image, "backsub", 0);
    207201
    208     // pause and wait for user input:
    209     // continue, save (provide name), ??
    210     char key[10];
    211     fprintf (stdout, "[c]ontinue? ");
    212     if (!fgets(key, 8, stdin)) {
    213         psWarning("Unable to read option");
    214     }
     202    pmVisualAskUser(NULL);
    215203    return true;
    216204}
    … …  
    223211    if (kapa == -1) return false;
    224212
    225     // XXX test: image->data.F32[10][10] = 10000;
    226213    psphotVisualRangeImage (kapa, image, "signif", 2, -1.0, 25.0*25.0);
    227214
    228     // pause and wait for user input:
    229     // continue, save (provide name), ??
    230     char key[10];
    231     fprintf (stdout, "[c]ontinue? ");
    232     if (!fgets(key, 8, stdin)) {
    233         psWarning("Unable to read option");
    234     }
     215    pmVisualAskUser(NULL);
    235216    return true;
    236217}
    … …  
    302283    FREE (overlay);
    303284
    304     // pause and wait for user input:
    305     // continue, save (provide name), ??
    306     char key[10];
    307     fprintf (stdout, "[c]ontinue? ");
    308     if (!fgets(key, 8, stdin)) {
    309         psWarning("Unable to read option");
    310     }
     285    pmVisualAskUser(NULL);
    311286    return true;
    312287}
    … …  
    415390    FREE (overlay);
    416391
    417     // pause and wait for user input:
    418     // continue, save (provide name), ??
    419     char key[10];
    420     fprintf (stdout, "[c]ontinue? ");
    421     if (!fgets(key, 8, stdin)) {
    422         psWarning("Unable to read option");
    423     }
     392    pmVisualAskUser(NULL);
    424393    return true;
    425394}
    … …  
    475444    FREE (overlay);
    476445
    477     // pause and wait for user input:
    478     // continue, save (provide name), ??
    479     char key[10];
    480     fprintf (stdout, "[c]ontinue? ");
    481     if (!fgets(key, 8, stdin)) {
    482         psWarning("Unable to read option");
    483     }
    484 
     446    pmVisualAskUser(NULL);
    485447    return true;
    486448}
    … …  
    735697    psFree (mFaint);
    736698
    737     // pause and wait for user input:
    738     // continue, save (provide name), ??
    739     char key[10];
    740     fprintf (stdout, "[c]ontinue? ");
    741     if (!fgets(key, 8, stdin)) {
    742         psWarning("Unable to read option");
    743     }
     699    pmVisualAskUser(NULL);
    744700    return true;
    745701}
    … …  
    808764    psphotVisualShowRoughClass_Single (myKapa, sources, PM_SOURCE_TYPE_STAR, PM_SOURCE_MODE_SATSTAR, "green");
    809765
    810     // pause and wait for user input:
    811     // continue, save (provide name), ??
    812     char key[10];
    813766    fprintf (stdout, "red: STAR or SAT AREA; blue: EXTENDED or DEFECT; green: SATSTAR; yellow: PSFSTAR\n");
    814     fprintf (stdout, "[c]ontinue? ");
    815     if (!fgets(key, 8, stdin)) {
    816         psWarning("Unable to read option");
    817     }
     767    pmVisualAskUser(NULL);
    818768    return true;
    819769}
    … …  
    879829    psFree (modelRef);
    880830
    881     // pause and wait for user input:
    882     // continue, save (provide name), ??
    883     char key[10];
    884     fprintf (stdout, "[c]ontinue? ");
    885     if (!fgets(key, 8, stdin)) {
    886         psWarning("Unable to read option");
    887     }
     831    pmVisualAskUser(NULL);
    888832    return true;
    889833}
    … …  
    1029973    psphotVisualRangeImage (myKapa, outsub, "psfsub", 1, -0.05, 0.95);
    1030974
    1031     // pause and wait for user input:
    1032     // continue, save (provide name), ??
    1033     char key[10];
    1034     fprintf (stdout, "[c]ontinue? ");
    1035     if (!fgets(key, 8, stdin)) {
    1036         psWarning("Unable to read option");
    1037     }
    1038 
     975    pmVisualAskUser(NULL);
    1039976    psFree (outpos);
    1040977    psFree (outsub);
    … …  
    11721109    psphotVisualScaleImage (myKapa, outsat, "satstar", 2);
    11731110
    1174     // pause and wait for user input:
    1175     // continue, save (provide name), ??
    1176     char key[10];
    1177     fprintf (stdout, "[c]ontinue? ");
    1178     if (!fgets(key, 8, stdin)) {
    1179         psWarning("Unable to read option");
    1180     }
    1181 
     1111    pmVisualAskUser(NULL);
    11821112    psFree (outsat);
    11831113    return true;
    … …  
    13671297    psEllipseAxes axes;
    13681298
     1299    // XXX skip this for now: it is not very clear
     1300    return true;
     1301
    13691302    if (!pmVisualIsVisual()) return true;
    13701303
    … …  
    14481381    FREE (overlayO);
    14491382
    1450     // pause and wait for user input:
    1451     // continue, save (provide name), ??
    1452     char key[10];
    14531383    fprintf (stdout, "even bits (0x0001, 0x0004, ... : red\n");
    14541384    fprintf (stdout, "odd bits (0x0002, 0x0008, ... : yellow\n");
    1455     fprintf (stdout, "[c]ontinue? ");
    1456     if (!fgets(key, 8, stdin)) {
    1457         psWarning("Unable to read option");
    1458     }
     1385    pmVisualAskUser(NULL);
    14591386
    14601387    return true;
    … …  
    15311458    psphotVisualShowSourceSize_Single (myKapa, sources, PM_SOURCE_MODE_SATSTAR, 1, 1.0, "yellow");
    15321459
    1533     // pause and wait for user input:
    1534     // continue, save (provide name), ??
    1535     char key[10];
    15361460    fprintf (stdout, "red: CR; blue: EXTENDED; green: PSF-like; yellow: SATSTAR\n");
    1537     fprintf (stdout, "[c]ontinue? ");
    1538     if (!fgets(key, 8, stdin)) {
    1539         psWarning("Unable to read option");
    1540     }
     1461    pmVisualAskUser(NULL);
    15411462    return true;
    15421463}
    … …  
    19971918    psFree (mCR);
    19981919
    1999     // pause and wait for user input:
    2000     // continue, save (provide name), ??
    2001     char key[10];
    2002     fprintf (stdout, "[c]ontinue? ");
    2003     if (!fgets(key, 8, stdin)) {
    2004         psWarning("Unable to read option");
    2005     }
     1920    pmVisualAskUser(NULL);
    20061921    return true;
    20071922}
    … …  
    20161931    psphotVisualScaleImage (myKapa, readout->image, "resid", 1);
    20171932
    2018     // pause and wait for user input:
    2019     // continue, save (provide name), ??
    2020     char key[10];
    2021     fprintf (stdout, "[c]ontinue? ");
    2022     if (!fgets(key, 8, stdin)) {
    2023         psWarning("Unable to read option");
    2024     }
     1933    pmVisualAskUser(NULL);
    20251934    return true;
    20261935}
    … …  
    20311940    float lineX[2], lineY[2];
    20321941
    2033     // if (!pmVisualIsVisual()) return true;
     1942    if (!pmVisualIsVisual()) return true;
    20341943
    20351944    int myKapa = psphotKapaChannel (2);
    … …  
    21412050    psFree (dy);
    21422051
    2143     // pause and wait for user input:
    2144     // continue, save (provide name), ??
    2145     char key[10];
    2146     fprintf (stdout, "[c]ontinue? ");
    2147     if (!fgets(key, 8, stdin)) {
    2148         psWarning("Unable to read option");
    2149     }
     2052    pmVisualAskUser(NULL);
    21502053    return true;
    21512054}
    … …  
    22002103    FREE (overlay);
    22012104
    2202     // pause and wait for user input:
    2203     // continue, save (provide name), ??
    2204     char key[10];
    2205     fprintf (stdout, "[c]ontinue? ");
    2206     if (!fgets(key, 8, stdin)) {
    2207         psWarning("Unable to read option");
    2208     }
    2209 
     2105    pmVisualAskUser(NULL);
    22102106    return true;
    22112107}
Note: See TracChangeset for help on using the changeset viewer.