X-Git-Url: http://git.kpe.io/?p=ctsim.git;a=blobdiff_plain;f=include%2Fbackprojectors.h;h=4ee4ebbbe09ddb947c7da086491173d77c8b2148;hp=b36dfb83cefbb7ef776ef5d4e2da3871e378a9ff;hb=dc034c9d0b7d9c3874a324a4c2c189a02945adc8;hpb=a05f3cb550877e94aa118cc04b361c0c8fdb3dc3

diff --git a/include/backprojectors.h b/include/backprojectors.h
index b36dfb8..4ee4ebb 100644
--- a/include/backprojectors.h
+++ b/include/backprojectors.h
@@ -9,7 +9,7 @@
 **  This is part of the CTSim program
 **  Copyright (C) 1983-2000 Kevin Rosenberg
 **
-**  $Id: backprojectors.h,v 1.14 2000/08/31 08:38:58 kevin Exp $
+**  $Id: backprojectors.h,v 1.18 2000/12/16 06:12:47 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
@@ -67,7 +67,7 @@ class Backprojector
   void BackprojectView (const double* const viewData, const double viewAngle);
 
   bool fail() const {return m_fail;}
-  const string& failMessage() const {return m_failMessage;}
+  const std::string& failMessage() const {return m_failMessage;}
 
   static const int getBackprojectCount() {return s_iBackprojectCount;}
   static const char** getBackprojectNameArray() {return s_aszBackprojectName;}
@@ -85,13 +85,13 @@ class Backprojector
 
 
  private:
-  string m_nameBackproject;
-  string m_nameInterpolation;
+  std::string m_nameBackproject;
+  std::string m_nameInterpolation;
   int m_idBackproject;
   int m_idInterpolation;
   Backproject* m_pBackprojectImplem;
   bool m_fail;
-  string m_failMessage;
+  std::string m_failMessage;
 
   static const char* s_aszBackprojectName[];
   static const char* s_aszBackprojectTitle[];
@@ -126,7 +126,7 @@ class Backproject
     kint32 nx;
     kint32 ny;
     double detInc;
-    double rotInc;
+    double rotScale;
     int iDetCenter;      	// index refering to L=0 projection 
     int nDet;
     double xMin, xMax, yMin, yMax;     // Retangular coords of phantom
@@ -144,10 +144,10 @@ class BackprojectTrig : public Backproject
 {
  public:
   BackprojectTrig (const Projections& proj, ImageFile& im, int interpID, const int interpFactor)
-      : Backproject::Backproject (proj, im, interpID, interpFactor)
+      : Backproject (proj, im, interpID, interpFactor)
       {}
 
-  void BackprojectView (const double* const t, double view_angle);
+  void BackprojectView (const double* const t, const double view_angle);
 };
 
 
@@ -155,9 +155,9 @@ class BackprojectTable : public Backproject
 {
  public:
   BackprojectTable (const Projections& proj, ImageFile& im, int interpID, const int interpFactor);
-  ~BackprojectTable ();
+  virtual ~BackprojectTable ();
 
-  void BackprojectView (const double* const t, double view_angle);
+  void BackprojectView (const double* const t, const double view_angle);
 
  protected:
   Array2d<kfloat64> arrayR;
@@ -173,7 +173,7 @@ class BackprojectDiff : public Backproject
   BackprojectDiff (const Projections& proj, ImageFile& im, int interpID, const int interpFactor);
   ~BackprojectDiff ();
 
-  void BackprojectView (const double* const t, double view_angle);
+  void BackprojectView (const double* const t, const double view_angle);
 
  protected:
   double start_r;
@@ -185,20 +185,20 @@ class BackprojectDiff2 : public BackprojectDiff
 {
  public:
   BackprojectDiff2 (const Projections& proj, ImageFile& im, int interpID, const int interpFactor)
-    :  BackprojectDiff::BackprojectDiff (proj, im, interpID, interpFactor)
+    :  BackprojectDiff (proj, im, interpID, interpFactor)
     {}
 
-  void BackprojectView (const double* const t, double view_angle);
+  void BackprojectView (const double* const t, const double view_angle);
 };
 
 class BackprojectIntDiff2 : public BackprojectDiff
 {
  public:
   BackprojectIntDiff2 (const Projections& proj, ImageFile& im, int interpID, const int interpFactor)
-    :  BackprojectDiff::BackprojectDiff (proj, im, interpID, interpFactor)
+    :  BackprojectDiff (proj, im, interpID, interpFactor)
     {}
   
-  void BackprojectView (const double* const t, double view_angle);
+  void BackprojectView (const double* const t, const double view_angle);
 };
 
 
@@ -206,30 +206,36 @@ class BackprojectIntDiff3 : public BackprojectDiff
 {
  public:
   BackprojectIntDiff3 (const Projections& proj, ImageFile& im, int interpID, const int interpFactor)
-    :  BackprojectDiff::BackprojectDiff (proj, im, interpID, interpFactor)
+    :  BackprojectDiff (proj, im, interpID, interpFactor)
     {}
   
-  void BackprojectView (const double* const t, double view_angle);
+  void BackprojectView (const double* const t, const double view_angle);
 };
 
 class BackprojectEquilinear : public BackprojectTable
 {
  public:
   BackprojectEquilinear (const Projections& proj, ImageFile& im, int interpID, const int interpFactor)
-      : BackprojectTable::BackprojectTable (proj, im, interpID, interpFactor)
+      : BackprojectTable (proj, im, interpID, interpFactor)
       {}
 
-  void BackprojectView (const double* const t, double view_angle);
+  void BackprojectView (const double* const t, const double view_angle);
+
+  virtual ~BackprojectEquilinear()
+      {}
 };
 
 class BackprojectEquiangular : public BackprojectTable
 {
  public:
   BackprojectEquiangular (const Projections& proj, ImageFile& im, int interpID, const int interpFactor)
-      : BackprojectTable::BackprojectTable (proj, im, interpID, interpFactor)
+      : BackprojectTable (proj, im, interpID, interpFactor)
       {}
 
-  void BackprojectView (const double* const t, double view_angle);
+  void BackprojectView (const double* const t, const double view_angle);
+
+  virtual ~BackprojectEquiangular()
+      {}
 };