X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=tools%2Fphm2pj.cpp;h=ee4832a08e8b2fd5597e457684a49ffeb436f36f;hb=6b3ed4969c5a651aae71391127310ee797ecce6b;hp=b494aa2814b1b7f10c0d72544c897022a1c4c13c;hpb=286d655a25df2668bd65ad365676c6ecc94415a1;p=ctsim.git diff --git a/tools/phm2pj.cpp b/tools/phm2pj.cpp index b494aa2..ee4832a 100644 --- a/tools/phm2pj.cpp +++ b/tools/phm2pj.cpp @@ -9,7 +9,7 @@ ** This is part of the CTSim program ** Copyright (C) 1983-2000 Kevin Rosenberg ** -** $Id: phm2pj.cpp,v 1.3 2000/07/22 15:45:33 kevin Exp $ +** $Id: phm2pj.cpp,v 1.7 2000/08/02 18:09:11 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 @@ -47,6 +47,8 @@ static struct option phm2pj_options[] = {0, 0, 0, 0} }; +static const char* g_szIdStr = "$id$"; + void phm2pj_usage (const char *program) @@ -285,7 +287,24 @@ phm2pj_main (int argc, char* argv[]) #else Projections pjGlobal (scanner); - scanner.collectProjections (pjGlobal, phm, 0, opt_trace); + + SGPDriver* pSGPDriver = NULL; + SGP* pSGP = NULL; + + if (opt_trace >= TRACE_PHM) { + pSGPDriver = new SGPDriver ("phm2pj", 600, 600); + pSGP = new SGP (*pSGPDriver); + } + + scanner.collectProjections (pjGlobal, phm, 0, opt_trace, pSGP); + + if (opt_trace >= TRACE_PHM) { + cout << "Press enter to continue\n"; + cio_kb_getc(); + delete pSGP; pSGP = NULL; + delete pSGPDriver; pSGPDriver = NULL; + } + #endif #ifdef HAVE_MPI @@ -358,6 +377,9 @@ main (int argc, char* argv[]) try { retval = phm2pj_main(argc, argv); +#if HAVE_DMALLOC + // dmalloc_shutdown(); +#endif } catch (exception e) { cerr << "Exception: " << e.what() << endl; } catch (...) {