X-Git-Url: http://git.kpe.io/?p=ctsim.git;a=blobdiff_plain;f=tools%2Fphm2if.cpp;h=98eb4aeadaa290ed57eb69d63cb188256a12f67e;hp=8d5e403d997452803c4c81df671281a54d3a04c6;hb=8a7697ce57b56cdc43698cd1241ad98d49f9b5ac;hpb=e9c20d8b9cf2a0f49d0086e50bd6a4eb2c6c2dac diff --git a/tools/phm2if.cpp b/tools/phm2if.cpp index 8d5e403..98eb4ae 100644 --- a/tools/phm2if.cpp +++ b/tools/phm2if.cpp @@ -9,7 +9,7 @@ ** This is part of the CTSim program ** Copyright (C) 1983-2000 Kevin Rosenberg ** -** $Id: phm2if.cpp,v 1.20 2001/01/07 22:19:44 kevin Exp $ +** $Id$ ** ** 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 @@ -29,7 +29,7 @@ #include "timer.h" -enum { O_PHANTOM, O_DESC, O_NSAMPLE, O_FILTER, O_TRACE, O_VERBOSE, O_HELP, +enum { O_PHANTOM, O_DESC, O_NSAMPLE, O_FILTER, O_VIEW_RATIO, O_TRACE, O_VERBOSE, O_HELP, O_PHMFILE, O_FILTER_DOMAIN, O_FILTER_BW, O_FILTER_PARAM, O_DEBUG, O_VERSION }; static struct option my_options[] = @@ -43,6 +43,7 @@ static struct option my_options[] = {"filter-bw", 1, 0, O_FILTER_BW}, {"filter-param", 1, 0, O_FILTER_PARAM}, {"trace", 1, 0, O_TRACE}, + {"view-ratio", 1, 0, O_VIEW_RATIO}, {"verbose", 0, 0, O_VERBOSE}, {"debug", 0, 0, O_DEBUG}, {"help", 0, 0, O_HELP}, @@ -50,7 +51,7 @@ static struct option my_options[] = {0, 0, 0, 0} }; -static const char* g_szIdStr = "$Id: phm2if.cpp,v 1.20 2001/01/07 22:19:44 kevin Exp $"; +static const char* g_szIdStr = "$Id$"; void phm2if_usage (const char *program) @@ -61,12 +62,11 @@ phm2if_usage (const char *program) std::cout << " outfile Name of output file for image\n"; std::cout << " nx Number of pixels X-axis\n"; std::cout << " ny Number of pixels Y-axis\n"; + std::cout << " --view-ratio View diameter to phantom diameter ratio (default = 1)\n"; std::cout << " --phantom Phantom to use for projection\n"; std::cout << " herman Herman head phantom\n"; - std::cout << " herman-b Herman head phantom (Bordered)\n"; std::cout << " shepp-logan Shepp-Logan head phantom\n"; - std::cout << " shepp-logan-b Shepp-Logan head phantom (Bordered)\n"; - std::cout << " unitpulse Unit pulse phantom\n"; + std::cout << " unit-pulse Unit pulse phantom\n"; std::cout << " --phmfile Generate Phantom from phantom file\n"; std::cout << " --filter Generate Phantom from a filter function\n"; std::cout << " abs_bandlimit Abs * Bandlimiting\n"; @@ -89,10 +89,6 @@ phm2if_usage (const char *program) std::cout << " --trace Trace level to use\n"; std::cout << " none No tracing (default)\n"; std::cout << " console Trace text level\n"; - std::cout << " phantom Trace phantom\n"; - std::cout << " proj Trace projections\n"; - std::cout << " plot Trace plot\n"; - std::cout << " clipping Trace clipping\n"; std::cout << " --debug Debug mode\n"; std::cout << " --verbose Verbose mode\n"; std::cout << " --version Print version\n"; @@ -117,6 +113,7 @@ phm2if_main (int argc, char* const argv[]) int opt_nx = 0; int opt_ny = 0; int opt_nsample = 1; + double optViewRatio = 1.; double optFilterParam = 1.; double optFilterBW = 1.; int optTrace = Trace::TRACE_NONE; @@ -173,6 +170,15 @@ phm2if_main (int argc, char* const argv[]) return (1); } break; + case O_VIEW_RATIO: + optViewRatio = strtod(optarg, &endptr); + endstr = optarg + strlen(optarg); + if (endptr != endstr) { + sys_error(ERR_SEVERE,"Error setting --view-ratio to %s\n", optarg); + phm2if_usage(argv[0]); + return (1); + } + break; case O_FILTER_PARAM: optFilterParam = strtod(optarg, &endptr); endstr = optarg + strlen(optarg); @@ -234,7 +240,7 @@ phm2if_main (int argc, char* const argv[]) } std::ostringstream oss; - oss << "phm2if: nx=" << opt_nx << ", ny=" << opt_ny << ", nsample=" << opt_nsample << ", "; + oss << "phm2if: nx=" << opt_nx << ", ny=" << opt_ny << ", viewRatio=" << optViewRatio << ", nsample=" << opt_nsample << ", "; if (optPhmFilename != "") oss << "phantomFile=" << optPhmFilename; else if (optPhmName != "") @@ -279,6 +285,7 @@ phm2if_main (int argc, char* const argv[]) mpiWorld.getComm().Bcast (&opt_nx, 1, MPI::INT, 0); mpiWorld.getComm().Bcast (&opt_ny, 1, MPI::INT, 0); mpiWorld.getComm().Bcast (&opt_nsample, 1, MPI::INT, 0); + mpiWorld.getComm().Bcast (&optViewRatio, 1, MPI::DOUBLE, 0); mpiWorld.getComm().Bcast (&optFilterParam, 1, MPI::DOUBLE, 0); mpiWorld.getComm().Bcast (&optFilterBW, 1, MPI::DOUBLE, 0); @@ -316,7 +323,7 @@ phm2if_main (int argc, char* const argv[]) } } else { TimerCollectiveMPI timerRasterize (mpiWorld.getComm()); - phm.convertToImagefile (*pImLocal, opt_nsample, optTrace, mpiWorld.getMyStartWorkUnit(), mpiWorld.getMyLocalWorkUnits(), false); + phm.convertToImagefile (*pImLocal, optViewRatio, opt_nsample, optTrace, mpiWorld.getMyStartWorkUnit(), mpiWorld.getMyLocalWorkUnits(), false); if (optVerbose) timerRasterize.timerEndAndReport ("Time to rasterize phantom"); @@ -332,11 +339,7 @@ phm2if_main (int argc, char* const argv[]) } else if (optFilterName != "") { pImGlobal->filterResponse (optDomainName.c_str(), optFilterBW, optFilterName.c_str(), optFilterParam); } else { -#if HAVE_SGP - if (optTrace >= Trace::TRACE_PHANTOM) - phm.show(); -#endif - phm.convertToImagefile (*pImGlobal, opt_nsample, optTrace); + phm.convertToImagefile (*pImGlobal, optViewRatio, opt_nsample, optTrace); } #endif @@ -349,19 +352,6 @@ phm2if_main (int argc, char* const argv[]) pImGlobal->fileWrite (optOutFilename.c_str()); if (optVerbose) std::cout << "Time to rasterize phantom: " << calctime << " seconds\n"; - - if (optTrace >= Trace::TRACE_PHANTOM) { - double dmin, dmax; - int nscale; - - std::cout << "Enter display size scale (nominal = 1): "; - std::cin >> nscale; - std::cout << "Enter minimum and maximum densities (min, max): "; - std::cin >> dmin; - - std::cin >> dmax; - pImGlobal->displayScaling (nscale, dmin, dmax); - } } delete pImGlobal;