X-Git-Url: http://git.kpe.io/?p=ctsim.git;a=blobdiff_plain;f=include%2Fprojections.h;h=8a916166170327ee92adcde5dffe93d6b7993c21;hp=38828a1532428590a7f6d28e854921453f39b78b;hb=a05f3cb550877e94aa118cc04b361c0c8fdb3dc3;hpb=6bfb747f8163381d94a02c03a0351e9ca6815d22

diff --git a/include/projections.h b/include/projections.h
index 38828a1..8a91616 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.12 2000/08/27 20:32:55 kevin Exp $
+**  $Id: projections.h,v 1.13 2000/08/31 08:38:58 kevin Exp $
 **
 **
 **  This program is free software; you can redistribute it and/or modify
@@ -32,7 +32,7 @@
 class Scanner;
 class DetectorArray;
 class Array2dFileLabel;
-
+class ostringstream;
 
 // Projections
 class Projections
@@ -40,16 +40,18 @@ class Projections
  public:
   Projections (const int nView, const int nDet);
   Projections (const Scanner& scanner);
-  Projections (void);
-  ~Projections (void);
+  Projections ();
+  ~Projections ();
 
   void initFromScanner (const Scanner& scanner);
 
-  void printProjectionData (void);
-  void printScanInfo (void) const;
+  void printProjectionData ();
+  void printScanInfo (ostringstream& os) const;
 
+  bool read (const string& fname);
   bool read (const char* fname);
   bool write (const char* fname);
+  bool write (const string& fname);
   bool detarrayRead (fnetorderstream& fs, DetectorArray& darray, const int view_num);
   bool detarrayWrite (fnetorderstream& fs, const DetectorArray& darray, const int view_num);
 
@@ -61,20 +63,24 @@ class Projections
   void setPhmLen (double phmLen) { m_phmLen = phmLen;}
   void setCalcTime (double calcTime) {m_calcTime = calcTime;}
   void setRemark (const char* remark) {m_remark = remark;}
-  void setRemark (const string remark) {m_remark = remark;}
-
-  const double detStart(void) const {return m_detStart;}
-  const double rotStart(void) const {return m_rotStart;}
-  const double calcTime(void) const {return m_calcTime;}
-  const double phmLen(void) const {return m_phmLen;}
-  const char*  remark(void) const {return m_remark.c_str();}
-  const double detInc(void) const {return m_detInc;}
-  const double rotInc(void) const {return m_rotInc;}
-  const int nDet(void) const {return m_nDet;}
-  const int nView(void) const {return m_nView;}
-  const string& getFilename(void) const {return m_filename;}
-  Array2dFileLabel& getLabel(void) {return m_label;}
-  const Array2dFileLabel& getLabel(void) const {return m_label;}
+  void setRemark (const string& remark) {m_remark = remark;}
+
+  double detStart() const {return m_detStart;}
+  double rotStart() const {return m_rotStart;}
+  double calcTime() const {return m_calcTime;}
+  double phmLen() const {return m_phmLen;}
+  const char*  remark() const {return m_remark.c_str();}
+  double detInc() const {return m_detInc;}
+  double rotInc() const {return m_rotInc;}
+  int nDet() const {return m_nDet;}
+  int nView() const {return m_nView;}
+  int geometry() const {return m_geometry;}
+  double focalLength() const {return m_focalLength;}
+  double fieldOfView() const {return m_fieldOfView;}
+
+  const string& getFilename() const {return m_filename;}
+  Array2dFileLabel& getLabel() {return m_label;}
+  const Array2dFileLabel& getLabel() const {return m_label;}
 
   DetectorArray& getDetectorArray (const int iview)
       { return (*m_projData[iview]); }
@@ -108,12 +114,12 @@ class Projections
 
   const static kuint16 m_signature = ('P'*256 + 'J');
 
-  bool headerRead (void);
-  bool headerWrite (void);
+  bool headerRead ();
+  bool headerWrite ();
   bool headerRead (fnetorderstream& fs);
   bool headerWrite (fnetorderstream& fs);
-  void newProjData (void);
-  void deleteProjData (void);
+  void newProjData ();
+  void deleteProjData ();
 
   void init (const int nView, const int nDet);