X-Git-Url: http://git.kpe.io/?p=ctsim.git;a=blobdiff_plain;f=include%2Fimagefile.h;h=607f7166cd1cef4bd2f323c273830c0b38bb23e7;hp=5d362199adea76daaa027f631a49386de1b60d09;hb=44ba9ce559d2d52cbd7bbea6bcd76242840fd3eb;hpb=595e63c804284d460ce4d032c3848b75bc57186d

diff --git a/include/imagefile.h b/include/imagefile.h
index 5d36219..607f716 100644
--- a/include/imagefile.h
+++ b/include/imagefile.h
@@ -4,7 +4,10 @@
 #include <string>
 #include <sys/types.h>
 #include <unistd.h>
+#include <fstream>
+#include <iostream>
 #include "ctsupport.h"
+#include "fnetorderstream.h"
 #include "array2d.h"
 
 using namespace std;
@@ -70,7 +73,7 @@ private:
   kuint16 headersize;
   string  filename;
   int file_id;
-  iostream *io;
+  frnetorderstream *m_pFS;
   bool bHeaderWritten;
   bool bDataWritten;
 
@@ -193,7 +196,6 @@ Array2dFile<T>::init (void)
 {
   mPixelSize = sizeof(T);
   signature = ('I' * 256 + 'F');
-  file_id = -1;
   mNX = 0;
   mNY = 0;
   headersize = 0;
@@ -204,7 +206,7 @@ Array2dFile<T>::init (void)
   mMinX = mMaxX = mMinY = mMaxY = 0;
   mOffsetPV = 0;
   mScalePV = 1;
-  io = NULL;
+  m_pFS = NULL;
 
 #if 0
   const type_info& t_id = typeid(T);
@@ -246,10 +248,10 @@ template<class T>
 void
 Array2dFile<T>::fileClose (void)
 {
-  if (file_id >= 0) {
+  if (m_pFS) {
       headerWrite ();
-      close (file_id);
-      file_id = -1;
+      m_pFS->close ();
+      m_pFS = NULL;
   }
 }
 
@@ -257,11 +259,11 @@ template<class T>
 bool
 Array2dFile<T>::fileCreate (void)
 {
-  //  io = new iostream(filename, ios::out | ios::in | ios::trunc | io::binary);
-    if ((file_id = open (filename.c_str(), O_RDWR | O_CREAT | O_TRUNC | O_BINARY, S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH)) < 0) {
-	sys_error (ERR_WARNING, "Error opening file %s for writing [fileCreate]", filename.c_str());
-	return (false);
-    }
+  m_pFS = new frnetorderstream (filename.c_str(), ios::out | ios::in | ios::trunc | ios::binary);
+  if (! m_pFS) {
+      sys_error (ERR_WARNING, "Error opening file %s for writing [fileCreate]", filename.c_str());
+      return (false);
+  }
   headerWrite();
   return (true);
 }
@@ -270,13 +272,14 @@ template<class T>
 bool
 Array2dFile<T>::fileRead (void)
 {
-  // io = new iostream(filename, ios::out | ios::in | io::binary);
-  if ((file_id = open (filename.c_str(), O_RDONLY | O_BINARY)) < 0) {
+  m_pFS = new frnetorderstream (filename.c_str(), ios::out | ios::in | ios::binary | ios::nocreate);
+  if (m_pFS->fail()) {
     sys_error (ERR_WARNING, "Unable to open file %s [fileRead]", filename.c_str());
     return (false);
   }
 
-  headerRead();
+  if (! headerRead())
+      return false;
 
   array.initSetSize(mNX, mNY);
 
@@ -340,35 +343,35 @@ template<class T>
 bool
 Array2dFile<T>::headerRead (void)
 {
-  if (file_id < 0) {
+  if (! m_pFS) {
     sys_error (ERR_WARNING, "Tried to read header with file closed [headerRead]");
     return (false);
   }
 
-  lseek (file_id, 0, SEEK_SET);
+  m_pFS->seekg (0);
   kuint16 file_signature;
   kuint16 file_mPixelSize;
   kuint16 file_mPixelType;
 
-  read_nint16 (&headersize, file_id);
-  read_nint16 (&file_signature, file_id);
-  read_nint16 (&num_labels, file_id);
-  read_nint16 (&file_mPixelType, file_id);
-  read_nint16 (&file_mPixelSize, file_id);
-  read_nint32 (&mNX, file_id);
-  read_nint32 (&mNY, file_id);
-  read_nint16 (&axis_increment_known, file_id);
-  read_nfloat64 (&mIncX, file_id);
-  read_nfloat64 (&mIncY, file_id);
-  read_nint16 (&axis_extent_known, file_id);
-  read_nfloat64 (&mMinX, file_id);
-  read_nfloat64 (&mMaxX, file_id);
-  read_nfloat64 (&mMinY, file_id);
-  read_nfloat64 (&mMaxY, file_id);
-  read_nfloat64 (&mOffsetPV, file_id);
-  read_nfloat64 (&mScalePV, file_id);
-
-  int read_headersize = lseek (file_id, 0, SEEK_CUR);
+  m_pFS->readInt16 (headersize);
+  m_pFS->readInt16 (file_signature);
+  m_pFS->readInt16 (num_labels);
+  m_pFS->readInt16 (file_mPixelType);
+  m_pFS->readInt16 (file_mPixelSize);
+  m_pFS->readInt32 (mNX);
+  m_pFS->readInt32 (mNY);
+  m_pFS->readInt16 (axis_increment_known);
+  m_pFS->readFloat64 (mIncX);
+  m_pFS->readFloat64 (mIncY);
+  m_pFS->readInt16 (axis_extent_known);
+  m_pFS->readFloat64 (mMinX);
+  m_pFS->readFloat64 (mMaxX);
+  m_pFS->readFloat64 (mMinY);
+  m_pFS->readFloat64 (mMaxY);
+  m_pFS->readFloat64 (mOffsetPV);
+  m_pFS->readFloat64 (mScalePV);
+
+  int read_headersize = m_pFS->tellg();
   if (read_headersize != headersize) {
     sys_error (ERR_WARNING, "Read headersize %d != file headersize %d", read_headersize, headersize);
     return (false);
@@ -393,33 +396,32 @@ template<class T>
 bool
 Array2dFile<T>::headerWrite (void)
 {
-  if (file_id < 0) {
+  if (! m_pFS) {
     sys_error (ERR_WARNING, "Tried to write header with file closed");
     return (false);
   }
 
-  lseek (file_id, 0, SEEK_SET);
-  write_nint16 (&headersize, file_id);
-  write_nint16 (&signature, file_id);
-  write_nint16 (&num_labels, file_id);
-  write_nint16 (&mPixelType, file_id);
-  write_nint16 (&mPixelSize, file_id);
-  write_nint32 (&mNX, file_id);
-  write_nint32 (&mNY, file_id);
-  write_nint16 (&axis_increment_known, file_id);
-  write_nfloat64 (&mIncX, file_id);
-  write_nfloat64 (&mIncY, file_id);
-  write_nint16 (&axis_extent_known, file_id);
-  write_nfloat64 (&mMinX, file_id);
-  write_nfloat64 (&mMaxX, file_id);
-  write_nfloat64 (&mMinY, file_id);
-  write_nfloat64 (&mMaxY, file_id);
-  write_nfloat64 (&mOffsetPV, file_id);
-  write_nfloat64 (&mScalePV, file_id);
-
-  headersize = lseek (file_id, 0, SEEK_CUR);
-  lseek (file_id, 0, SEEK_SET);
-  write_nint16 (&headersize, file_id);
+  m_pFS->seekp (0);
+  m_pFS->writeInt16 (headersize);
+  m_pFS->writeInt16 (signature);
+  m_pFS->writeInt16 (num_labels);
+  m_pFS->writeInt16 (mPixelType);
+  m_pFS->writeInt16 (mPixelSize);
+  m_pFS->writeInt32 (mNX);
+  m_pFS->writeInt32 (mNY);
+  m_pFS->writeInt16 (axis_increment_known);
+  m_pFS->writeFloat64 (mIncX);
+  m_pFS->writeFloat64 (mIncY);
+  m_pFS->writeInt16 (axis_extent_known);
+  m_pFS->writeFloat64 (mMinX);
+  m_pFS->writeFloat64 (mMaxX);
+  m_pFS->writeFloat64 (mMinY);
+  m_pFS->writeFloat64 (mMaxY);
+  m_pFS->writeFloat64 (mOffsetPV);
+  m_pFS->writeFloat64 (mScalePV);
+
+  headersize = m_pFS->tellp();
+  m_pFS->writeInt16 (headersize);
   
   return (true);
 }
@@ -428,8 +430,8 @@ template<class T>
 bool
 Array2dFile<T>::arrayDataWrite (void)
 {
-  if (file_id < 0) {
-    sys_error (ERR_WARNING, "Tried to arrayDataWrite with file_id < 0");
+  if (! m_pFS) {
+    sys_error (ERR_WARNING, "Tried to arrayDataWrite with !m_pFS");
     return (false);
   }
 
@@ -437,13 +439,17 @@ Array2dFile<T>::arrayDataWrite (void)
   if (! da) 
       return (false);
 
-  lseek (file_id, headersize, SEEK_SET);
-  for (unsigned int ix = 0; ix < mNX; ix++)
-      for (unsigned int iy = 0; iy < mNY; iy++) {
-	  T value = da[ix][iy];
-	  ConvertReverseNetworkOrder (&value, sizeof(T));
-	      write (file_id, &value, mPixelSize);
-      }
+  m_pFS->seekp (headersize);
+  for (unsigned int ix = 0; ix < mNX; ix++) {
+      if (NativeBigEndian()) {
+	  for (unsigned int iy = 0; iy < mNY; iy++) {
+	      T value = da[ix][iy];
+	      ConvertReverseNetworkOrder (&value, sizeof(T));
+	      m_pFS->write (&value, mPixelSize);
+	  }
+      } else 
+	  m_pFS->write (da[ix], sizeof(T) * mNY);
+  }
 
   return (true);
 }
@@ -452,8 +458,8 @@ template<class T>
 bool
 Array2dFile<T>::arrayDataRead (void)
 {
-  if (file_id < 0) {
-    sys_error (ERR_WARNING, "Tried to arrayDataRead with file_id < 0");
+  if (! m_pFS) {
+    sys_error (ERR_WARNING, "Tried to arrayDataRead with !m_pFS");
     return (false);
   }
 
@@ -461,14 +467,19 @@ Array2dFile<T>::arrayDataRead (void)
   if (! da) 
       return (false);
 
-  lseek (file_id, headersize, SEEK_SET);
+  m_pFS->seekg (headersize);
   T pixelBuffer;
-  for (int ix = 0; ix < mNX; ix++) 
-      for (unsigned int iy = 0; iy < mNY; iy++) {
-	  read (file_id, &pixelBuffer, mPixelSize);
-	  ConvertReverseNetworkOrder (&pixelBuffer, sizeof(T));
-	  da[ix][iy] = pixelBuffer;
-      }
+  for (int ix = 0; ix < mNX; ix++) {
+      if (NativeBigEndian()) {
+	  for (unsigned int iy = 0; iy < mNY; iy++) {
+	      m_pFS->read (&pixelBuffer, mPixelSize);
+	      ConvertReverseNetworkOrder (&pixelBuffer, sizeof(T));
+	      da[ix][iy] = pixelBuffer;
+	  } 
+      } else
+	  m_pFS->read (da[ix], sizeof(T) * mNY);
+  }
+
 
   return (true);
 }
@@ -488,26 +499,21 @@ Array2dFile<T>::labelSeek (unsigned int label_num)
   }
 
   off_t pos = headersize + array.sizeofArray();
-  if (lseek (file_id, pos, SEEK_SET) != pos) {
-    sys_error (ERR_WARNING, "Can't seek to end of data array");
-    return (false);
-  }
+  m_pFS->seekg (pos);
 
   for (int i = 0; i < label_num; i++)
       {
 	  pos += 22;  // Skip to string length
-	  if (lseek (file_id, pos, SEEK_SET) != pos) {
-	    sys_error (ERR_WARNING, "Can't seek to string length");
-	    return (false);
-	  }
+	  m_pFS->seekg (pos);
+	      
 	  kuint16 strlength;
-	  read_nint16 (&strlength, file_id);
+	  m_pFS->readInt16 (strlength);
 	  pos += 2 + strlength;  // Skip label string length + data
-	  if (lseek (file_id, pos, SEEK_SET) != pos) {
-	    sys_error (ERR_WARNING, "Can't seek past label string");
-	    return (false);
-	  }
+	  m_pFS->seekg (pos);
       }
+  
+  if (! m_pFS)
+      return false;
 
   return (true);
 }
@@ -526,19 +532,19 @@ Array2dFile<T>::labelRead (Array2dFileLabel& label, unsigned int label_num)
     return (false);
   }
 
-  read_nint16 (&label.m_labelType, file_id);
-  read_nint16 (&label.m_year, file_id);
-  read_nint16 (&label.m_month, file_id);
-  read_nint16 (&label.m_day, file_id);
-  read_nint16 (&label.m_hour, file_id);
-  read_nint16 (&label.m_minute, file_id);
-  read_nint16 (&label.m_second, file_id);
-  read_nfloat64 (&label.m_calcTime, file_id);
+  m_pFS->readInt16 (label.m_labelType);
+  m_pFS->readInt16 (label.m_year);
+  m_pFS->readInt16 (label.m_month);
+  m_pFS->readInt16 (label.m_day);
+  m_pFS->readInt16 (label.m_hour);
+  m_pFS->readInt16 (label.m_minute);
+  m_pFS->readInt16 (label.m_second);
+  m_pFS->readFloat64 (label.m_calcTime);
 
   kuint16 strlength;
-  read_nint16 (&strlength, file_id);
+  m_pFS->readInt16 (strlength);
   char str [strlength+1];
-  read (file_id, str, strlength);
+  m_pFS->read (str, strlength);
   str[strlength] = 0;
   label.m_strLabel = str;
 
@@ -568,22 +574,21 @@ Array2dFile<T>::labelAdd (const Array2dFileLabel& label)
 {
   labelSeek (num_labels);
   
-  write_nint16 (&label.m_labelType, file_id);
-  write_nint16 (&label.m_year, file_id);
-  write_nint16 (&label.m_month, file_id);
-  write_nint16 (&label.m_day, file_id);
-  write_nint16 (&label.m_hour, file_id);
-  write_nint16 (&label.m_minute, file_id);
-  write_nint16 (&label.m_second, file_id);
-  write_nfloat64 (&label.m_calcTime, file_id);
+  m_pFS->writeInt16 (label.m_labelType);
+  m_pFS->writeInt16 (label.m_year);
+  m_pFS->writeInt16 (label.m_month);
+  m_pFS->writeInt16 (label.m_day);
+  m_pFS->writeInt16 (label.m_hour);
+  m_pFS->writeInt16 (label.m_minute);
+  m_pFS->writeInt16 (label.m_second);
+  m_pFS->writeFloat64 (label.m_calcTime);
   kuint16 strlength = label.m_strLabel.length();
-  write_nint16 (&strlength, file_id);
-  write (file_id, static_cast<const void*>(label.m_strLabel.c_str()), strlength);
+  m_pFS->writeInt16 (strlength);
+  m_pFS->write (label.m_strLabel.c_str(), strlength);
 
   num_labels++;
 
   headerWrite();
-  fsync(file_id);
 }
 
 template<class T>
@@ -674,7 +679,7 @@ class F64Image : public Array2dFile<kfloat64>
 #endif
 };
 
-#define IMAGEFILE_64_BITS 1
+#undef IMAGEFILE_64_BITS
 #ifdef IMAGEFILE_64_BITS
 typedef F64Image   ImageFile;
 typedef kfloat64   ImageFileValue;