X-Git-Url: http://git.kpe.io/?p=ctsim.git;a=blobdiff_plain;f=libctsim%2Fimagefile.cpp;h=a751573aef3e35ab0ee60b80c7c37d603228966b;hp=9df4285a8a35904ee88939647bb6a5428f81a51b;hb=6afa21de8aa00b405de47584efe108c71df33e1b;hpb=1e88cf0f7fa4f690ea9f110e8ed3f2b5338d0a10 diff --git a/libctsim/imagefile.cpp b/libctsim/imagefile.cpp index 9df4285..a751573 100644 --- a/libctsim/imagefile.cpp +++ b/libctsim/imagefile.cpp @@ -9,7 +9,7 @@ ** This is part of the CTSim program ** Copyright (C) 1983-2000 Kevin Rosenberg ** -** $Id: imagefile.cpp,v 1.11 2000/08/25 15:59:13 kevin Exp $ +** $Id: imagefile.cpp,v 1.19 2000/12/16 02:44:26 kevin Exp $ ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License (version 2) as @@ -28,6 +28,29 @@ #include "ct.h" +F32Image::F32Image (int nx, int ny) + : Array2dFile (nx, ny, sizeof(kfloat32), Array2dFile::PIXEL_FLOAT32) + { + } + +F32Image::F32Image (void) + : Array2dFile() + { + setPixelFormat (Array2dFile::PIXEL_FLOAT32); + setPixelSize (sizeof(kfloat32)); + } + +F64Image::F64Image (int nx, int ny) + : Array2dFile (nx, ny, sizeof(kfloat64), Array2dFile::PIXEL_FLOAT64) + { + } + +F64Image::F64Image (void) + : Array2dFile () + { + setPixelFormat (PIXEL_FLOAT64); + setPixelSize (sizeof(kfloat64)); + } void ImageFile::filterResponse (const char* const domainName, double bw, const char* const filterName, double filt_param) @@ -94,7 +117,8 @@ ImageFile::displayScaling (const int scale, const ImageFileValue pmin, const Ima delete pPens; return (id_X11); - +#else + return 0; #endif } @@ -135,14 +159,14 @@ ImageFile::comparativeStatistics (const ImageFile& imComp, double& d, double& r, double absErrorSum = 0.; double sqDiffFromMeanSum = 0.; double absValueSum = 0.; - for (unsigned int ix = 0; ix < m_nx; ix++) { + for (unsigned int ix2 = 0; ix2 < m_nx; ix2++) { for (unsigned int iy = 0; iy < m_ny; iy++) { - double diff = v[ix][iy] - vComp[ix][iy]; + double diff = v[ix2][iy] - vComp[ix2][iy]; sqErrorSum += diff * diff; absErrorSum += fabs(diff); - double diffFromMean = v[ix][iy] - myMean; + double diffFromMean = v[ix2][iy] - myMean; sqDiffFromMeanSum += diffFromMean * diffFromMean; - absValueSum += fabs(v[ix][iy]); + absValueSum += fabs(v[ix2][iy]); } } @@ -152,10 +176,10 @@ ImageFile::comparativeStatistics (const ImageFile& imComp, double& d, double& r, int hx = m_nx / 2; int hy = m_ny / 2; double eMax = -1; - for (int ix = 0; ix < hx; ix++) { + for (int ix3 = 0; ix3 < hx; ix3++) { for (int iy = 0; iy < hy; iy++) { - double avgPixel = 0.25 * (v[2*ix][2*iy] + v[2*ix+1][2*iy] + v[2*ix][2*iy+1] + v[2*ix+1][2*iy+1]); - double avgPixelComp = 0.25 * (vComp[2*ix][2*iy] + vComp[2*ix+1][2*iy] + vComp[2*ix][2*iy+1] + vComp[2*ix+1][2*iy+1]); + double avgPixel = 0.25 * (v[2*ix3][2*iy] + v[2*ix3+1][2*iy] + v[2*ix3][2*iy+1] + v[2*ix3+1][2*iy+1]); + double avgPixelComp = 0.25 * (vComp[2*ix3][2*iy] + vComp[2*ix3+1][2*iy] + vComp[2*ix3][2*iy+1] + vComp[2*ix3+1][2*iy+1]); double error = fabs (avgPixel - avgPixelComp); if (error > eMax) eMax = error; @@ -228,11 +252,11 @@ ImageFile::statistics (double& min, double& max, double& mean, double& mode, dou double spread = max - min; mode = 0; stddev = 0; - for (int ix = 0; ix < nx; ix++) { + for (int ix4 = 0; ix4 < nx; ix4++) { for (int iy = 0; iy < ny; iy++) { - int b = static_cast((((v[ix][iy] - min) / spread) * (nbin - 1)) + 0.5); + int b = static_cast((((v[ix4][iy] - min) / spread) * (nbin - 1)) + 0.5); hist[b]++; - double diff = (v[ix][iy] - mean); + double diff = (v[ix4][iy] - mean); stddev += diff * diff; } } @@ -250,12 +274,12 @@ ImageFile::statistics (double& min, double& max, double& mean, double& mode, dou mode = (max_binindex * spread / (nbin - 1)) + min; int nPixels = nx * ny; - slist vecImage; - for (int ix = 0; ix < nx; ix++) + list vecImage; + for (int ix5 = 0; ix5 < nx; ix5++) for (int iy = 0; iy < ny; iy++) - vecImage.push_front (v[ix][iy]); + vecImage.push_front (v[ix5][iy]); vecImage.sort(); - slist::const_iterator iter = vecImage.begin(); + list::const_iterator iter = vecImage.begin(); for (int i = 0; i < (nPixels / 2) - 1; i++) iter++; // Advance iterator to (nPixels / 2) - 1; @@ -297,7 +321,7 @@ ImageFile::writeImagePGM (const char *outfile, int nxcell, int nycell, double de int ny = m_ny; ImageFileArray v = getArray(); - unsigned char rowp [nx * nxcell]; + unsigned char* rowp = new unsigned char [nx * nxcell]; if ((fp = fopen (outfile, "wb")) == NULL) return; @@ -317,10 +341,11 @@ ImageFile::writeImagePGM (const char *outfile, int nxcell, int nycell, double de } for (int ir = 0; ir < nycell; ir++) { for (int ic = 0; ic < nx * nxcell; ic++) - fprintf(fp, "%c ", rowp[ic]); + fputc( rowp[ic], fp ); } } - + + delete rowp; fclose(fp); } @@ -332,9 +357,7 @@ ImageFile::writeImagePGMASCII (const char *outfile, int nxcell, int nycell, doub int ny = m_ny; ImageFileArray v = getArray(); - unsigned char rowp [nx * nxcell]; - if (rowp == NULL) - return; + unsigned char* rowp = new unsigned char [nx * nxcell]; if ((fp = fopen (outfile, "wb")) == NULL) return; @@ -358,7 +381,8 @@ ImageFile::writeImagePGMASCII (const char *outfile, int nxcell, int nycell, doub fprintf(fp, "\n"); } } - + + delete rowp; fclose(fp); } @@ -375,7 +399,7 @@ ImageFile::writeImagePNG (const char *outfile, int bitdepth, int nxcell, int nyc int ny = m_ny; ImageFileArray v = getArray(); - unsigned char rowp [nx * nxcell * (bitdepth / 8)]; + unsigned char* rowp = new unsigned char [nx * nxcell * (bitdepth / 8)]; if ((fp = fopen (outfile, "wb")) == NULL) return; @@ -427,6 +451,7 @@ ImageFile::writeImagePNG (const char *outfile, int bitdepth, int nxcell, int nyc png_write_end(png_ptr, info_ptr); png_destroy_write_struct(&png_ptr, &info_ptr); + delete rowp; fclose(fp); }