X-Git-Url: http://git.kpe.io/?p=ctsim.git;a=blobdiff_plain;f=libctsim%2Freconstruct.cpp;h=c85802749998665c64f2ebd974578e08d60e4804;hp=58f17bc9ac7e7bfc530f446246cc5cf3d388a134;hb=c00c639073653fac7463a88f2b000f263236550d;hpb=ee0105d74fec9d6bfd236e22e9e1d315e46c568e

diff --git a/libctsim/reconstruct.cpp b/libctsim/reconstruct.cpp
index 58f17bc..c858027 100644
--- a/libctsim/reconstruct.cpp
+++ b/libctsim/reconstruct.cpp
@@ -8,7 +8,7 @@
 **  This is part of the CTSim program
 **  Copyright (C) 1983-2000 Kevin Rosenberg
 **
-**  $Id: reconstruct.cpp,v 1.2 2000/12/06 01:46:43 kevin Exp $
+**  $Id: reconstruct.cpp,v 1.7 2001/01/02 16:02:13 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
@@ -108,7 +108,7 @@ Reconstructor::plotFilter (SGP* pSGP)
 {
 #if HAVE_SGP
   int nVecFilter = m_pProcessSignal->getNFilterPoints();
-  double adPlotXAxis [nVecFilter];
+  double* adPlotXAxis = new double [nVecFilter];
 
   if (nVecFilter > 0 && pSGP)  {
     double f = m_pProcessSignal->getFilterMin();
@@ -117,13 +117,14 @@ Reconstructor::plotFilter (SGP* pSGP)
       adPlotXAxis[i] = f;
 
     if (m_pProcessSignal->getFilter()) {
-      EZPlot ezplot (*pSGP);
+      EZPlot ezplot;
 
       ezplot.ezset ("title Filter Response");
       ezplot.addCurve (adPlotXAxis, m_pProcessSignal->getFilter(), nVecFilter);
-      ezplot.plot();
+      ezplot.plot (pSGP);
     }
   }
+  delete adPlotXAxis;
 #endif
 }
 
@@ -137,7 +138,7 @@ Reconstructor::reconstructAllViews ()
 
 
 void
-Reconstructor::reconstructView (int iStartView, int iViewCount, SGP* pSGP)
+Reconstructor::reconstructView (int iStartView, int iViewCount, SGP* pSGP, bool bBackprojectView)
 {
   double* adFilteredProj = new double [m_nFilteredProjections];   // filtered projections
 
@@ -146,7 +147,7 @@ Reconstructor::reconstructView (int iStartView, int iViewCount, SGP* pSGP)
       
   for (int iView = iStartView; iView < (iStartView + iViewCount); iView++)  {
     if (m_iTrace == Trace::TRACE_CONSOLE) 
-      cout <<"Reconstructing view " << iView << " (last = " << m_rProj.nView() - 1 << ")\n";
+		std::cout <<"Reconstructing view " << iView << " (last = " << m_rProj.nView() - 1 << ")\n";
       
     const DetectorArray& rDetArray = m_rProj.getDetectorArray (iView);
     const DetectorValue* detval = rDetArray.detValues();
@@ -165,11 +166,12 @@ Reconstructor::reconstructView (int iStartView, int iViewCount, SGP* pSGP)
 #endif
 #endif
 
-    m_pBackprojector->BackprojectView (adFilteredProj, rDetArray.viewAngle());
+	if (bBackprojectView)
+      m_pBackprojector->BackprojectView (adFilteredProj, rDetArray.viewAngle());
 
 #ifdef HAVE_SGP
     if (m_iTrace >= Trace::TRACE_PLOT && pSGP) {
-      EZPlot ezplotProj (*pSGP);
+      EZPlot ezplotProj;
 
       ezplotProj.ezset ("clear");
       ezplotProj.ezset ("title Raw Projection");
@@ -181,7 +183,7 @@ Reconstructor::reconstructView (int iStartView, int iViewCount, SGP* pSGP)
       ezplotProj.ezset ("box.");
       ezplotProj.ezset ("grid.");
       ezplotProj.addCurve (m_adPlotXAxis, detval, m_rProj.nDet());
-      ezplotProj.plot();
+      ezplotProj.plot (pSGP);
       ezplotProj.ezset ("clear");
       ezplotProj.ezset ("title Filtered Projection");
       ezplotProj.ezset ("xticks major 5");
@@ -191,11 +193,11 @@ Reconstructor::reconstructView (int iStartView, int iViewCount, SGP* pSGP)
       ezplotProj.ezset ("box");
       ezplotProj.ezset ("grid");
       ezplotProj.addCurve (m_adPlotXAxis, adFilteredProj,  m_nFilteredProjections);
-      ezplotProj.plot();
+      ezplotProj.plot (pSGP);
     } 
 #endif  //HAVE_SGP
   }
-
-  delete adFilteredProj;
+
+  delete adFilteredProj;
 }