X-Git-Url: http://git.kpe.io/?p=ctsim.git;a=blobdiff_plain;f=include%2Farray2dfile.h;h=b49e04a25ed80c89d5d9b90d459d6a0087dde9ca;hp=22e8b6173401fe6ed3d2dec6dccc4c2211e65af5;hb=c00c639073653fac7463a88f2b000f263236550d;hpb=7ec2cd66921180a624813dff9f8bac76c6b268cc

diff --git a/include/array2dfile.h b/include/array2dfile.h
index 22e8b61..b49e04a 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.14 2001/01/01 10:14:34 kevin Exp $
+**  $Id: array2dfile.h,v 1.18 2001/01/02 16:02:12 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
@@ -34,11 +34,11 @@
 
 #include <sys/types.h>
 #include <cstring>
-#include <string>
+#include <string>
 #include <iosfwd>
-#include <iomanip>
-#include <fstream>
-#include <iostream>
+#include <iomanip>
+#include <fstream>
+#include <iostream>
 #include <vector>
 #include "ctsupport.h"
 #include "fnetorderstream.h"
@@ -89,6 +89,8 @@ public:
     const std::string& getDateString () const;
 
     void print (std::ostream& os) const;
+    void printBrief (std::ostream& os) const;
+    void printBrief (std::ostringstream& os) const;
 
     Array2dFileLabel (const Array2dFileLabel& rhs);
 
@@ -125,12 +127,12 @@ public:
     PIXEL_FLOAT32 = 7,
     PIXEL_FLOAT64 = 8,
   };
-
-  enum {
-    DATA_TYPE_INVALID = 0,
-    DATA_TYPE_REAL,
-    DATA_TYPE_COMPLEX,
-  };
+
+  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);
@@ -151,7 +153,7 @@ public:
 
   void labelAdd (int type, const char* const m_strLabel, double calc_time=0.);
 
-  void labelsCopy (Array2dFile& file, const char* const idStr = NULL);
+  void labelsCopy (const Array2dFile& file, const char* const idStr = NULL);
 
   void setPixelFormat (int type)
       { m_pixelFormat = type; }
@@ -164,26 +166,26 @@ public:
 
   kuint32 ny (void) const
       { return m_ny; }
-
-  bool isComplex() const
-  { return m_dataType == DATA_TYPE_COMPLEX; }
-
-  bool isReal() const
-  { return m_dataType == DATA_TYPE_REAL; }
-
-  int dataType () const
-  { return static_cast<int>(m_dataType); }
-
-  void setDataType (int dataType)
-  { m_dataType = dataType; }
+
+  bool isComplex() const
+  { return m_dataType == DATA_TYPE_COMPLEX; }
+
+  bool isReal() const
+  { return m_dataType == DATA_TYPE_REAL; }
+
+  int dataType () const
+  { return static_cast<int>(m_dataType); }
+
+  void setDataType (int dataType)
+  { m_dataType = dataType; }
 
   void setAxisIncrement (double axisIncX, double axisIncY);
 
-  bool reallocRealToComplex ();
-
-  bool reallocComplexToReal ();
+  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);
@@ -202,6 +204,11 @@ public:
       {  return m_filename; }
 
   void printLabels (std::ostream& os) const;
+  void printLabelsBrief (std::ostream& os) const;
+  void printLabelsBrief (std::ostringstream& os) const;
+
+  unsigned int nLabels() const
+  { return m_labels.size(); }
 
   typedef std::vector<Array2dFileLabel*>::iterator labelIterator;
   typedef std::vector<Array2dFileLabel*>::const_iterator constLabelIterator;
@@ -224,10 +231,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;
+  unsigned char** m_imaginaryArrayData;
 
 private:
   void init (void);
@@ -248,9 +255,9 @@ private:
 
   void allocArrays ();
   void freeArrays ();
-
-  void allocArray (unsigned char**& rppData);
-  void freeArray (unsigned char**& rppData);
+
+  void allocArray (unsigned char**& rppData);
+  void freeArray (unsigned char**& rppData);
 
   Array2dFile (const Array2dFile& rhs);        // copy constructor
   Array2dFile& operator= (const Array2dFile&); // assignment operator