r460: no message

[ctsim.git] / libctsim / scanner.cpp

diff --git a/libctsim/scanner.cpp b/libctsim/scanner.cpp
index e10446ff8c6a90a7712b3369544e41eece65ede8..30b75d25535a2b0ac4e472c7604f59ed63002f0d 100644 (file)
--- a/libctsim/scanner.cpp
+++ b/libctsim/scanner.cpp
@@ -7,9 +7,9 @@
 **   Date Started:  1984
 **
 **  This is part of the CTSim program
-**  Copyright (C) 1983-2000 Kevin Rosenberg
+**  Copyright (c) 1983-2001 Kevin Rosenberg
 **
-**  $Id: scanner.cpp,v 1.23 2001/01/04 21:28:41 kevin Exp $
+**  $Id: scanner.cpp,v 1.27 2001/01/28 19:10:18 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
@@ -318,6 +318,7 @@ Scanner::collectProjections (Projections& proj, const Phantom& phm, const int iS
       m_pSGP->moveAbs (0., 0.);
       m_pSGP->drawCircle (m_dFocalLength);
       m_pSGP->setColor (C_BLUE);
+      m_pSGP->setTextPointSize (9);
       phm.draw (*m_pSGP);
       m_dTextHeight = m_pSGP->getCharHeight ();
       
@@ -535,13 +536,24 @@ Scanner::traceShowParamRasterOp (int iRasterOp, const char *szLabel, const char
 #ifdef HAVE_SGP
   if (m_pSGP) {
     m_pSGP->setRasterOp (iRasterOp);
-    double dYPos = m_dYMaxWin - (row * m_dTextHeight);
-    m_pSGP->moveAbs (m_dXMinWin, dYPos);
     m_pSGP->setTextColor (color, -1);
-    m_pSGP->drawText (szLabel);
     double dValueOffset = (m_dXMaxWin - m_dXMinWin) / 4;
-    m_pSGP->moveAbs (m_dXMinWin + dValueOffset, dYPos);
-    m_pSGP->drawText (szValue);
+    if (row < 4) {
+      double dYPos = m_dYMaxWin - (row * m_dTextHeight);
+      double dXPos = m_dXMinWin;
+      m_pSGP->moveAbs (dXPos, dYPos);
+      m_pSGP->drawText (szLabel);
+      m_pSGP->moveAbs (dXPos + dValueOffset, dYPos);
+      m_pSGP->drawText (szValue);
+    } else {
+      row -= 4;
+      double dYPos = m_dYMaxWin - (row * m_dTextHeight);
+      double dXPos = m_dXMinWin + (m_dXMaxWin - m_dXMinWin) * 0.5;
+      m_pSGP->moveAbs (dXPos, dYPos);
+      m_pSGP->drawText (szLabel);
+      m_pSGP->moveAbs (dXPos + dValueOffset, dYPos);
+      m_pSGP->drawText (szValue);
+    }
   } else 
 #endif
   {