** This is part of the CTSim program
** Copyright (C) 1983-2000 Kevin Rosenberg
**
-** $Id: array2dfile.cpp,v 1.3 2000/06/28 15:25:34 kevin Exp $
+** $Id: array2dfile.cpp,v 1.20 2000/12/16 02:44:26 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
******************************************************************************/
#include "array2dfile.h"
-#include <ctime>
-#include <sstream>
+#include <ctime>\r
+#ifdef MSVC\r
+typedef long off_t;\r
+#endif
using namespace std;
+const kuint16 Array2dFile::m_signature = ('I'*256+'F');
///////////////////////////////////////////////////////////////////////////
// CLASS IMPLEMENTATION
init();
}
-Array2dFileLabel::Array2dFileLabel(const char* const str, double ctime = 0.)
+Array2dFileLabel::Array2dFileLabel(const char* const str, double ctime)
: m_strLabel (str)
{
init();
m_calcTime = ctime;
}
-Array2dFileLabel::Array2dFileLabel(const int type, const char* const str, double ctime = 0.)
+Array2dFileLabel::Array2dFileLabel(const int type, const char* const str, double ctime)
: m_strLabel (str)
{
init();
const string&
Array2dFileLabel::getDateString (void) const
{
- ostringstream oss;
- oss << m_month + 1 <<"/"<< m_day <<"/"<< m_year + 1900 << " " << m_hour <<":"<< m_minute <<":"<< m_second;
- m_strDate = oss.str();
+ char szDate [128];\r
+ snprintf (szDate, sizeof(szDate), "%2d/%02d/%4d %02d:%02d:%02d",\r
+ m_month + 1, m_day, m_year + 1900, m_hour, m_minute, m_second);
+ m_strDate = szDate;
return m_strDate;
}
}
void
-Array2dFileLabel::print (ostream& os) const
+Array2dFileLabel::print (std::ostream& os) const
{
if (m_labelType == L_HISTORY) {
os << "History: " << endl;
{
freeArray ();
for (labelIterator l = m_labels.begin(); l != m_labels.end(); l++)
- delete *l;
+ delete *l;
}
Array2dFile::Array2dFile (void)
void
Array2dFile::setArraySize (int x, int y, int pixelSize, int pixelFormat)
{
- m_nx = x;
- m_ny = y;
m_pixelSize = pixelSize;
- m_arraySize = m_nx * m_ny * m_pixelSize;
m_pixelFormat = pixelFormat;
- allocArray ();
+ setArraySize (x, y);
}
void
m_arrayData = new unsigned char* [m_nx];
int columnBytes = m_ny * m_pixelSize;
- for (int i = 0; i < m_nx; i++)
+ for (unsigned int i = 0; i < m_nx; i++)
m_arrayData[i] = new unsigned char [columnBytes];
}
Array2dFile::freeArray (void)
{
if (m_arrayData) {
- for (int i = 0; i < m_nx; i++)
+ for (unsigned int i = 0; i < m_nx; i++)
delete m_arrayData[i];
delete m_arrayData;
m_arrayData = NULL;
}
}
+bool
+Array2dFile::fileWrite (const string& filename)
+{
+ return fileWrite (filename.c_str());
+}
+
bool
Array2dFile::fileWrite (const char* const filename)
{
return true;
}
+bool
+Array2dFile::fileRead (const string& filename)
+{
+ return fileRead (filename.c_str());
+}
+
bool
Array2dFile::fileRead (const char* const filename)
{
m_filename = filename;
- frnetorderstream fs (m_filename.c_str(), ios::out | ios::in | ios::binary | ios::nocreate);
+#ifdef MSVC\r
+ frnetorderstream fs (m_filename.c_str(), ios::out | ios::in | ios::binary);\r
+#else\r
+ frnetorderstream fs (m_filename.c_str(), ios::out | ios::in | ios::binary | ios::nocreate);\r
+#endif\r
if (fs.fail()) {
sys_error (ERR_WARNING, "Unable to open file %s [fileRead]", m_filename.c_str());
return false;
fs.writeFloat64 (m_offsetPV);
fs.writeFloat64 (m_scalePV);
- m_headersize = fs.tellp();
+ m_headersize = static_cast<kuint16>(fs.tellp());
fs.seekp (0);
fs.writeInt16 (m_headersize);
if (NativeBigEndian()) {
for (unsigned int iy = 0; iy < m_ny; iy++) {
ConvertReverseNetworkOrder (ptrColumn, m_pixelSize);
- fs.write (ptrColumn, m_pixelSize);
+ fs.write (reinterpret_cast<const char*>(ptrColumn), m_pixelSize);
ptrColumn += m_pixelSize;
}
} else
- fs.write (ptrColumn, columnSize);
+ fs.write (reinterpret_cast<const char*>(ptrColumn), columnSize);
}
return true;
fs.seekg (m_headersize);
int columnSize = m_ny * m_pixelSize;
- for (int ix = 0; ix < m_nx; ix++) {
+ for (unsigned int ix = 0; ix < m_nx; ix++) {
unsigned char* ptrColumn = m_arrayData[ix];
if (NativeBigEndian()) {
for (unsigned int iy = 0; iy < m_ny; iy++) {
- fs.read (ptrColumn, m_pixelSize);
+ fs.read (reinterpret_cast<char*>(ptrColumn), m_pixelSize);
ConvertReverseNetworkOrder (ptrColumn, m_pixelSize);
ptrColumn += m_pixelSize;
}
} else
- fs.read (ptrColumn, columnSize);
+ fs.read (reinterpret_cast<char*>(ptrColumn), columnSize);
}
return true;
kuint16 strLength;
fs.readInt16 (strLength);
- char labelStr [strLength+1];
- fs.read (labelStr, strLength);
- labelStr[strLength] = 0;
+ char* pszLabelStr = new char [strLength+1];
+ fs.read (pszLabelStr, strLength);
+ pszLabelStr[strLength] = 0;
- Array2dFileLabel* pLabel = new Array2dFileLabel(labelType, labelStr, calcTime);
+ Array2dFileLabel* pLabel = new Array2dFileLabel (labelType, pszLabelStr, calcTime);
+ delete pszLabelStr;\r
+\r
pLabel->setDateTime (year, month, day, hour, minute, second);
- m_labels.push_back (pLabel);
+ m_labels.push_back (pLabel);\r
}
return true;
}
void
-Array2dFile::labelAdd (const char* const lstr, double calc_time=0.)
+Array2dFile::labelAdd (const char* const lstr, double calc_time)
{
labelAdd (Array2dFileLabel::L_HISTORY, lstr, calc_time);
}
void
-Array2dFile::labelAdd (int type, const char* const lstr, double calc_time=0.)
+Array2dFile::labelAdd (int type, const char* const lstr, double calc_time)
{
Array2dFileLabel label (type, lstr, calc_time);
}
void
-Array2dFile::labelsCopy (Array2dFile& copyFile, const char* const idStr)
+Array2dFile::labelsCopy (Array2dFile& copyFile, const char* const pszId)
{
- string id = idStr;
- for (int i = 0; i < copyFile.getNumLabels(); i++) {
- Array2dFileLabel l = copyFile.labelGet (i);
- copyFile.labelGet(i).print(cout);
- l.print(cout);
+ string id;
+ if (pszId)
+ id = pszId;
+ for (unsigned int i = 0; i < copyFile.getNumLabels(); i++) {
+ Array2dFileLabel l (copyFile.labelGet (i));
string lstr = l.getLabelString();
- lstr = idStr + lstr;
+ lstr = id + lstr;
l.setLabelString (lstr);
labelAdd (l);
}
{
if (m_arrayData) {
int columnSize = m_ny * m_pixelSize;
- for (int ix = 0; ix < m_nx; ix++)
+ for (unsigned int ix = 0; ix < m_nx; ix++)
memset (m_arrayData[ix], 0, columnSize);
}
}
void
Array2dFile::printLabels (ostream& os) const
{
- int nlabels = getNumLabels();
-
for (constLabelIterator l = m_labels.begin(); l != m_labels.end(); l++) {
const Array2dFileLabel& label = **l;