X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=include%2Fprojections.h;h=338f37685a321e3e1caa39ef13e5cb6012a12a51;hb=0eb095f799dd4222e6eb9b1db9e8c6f2831a1540;hp=eb1c3c7d03b852b4e2085eb976ab259b31e1ba8b;hpb=484b9ac2ebf8f88dbe36bdc1d3a9c1b6a2b242eb;p=ctsim.git

diff --git a/include/projections.h b/include/projections.h
index eb1c3c7..338f376 100644
--- a/include/projections.h
+++ b/include/projections.h
@@ -9,7 +9,7 @@
 **  This is part of the CTSim program
 **  Copyright (C) 1983-2000 Kevin Rosenberg
 **
-**  $Id: projections.h,v 1.17 2000/12/16 03:29:02 kevin Exp $
+**  $Id: projections.h,v 1.19 2001/01/03 22:00:46 kevin Exp $
 **
 **
 **  This program is free software; you can redistribute it and/or modify
@@ -47,15 +47,18 @@ class Projections
 
   void printProjectionData (int startView, int endView);
   void printProjectionData ();
-  void printScanInfo (ostringstream& os) const;
+  void printScanInfo (std::ostringstream& os) const;
 
-  bool read (const string& fname);
+  bool read (const std::string& fname);
   bool read (const char* fname);
   bool write (const char* fname);
-  bool write (const string& fname);
+  bool write (const std::string& fname);
   bool detarrayRead (fnetorderstream& fs, DetectorArray& darray, const int view_num);
   bool detarrayWrite (fnetorderstream& fs, const DetectorArray& darray, const int view_num);
 
+  bool convertPolar (ImageFile& rIF, int iInterpolation);
+  bool convertFFTPolar (ImageFile& rIF, int iInterpolation, int iZeropad);
+
   bool reconstruct (ImageFile& im, const char* const filterName, double filt_param, const char* const filterMethodName, const int zeropad, const char* frequencyFilterName, const char* const interpName, int interp_param, const char* const backprojName, const int trace) const;
 
   void setNView (int nView);  // used in MPI to restrict # of views
@@ -64,7 +67,7 @@ class Projections
   void setPhmLen (double phmLen) { m_phmLen = phmLen;}
   void setCalcTime (double calcTime) {m_calcTime = calcTime;}
   void setRemark (const char* remark) {m_remark = remark; m_label.setLabelString(remark);}
-  void setRemark (const string& remark) {setRemark(remark.c_str());}
+  void setRemark (const std::string& remark) {setRemark(remark.c_str());}
 
   double detStart() const {return m_detStart;}
   double rotStart() const {return m_rotStart;}
@@ -79,7 +82,7 @@ class Projections
   double focalLength() const {return m_focalLength;}
   double fieldOfView() const {return m_fieldOfView;}
 
-  const string& getFilename() const {return m_filename;}
+  const std::string& getFilename() const {return m_filename;}
   Array2dFileLabel& getLabel() {return m_label;}
   const Array2dFileLabel& getLabel() const {return m_label;}
 
@@ -90,16 +93,16 @@ class Projections
       { return (*m_projData[iview]); }
 
   static bool copyHeader (const char* const filename, std::ostream& os);
-  static bool copyHeader (const string& filename, std::ostream& os);
+  static bool copyHeader (const std::string& filename, std::ostream& os);
 
   static bool copyViewData (const char* const filename, std::ostream& os, int startView, int endView);
-  static bool copyViewData (const string& filename, std::ostream& os, int startView, int endView);
+  static bool copyViewData (const std::string& filename, std::ostream& os, int startView, int endView);
   
  private:
   int m_headerSize;		// Size of disk file header 
   int m_geometry;		// Geometry of scanner 
   class DetectorArray **m_projData;	// Pointer to array of detarray_st pointers 
-  string m_remark;	        // description of raysum data 
+  std::string m_remark;	        // description of raysum data 
   int m_nDet;			// number of detectors in array 
   int m_nView;			// number of rotated views 
   double m_calcTime;		// time required to calculate raysums 
@@ -116,7 +119,7 @@ class Projections
   kuint32 m_hour;
   kuint32 m_minute;
   kuint32 m_second;
-  string m_filename;
+  std::string m_filename;
   Array2dFileLabel m_label;
 
   const static kuint16 m_signature;