X-Git-Url: http://git.kpe.io/?p=ctsim.git;a=blobdiff_plain;f=libctsim%2Freconstruct.cpp;h=7bc6a833c6b39b873c3711315f25bcf93ccf6411;hp=df456214c7b2a4066e7d9caa986c5eff9591d352;hb=3f6c94c6bd432ad7b7a55ad991d3b8223fb44f18;hpb=5c6b29ab4885308cc3381af6e0a68f4804956d2e

diff --git a/libctsim/reconstruct.cpp b/libctsim/reconstruct.cpp
index df45621..7bc6a83 100644
--- a/libctsim/reconstruct.cpp
+++ b/libctsim/reconstruct.cpp
@@ -6,9 +6,9 @@
 **   Date Started: Aug 84
 **
 **  This is part of the CTSim program
-**  Copyright (C) 1983-2000 Kevin Rosenberg
+**  Copyright (c) 1983-2001 Kevin Rosenberg
 **
-**  $Id: reconstruct.cpp,v 1.6 2000/12/29 15:45:06 kevin Exp $
+**  $Id: reconstruct.cpp,v 1.13 2001/02/20 04:48:45 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
@@ -49,8 +49,12 @@
  */
 
 
-Reconstructor::Reconstructor (const Projections& rProj, ImageFile& rIF, const char* const filterName, double filt_param, const char* const filterMethodName, const int zeropad, const char* filterGenerationName, const char* const interpName, int interpFactor, const char* const backprojectName, const int iTrace, SGP* pSGP)
-  : m_rProj(rProj), m_rImagefile(rIF), m_pProcessSignal(0), m_pBackprojector(0), m_iTrace(iTrace), m_bFail(false), m_adPlotXAxis(0)
+Reconstructor::Reconstructor (const Projections& rProj, ImageFile& rIF, const char* const filterName, 
+                              double filt_param, const char* const filterMethodName, const int zeropad, 
+                              const char* filterGenerationName, const char* const interpName, 
+                              int interpFactor, const char* const backprojectName, const int iTrace, SGP* pSGP)
+  : m_rProj(rProj), m_rImagefile(rIF), m_pProcessSignal(0), m_pBackprojector(0), m_iTrace(iTrace), 
+    m_bFail(false), m_adPlotXAxis(0)
 {
   m_nFilteredProjections = m_rProj.nDet() * interpFactor;
 
@@ -65,7 +69,9 @@ Reconstructor::Reconstructor (const Projections& rProj, ImageFile& rIF, const ch
 #endif
 
   double filterBW = 1. / m_rProj.detInc();
-  m_pProcessSignal = new ProcessSignal (filterName, filterMethodName, filterBW, m_rProj.detInc(), m_rProj.nDet(), filt_param, "spatial", filterGenerationName, zeropad, interpFactor, iTrace, m_rProj.geometry(), m_rProj.focalLength(), pSGP);
+  m_pProcessSignal = new ProcessSignal (filterName, filterMethodName, filterBW, m_rProj.detInc(), 
+    m_rProj.nDet(), filt_param, "spatial", filterGenerationName, zeropad, interpFactor, iTrace, 
+    m_rProj.geometry(), m_rProj.focalLength(), pSGP);
 
   if (m_pProcessSignal->fail()) {
     m_bFail = true;
@@ -85,7 +91,7 @@ Reconstructor::Reconstructor (const Projections& rProj, ImageFile& rIF, const ch
     return;
   }
 
-#if HAVE_SGP
+#ifdef HAVE_SGP
   m_adPlotXAxis = new double [m_rProj.nDet()];
   double x = - ((m_rProj.nDet() - 1) / 2) * m_rProj.detInc();
   double xInc = m_rProj.detInc();
@@ -106,7 +112,7 @@ Reconstructor::~Reconstructor ()
 void
 Reconstructor::plotFilter (SGP* pSGP)
 {
-#if HAVE_SGP
+#ifdef HAVE_SGP
   int nVecFilter = m_pProcessSignal->getNFilterPoints();
   double* adPlotXAxis = new double [nVecFilter];
 
@@ -123,7 +129,7 @@ Reconstructor::plotFilter (SGP* pSGP)
       ezplot.addCurve (adPlotXAxis, m_pProcessSignal->getFilter(), nVecFilter);
       ezplot.plot (pSGP);
     }
-  }
+  }
   delete adPlotXAxis;
 #endif
 }
@@ -138,7 +144,7 @@ Reconstructor::reconstructAllViews ()
 
 
 void
-Reconstructor::reconstructView (int iStartView, int iViewCount, SGP* pSGP, bool bBackprojectView)
+Reconstructor::reconstructView (int iStartView, int iViewCount, SGP* pSGP, bool bBackprojectView, double dGraphWidth)
 {
   double* adFilteredProj = new double [m_nFilteredProjections];   // filtered projections
 
@@ -165,7 +171,7 @@ Reconstructor::reconstructView (int iStartView, int iViewCount, SGP* pSGP, bool
     }
 #endif
 #endif
-
+
 	if (bBackprojectView)
       m_pBackprojector->BackprojectView (adFilteredProj, rDetArray.viewAngle());
 
@@ -173,31 +179,52 @@ Reconstructor::reconstructView (int iStartView, int iViewCount, SGP* pSGP, bool
     if (m_iTrace >= Trace::TRACE_PLOT && pSGP) {
       EZPlot ezplotProj;
 
+      std::ostringstream osXLength;
+      osXLength << "xlength " << dGraphWidth;
+
       ezplotProj.ezset ("clear");
       ezplotProj.ezset ("title Raw Projection");
       ezplotProj.ezset ("xticks major 5");
+      ezplotProj.ezset ("yticks major 5");
       ezplotProj.ezset ("xlabel ");
       ezplotProj.ezset ("ylabel ");
-      ezplotProj.ezset ("yporigin .5");
-      ezplotProj.ezset ("ylength .5");
+      ezplotProj.ezset ("yporigin 0.55");
+      ezplotProj.ezset ("ylength 0.45");
+      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_rProj.nDet()];
+      for (unsigned int id = 0; id < m_rProj.nDet(); id++) {
+        pdDetval[id] = detval[id];
+      }
+      ezplotProj.addCurve (m_adPlotXAxis, pdDetval, m_rProj.nDet());
+      delete pdDetval;
+#else
       ezplotProj.addCurve (m_adPlotXAxis, detval, m_rProj.nDet());
+#endif
+      pSGP->setTextPointSize (12);
       ezplotProj.plot (pSGP);
+
       ezplotProj.ezset ("clear");
       ezplotProj.ezset ("title Filtered Projection");
       ezplotProj.ezset ("xticks major 5");
       ezplotProj.ezset ("xlabel ");
       ezplotProj.ezset ("ylabel ");
-      ezplotProj.ezset ("ylength .5");
+      ezplotProj.ezset ("yticks major 5");
+      ezplotProj.ezset ("yporigin 0.10");
+      ezplotProj.ezset ("ylength 0.45");
+      ezplotProj.ezset (osXLength.str().c_str());
       ezplotProj.ezset ("box");
       ezplotProj.ezset ("grid");
       ezplotProj.addCurve (m_adPlotXAxis, adFilteredProj,  m_nFilteredProjections);
+      pSGP->setTextPointSize (12);
       ezplotProj.plot (pSGP);
-    } 
+
+} 
 #endif  //HAVE_SGP
   }
-
-  delete adFilteredProj;
+
+  delete adFilteredProj;
 }