X-Git-Url: http://git.kpe.io/?p=ctsim.git;a=blobdiff_plain;f=include%2Farray2dfile.h;fp=include%2Farray2dfile.h;h=754ad93a9d1df81138605fc684a81edf8db8a8a0;hp=21023dc3c33f83e63646ec0f4c04717a1039aaf4;hb=67a6c34b5a6f38d34e8cbe66091853f453fd2d7a;hpb=5c6b29ab4885308cc3381af6e0a68f4804956d2e

diff --git a/include/array2dfile.h b/include/array2dfile.h
index 21023dc..754ad93 100644
--- a/include/array2dfile.h
+++ b/include/array2dfile.h
@@ -9,7 +9,7 @@
 **  This is part of the CTSim program
 **  Copyright (C) 1983-2000 Kevin Rosenberg
 **
-**  $Id: array2dfile.h,v 1.12 2000/12/16 06:12:47 kevin Exp $
+**  $Id: array2dfile.h,v 1.13 2000/12/29 19:30:08 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
@@ -125,12 +125,18 @@ public:
     PIXEL_FLOAT32 = 7,
     PIXEL_FLOAT64 = 8,
   };
-
-  Array2dFile (int nx, int ny, int pixelSize, int pixelFormat = PIXEL_INVALID);
+
+  enum {
+    DATA_TYPE_INVALID = 0,
+    DATA_TYPE_REAL,
+    DATA_TYPE_COMPLEX,
+  };
+
+  Array2dFile (int nx, int ny, int pixelSize, int pixelFormat = PIXEL_INVALID, int dataType = DATA_TYPE_REAL);
   Array2dFile (void);
   ~Array2dFile ();
 
-  void setArraySize (int nx, int ny, int pixelSize, int pixelFormat = PIXEL_INVALID);
+  void setArraySize (int nx, int ny, int pixelSize, int pixelFormat = PIXEL_INVALID, int dataType = DATA_TYPE_REAL);
 
   void setArraySize (int nx, int ny);
 
@@ -158,12 +164,21 @@ public:
 
   kuint32 ny (void) const
       { return m_ny; }
+
+  int dataType () const
+  { return static_cast<int>(m_dataType); }
+
+  void setDataType (int dataType)
+  { m_dataType = dataType; }
 
   void setAxisIncrement (double axisIncX, double axisIncY);
 
-  void setAxisExtent (double minX, double maxX, double minY, double maxY);
+  bool reallocRealToComplex ();
+
+  bool reallocComplexToReal ();
 
-  void getPixelValueRange (double& pvmin, double& pvmax) const;
+  void getPixelValueRange (double& pvmin, double& pvmax) const;
+  void setAxisExtent (double minX, double maxX, double minY, double maxY);
       
   void doPixelOffsetScale (double offset, double scale);
 
@@ -203,8 +218,10 @@ public:
   kuint32 m_ny;
   kuint32 m_arraySize;
   labelContainer m_labels;
-  kuint16 m_numFileLabels;
+  kuint16 m_numFileLabels;
+  kuint16 m_dataType;
   unsigned char** m_arrayData;
+  unsigned char** m_imaginaryArrayData;
 
 private:
   void init (void);
@@ -223,9 +240,11 @@ private:
 
   bool labelSeek (int label_num);
 
-  void allocArray (void);
-  
-  void freeArray (void);
+  void allocArrays ();
+  void freeArrays ();
+
+  void allocArray (unsigned char**& rppData);
+  void freeArray (unsigned char**& rppData);
 
   Array2dFile (const Array2dFile& rhs);        // copy constructor
   Array2dFile& operator= (const Array2dFile&); // assignment operator