r348: fix linefeed problem

[ctsim.git] / libctsim / phantom.cpp

diff --git a/libctsim/phantom.cpp b/libctsim/phantom.cpp
index b74e531930a067cbc295b0b36a7075e29b77d9f8..467c8e90d5f4eab03f48533433240384ebda42f2 100644 (file)
--- a/libctsim/phantom.cpp
+++ b/libctsim/phantom.cpp
@@ -9,7 +9,7 @@
 **  This is part of the CTSim program
 **  Copyright (C) 1983-2000 Kevin Rosenberg
 **
-**  $Id: phantom.cpp,v 1.25 2001/01/02 07:47:36 kevin Exp $
+**  $Id: phantom.cpp,v 1.26 2001/01/02 16:02:13 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
@@ -27,8 +27,8 @@
 
 #include "ct.h"
 
-const int PhantomElement::POINTS_PER_CIRCLE = 360;\r
-const double PhantomElement::SCALE_PELEM_EXTENT=0.005;  // increase pelem limits by 0.5% \r
+const int PhantomElement::POINTS_PER_CIRCLE = 360;
+const double PhantomElement::SCALE_PELEM_EXTENT=0.005;  // increase pelem limits by 0.5% 
 
 const int Phantom::PHM_INVALID = -1;
 const int Phantom::PHM_HERMAN = 0;
@@ -226,15 +226,15 @@ Phantom::createFromFile (const char* const fname)
   return (bGoodFile);
 }
 
-bool\r
-Phantom::fileWrite (const char* const fname)\r
-{\r
-  fstream file (fname, ios::out);\r
-\r
-  if (! file.fail())\r
-    printDefinitions (file);\r
-  return ! file.fail();\r
-}\r
+bool
+Phantom::fileWrite (const char* const fname)
+{
+  fstream file (fname, ios::out);
+
+  if (! file.fail())
+    printDefinitions (file);
+  return ! file.fail();
+}
 
 /* NAME
  *   addPElem          Add pelem
@@ -288,12 +288,12 @@ Phantom::print (std::ostream& os) const
   os << "Number of PElements: " << m_nPElem << "\n";
   os << "Limits: xmin=" << m_xmin << ", ymin=" << m_ymin << ", xmax=" << m_xmax << ", ymax=" << m_ymax << "\n";
   
-  for (PElemConstIterator i = m_listPElem.begin(); i != m_listPElem.end(); i++) {\r
+  for (PElemConstIterator i = m_listPElem.begin(); i != m_listPElem.end(); i++) {
     const PhantomElement& rPE = **i;
-      os << "PhantomElement: nPoints=" << rPE.nOutlinePoints();\r
+      os << "PhantomElement: nPoints=" << rPE.nOutlinePoints();
       os << ", atten=" << rPE.atten() << " rot=" << convertRadiansToDegrees (rPE.rot()) << "\n";
       os << "xmin=" << rPE.xmin() << ", ymin=" << rPE.ymin() << ", xmax=" << rPE.xmax() << ", ymax=" << rPE.ymax() << "\n";
-    \r
+    
       if (false)
         for (int i = 0; i < rPE.nOutlinePoints(); i++)
           os << rPE.xOutline()[i] << "," << rPE.yOutline()[i] << "\n";
@@ -305,36 +305,36 @@ Phantom::print (std::ostringstream& os) const
   os << "Number of PElements: " << m_nPElem << "\n";
   os << "Limits: xmin=" << m_xmin << ", ymin=" << m_ymin << ", xmax=" << m_xmax << ", ymax=" << m_ymax << "\n";
   
-  for (PElemConstIterator i = m_listPElem.begin(); i != m_listPElem.end(); i++) {\r
+  for (PElemConstIterator i = m_listPElem.begin(); i != m_listPElem.end(); i++) {
     const PhantomElement& rPE = **i;
-      os << "PhantomElement: nPoints=" << rPE.nOutlinePoints();\r
+      os << "PhantomElement: nPoints=" << rPE.nOutlinePoints();
       os << ", atten=" << rPE.atten() << " rot=" << convertRadiansToDegrees (rPE.rot()) << "\n";
       os << "xmin=" << rPE.xmin() << ", ymin=" << rPE.ymin() << ", xmax=" << rPE.xmax() << ", ymax=" << rPE.ymax() << "\n";
-    \r
+    
       if (false)
         for (int i = 0; i < rPE.nOutlinePoints(); i++)
           os << rPE.xOutline()[i] << "," << rPE.yOutline()[i] << "\n";
   }
 }
-\r
-void\r
-Phantom::printDefinitions (std::ostream& os) const\r
-{\r
-  for (PElemConstIterator i = m_listPElem.begin(); i != m_listPElem.end(); i++) {\r
-    const PhantomElement& rPE = **i;\r
-    rPE.printDefinition (os);\r
-  }\r
-}
-\r
-void\r
-Phantom::printDefinitions (std::ostringstream& os) const\r
-{\r
-  for (PElemConstIterator i = m_listPElem.begin(); i != m_listPElem.end(); i++) {\r
-    const PhantomElement& rPE = **i;\r
-    rPE.printDefinition (os);\r
-  }\r
-}
-\r
+
+void
+Phantom::printDefinitions (std::ostream& os) const
+{
+  for (PElemConstIterator i = m_listPElem.begin(); i != m_listPElem.end(); i++) {
+    const PhantomElement& rPE = **i;
+    rPE.printDefinition (os);
+  }
+}
+
+void
+Phantom::printDefinitions (std::ostringstream& os) const
+{
+  for (PElemConstIterator i = m_listPElem.begin(); i != m_listPElem.end(); i++) {
+    const PhantomElement& rPE = **i;
+    rPE.printDefinition (os);
+  }
+}
+
 
 /* NAME
  *   show              Show vector outline of Phantom to user
@@ -550,13 +550,13 @@ Phantom::convertToImagefile (ImageFile& im, const int in_nsample, const int trac
   if (nsample > 1) {
     double factor = 1.0 / static_cast<double>(nsample * nsample);
 
-\r
+
     for (int ix = 0; ix < colCount; ix++) {
-               int iColStore = ix;\r
-               if (bStoreAtColumnPos)\r
-                       iColStore += colStart;\r
+               int iColStore = ix;
+               if (bStoreAtColumnPos)
+                       iColStore += colStart;
                for (int iy = 0; iy < ny; iy++)
-                       v[iColStore][iy] *= factor;\r
+                       v[iColStore][iy] *= factor;
        }
   }
 }
@@ -594,27 +594,27 @@ PhantomElement::PhantomElement (const char *type, const double cx, const double
   m_rectLimits[2] = m_xmax;   m_rectLimits[3] = m_ymax;
 }
 
-\r
+
 
 PhantomElement::~PhantomElement ()
 {
     delete m_xOutline;
     delete m_yOutline;
 }
-\r
-void\r
-PhantomElement::printDefinition (std::ostream& os) const\r
-{\r
-  os << convertTypeToName (m_type) << " " << m_cx << " " << m_cy << " " << m_u << " "\r
-    << m_v << " " << convertRadiansToDegrees (m_rot) << " " << m_atten << "\n";\r
-}\r
-
-void\r
-PhantomElement::printDefinition (std::ostringstream& os) const\r
-{\r
-  os << convertTypeToName (m_type) << " " << m_cx << " " << m_cy << " " << m_u << " "\r
-    << m_v << " " << convertRadiansToDegrees (m_rot) << " " << m_atten << "\n";\r
-}\r
+
+void
+PhantomElement::printDefinition (std::ostream& os) const
+{
+  os << convertTypeToName (m_type) << " " << m_cx << " " << m_cy << " " << m_u << " "
+    << m_v << " " << convertRadiansToDegrees (m_rot) << " " << m_atten << "\n";
+}
+
+void
+PhantomElement::printDefinition (std::ostringstream& os) const
+{
+  os << convertTypeToName (m_type) << " " << m_cx << " " << m_cy << " " << m_u << " "
+    << m_v << " " << convertRadiansToDegrees (m_rot) << " " << m_atten << "\n";
+}
 
 PhmElemType
 PhantomElement::convertNameToType (const char* const typeName)
@@ -636,26 +636,26 @@ PhantomElement::convertNameToType (const char* const typeName)
 
     return (type);
 }
-\r
-const char* const\r
-PhantomElement::convertTypeToName (PhmElemType iType)\r
-{\r
-  static char* pszType = "Unknown";\r
-\r
-  if (iType == PELEM_RECTANGLE)\r
-    pszType = "rectangle";\r
-  else if (iType == PELEM_TRIANGLE)\r
-    pszType = "triangle";\r
-  else if (iType == PELEM_ELLIPSE)\r
-    pszType = "ellipse";\r
-  else if (iType == PELEM_SECTOR)\r
-    pszType = "sector";\r
-  else if (iType == PELEM_SEGMENT)\r
-    pszType = "segment";\r
-\r
-  return pszType;\r
-}\r
-\r
+
+const char* const
+PhantomElement::convertTypeToName (PhmElemType iType)
+{
+  static char* pszType = "Unknown";
+
+  if (iType == PELEM_RECTANGLE)
+    pszType = "rectangle";
+  else if (iType == PELEM_TRIANGLE)
+    pszType = "triangle";
+  else if (iType == PELEM_ELLIPSE)
+    pszType = "ellipse";
+  else if (iType == PELEM_SECTOR)
+    pszType = "sector";
+  else if (iType == PELEM_SEGMENT)
+    pszType = "segment";
+
+  return pszType;
+}
+
 
 void 
 PhantomElement::makeTransformMatrices ()