r233: *** empty log message ***

diff --git a/ChangeLog b/ChangeLog
index f6d6362e49dc2306776db204d59c9c2b8f69c9db..582e251e912f3391963d2bba78bd976d14f29c03 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,7 @@
-2.0.6 - 12/02/00
+2.0.6 - 12/03/00
    Fixed minor compilation problem with procsignal.h
    Updated README file
+   Fixed bug when simulating projections and Trace == CONSOLE
        
 2.0.5 - 12/01/00
    Improved compilation on RedHat 7

diff --git a/configure b/configure
index d598ba9b26eea8e9cd23364a941564f1f2f230d3..00eb567e03c42bcb5cf28811066a637aec8c3faf 100755 (executable)
--- a/configure
+++ b/configure
@@ -715,7 +715,7 @@ fi
 
 PACKAGE=ctsim
 
-VERSION=2.0.5
+VERSION=2.0.6
 
 if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
   { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; }

diff --git a/libctsim/scanner.cpp b/libctsim/scanner.cpp
index bb7a7d84cbb4d3bd96b2c1b6a4d3cd383d30c312..77fbb1e7510ba0e9af77b1a70a168b739d9485d3 100644 (file)
--- a/libctsim/scanner.cpp
+++ b/libctsim/scanner.cpp
@@ -9,7 +9,7 @@
 **  This is part of the CTSim program
 **  Copyright (C) 1983-2000 Kevin Rosenberg
 **
-**  $Id: scanner.cpp,v 1.15 2000/09/07 14:29:05 kevin Exp $
+**  $Id: scanner.cpp,v 1.16 2000/12/03 12:22:46 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
@@ -260,7 +260,7 @@ Scanner::collectProjections (Projections& proj, const Phantom& phm, const int tr
 }
 
 void
-Scanner::collectProjections (Projections& proj, const Phantom& phm, const int iStartView, const int iNumViews, bool bStoreAtViewPosition, const int trace, SGP* pSGP)
+Scanner::collectProjections (Projections& proj, const Phantom& phm, const int iStartView, const int iNumViews, bool bStoreAtViewPosition, const int trace, SGP* pSGP = NULL)
 {
   m_trace = trace;
   double start_angle = iStartView * proj.rotInc();
@@ -361,10 +361,12 @@ Scanner::collectProjections (Projections& proj, const Phantom& phm, const int iS
       }
       m_pSGP->setPenWidth (1);
     }
-    if (m_trace >= Trace::TRACE_CONSOLE)
+    if (m_trace > Trace::TRACE_CONSOLE)
       traceShowParam ("Current View:", "%d (%.0f%%)", PROJECTION_TRACE_ROW_CURR_VIEW, C_RED, iView + iStartView, (iView + iStartView) / static_cast<double>(m_nView) * 100.);
 #endif
-           
+    if (m_trace == Trace::TRACE_CONSOLE)
+       cout << "Current View: " << iView+iStartView << endl;
+
     projectSingleView (phm, detArray, xd1, yd1, xd2, yd2, xs1, ys1, xs2, ys2, viewAngle + 3 * HALFPI);
     detArray.setViewAngle (viewAngle);