r244: *** empty log message ***

[ctsim.git] / include / projections.h

diff --git a/include/projections.h b/include/projections.h
index 8a916166170327ee92adcde5dffe93d6b7993c21..4bad1e4d8be2e4ccc085da1967c06d2418ed93cc 100644 (file)
--- 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.13 2000/08/31 08:38:58 kevin Exp $
+**  $Id: projections.h,v 1.15 2000/12/04 05:36:57 kevin Exp $
 **
 **
 **  This program is free software; you can redistribute it and/or modify
@@ -32,7 +32,9 @@
 class Scanner;
 class DetectorArray;
 class Array2dFileLabel;
-class ostringstream;
+\r
+#include <sstream>\r
+
 
 // Projections
 class Projections
@@ -62,8 +64,8 @@ class Projections
   void setDetInc (double detInc) { m_detInc = detInc;}
   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;}
+  void setRemark (const char* remark) {m_remark = remark; m_label.setLabelString(remark);}
+  void setRemark (const string& remark) {setRemark(remark.c_str());}
 
   double detStart() const {return m_detStart;}
   double rotStart() const {return m_rotStart;}
@@ -91,7 +93,7 @@ class Projections
  private:
   int m_headerSize;            // Size of disk file header 
   int m_geometry;              // Geometry of scanner 
-  struct DetectorArray **m_projData;   // Pointer to array of detarray_st pointers 
+  class DetectorArray **m_projData;    // Pointer to array of detarray_st pointers 
   string m_remark;             // description of raysum data 
   int m_nDet;                  // number of detectors in array 
   int m_nView;                 // number of rotated views 
@@ -112,7 +114,7 @@ class Projections
   string m_filename;
   Array2dFileLabel m_label;
 
-  const static kuint16 m_signature = ('P'*256 + 'J');
+  const static kuint16 m_signature;
 
   bool headerRead ();
   bool headerWrite ();