X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=libctsim%2Freconstruct.cpp;h=6aca7f88a63795a3083286d7527b6e9cad2fd6fa;hb=b6a9ea0d7004823a8bfd262674cd620c143e4be5;hp=a81a34be97d6bd7df9cb2b9667b4dc821eedb71b;hpb=1a050c98763fbbc0662731b0b76953acede6f5d7;p=ctsim.git diff --git a/libctsim/reconstruct.cpp b/libctsim/reconstruct.cpp index a81a34b..6aca7f8 100644 --- a/libctsim/reconstruct.cpp +++ b/libctsim/reconstruct.cpp @@ -6,9 +6,7 @@ ** Date Started: Aug 84 ** ** This is part of the CTSim program -** Copyright (c) 1983-2001 Kevin Rosenberg -** -** $Id$ +** Copyright (c) 1983-2009 Kevin Rosenberg ** ** 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 @@ -165,7 +163,7 @@ Reconstructor::reconstructView (int iStartView, int iViewCount, SGP* pSGP, bool for (int iView = iStartView; iView < (iStartView + iViewCount); iView++) { if (m_iTrace == Trace::TRACE_CONSOLE) - std::cout <<"Reconstructing view " << iView << " (last = " << m_pProj->nView() - 1 << ")\n"; + std::cout <<"Reconstructing view " << iView << " (last = " << m_pProj->nView() - 1 << ")\n"; const DetectorArray& rDetArray = m_pProj->getDetectorArray (iView); const DetectorValue* detval = rDetArray.detValues(); @@ -184,7 +182,7 @@ Reconstructor::reconstructView (int iStartView, int iViewCount, SGP* pSGP, bool #endif #endif - if (bBackprojectView) + if (bBackprojectView) m_pBackprojector->BackprojectView (adFilteredProj, rDetArray.viewAngle()); #ifdef HAVE_SGP @@ -205,17 +203,8 @@ Reconstructor::reconstructView (int iStartView, int iViewCount, SGP* pSGP, bool ezplotProj.ezset (osXLength.str().c_str()); ezplotProj.ezset ("box."); ezplotProj.ezset ("grid."); -#if 0 // workaround c++ optimizer bug, now disabled by using /O1 in code - double* pdDetval = new double [m_pProj->nDet()]; - for (unsigned int id = 0; id < m_pProj->nDet(); id++) { - pdDetval[id] = detval[id]; - } - ezplotProj.addCurve (m_adPlotXAxis, pdDetval, m_pProj->nDet()); - delete pdDetval; -#else ezplotProj.addCurve (m_adPlotXAxis, detval, m_pProj->nDet()); -#endif - pSGP->setTextPointSize (12); + pSGP->setTextPointSize (9); ezplotProj.plot (pSGP); ezplotProj.ezset ("clear"); @@ -230,7 +219,7 @@ Reconstructor::reconstructView (int iStartView, int iViewCount, SGP* pSGP, bool ezplotProj.ezset ("box"); ezplotProj.ezset ("grid"); ezplotProj.addCurve (m_adPlotXAxis, adFilteredProj, m_nFilteredProjections); - pSGP->setTextPointSize (12); + pSGP->setTextPointSize (9); ezplotProj.plot (pSGP); }