X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=include%2Fimagefile.h;h=a5dfd3af54a9225bb0c205a59988c03f52bd0e32;hb=dca8d386ab6a4e33050b456cff4547d6adfdf249;hp=5b440a03c0bde6a69de1076b723e390ba052ef21;hpb=505de7e90b7c4a6ab3e81ee3192a7d9837701806;p=ctsim.git

diff --git a/include/imagefile.h b/include/imagefile.h
index 5b440a0..a5dfd3a 100644
--- a/include/imagefile.h
+++ b/include/imagefile.h
@@ -1,15 +1,13 @@
 /*****************************************************************************
 ** FILE IDENTIFICATION
 **
-**	Name:	      imagefile.h
+**      Name:         imagefile.h
 **      Purpose:      imagefile class header
-**	Programmer:   Kevin Rosenberg
-**	Date Started: June 2000
+**      Programmer:   Kevin Rosenberg
+**      Date Started: June 2000
 **
 **  This is part of the CTSim program
-**  Copyright (c) 1983-2001 Kevin Rosenberg
-**
-**  $Id: imagefile.h,v 1.33 2001/03/02 02:08:14 kevin Exp $
+**  Copyright (c) 1983-2009 Kevin Rosenberg
 **
 **  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
@@ -46,7 +44,7 @@
 class F32Image : public Array2dFile
 {
 public:
-  F32Image (int nx, int ny, int dataType = Array2dFile::DATA_TYPE_REAL);     
+  F32Image (int nx, int ny, int dataType = Array2dFile::DATA_TYPE_REAL);
   F32Image (void);
 
   kfloat32** getArray (void)
@@ -136,6 +134,7 @@ public:
 
   static const int EXPORT_FORMAT_INVALID;
   static const int IMPORT_FORMAT_INVALID;
+  static const int EXPORT_FORMAT_TEXT;
   static const int EXPORT_FORMAT_PGM;
   static const int EXPORT_FORMAT_PGMASCII;
   static const int IMPORT_FORMAT_PPM;
@@ -148,6 +147,7 @@ public:
   static const int EXPORT_FORMAT_DICOM;
   static const int IMPORT_FORMAT_DICOM;
 #endif
+  static const int EXPORT_FORMAT_RAW;
 
   static const int getExportFormatCount() {return s_iExportFormatCount;}
   static const char** getExportFormatNameArray() {return s_aszExportFormatName;}
@@ -213,29 +213,30 @@ public:
 #endif
   bool magnitude (ImageFile& result) const;
   bool phase (ImageFile& result) const;
-
-  int display (void) const;
-  int displayScaling (const int scaleFactor, ImageFileValue pmin, ImageFileValue pmax) const;
+  bool real (ImageFile& result) const;
+  bool imaginary (ImageFile& result) const;
 
   bool exportImage (const char* const pszFormat, const char* const pszFilename, int nxcell, int nycell, double densmin, double densmax);
 
   bool importImage (const char* const pszFormat, const char* const pszFilename);
 
-#if HAVE_PNG
+#ifdef HAVE_PNG
   bool writeImagePNG (const char* const outfile, int bitdepth, int nxcell, int nycell, double densmin, double densmax);
   bool readImagePNG (const char* const pszFile);
 #endif
-#if HAVE_GD
+#ifdef HAVE_GD
   bool writeImageGIF (const char* const outfile, int nxcell, int nycell, double densmin, double densmax);
 #endif
   bool writeImagePGM (const char* const outfile, int nxcell, int nycell, double densmin, double densmax);
   bool writeImagePGMASCII (const char* const outfile, int nxcell, int nycell, double densmin, double densmax);
   bool readImagePPM (const char* const pszFile);
+  bool writeImageRaw(const char* const outfile, int nxcell, int nycell);
+  bool writeImageText (const char* const outfile);
 
   static double redGrayscaleFactor() {return s_dRedGrayscaleFactor;}
   static double greenGrayscaleFactor() {return s_dGreenGrayscaleFactor;}
   static double blueGrayscaleFactor() {return s_dBlueGrayscaleFactor;}
-  static double colorToGrayscale (double r, double g, double b) 
+  static double colorToGrayscale (double r, double g, double b)
   { return r * s_dRedGrayscaleFactor + g * s_dGreenGrayscaleFactor + b * s_dBlueGrayscaleFactor; }
 };