r295: *** empty log message ***

[ctsim.git] / libctsim / scanner.cpp

diff --git a/libctsim/scanner.cpp b/libctsim/scanner.cpp
index c8c86632d1c15924cf9e9f4794ed8be6b9703c9a..98eb8a8013cfae6476949e12ad1a0fb6c772ea6d 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.17 2000/12/06 01:46:43 kevin Exp $
+**  $Id: scanner.cpp,v 1.21 2000/12/18 02:23:43 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
@@ -303,7 +303,7 @@ Scanner::collectProjections (Projections& proj, const Phantom& phm, const int iS
   if (pSGP && m_trace >= Trace::TRACE_PHANTOM) {
       m_pSGP = pSGP;
       m_pSGP->eraseWindow();
-      double dWindowSize = max(m_detLen, m_dFocalLength * 2) * SQRT2;
+      double dWindowSize = dmax (m_detLen, m_dFocalLength * 2) * SQRT2;
       double dHalfWindowSize = dWindowSize / 2;
       m_dXMinWin = m_dXCenter - dHalfWindowSize;
       m_dXMaxWin = m_dXCenter + dHalfWindowSize;
@@ -365,7 +365,7 @@ Scanner::collectProjections (Projections& proj, const Phantom& phm, const int iS
       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;
+               std::cout << "Current View: " << iView+iStartView << std::endl;
 
     projectSingleView (phm, detArray, xd1, yd1, xd2, yd2, xs1, ys1, xs2, ys2, viewAngle + 3 * HALFPI);
     detArray.setViewAngle (viewAngle);
@@ -532,15 +532,7 @@ Scanner::traceShowParamRasterOp (int iRasterOp, const char *szLabel, const char
 {  
   char szValue[256];
 
-#ifdef MSVC
-  vsprintf (szValue, fmt, args);
-#else
-  vnsprintf (szValue, sizeof(szValue), fmt, args);
-#endif
-
-  //  cio_set_cpos (raysum_trace_menu_column, row);
-  //  cio_set_text_clr (color - 8, 0);
-  //  cio_set_text_clr (color, 0);
+  vsnprintf (szValue, sizeof(szValue), fmt, args);
 
 #ifdef HAVE_SGP
   if (m_pSGP) {