X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=libctsim%2Freconstruct.cpp;h=df456214c7b2a4066e7d9caa986c5eff9591d352;hb=9b2bb510160bdb56f04847f5b55ab61dd8a47976;hp=8e09a16b55be487ecba1c568ad835bdcfb3dd7b6;hpb=bfcc769cf8019eabc8c65c07257c8dbee4b4c977;p=ctsim.git

diff --git a/libctsim/reconstruct.cpp b/libctsim/reconstruct.cpp
index 8e09a16..df45621 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.1 2000/09/02 05:13:57 kevin Exp $
+**  $Id: reconstruct.cpp,v 1.6 2000/12/29 15:45:06 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,16 +138,16 @@ Reconstructor::reconstructAllViews ()
 
 
 void
-Reconstructor::reconstructView (int iStartView, int iViewCount, SGP* pSGP)
+Reconstructor::reconstructView (int iStartView, int iViewCount, SGP* pSGP, bool bBackprojectView)
 {
-  double adFilteredProj [m_nFilteredProjections];   // filtered projections
+  double* adFilteredProj = new double [m_nFilteredProjections];   // filtered projections
 
   if (iViewCount <= 0)
     iViewCount = m_rProj.nView() - iStartView;
       
   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();
@@ -164,12 +165,13 @@ 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,9 +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;
 }