r164: *** empty log message ***

[ctsim.git] / libctsim / projections.cpp

diff --git a/libctsim/projections.cpp b/libctsim/projections.cpp
index e5d19a37cceafc09cfafb3bd37df7bbd225052bc..7d3e814967394d885dd3b494ea0c626f351157df 100644 (file)
--- a/libctsim/projections.cpp
+++ b/libctsim/projections.cpp
@@ -8,7 +8,7 @@
 **  This is part of the CTSim program
 **  Copyright (C) 1983-2000 Kevin Rosenberg
 **
-**  $Id: projections.cpp,v 1.17 2000/07/28 10:51:31 kevin Exp $
+**  $Id: projections.cpp,v 1.18 2000/07/29 19:50:08 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
@@ -530,6 +530,7 @@ Projections::reconstruct (ImageFile& im, const char* const filterName, double fi
       SGP sgp (sgpDriver);
       EZPlot ezplot (sgp);
 
+      ezplot.ezset ("title Filter Response");
       ezplot.addCurve (plot_xaxis, filter.getFilter(), nVecFilter);
       ezplot.plot();
       cio_put_str ("Press any key to continue");
@@ -556,54 +557,51 @@ Projections::reconstruct (ImageFile& im, const char* const filterName, double fi
 
     filter.filterSignal (detval, filteredProj);
 
+
+
+#ifdef HAVE_BSPLINE_INTERP
+    if (interp_type == I_BSPLINE) 
+       bspline (m_nDet, zoom_factor, spline_order, filteredProj, filteredProj);
+    
+#ifdef HAVE_SGP
+    if (trace >= TRACE_PLOT && interp_type == I_BSPLINE) {
+       bspline (m_nDet, zoom_factor, spline_order, filteredProj, filteredProj);
+      ezplot_1d (filteredProj, n_filteredProj);
+    }
+#endif
+#endif
+
+    bj.BackprojectView (filteredProj, darray.viewAngle());
+
 #ifdef HAVE_SGP
-    if (trace >= TRACE_PLOT)  {
+    if (trace >= TRACE_PLOT) {
       SGPDriver sgpDriverProj ("Projection");
       SGP sgpProj (sgpDriverProj);
       EZPlot ezplotProj (sgpProj);
 
       ezplotProj.ezset  ("clear");
+      ezplotProj.ezset ("title Filtered Projection");
       ezplotProj.ezset  ("xticks major 5.");
       ezplotProj.ezset  ("xlabel ");
       ezplotProj.ezset  ("ylabel ");
-      ezplotProj.ezset  ("xlength .5.");
+      ezplotProj.ezset  ("yporigin .5.");
+      ezplotProj.ezset  ("ylength .5.");
       ezplotProj.ezset  ("box.");
       ezplotProj.ezset  ("grid.");
-      ezplotProj.addCurve (detval, plot_xaxis, m_nDet);
+      ezplotProj.addCurve (plot_xaxis, detval, m_nDet);
       ezplotProj.plot();
       ezplotProj.ezset  ("clear");
       ezplotProj.ezset  ("xticks major 5.");
       ezplotProj.ezset  ("xlabel ");
       ezplotProj.ezset  ("ylabel ");
-      ezplotProj.ezset  ("xporigin .5.");
-      ezplotProj.ezset  ("xlength .5.");
+      ezplotProj.ezset  ("ylength .5.");
       ezplotProj.ezset ("box");
       ezplotProj.ezset ("grid");
-      ezplotProj.addCurve (filteredProj, plot_xaxis, n_filteredProj);
+      ezplotProj.addCurve (plot_xaxis, filteredProj,  n_filteredProj);
       ezplotProj.plot();
-      cout << "Press enter to continue\n";
-      cio_kb_getc();
-    }
-#endif  //HAVE_SGP
 
-#ifdef HAVE_BSPLINE_INTERP
-    if (interp_type == I_BSPLINE) 
-       bspline (m_nDet, zoom_factor, spline_order, filteredProj, filteredProj);
-    
-#ifdef HAVE_SGP
-    if (trace >= TRACE_PLOT && interp_type == I_BSPLINE) {
-       bspline (m_nDet, zoom_factor, spline_order, filteredProj, filteredProj);
-      ezplot_1d (filteredProj, n_filteredProj);
-    }
-#endif
-#endif
-
-    bj.BackprojectView (filteredProj, darray.viewAngle());
-
-#ifdef HAVE_SGP
-    if (trace >= TRACE_PLOT) {
+      cout << "Do you want to exit with current pic (y/n)? " << flush;
       char str[256];
-      printf ("Do you want to exit with current pic (y/n) -- ");
       fgets(str, sizeof(str), stdin);
       if (tolower(str[0]) == 'y') {
        break;