r156: *** empty log message ***

[ctsim.git] / include / scanner.h

diff --git a/include/scanner.h b/include/scanner.h
index 39a90027cfa1848094250916d04dcfd6826a2f64..000aba1860117dc913d71f23364deb39f23f0b58 100644 (file)
--- a/include/scanner.h
+++ b/include/scanner.h
@@ -9,7 +9,7 @@
 **  This is part of the CTSim program
 **  Copyright (C) 1983-2000 Kevin Rosenberg
 **
-**  $Id: scanner.h,v 1.5 2000/06/25 17:32:24 kevin Exp $
+**  $Id: scanner.h,v 1.7 2000/07/20 11:17:31 kevin Exp $
 **
 **
 **  This program is free software; you can redistribute it and/or modify
@@ -30,7 +30,8 @@
 #define SCANNER_H
 
 class Projections;
-
+class Phantom;
+class PhantomElement;
 
 // Projections are collected along an array of ndet detectors.  The data
 // for these detectors is stored in the class DetectorArray
@@ -67,12 +68,16 @@ class Scanner
        GEOMETRY_INVALID,
        GEOMETRY_PARALLEL,
        GEOMETRY_EQUILINEAR,
-       GEOMETRY_EQUIANGLE
+       GEOMETRY_EQUIANGULAR,
     } GeometryID;
   
-    static const char GEOMETRY_PARALLEL_STR[] = "parallel";
-    static const char GEOMETRY_EQUILINEAR_STR[] = "equilinear";
-    static const char GEOMETRY_EQUIANGLE_STR[] = "equiangle";
+    static const char GEOMETRY_PARALLEL_STR[];
+    static const char GEOMETRY_EQUILINEAR_STR[];
+    static const char GEOMETRY_EQUIANGULAR_STR[];
+
+    static const char GEOMETRY_PARALLEL_TITLE_STR[];
+    static const char GEOMETRY_EQUILINEAR_TITLE_STR[];
+    static const char GEOMETRY_EQUIANGULAR_TITLE_STR[];
 
   Scanner (const Phantom& phm, const char* const geometryName, int nDet, int nView, int nSample, const double rot_anglen);
   ~Scanner();