X-Git-Url: http://git.kpe.io/?p=ctsim.git;a=blobdiff_plain;f=include%2Farray2dfile.h;h=754ad93a9d1df81138605fc684a81edf8db8a8a0;hp=9af82a70d8c7949f8c7310d65e8cc5dc4fda7b86;hb=67a6c34b5a6f38d34e8cbe66091853f453fd2d7a;hpb=baba40afccf75bd75d612980fee023ff22c40952

diff --git a/include/array2dfile.h b/include/array2dfile.h
index 9af82a7..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.8 2000/12/04 04:15:48 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
@@ -33,17 +33,17 @@
 #endif
 
 #include <sys/types.h>
-#include <string.h>
-#include <string>
-#include <fstream>
-#include <iostream>
+#include <cstring>
+#include <string>
+#include <iosfwd>
+#include <iomanip>
+#include <fstream>
+#include <iostream>
 #include <vector>
 #include "ctsupport.h"
 #include "fnetorderstream.h"
 #include "array2d.h"
 
-using namespace std;
-
 class Array2dFileLabel
 {
 public:
@@ -61,7 +61,7 @@ public:
 
     ~Array2dFileLabel();
 
-    const string& getLabelString (void) const
+    const std::string& getLabelString (void) const
 	{ return m_strLabel; }
 
     kfloat64 getCalcTime (void) const
@@ -76,19 +76,19 @@ public:
     int getLabelType (void) const
 	{ return m_labelType; }
 
-    string& setLabelString (const char* const str)
+	std::string& setLabelString (const char* const str)
 	{ m_strLabel = str; return (m_strLabel); }
 
-    string& setLabelString (const string& str)
+	std::string& setLabelString (const std::string& str)
 	{ m_strLabel = str; return (m_strLabel); }
 
     void setDateTime (int year, int month, int day, int hour, int minute, int second);
 
     void getDateTime (int& year, int& month, int& day, int& hour, int& minute, int& second) const;
 
-    const string& getDateString () const;
+    const std::string& getDateString () const;
 
-    void print (ostream& os) const;
+    void print (std::ostream& os) const;
 
     Array2dFileLabel (const Array2dFileLabel& rhs);
 
@@ -104,10 +104,10 @@ private:
     kuint16 m_hour;
     kuint16 m_minute;
     kuint16 m_second;
-    string m_strLabel;
+	std::string m_strLabel;
     kfloat64 m_calcTime;
 
-    mutable string m_strDate;
+    mutable std::string m_strDate;
 };
 
 
@@ -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);
 
@@ -171,26 +186,26 @@ public:
 
   bool fileRead (const char* const filename);
 
-  bool fileRead (const string& filename);
+  bool fileRead (const std::string& filename);
 
   bool fileWrite (const char* const filename);
 
-  bool fileWrite (const string& filename);
+  bool fileWrite (const std::string& filename);
 
-  const string& getFilename (void) const 
+  const std::string& getFilename (void) const 
       {  return m_filename; }
 
-  void printLabels (ostream& os) const;
+  void printLabels (std::ostream& os) const;
 
-  typedef vector<Array2dFileLabel*>::iterator labelIterator;
-  typedef vector<Array2dFileLabel*>::const_iterator constLabelIterator;
+  typedef std::vector<Array2dFileLabel*>::iterator labelIterator;
+  typedef std::vector<Array2dFileLabel*>::const_iterator constLabelIterator;
 
  protected:
-  typedef vector<Array2dFileLabel*> labelContainer;
+	 typedef std::vector<Array2dFileLabel*> labelContainer;
 
   static const kuint16 m_signature;
   kuint16 m_headersize;
-  string  m_filename;
+  std::string  m_filename;
 
   kuint16 m_pixelSize;
   kuint16 m_pixelFormat;
@@ -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