r5231: Auto commit for Debian build

[ctsim.git] / libctsim / scanner.cpp

diff --git a/libctsim/scanner.cpp b/libctsim/scanner.cpp
index 5be1b78f79a7812ad0b5b818b061abbdf6ec5b74..aeb51975e82fd7e8436a542aae971d1203617245 100644 (file)
--- a/libctsim/scanner.cpp
+++ b/libctsim/scanner.cpp
@@ -9,7 +9,7 @@
 **  This is part of the CTSim program
 **  Copyright (c) 1983-2001 Kevin Rosenberg
 **
-**  $Id: scanner.cpp,v 1.41 2002/05/05 14:22:44 kevin Exp $
+**  $Id: scanner.cpp,v 1.44 2003/07/04 21:39:40 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
@@ -32,19 +32,22 @@ const int Scanner::GEOMETRY_INVALID = -1;
 const int Scanner::GEOMETRY_PARALLEL = 0;
 const int Scanner::GEOMETRY_EQUIANGULAR = 1;
 const int Scanner::GEOMETRY_EQUILINEAR = 2;
+const int Scanner::GEOMETRY_LINOGRAM = 3;
 
-const char* Scanner::s_aszGeometryName[] = 
+const char* const Scanner::s_aszGeometryName[] = 
 {
-  {"parallel"},
-  {"equiangular"},
-  {"equilinear"},
+  "parallel",
+  "equiangular",
+  "equilinear",
+  "linogram",
 };
 
-const char* Scanner::s_aszGeometryTitle[] = 
+const char* const Scanner::s_aszGeometryTitle[] = 
 {
-  {"Parallel"},
-  {"Equiangular"},
-  {"Equilinear"},
+  "Parallel",
+  "Equiangular",
+  "Equilinear",
+  "Linogram",
 };
 
 const int Scanner::s_iGeometryCount = sizeof(s_aszGeometryName) / sizeof(const char*);
@@ -354,7 +357,7 @@ Scanner::collectProjections (Projections& proj, const Phantom& phm, const int iS
       m_pSGP->setColor (C_BLUE);
 #if MSVC
       m_pSGP->setTextPointSize (9);
-else
+#else
       m_pSGP->setTextPointSize (14);
 #endif
       phm.draw (*m_pSGP);