r11859: Canonicalize whitespace

[ctsim.git] / include / ctndicom.h

diff --git a/include/ctndicom.h b/include/ctndicom.h
index 011df7c867c81ee7619993ab64ff8d84a7ca3876..0a1d0fc56aad980ff9837a988adff6b33b8226d3 100644 (file)
--- a/include/ctndicom.h
+++ b/include/ctndicom.h
@@ -1,15 +1,15 @@
 /*****************************************************************************
 ** FILE IDENTIFICATION
 **
-**     Name:           ctndicomp.cpp
+**      Name:           ctndicomp.cpp
 **  Purpose:      Interface to CTN Dicom header
-**     Programmer:   Kevin Rosenberg
-**     Date Started: March 2001
+**      Programmer:   Kevin Rosenberg
+**      Date Started: March 2001
 **
 **  This is part of the CTSim program
 **  Copyright (c) 1983-2001 Kevin Rosenberg
 **
-**  $Id: ctndicom.h,v 1.4 2001/03/05 21:59:55 kevin Exp $
+**  $Id$
 **
 **  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
@@ -78,7 +78,7 @@ private:
   Projections* m_pProjections;
   DCM_OBJECT* m_pFile;
 
-  void loadImage(unsigned short iNRows, unsigned short iNCols, unsigned short iBitsAllocated, 
+  void loadImage(unsigned short iNRows, unsigned short iNCols, unsigned short iBitsAllocated,
             unsigned short iBitsStored, unsigned short iHighBit, unsigned short iPixRep);
 
   void loadProjections();
@@ -110,21 +110,20 @@ public:
 
 class DicomExporter {
 private:
+  const ImageFile* m_pImageFile;
   std::string m_strFilename;
   bool m_bFail;
   std::string m_strFailMessage;
-  const ImageFile* m_pImageFile;
-  DCM_OBJECT* m_pFile;
-
-  void saveImage (unsigned short iNRows, unsigned short iNCols, unsigned short iBitsAllocated, 
-            unsigned short iBitsStored, unsigned short iHighBit, unsigned short iPixRep);
+  DCM_OBJECT* m_pObject;
 
+  bool createDicomObject();
 
 public:
 
-  DicomExporter (const char* const pszFile, const ImageFile* pImageFile);
+  DicomExporter (ImageFile* pImageFile);
   ~DicomExporter();
 
+  bool writeFile (const char* const pszFilename);
   bool fail() const {return m_bFail;}
   const std::string& failMessage() const {return m_strFailMessage;}
 };