IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Ignore:
Timestamp:
Aug 8, 2006, 1:32:23 PM (20 years ago)
Author:
jhoblitt
Message:

bug #790 - remove psErrorText.h and inline all error codes. all newly inlined error codes are wrapped with the _() macro from future gettextification

Location:
trunk/psLib/src
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk/psLib/src

    • Property svn:ignore

      •  

        old new  
        1010libpslib.la.temp
        1111config.h.in
        12 psErrorText.h
        1312*.bb
        1413*.bbg

  • trunk/psLib/src/fits/psFitsImage.c

    r7846 r8232  
    77 *  @author Robert DeSonia, MHPCC
    88 *
    9  *  @version $Revision: 1.11 $ $Name: not supported by cvs2svn $
    10  *  @date $Date: 2006-07-08 03:06:40 $
     9 *  @version $Revision: 1.12 $ $Name: not supported by cvs2svn $
     10 *  @date $Date: 2006-08-08 23:32:23 $
    1111 *
    1212 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    1919#include "string.h"
    2020#include "psError.h"
    21 #include "psErrorText.h"
     21
    2222#include "psImageStructManip.h"
    2323#include "psMemory.h"
    … …  
    4949    if (fits == NULL) {
    5050        psError(PS_ERR_BAD_PARAMETER_NULL, true,
    51                 PS_ERRORTEXT_psFits_NULL);
     51                _("The input psFits object can not NULL."));
    5252        return NULL;
    5353    }
    … …  
    5959        (void)fits_get_errstatus(status, fitsErr);
    6060        psError(PS_ERR_IO, true,
    61                 PS_ERRORTEXT_psFits_GET_HDU_TYPE_FAILED,
     61                _("Could not determine the HDU type. CFITSIO Error: %s"),
    6262                fitsErr);
    6363        return NULL;
    … …  
    6565    if (hdutype != IMAGE_HDU) {
    6666        psError(PS_ERR_IO, true,
    67                 PS_ERRORTEXT_psFits_NOT_IMAGE_TYPE);
     67                _("Current FITS HDU type must be an image."));
    6868        return NULL;
    6969    }
    … …  
    7373        fits_get_errstatus(status, fitsErr);
    7474        psError(PS_ERR_IO, true,
    75                 PS_ERRORTEXT_psFits_DATATYPE_UNKNOWN,
     75                _("Could not determine image data type. CFITSIO Error: %s"),
    7676                fitsErr);
    7777        return NULL;
    … …  
    8282        (void)fits_get_errstatus(status, fitsErr);
    8383        psError(PS_ERR_IO, true,
    84                 PS_ERRORTEXT_psFits_IMAGE_DIM_UNKNOWN,
     84                _("Could not determine image dimensions. CFITSIO Error: %s"),
    8585                fitsErr);
    8686        return NULL;
    … …  
    9090    if ((nAxis < 2) || (nAxis > 3)) {
    9191        psError(PS_ERR_IO, true,
    92                 PS_ERRORTEXT_psFits_IMAGE_DIMENSION_UNSUPPORTED,
     92                _("Image number of dimensions, %d, is not valid.  Only two or three dimensions supported for FITS I/O."),
    9393                nAxis);
    9494        return NULL;
    … …  
    9999        (void)fits_get_errstatus(status, fitsErr);
    100100        psError(PS_ERR_IO, true,
    101                 PS_ERRORTEXT_psFits_IMAGE_SIZE_UNKNOWN,
     101                _("Could not determine image size. CFITSIO Error: %s"),
    102102                fitsErr);
    103103        return NULL;
    … …  
    163163    default:
    164164        psError(PS_ERR_IO, true,
    165                 PS_ERRORTEXT_psFits_FITS_TYPE_UNSUPPORTED,
     165                _("FITS image type, BITPIX=%d, is not supported."),
    166166                bitPix);
    167167        return NULL;
    … …  
    178178        (void)fits_get_errstatus(status, fitsErr);
    179179        psError(PS_ERR_IO, true,
    180                 PS_ERRORTEXT_psFits_READ_FAILED,
     180                _("Reading FITS file failed. CFITSIO Error: %s"),
    181181                fitsErr);
    182182        return NULL;
    … …  
    208208
    209209    if (!fits) {
    210         psError(PS_ERR_BAD_PARAMETER_NULL, true, PS_ERRORTEXT_psFits_NULL);
     210        psError(PS_ERR_BAD_PARAMETER_NULL, true, _("The input psFits object can not NULL."));
    211211        return false;
    212212    }
    213213
    214214    if (!input) {
    215         psError(PS_ERR_BAD_PARAMETER_NULL, true, PS_ERRORTEXT_psFits_IMAGE_NULL);
     215        psError(PS_ERR_BAD_PARAMETER_NULL, true, _("The input psImage was NULL.  Need a non-NULL psImage for operation to be performed."));
    216216        return false;
    217217    }
    … …  
    299299        (void)fits_get_errstatus(status, fitsErr);
    300300        psError(PS_ERR_IO, true,
    301                 PS_ERRORTEXT_psFits_WRITE_FAILED,
     301                _("Could not write data to file. CFITSIO Error: %s"),
    302302                fitsErr);
    303303        return false;
    … …  
    318318    if (fits == NULL) {
    319319        psError(PS_ERR_BAD_PARAMETER_NULL, true,
    320                 PS_ERRORTEXT_psFits_NULL);
     320                _("The input psFits object can not NULL."));
    321321        return false;
    322322    }
    … …  
    324324    if (input == NULL) {
    325325        psError(PS_ERR_BAD_PARAMETER_NULL, true,
    326                 PS_ERRORTEXT_psFits_IMAGE_NULL);
     326                _("The input psImage was NULL.  Need a non-NULL psImage for operation to be performed."));
    327327        return false;
    328328    }
    … …  
    334334        (void)fits_get_errstatus(status, fitsErr);
    335335        psError(PS_ERR_IO, true,
    336                 PS_ERRORTEXT_psFits_GET_HDU_TYPE_FAILED,
     336                _("Could not determine the HDU type. CFITSIO Error: %s"),
    337337                fitsErr);
    338338        return NULL;
    … …  
    340340    if (hdutype != IMAGE_HDU) {
    341341        psError(PS_ERR_IO, true,
    342                 PS_ERRORTEXT_psFits_NOT_IMAGE_TYPE);
     342                _("Current FITS HDU type must be an image."));
    343343        return NULL;
    344344    }
    … …  
    369369        PS_TYPE_NAME(imageTypeStr,input->type.type);
    370370        psError(PS_ERR_IO, true,
    371                 PS_ERRORTEXT_psFits_IMAGE_UPDATE_TYPE_MISMATCH,
     371                _("Can not update a %s image given a %s image."),
    372372                fitsTypeStr, imageTypeStr);
    373373        return false;
    … …  
    377377    if (z >= nAxes[2]) {
    378378        psError(PS_ERR_BAD_PARAMETER_SIZE, true,
    379                 PS_ERRORTEXT_psFits_FITS_Z_SMALL,
     379                _("Current FITS HDU has %d z-planes, but z-plane %d was specified."),
    380380                nAxes[2],z);
    381381        return false;
    … …  
    412412        (void)fits_get_errstatus(status, fitsErr);
    413413        psError(PS_ERR_IO, true,
    414                 PS_ERRORTEXT_psFits_WRITE_FAILED,
     414                _("Could not write data to file. CFITSIO Error: %s"),
    415415                fitsErr);
    416416        return false;
    … …  
    429429    if (fits == NULL) {
    430430        psError(PS_ERR_BAD_PARAMETER_NULL, true,
    431                 PS_ERRORTEXT_psFits_NULL);
     431                _("The input psFits object can not NULL."));
    432432        return NULL;
    433433    }
    … …  
    439439        (void)fits_get_errstatus(status, fitsErr);
    440440        psError(PS_ERR_IO, true,
    441                 PS_ERRORTEXT_psFits_IMAGE_DIM_UNKNOWN,
     441                _("Could not determine image dimensions. CFITSIO Error: %s"),
    442442                fitsErr);
    443443        return NULL;
    … …  
    454454            (void)fits_get_errstatus(status, fitsErr);
    455455            psError(PS_ERR_IO, true,
    456                     PS_ERRORTEXT_psFits_IMAGE_SIZE_UNKNOWN,
     456                    _("Could not determine image size. CFITSIO Error: %s"),
    457457                    fitsErr);
    458458            return NULL;
    … …  
    469469
    470470    // Bad dimensionality
    471     psError(PS_ERR_IO, true, PS_ERRORTEXT_psFits_IMAGE_DIMENSION_UNSUPPORTED, nAxis);
     471    psError(PS_ERR_IO, true, _("Image number of dimensions, %d, is not valid.  Only two or three dimensions supported for FITS I/O."), nAxis);
    472472    return NULL;
    473473}
    … …  
    477477    if (fits == NULL) {
    478478        psError(PS_ERR_BAD_PARAMETER_NULL, true,
    479                 PS_ERRORTEXT_psFits_NULL);
     479                _("The input psFits object can not NULL."));
    480480        return false;
    481481    }
    … …  
    483483    if (input == NULL) {
    484484        psError(PS_ERR_BAD_PARAMETER_NULL, true,
    485                 PS_ERRORTEXT_psFits_IMAGE_NULL);
     485                _("The input psImage was NULL.  Need a non-NULL psImage for operation to be performed."));
    486486        return false;
    487487    }
    488488
    489489    if (input->n == 0) {
    490         psError(PS_ERR_BAD_PARAMETER_SIZE, true, PS_ERRORTEXT_psFits_ARRAY_EMPTY);
     490        psError(PS_ERR_BAD_PARAMETER_SIZE, true, _("The input array was empty."));
    491491        return false;
    492492    }
    … …  
    504504        testImage = input->data[i];
    505505        if (testImage->numCols != numCols || testImage->numRows != numRows) {
    506             psError(PS_ERR_BAD_PARAMETER_SIZE, true, PS_ERRORTEXT_psFits_ARRAY_SIZE_DIFFER);
     506            psError(PS_ERR_BAD_PARAMETER_SIZE, true, _("The sizes of images in the array differ."));
    507507            return false;
    508508        }
    … …  
    522522                                   input->n);
    523523    if (! update) {
    524         psError(PS_ERR_UNKNOWN, false, PS_ERRORTEXT_psFits_METADATA_ADD_FAILED,
     524        psError(PS_ERR_UNKNOWN, false, _("Failed to add metadata item, %s."),
    525525                "NAXIS, NAXIS1, NAXIS2, NAXIS3");
    526526        psFree(headerCopy);
    … …  
    532532    // The next are psFitsImageUpdate to write into the extension.
    533533    if (! psFitsWriteImage(fits, headerCopy, input->data[0], input->n, extname)) {
    534         psError(PS_ERR_UNKNOWN, false, PS_ERRORTEXT_psFits_WRITE_PLANE_FAILED, 0);
     534        psError(PS_ERR_UNKNOWN, false, _("Could not write image plane %d."), 0);
    535535        psFree(headerCopy);
    536536        return false;
    … …  
    540540    for (int i = 1; i < input->n; i++) {
    541541        if (! psFitsUpdateImage(fits, input->data[i], 0, 0, i)) {
    542             psError(PS_ERR_UNKNOWN, false, PS_ERRORTEXT_psFits_WRITE_PLANE_FAILED, i);
     542            psError(PS_ERR_UNKNOWN, false, _("Could not write image plane %d."), i);
    543543            return false;
    544544        }
    … …  
    552552    if (fits == NULL) {
    553553        psError(PS_ERR_BAD_PARAMETER_NULL, true,
    554                 PS_ERRORTEXT_psFits_NULL);
     554                _("The input psFits object can not NULL."));
    555555        return false;
    556556    }
    … …  
    558558    if (input == NULL) {
    559559        psError(PS_ERR_BAD_PARAMETER_NULL, true,
    560                 PS_ERRORTEXT_psFits_IMAGE_NULL);
     560                _("The input psImage was NULL.  Need a non-NULL psImage for operation to be performed."));
    561561        return false;
    562562    }
    563563
    564564    if (input->n == 0) {
    565         psError(PS_ERR_BAD_PARAMETER_SIZE, true, PS_ERRORTEXT_psFits_ARRAY_EMPTY);
     565        psError(PS_ERR_BAD_PARAMETER_SIZE, true, _("The input array was empty."));
    566566        return false;
    567567    }
    … …  
    569569    for (int i = 0; i < input->n; i++) {
    570570        if (! psFitsUpdateImage(fits, input->data[i], x0, y0, i)) {
    571             psError(PS_ERR_UNKNOWN, false, PS_ERRORTEXT_psFits_UPDATE_PLANE_FAILED, i);
     571            psError(PS_ERR_UNKNOWN, false, _("Could not update image plane %d."), i);
    572572            return false;
    573573        }
Note: See TracChangeset for help on using the changeset viewer.