X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;ds=sidebyside;f=include%2Fscanner.h;h=77962cb9812f816d8418812abd6b9531c014a177;hb=8a7697ce57b56cdc43698cd1241ad98d49f9b5ac;hp=663ebd7f72d1d45d8c4cdfa364362c95bde22c44;hpb=999a754d1519a49ca062ee87b22bf601c1ee9f21;p=ctsim.git

diff --git a/include/scanner.h b/include/scanner.h
index 663ebd7..77962cb 100644
--- 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.21 2001/03/11 06:34:37 kevin Exp $
+**  $Id$
 **
 **
 **  This program is free software; you can redistribute it and/or modify
@@ -72,29 +72,30 @@ class Scanner
   static const int Scanner::GEOMETRY_PARALLEL;
   static const int Scanner::GEOMETRY_EQUILINEAR;
   static const int Scanner::GEOMETRY_EQUIANGULAR;
+  static const int Scanner::GEOMETRY_LINOGRAM;
 
   
   Scanner (const Phantom& phm, const char* const geometryName, int nDet, 
-    int nView, int nSample, const double rot_anglen, 
+    int nView, int iOffsetView, int nSample, const double rot_anglen, 
     double dFocalLengthRatio, double dCenterDetectorRatio, double dViewRatio, double dScanRatio);
   ~Scanner();
   
   void collectProjections (Projections& proj, const Phantom& phm, const int trace = Trace::TRACE_NONE,
     SGP* pSGP = NULL);
 
-  void collectProjections (Projections& proj, const Phantom& phm, const int iStartView, const int iNumViews, 
-    bool bStoreAtViewPosition, const int trace = Trace::TRACE_NONE, SGP* pSGP = NULL);
+  void collectProjections (Projections& proj, const Phantom& phm, const int iStartView, const int iNumViews, const int iOffsetView, bool bStoreAtViewPosition, const int trace = Trace::TRACE_NONE, SGP* pSGP = NULL);
 
-  void collectProjections (Projections& proj, const Phantom& phm, const int iStartView, const int iNumViews, 
-    int iStorageOffset, const int trace = Trace::TRACE_NONE, SGP* pSGP = NULL);
+  void collectProjections (Projections& proj, const Phantom& phm, const int iStartView, const int iNumViews, const int iOffsetView, int iStorageOffset, const int trace = Trace::TRACE_NONE, SGP* pSGP = NULL);
 
   void setNView (int nView);
+  void setOffsetView (int iOffsetView);
 
   bool fail() const {return m_fail;}
   const std::string& failMessage() const {return m_failMessage;}
   unsigned int nDet() const {return m_nDet;}
   unsigned int nView() const {return m_nView;}
- 
+  unsigned int offsetView() const {return m_iOffsetView;}
+  unsigned int startView() const {return m_startView;} 
   double rotInc() const {return m_rotInc;}
   double detInc() const {return m_detInc;}
   double detLen() const {return m_detLen;}
@@ -110,8 +111,8 @@ class Scanner
   int geometry() const {return m_idGeometry;}
 
   static int getGeometryCount() {return s_iGeometryCount;}
-  static const char** getGeometryNameArray() {return s_aszGeometryName;}
-  static const char** getGeometryTitleArray() {return s_aszGeometryTitle;}
+  static const char* const* getGeometryNameArray() {return s_aszGeometryName;}
+  static const char* const* getGeometryTitleArray() {return s_aszGeometryTitle;}
   static int convertGeometryNameToID (const char* const geometryName);
   static const char* convertGeometryIDToName (const int idGeometry);
   static const char* convertGeometryIDToTitle (const int idGeometry);
@@ -122,6 +123,8 @@ class Scanner
   int m_idGeometry;
   unsigned int m_nDet;		/* Number of detectors in array */
   unsigned int m_nView;		/* Number of rotated views */
+  unsigned int m_iOffsetView; 
+  unsigned int m_startView; 
   unsigned int m_nSample;	/* Number of rays per detector */
   double m_dFocalLength;        // Focal Length, distance from source to center
   double m_dSourceDetectorLength; // Distance from source to detectors
@@ -162,8 +165,8 @@ class Scanner
   double m_dTextHeight;
 #endif
 
-  static const char* s_aszGeometryName[];
-  static const char* s_aszGeometryTitle[];
+  static const char* const s_aszGeometryName[];
+  static const char* const s_aszGeometryTitle[];
   static const int s_iGeometryCount;
 
   void projectSingleView (const Phantom& phm, DetectorArray& darray, const double xd1, const double yd1, const double xd2, const double yd2, const double xs1, const double ys1, const double xs2, const double ys2, const double dDetAngle);